From 4c39b79fac47e7d5f11e22a3832d2cd9da3823e1 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 31 Jan 2023 16:45:06 +0800 Subject: [PATCH 001/340] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E6=A5=BC=E9=99=A2?= =?UTF-8?q?=E5=B0=8F=E7=BB=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/constant/TopicConstant.java | 12 + .../group/dto/topic/YtTopicAttachmentDTO.java | 95 +++++ .../topic/YtTopicCommentAttachmentDTO.java | 109 ++++++ .../group/dto/topic/YtTopicCommentDTO.java | 74 ++++ .../resi/group/dto/topic/YtTopicDTO.java | 125 ++++++ .../group/dto/topic/YtTopicVoteDetailDTO.java | 70 ++++ .../dto/topic/form/CreateYtTopicFormDTO.java | 86 +++++ .../dto/topic/form/YtTopicCommentFormDTO.java | 31 ++ .../dto/topic/form/YtTopicDetailFormDTO.java | 26 ++ .../dto/topic/form/YtTopicPageFormDTO.java | 32 ++ .../dto/topic/form/YtTopicVoteFormDTO.java | 28 ++ .../topic/result/YtTopicCommentResultDTO.java | 65 ++++ .../topic/result/YtTopicDetailResultDTO.java | 85 +++++ .../topic/result/YtTopicInfoResultDTO.java | 64 ++++ .../topic/controller/YtTopicController.java | 134 +++++++ .../topic/dao/YtTopicAttachmentDao.java | 16 + .../dao/YtTopicCommentAttachmentDao.java | 16 + .../modules/topic/dao/YtTopicCommentDao.java | 29 ++ .../epmet/modules/topic/dao/YtTopicDao.java | 28 ++ .../topic/dao/YtTopicVoteDetailDao.java | 16 + .../topic/entity/YtTopicAttachmentEntity.java | 61 +++ .../YtTopicCommentAttachmentEntity.java | 79 ++++ .../topic/entity/YtTopicCommentEntity.java | 41 ++ .../modules/topic/entity/YtTopicEntity.java | 91 +++++ .../topic/entity/YtTopicVoteDetailEntity.java | 36 ++ .../modules/topic/service/YtTopicService.java | 85 +++++ .../service/impl/YtTopicServiceImpl.java | 355 ++++++++++++++++++ .../db/migration/V0.0.28__yt_topic.sql | 92 +++++ .../mapper/topic/YtTopicAttachmentDao.xml | 7 + .../topic/YtTopicCommentAttachmentDao.xml | 7 + .../mapper/topic/YtTopicCommentDao.xml | 16 + .../resources/mapper/topic/YtTopicDao.xml | 19 + .../mapper/topic/YtTopicVoteDetailDao.xml | 8 + 33 files changed, 2038 insertions(+) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicAttachmentDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicCommentAttachmentDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicCommentDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicVoteDetailDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicCommentFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicPageFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicVoteFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicCommentResultDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicAttachmentDao.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicCommentAttachmentDao.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicCommentDao.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicDao.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicVoteDetailDao.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicAttachmentEntity.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicCommentAttachmentEntity.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicCommentEntity.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicEntity.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicVoteDetailEntity.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.28__yt_topic.sql create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicAttachmentDao.xml create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicCommentAttachmentDao.xml create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicCommentDao.xml create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicVoteDetailDao.xml diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java index 457e794443..1ba2bee6fe 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java @@ -120,4 +120,16 @@ public interface TopicConstant { String RESOLVED = "resolved"; String MEMBER = "member"; + /** + * 反对 + */ + String OPPOSITION = "opposition"; + /** + * 赞成 + */ + String SUPPORT = "support"; + /** + * 无 + */ + String NONE = "none"; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicAttachmentDTO.java new file mode 100644 index 0000000000..dddb6d1c4c --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicAttachmentDTO.java @@ -0,0 +1,95 @@ +package com.epmet.resi.group.dto.topic; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 烟台话题附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-01-30 + */ +@Data +public class YtTopicAttachmentDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 话题Id，关联resi_topic的id + */ + private String topicId; + + /** + * 附件名（uuid随机生成） + */ + private String attachmentName; + + /** + * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） + */ + private String attachmentFormat; + + /** + * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） + */ + private String attachmentType; + + /** + * 附件地址 + */ + private String attachmentUrl; + + /** + * 排序字段 + */ + private Integer sort; + + /** + * 语音或视频时长，秒 + */ + private Integer duration; + + /** + * 删除标记 0：未删除，1：已删除 + */ + private String 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/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicCommentAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicCommentAttachmentDTO.java new file mode 100644 index 0000000000..ff5b669689 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicCommentAttachmentDTO.java @@ -0,0 +1,109 @@ +package com.epmet.resi.group.dto.topic; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 烟台话题评论附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-01-30 + */ +@Data +public class YtTopicCommentAttachmentDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 话题Id + */ + private String topicId; + + /** + * 评论Id + */ + private String topicCommentId; + + /** + * 文件名 + */ + private String fileName; + + /** + * 附件名（uuid随机生成） + */ + private String attachmentName; + + /** + * 文件大小，单位b + */ + private Integer attachmentSize; + + /** + * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） + */ + private String attachmentFormat; + + /** + * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） + */ + private String attachmentType; + + /** + * 附件地址 + */ + private String attachmentUrl; + + /** + * 排序字段 + */ + private Integer sort; + + /** + * 语音或视频时长，秒 + */ + private Integer duration; + + /** + * 删除标记 0：未删除，1：已删除 + */ + private String 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/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicCommentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicCommentDTO.java new file mode 100644 index 0000000000..b397d26fef --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicCommentDTO.java @@ -0,0 +1,74 @@ +package com.epmet.resi.group.dto.topic; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 烟台话题评论表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-01-30 + */ +@Data +public class YtTopicCommentDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 话题Id，来自resi_topic + */ + private String topicId; + + /** + * + */ + private String commentContent; + + /** + * 评论状态：讨论中：discussing；已屏蔽 :hidden + */ + private String status; + + /** + * 删除标记 0：未删除，1：已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人，评论人Id，来自user + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicDTO.java new file mode 100644 index 0000000000..8e4fa3add3 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicDTO.java @@ -0,0 +1,125 @@ +package com.epmet.resi.group.dto.topic; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 烟台话题信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-01-30 + */ +@Data +public class YtTopicDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 网格ID + */ + private String gridId; + + /** + * + */ + private String topicContent; + + /** + * 话题状态（讨论中 - discussing、 已屏蔽 - hidden、 已关闭 - closed） + */ + private String status; + + /** + * 关闭状态：已解决 resolved，未解决 unresolved + */ + private String closedStatus; + + /** + * 省 + */ + private String province; + + /** + * 市 + */ + private String city; + + /** + * 区 + */ + private String area; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 维度 + */ + private String latitude; + + /** + * 定位地址 + */ + private String locateAddress; + + /** + * 定位经度 + */ + private String locateLongitude; + + /** + * 定位维度 + */ + private String locateLatitude; + + /** + * 删除标记 0：未删除，1：已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人，发布人Id来源于user + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicVoteDetailDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicVoteDetailDTO.java new file mode 100644 index 0000000000..bf8d7c10b1 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/YtTopicVoteDetailDTO.java @@ -0,0 +1,70 @@ +package com.epmet.resi.group.dto.topic; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 话题表决记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-01-30 + */ +@Data +public class YtTopicVoteDetailDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 话题ID + */ + private String topicId; + + /** + * 态度 - opposition（反对）support（赞成） + */ + private String attitude; + + /** + * 删除标识 0未删除、1已删除 + */ + private String 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/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java new file mode 100644 index 0000000000..83e899f647 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java @@ -0,0 +1,86 @@ +package com.epmet.resi.group.dto.topic.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Author zhaoqifeng + * @Date 2023/1/30 16:17 + */ +@Data +public class CreateYtTopicFormDTO implements Serializable { + private static final long serialVersionUID = 1L; + + private String customerId; + + private String gridId; + + + private String topicContent; + + /** + * 经度 + * */ + private String longitude; + + /** + * 纬度 + * */ + private String latitude; + + /** + * 地址 + * */ + @NotBlank(message = "地址信息不能为空") + private String address; + + /** + * 经度 + * */ + private String locateLongitude; + + /** + * 纬度 + * */ + private String locateLatitude; + + /** + * 地址 + * */ + private String locateAddress; + + /** + * 省份 + * */ + private String province; + + /** + * 城市 + * */ + private String city; + + /** + * 地区 + * */ + private String area; + + /** + * 图片附件 + */ + private List imageList; + /** + * 文件附件 + */ + private List docList; + /** + * 语音附件 + */ + private List voiceList; + /** + * 视频附件 + */ + private List videoList; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicCommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicCommentFormDTO.java new file mode 100644 index 0000000000..e047e12eae --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicCommentFormDTO.java @@ -0,0 +1,31 @@ +package com.epmet.resi.group.dto.topic.form; + +import com.epmet.resi.group.dto.notice.form.NoticeFileDTO; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @ClassName ResiPublishCommentFormDTO + * @Author wangc + * @date 2020.03.31 17:32 + */ +@Data +public class YtTopicCommentFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotBlank(message = "话题Id不能为空") + private String topicId; + + //@NotBlank(message = "评论内容不能为空") + private String commentContent; + + /** + * 图片附件集合 + */ + private List imageList; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java new file mode 100644 index 0000000000..058b5049be --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java @@ -0,0 +1,26 @@ +package com.epmet.resi.group.dto.topic.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @ClassName ResiTopicDetailFormDTO + * @Author wangc + * @date 2020.04.07 09:07 + */ +@Data +public class YtTopicDetailFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 话题Id + * */ + @NotBlank(message = "话题Id不能为空") + private String topicId; + +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicPageFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicPageFormDTO.java new file mode 100644 index 0000000000..45a77a1c6f --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicPageFormDTO.java @@ -0,0 +1,32 @@ +package com.epmet.resi.group.dto.topic.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @author Administrator + */ +@Data +public class YtTopicPageFormDTO extends PageFormDTO implements Serializable{ + + private static final long serialVersionUID = 1L; + + /** + * 组Id + * */ + @NotBlank(message = "网格Id不能为空") + private String gridId; + + /** + * 搜索时可以带状态的查询，也可以不带 + * */ + private String status; + + /** + * 用户Id + * */ + private String userId; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicVoteFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicVoteFormDTO.java new file mode 100644 index 0000000000..153467c7a2 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicVoteFormDTO.java @@ -0,0 +1,28 @@ +package com.epmet.resi.group.dto.topic.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @ClassName ResiPublishCommentFormDTO + * @Author wangc + * @date 2020.03.31 17:32 + */ +@Data +public class YtTopicVoteFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotBlank(message = "话题Id不能为空") + private String topicId; + + /** + * 态度opposition（反对）support（赞成） + */ + @NotBlank(message = "投票结果不能为空") + private String attitude; + +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicCommentResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicCommentResultDTO.java new file mode 100644 index 0000000000..cf18c2d385 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicCommentResultDTO.java @@ -0,0 +1,65 @@ +package com.epmet.resi.group.dto.topic.result; + +import com.alibaba.fastjson.annotation.JSONField; +import com.epmet.resi.group.dto.group.result.CommentFileDTO; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @Description + * @ClassName ResiCommentResultDTO + * @Author wangc + * @date 2020.04.01 17:07 + */ +@Data +public class YtTopicCommentResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 评论Id + * */ + private String commentId; + + /** + * 评论内容 + * */ + private String commentContent; + + /** + * 评论者头像 + * */ + private String commentUserHeadPhoto; + + /** + * 评论者姓名 + * */ + private String commentUserName; + + /** + * 用户Id 评论者Id + * */ + @JsonIgnore + private String userId; + + /** + * 评论时间 yyyy-MM-dd HH:mm + * */ + @JSONField(format="yyyy-MM-dd HH:mm") + private Date commentTime; + + /** + * 评论状态 + * */ + private String commentStatus; + + /** + * 图片附件集合 + */ + private List imageList = new ArrayList<>(); +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java new file mode 100644 index 0000000000..955d88532a --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java @@ -0,0 +1,85 @@ +package com.epmet.resi.group.dto.topic.result; + +import com.epmet.resi.group.dto.topic.form.FileDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Administrator + */ +@Data +public class YtTopicDetailResultDTO implements Serializable { + private static final long serialVersionUID = -6790536784979922200L; + + /** + * 话题Id + * */ + private String topicId; + + + /** + * 发布人名称 + * */ + private String releaseUserName; + + /** + * 发布人头像 + * */ + private String releaseUserHeadPhoto; + + /** + * 发布时间 yyyy-MM-dd HH:mm + * */ + private String releaseTime; + + /** + * 发布地址 + * */ + private String releaseAddress; + + /** + * 经度 + */ + private String longitude; + + /** + * 维度 + */ + private String latitude; + + /** + * 话题内容 + * */ + private String topicContent; + + /** + * 话题状态 + * */ + private String topicStatus; + + /** + * 图片访问地址 + * */ + private List topicImages; + + /** + * 话题语音详情 + * */ + private List topicVoices; + + /** + * 本人投票状态opposition（反对）support（赞成） none(未投票) + * */ + private String voteStatus; + /** + * 投票支持数 + * */ + private String supportCount; + /** + * 投票反对数 + * */ + private String oppositionCount; + +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java new file mode 100644 index 0000000000..4cc58aca38 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java @@ -0,0 +1,64 @@ +package com.epmet.resi.group.dto.topic.result; + +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * @author Administrator + */ +@Data +public class YtTopicInfoResultDTO implements Serializable { + private static final long serialVersionUID = -7029232911456325417L; + + /** + * 话题Id + * */ + private String topicId; + + /** + * 用户Id 话题发布人 + * */ + private String userId; + + /** + * 发布人名称 + * */ + private String releaseUserName; + + /** + * 发布人头像 + * */ + private String releaseUserHeadPhoto; + + /** + * 发布时间 yyyy-MM-dd HH:mm + * */ + @JSONField(format="yyyy-MM-dd HH:mm") + private Date releaseTime; + + /** + * 话题内容 + * */ + private String topicContent; + + /** + * 话题状态 讨论中 已关闭 + * */ + private String status; + + /** + * 是否本人 me other + * */ + private String releaseUserFlag; + + /** + * 第一张图片 + * */ + private List imageList; + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java new file mode 100644 index 0000000000..1e6ddcf394 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java @@ -0,0 +1,134 @@ +package com.epmet.modules.topic.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; +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.modules.topic.service.YtTopicService; +import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO; +import com.epmet.resi.group.dto.topic.form.*; +import com.epmet.resi.group.dto.topic.result.YtTopicCommentResultDTO; +import com.epmet.resi.group.dto.topic.result.YtTopicDetailResultDTO; +import com.epmet.resi.group.dto.topic.result.YtTopicInfoResultDTO; +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 java.util.List; + + +/** + * 烟台话题信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-01-30 + */ +@RestController +@RequestMapping("ytTopic") +public class YtTopicController { + + @Autowired + private YtTopicService ytTopicService; + + /** + * 发布话题 + * + * @Param tokenDto + * @Param formDTO + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2023/1/30 16:32 + */ + @PostMapping("createTopic") + @NoRepeatSubmit + public Result createTopic(@LoginUser TokenDto tokenDto, @RequestBody CreateYtTopicFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + ytTopicService.createTopic(tokenDto, formDTO); + return new Result(); + } + + /** + * 话题详情 + * + * @Param tokenDto + * @Param topicDetailFormDTO + * @Return {@link Result< YtTopicDetailResultDTO>} + * @Author zhaoqifeng + * @Date 2023/1/30 16:39 + */ + @PostMapping("topicDetail") + public Result getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody YtTopicDetailFormDTO topicDetailFormDTO) { + ValidatorUtils.validateEntity(topicDetailFormDTO); + return new Result().ok(ytTopicService.getTopicDetail(tokenDto, topicDetailFormDTO)); + } + + /** + * 话题列表 + * + * @Param tokenDto + * @Param topicPageFormDTO + * @Return {@link Result< PageData< YtTopicInfoResultDTO>>} + * @Author zhaoqifeng + * @Date 2023/1/30 16:55 + */ + @PostMapping("topicList") + public Result> getTopicList(@LoginUser TokenDto tokenDto, @RequestBody YtTopicPageFormDTO topicPageFormDTO) { + topicPageFormDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(topicPageFormDTO); + return new Result>().ok(ytTopicService.getTopicList(tokenDto, topicPageFormDTO)); + } + + /** + * 话题详情评论列表 + * + * @Param tokenDto + * @Param queryCommentFormDTO + * @Return {@link Result>} + * @Author zhaoqifeng + * @Date 2023/1/30 16:57 + */ + @PostMapping("topicCommentList") + public Result> getTopiCommentList(@LoginUser TokenDto tokenDto, @RequestBody YtTopicDetailFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return new Result>().ok(ytTopicService.getTopicCommentList(tokenDto, formDTO)); + } + + /** + * 评论话题 + * + * @Param tokenDto + * @Param formDTO + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2023/1/30 17:06 + */ + @PostMapping("topicComment") + @NoRepeatSubmit + public Result topiComment(@LoginUser TokenDto tokenDto, @RequestBody YtTopicCommentFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + ytTopicService.topicComment(tokenDto, formDTO); + return new Result(); + } + + /** + * 话题投票 + * + * @Param tokenDto + * @Param formDTO + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2023/1/30 17:08 + */ + @PostMapping("topicVote") + @NoRepeatSubmit + public Result topicVote(@LoginUser TokenDto tokenDto, @RequestBody YtTopicVoteFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + ytTopicService.topicVote(tokenDto, formDTO); + return new Result(); + } + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicAttachmentDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicAttachmentDao.java new file mode 100644 index 0000000000..332f1ce641 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicAttachmentDao.java @@ -0,0 +1,16 @@ +package com.epmet.modules.topic.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.topic.entity.YtTopicAttachmentEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 烟台话题附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-01-30 + */ +@Mapper +public interface YtTopicAttachmentDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicCommentAttachmentDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicCommentAttachmentDao.java new file mode 100644 index 0000000000..25ba6fe8a0 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicCommentAttachmentDao.java @@ -0,0 +1,16 @@ +package com.epmet.modules.topic.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.topic.entity.YtTopicCommentAttachmentEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 烟台话题评论附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-01-30 + */ +@Mapper +public interface YtTopicCommentAttachmentDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicCommentDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicCommentDao.java new file mode 100644 index 0000000000..2167e676cf --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicCommentDao.java @@ -0,0 +1,29 @@ +package com.epmet.modules.topic.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.topic.entity.YtTopicCommentEntity; +import com.epmet.resi.group.dto.topic.form.YtTopicDetailFormDTO; +import com.epmet.resi.group.dto.topic.result.YtTopicCommentResultDTO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 烟台话题评论表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-01-30 + */ +@Mapper +public interface YtTopicCommentDao extends BaseDao { + + /** + * 获取评论列表 + * + * @Param formDTO + * @Return {@link List} + * @Author zhaoqifeng + * @Date 2023/1/31 14:11 + */ + List selectCommentList(YtTopicDetailFormDTO formDTO); +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicDao.java new file mode 100644 index 0000000000..42cf49bcd1 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicDao.java @@ -0,0 +1,28 @@ +package com.epmet.modules.topic.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.topic.entity.YtTopicEntity; +import com.epmet.resi.group.dto.topic.form.YtTopicPageFormDTO; +import com.epmet.resi.group.dto.topic.result.YtTopicInfoResultDTO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 烟台话题信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-01-30 + */ +@Mapper +public interface YtTopicDao extends BaseDao { + /** + * 话题列表 + * + * @Param topicPageFormDTO + * @Return {@link List} + * @Author zhaoqifeng + * @Date 2023/1/31 13:52 + */ + List selectTopicList(YtTopicPageFormDTO topicPageFormDTO); +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicVoteDetailDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicVoteDetailDao.java new file mode 100644 index 0000000000..c947aef1fc --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/YtTopicVoteDetailDao.java @@ -0,0 +1,16 @@ +package com.epmet.modules.topic.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.topic.entity.YtTopicVoteDetailEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 话题表决记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-01-30 + */ +@Mapper +public interface YtTopicVoteDetailDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicAttachmentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicAttachmentEntity.java new file mode 100644 index 0000000000..b7da282f42 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicAttachmentEntity.java @@ -0,0 +1,61 @@ +package com.epmet.modules.topic.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-01-30 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("yt_topic_attachment") +public class YtTopicAttachmentEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 话题Id，关联resi_topic的id + */ + private String topicId; + + /** + * 附件名（uuid随机生成） + */ + private String attachmentName; + + /** + * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） + */ + private String attachmentFormat; + + /** + * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） + */ + private String attachmentType; + + /** + * 附件地址 + */ + private String attachmentUrl; + + /** + * 排序字段 + */ + private Integer sort; + + /** + * 语音或视频时长，秒 + */ + private Integer duration; + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicCommentAttachmentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicCommentAttachmentEntity.java new file mode 100644 index 0000000000..687b276579 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicCommentAttachmentEntity.java @@ -0,0 +1,79 @@ +package com.epmet.modules.topic.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-01-30 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("yt_topic_comment_attachment") +public class YtTopicCommentAttachmentEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 话题Id + */ + private String topicId; + + /** + * 评论Id + */ + private String topicCommentId; + + /** + * 文件名 + */ + private String fileName; + + /** + * 附件名（uuid随机生成） + */ + private String attachmentName; + + /** + * 文件大小，单位b + */ + private Integer attachmentSize; + + /** + * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） + */ + private String attachmentFormat; + + /** + * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） + */ + private String attachmentType; + + /** + * 附件地址 + */ + private String attachmentUrl; + + /** + * 排序字段 + */ + private Integer sort; + + /** + * 语音或视频时长，秒 + */ + private Integer duration; + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicCommentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicCommentEntity.java new file mode 100644 index 0000000000..52a60634d2 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicCommentEntity.java @@ -0,0 +1,41 @@ +package com.epmet.modules.topic.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-01-30 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("yt_topic_comment") +public class YtTopicCommentEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 话题Id，来自resi_topic + */ + private String topicId; + + /** + * + */ + private String commentContent; + + /** + * 评论状态：讨论中：discussing；已屏蔽 :hidden + */ + private String status; + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicEntity.java new file mode 100644 index 0000000000..6ccb37a2c8 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicEntity.java @@ -0,0 +1,91 @@ +package com.epmet.modules.topic.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-01-30 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("yt_topic") +public class YtTopicEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 网格ID + */ + private String gridId; + + /** + * + */ + private String topicContent; + + /** + * 话题状态（讨论中 - discussing、 已屏蔽 - hidden、 已关闭 - closed） + */ + private String status; + + /** + * 关闭状态：已解决 resolved，未解决 unresolved + */ + private String closedStatus; + + /** + * 省 + */ + private String province; + + /** + * 市 + */ + private String city; + + /** + * 区 + */ + private String area; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 维度 + */ + private String latitude; + + /** + * 定位地址 + */ + private String locateAddress; + + /** + * 定位经度 + */ + private String locateLongitude; + + /** + * 定位维度 + */ + private String locateLatitude; + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicVoteDetailEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicVoteDetailEntity.java new file mode 100644 index 0000000000..837b34641a --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicVoteDetailEntity.java @@ -0,0 +1,36 @@ +package com.epmet.modules.topic.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-01-30 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("yt_topic_vote_detail") +public class YtTopicVoteDetailEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 话题ID + */ + private String topicId; + + /** + * 态度 - opposition（反对）support（赞成） + */ + private String attitude; + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java new file mode 100644 index 0000000000..b0412edfb7 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java @@ -0,0 +1,85 @@ +package com.epmet.modules.topic.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.modules.topic.entity.YtTopicEntity; +import com.epmet.resi.group.dto.topic.form.*; +import com.epmet.resi.group.dto.topic.result.YtTopicCommentResultDTO; +import com.epmet.resi.group.dto.topic.result.YtTopicDetailResultDTO; +import com.epmet.resi.group.dto.topic.result.YtTopicInfoResultDTO; + +/** + * 烟台话题信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-01-30 + */ +public interface YtTopicService extends BaseService { + + /** + * 发布话题 + * + * @Param tokenDto + * @Param formDTO + * @Return + * @Author zhaoqifeng + * @Date 2023/1/30 16:18 + */ + void createTopic(TokenDto tokenDto, CreateYtTopicFormDTO formDTO); + + /** + * 话题详情 + * + * @Param tokenDto + * @Param formDTO + * @Return {@link YtTopicDetailResultDTO} + * @Author zhaoqifeng + * @Date 2023/1/30 16:39 + */ + YtTopicDetailResultDTO getTopicDetail(TokenDto tokenDto, YtTopicDetailFormDTO formDTO); + + /** + * 话题列表 + * + * @Param tokenDto + * @Param topicPageFormDTO + * @Return {@link PageData} + * @Author zhaoqifeng + * @Date 2023/1/30 16:56 + */ + PageData getTopicList(TokenDto tokenDto, YtTopicPageFormDTO topicPageFormDTO); + + /** + * 话题详情评论列表 + * + * @Param tokenDto + * @Param formDTO + * @Return {@link PageData} + * @Author zhaoqifeng + * @Date 2023/1/30 17:02 + */ + PageData getTopicCommentList(TokenDto tokenDto, YtTopicDetailFormDTO formDTO); + + /** + * 评论话题 + * + * @Param tokenDto + * @Param formDTO + * @Return + * @Author zhaoqifeng + * @Date 2023/1/30 17:05 + */ + void topicComment(TokenDto tokenDto, YtTopicCommentFormDTO formDTO); + + /** + * 话题投票 + * + * @Param tokenDto + * @Param formDTO + * @Return + * @Author zhaoqifeng + * @Date 2023/1/30 17:08 + */ + void topicVote(TokenDto tokenDto, YtTopicVoteFormDTO formDTO); +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java new file mode 100644 index 0000000000..36d148cfc3 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java @@ -0,0 +1,355 @@ +package com.epmet.modules.topic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; +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.modules.topic.dao.*; +import com.epmet.modules.topic.entity.*; +import com.epmet.modules.topic.service.YtTopicService; +import com.epmet.modules.utils.ModuleConstant; +import com.epmet.resi.group.constant.TopicConstant; +import com.epmet.resi.group.dto.group.result.CommentFileDTO; +import com.epmet.resi.group.dto.topic.form.*; +import com.epmet.resi.group.dto.topic.result.YtTopicCommentResultDTO; +import com.epmet.resi.group.dto.topic.result.YtTopicDetailResultDTO; +import com.epmet.resi.group.dto.topic.result.YtTopicInfoResultDTO; +import com.github.pagehelper.PageInfo; +import com.github.pagehelper.page.PageMethod; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; + +/** + * 烟台话题信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-01-30 + */ +@Slf4j +@Service +public class YtTopicServiceImpl extends BaseServiceImpl implements YtTopicService { + + @Resource + private YtTopicAttachmentDao ytTopicAttachmentDao; + @Resource + private YtTopicCommentDao ytTopicCommentDao; + @Resource + private YtTopicCommentAttachmentDao ytTopicCommentAttachmentDao; + @Resource + private YtTopicVoteDetailDao ytTopicVoteDetailDao; + + /** + * 发布话题 + * + * @Param tokenDto + * @Param formDTO + * @Return + * @Author zhaoqifeng + * @Date 2023/1/30 16:18 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void createTopic(TokenDto tokenDto, CreateYtTopicFormDTO formDTO) { + if(StringUtils.isBlank(formDTO.getTopicContent()) && CollectionUtils.isEmpty(formDTO.getVoiceList())) { + //话题内容和语音不能同时为空 + log.error(ModuleConstant.TOPIC_CONTENT_AND_VOICE_IS_NULL); + throw new EpmetException(ModuleConstant.TOPIC_CONTENT_AND_VOICE_IS_NULL); + } + + //1.保存话题草稿 + if(formDTO.getTopicContent().length() > TopicConstant.MAX_NUMBER_OF_CONTENT){ + //内容超过最大限制 + log.error(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED); + throw new EpmetException(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED); + } + + YtTopicEntity topic = ConvertUtils.sourceToTarget(formDTO, YtTopicEntity.class); + //如果只有语音，则话题内容为语音话题 + if (CollectionUtils.isNotEmpty(formDTO.getVoiceList()) && StringUtils.isBlank(formDTO.getTopicContent())) { + topic.setTopicContent("语音话题"); + } + topic.setCustomerId(tokenDto.getCustomerId()); + topic.setStatus(TopicConstant.PUBLISHMENT); + baseDao.insert(topic); + + //保存图片附件 + if(CollectionUtils.isNotEmpty(formDTO.getImageList())){ + int sort = 0; + for(String url : formDTO.getImageList()){ + YtTopicAttachmentEntity attachment = new YtTopicAttachmentEntity(); + attachment.setCustomerId(formDTO.getCustomerId()); + attachment.setAttachmentUrl(url); + attachment.setTopicId(topic.getId()); + attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase()); + attachment.setSort(sort++); + attachment.setAttachmentType(TopicConstant.IMAGE); + ytTopicAttachmentDao.insert(attachment); + } + } + + //保存语音附件 + if(CollectionUtils.isNotEmpty(formDTO.getVoiceList())){ + int sort = 0; + for(FileDTO file : formDTO.getVoiceList()){ + YtTopicAttachmentEntity attachment = new YtTopicAttachmentEntity(); + attachment.setCustomerId(formDTO.getCustomerId()); + attachment.setAttachmentUrl(file.getUrl()); + attachment.setTopicId(topic.getId()); + attachment.setCreatedBy(tokenDto.getUserId()); + attachment.setAttachmentFormat(file.getUrl().substring(file.getUrl().lastIndexOf(".") + NumConstant.ONE).toLowerCase()); + attachment.setSort(sort++); + attachment.setAttachmentType(TopicConstant.VOICE); + attachment.setDuration(file.getDuration()); + ytTopicAttachmentDao.insert(attachment); + } + } + + + + } + + /** + * 话题详情 + * + * @Param formDTO + * @Return {@link YtTopicDetailResultDTO} + * @Author zhaoqifeng + * @Date 2023/1/30 16:39 + */ + @Override + public YtTopicDetailResultDTO getTopicDetail(TokenDto tokenDto, YtTopicDetailFormDTO formDTO) { + //1.查询话题信息 + YtTopicEntity entity = baseDao.selectById(formDTO.getTopicId()); + if(null == entity){ + log.error(ModuleConstant.NO_SUCH_TOPIC); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), ModuleConstant.NO_SUCH_TOPIC, ModuleConstant.NO_SUCH_TOPIC); + } + YtTopicDetailResultDTO result = ConvertUtils.sourceToTarget(entity, YtTopicDetailResultDTO.class); + result.setTopicId(formDTO.getTopicId()); + result.setTopicStatus(entity.getStatus()); + result.setReleaseTime(DateUtils.format(entity.getCreatedTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)); + result.setReleaseAddress(entity.getAddress()); + + //2.查询话题图片附件 + LambdaQueryWrapper imgWrapper = new LambdaQueryWrapper<>(); + imgWrapper.eq(YtTopicAttachmentEntity::getTopicId, formDTO.getTopicId()); + imgWrapper.eq(YtTopicAttachmentEntity::getAttachmentType, TopicConstant.IMAGE); + imgWrapper.orderByAsc(YtTopicAttachmentEntity::getSort); + List imgList = ytTopicAttachmentDao.selectList(imgWrapper); + if (CollectionUtils.isNotEmpty(imgList)) { + List imageUrls = imgList.stream().map(YtTopicAttachmentEntity::getAttachmentUrl).collect(Collectors.toList()); + result.setTopicImages(imageUrls); + } + + //3.查询话题音频附件 + LambdaQueryWrapper voiceWrapper = new LambdaQueryWrapper<>(); + voiceWrapper.eq(YtTopicAttachmentEntity::getTopicId, formDTO.getTopicId()); + voiceWrapper.eq(YtTopicAttachmentEntity::getAttachmentType, TopicConstant.VOICE); + voiceWrapper.orderByAsc(YtTopicAttachmentEntity::getSort); + List voiceList = ytTopicAttachmentDao.selectList(voiceWrapper); + if (CollectionUtils.isNotEmpty(voiceList)) { + List voiceUrls = voiceList.stream().map(item ->{ + FileDTO fileDTO = new FileDTO(); + fileDTO.setUrl(item.getAttachmentUrl()); + fileDTO.setDuration(item.getDuration()); + return fileDTO; + }).collect(Collectors.toList()); + result.setTopicVoices(voiceUrls); + } + + + //4.获取发布人信息 + ResiUserInfoCache userInfo = CustomerResiUserRedis.getUserBaseInfo(entity.getCreatedBy()); + if (null == userInfo) { + String msg = "获取发布人信息失败"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } + result.setReleaseUserName(userInfo.getShowName()); + result.setReleaseUserHeadPhoto(userInfo.getHeadImgUrl()); + //5.获取投票信息 + result.setOppositionCount(NumConstant.ZERO_STR); + result.setSupportCount(NumConstant.ZERO_STR); + LambdaQueryWrapper voteWrapper = new LambdaQueryWrapper<>(); + voteWrapper.eq(YtTopicVoteDetailEntity::getTopicId, formDTO.getTopicId()); + List voteList = ytTopicVoteDetailDao.selectList(voteWrapper); + if (CollectionUtils.isNotEmpty(voteList)) { + Map voteMap = voteList.stream().collect(Collectors.groupingBy(YtTopicVoteDetailEntity::getAttitude, Collectors.counting())); + if (voteMap.containsKey(TopicConstant.OPPOSITION)) { + result.setOppositionCount(String.valueOf(voteMap.get(TopicConstant.OPPOSITION))); + } + if (voteMap.containsKey(TopicConstant.SUPPORT)) { + result.setSupportCount(String.valueOf(voteMap.get(TopicConstant.SUPPORT))); + } + } + voteWrapper.eq(YtTopicVoteDetailEntity::getCreatedBy, tokenDto.getUserId()); + voteList = ytTopicVoteDetailDao.selectList(voteWrapper); + if (CollectionUtils.isNotEmpty(voteList)) { + result.setVoteStatus(voteList.get(NumConstant.ZERO).getAttitude()); + } else { + result.setVoteStatus(TopicConstant.NONE); + } + return result; + } + + /** + * 话题列表 + * + * @Param tokenDto + * @Param topicPageFormDTO + * @Return {@link PageData} + * @Author zhaoqifeng + * @Date 2023/1/30 16:56 + */ + @Override + public PageData getTopicList(TokenDto tokenDto, YtTopicPageFormDTO topicPageFormDTO) { + PageMethod.startPage(topicPageFormDTO.getPageNo(), topicPageFormDTO.getPageSize()); + List list = baseDao.selectTopicList(topicPageFormDTO); + PageInfo pageInfo = new PageInfo<>(list); + if (CollectionUtils.isNotEmpty(list)) { + list.forEach(item -> { + ResiUserInfoCache userInfo = CustomerResiUserRedis.getUserBaseInfo(item.getUserId()); + if (null != userInfo) { + item.setReleaseUserName(userInfo.getShowName()); + item.setReleaseUserHeadPhoto(userInfo.getHeadImgUrl()); + } + if (tokenDto.getUserId().equals(item.getUserId())) { + item.setReleaseUserFlag("me"); + } else { + item.setReleaseUserFlag("other"); + } + //获取附件图片 + LambdaQueryWrapper imgWrapper = new LambdaQueryWrapper<>(); + imgWrapper.eq(YtTopicAttachmentEntity::getTopicId, item.getTopicId()); + imgWrapper.eq(YtTopicAttachmentEntity::getAttachmentType, TopicConstant.IMAGE); + imgWrapper.orderByAsc(YtTopicAttachmentEntity::getSort); + imgWrapper.last("limit 3"); + List imgList = ytTopicAttachmentDao.selectList(imgWrapper); + if (CollectionUtils.isNotEmpty(imgList)) { + List imageUrls = imgList.stream().map(YtTopicAttachmentEntity::getAttachmentUrl).collect(Collectors.toList()); + item.setImageList(imageUrls); + } + }); + } + return new PageData<>(list, pageInfo.getTotal()); + } + + /** + * 话题详情评论列表 + * + * @Param tokenDto + * @Param formDTO + * @Return {@link PageData} + * @Author zhaoqifeng + * @Date 2023/1/30 17:02 + */ + @Override + public PageData getTopicCommentList(TokenDto tokenDto, YtTopicDetailFormDTO formDTO) { + PageMethod.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = ytTopicCommentDao.selectCommentList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + if (CollectionUtils.isNotEmpty(list)) { + //获取评论附件信息 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(YtTopicCommentAttachmentEntity::getTopicId, formDTO.getTopicId()); + List attachmentList = ytTopicCommentAttachmentDao.selectList(wrapper); + Map> map = new HashMap<>(); + if (CollectionUtils.isNotEmpty(attachmentList)) { + map = attachmentList.stream().sorted(Comparator.comparingInt(YtTopicCommentAttachmentEntity::getSort)) + .collect(Collectors.groupingBy(YtTopicCommentAttachmentEntity::getTopicCommentId, LinkedHashMap::new, Collectors.toList())); + } + Map> finalMap = map; + list.forEach(item -> { + ResiUserInfoCache userInfo = CustomerResiUserRedis.getUserBaseInfo(item.getUserId()); + if (null != userInfo) { + item.setCommentUserName(userInfo.getShowName()); + item.setCommentUserHeadPhoto(userInfo.getHeadImgUrl()); + } + if (finalMap.containsKey(item.getCommentId())) { + List fileList = finalMap.get(item.getCommentId()).stream().map(i -> { + CommentFileDTO file = new CommentFileDTO(); + file.setName(i.getAttachmentName()); + file.setUrl(i.getAttachmentUrl()); + file.setDuration(i.getDuration()); + file.setSize(i.getAttachmentSize()); + file.setFormat(i.getAttachmentFormat()); + file.setType(i.getAttachmentType()); + return file; + }).collect(Collectors.toList()); + item.setImageList(fileList); + } + }); + } + return new PageData<>(list, pageInfo.getTotal()); + } + + /** + * 评论话题 + * + * @Param tokenDto + * @Param formDTO + * @Return + * @Author zhaoqifeng + * @Date 2023/1/30 17:05 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void topicComment(TokenDto tokenDto, YtTopicCommentFormDTO formDTO) { + YtTopicCommentEntity comment = ConvertUtils.sourceToTarget(formDTO, YtTopicCommentEntity.class); + comment.setStatus(TopicConstant.PUBLISHMENT); + comment.setCustomerId(tokenDto.getCustomerId()); + ytTopicCommentDao.insert(comment); + //保存评论附件 + //图片 + if (CollectionUtils.isNotEmpty(formDTO.getImageList())) { + AtomicInteger sort = new AtomicInteger(); + formDTO.getImageList().forEach(img -> { + YtTopicCommentAttachmentEntity attachment = new YtTopicCommentAttachmentEntity(); + attachment.setCustomerId(tokenDto.getCustomerId()); + attachment.setTopicId(formDTO.getTopicId()); + attachment.setTopicCommentId(comment.getId()); + attachment.setFileName(img.getName()); + attachment.setAttachmentName(""); + attachment.setAttachmentSize(img.getSize()); + attachment.setAttachmentFormat(img.getFormat()); + attachment.setAttachmentType(img.getType()); + attachment.setAttachmentUrl(img.getUrl()); + attachment.setSort(sort.get()); + attachment.setDuration(img.getDuration()); + sort.getAndIncrement(); + ytTopicCommentAttachmentDao.insert(attachment); + }); + } + } + + /** + * 话题投票 + * + * @Param tokenDto + * @Param formDTO + * @Return + * @Author zhaoqifeng + * @Date 2023/1/30 17:08 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void topicVote(TokenDto tokenDto, YtTopicVoteFormDTO formDTO) { + YtTopicVoteDetailEntity entity = ConvertUtils.sourceToTarget(formDTO, YtTopicVoteDetailEntity.class); + entity.setCustomerId(tokenDto.getCustomerId()); + ytTopicVoteDetailDao.insert(entity); + } +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.28__yt_topic.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.28__yt_topic.sql new file mode 100644 index 0000000000..93d13f692f --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.28__yt_topic.sql @@ -0,0 +1,92 @@ +CREATE TABLE `yt_topic` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) DEFAULT NULL COMMENT '客户ID', + `GRID_ID` varchar(64) DEFAULT NULL COMMENT '网格ID', + `TOPIC_CONTENT` text COMMENT '话题内容', + `STATUS` varchar(32) NOT NULL COMMENT '话题状态（讨论中 - discussing、 已屏蔽 - hidden、 已关闭 - closed）', + `CLOSED_STATUS` varchar(32) DEFAULT NULL COMMENT '关闭状态：已解决 resolved，未解决 unresolved', + `PROVINCE` varchar(32) DEFAULT NULL COMMENT '省', + `CITY` varchar(32) DEFAULT NULL COMMENT '市', + `AREA` varchar(32) DEFAULT NULL COMMENT '区 ', + `ADDRESS` varchar(255) NOT NULL COMMENT '地址', + `LONGITUDE` varchar(32) DEFAULT NULL COMMENT '经度', + `LATITUDE` varchar(32) DEFAULT NULL COMMENT '维度', + `LOCATE_ADDRESS` varchar(255) DEFAULT NULL COMMENT '定位地址', + `LOCATE_LONGITUDE` varchar(32) DEFAULT NULL COMMENT '定位经度', + `LOCATE_LATITUDE` varchar(32) DEFAULT NULL COMMENT '定位维度', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人，发布人Id来源于user', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='烟台话题信息表'; +CREATE TABLE `yt_topic_attachment` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) DEFAULT NULL COMMENT '客户ID', + `TOPIC_ID` varchar(64) NOT NULL COMMENT '话题Id，关联resi_topic的id', + `ATTACHMENT_NAME` varchar(64) DEFAULT NULL COMMENT '附件名（uuid随机生成）', + `ATTACHMENT_FORMAT` varchar(64) DEFAULT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）', + `ATTACHMENT_TYPE` varchar(64) DEFAULT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））', + `ATTACHMENT_URL` varchar(255) NOT NULL COMMENT '附件地址', + `SORT` int(1) NOT NULL COMMENT '排序字段', + `DURATION` int(11) unsigned zerofill DEFAULT '00000000000' COMMENT '语音或视频时长，秒', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE, + KEY `idx_topic_id` (`TOPIC_ID`) USING BTREE COMMENT '话题主键' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='烟台话题附件表'; +CREATE TABLE `yt_topic_comment` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) DEFAULT NULL COMMENT '客户ID', + `TOPIC_ID` varchar(64) NOT NULL COMMENT '话题Id，来自resi_topic', + `COMMENT_CONTENT` varchar(300) DEFAULT NULL, + `STATUS` varchar(32) DEFAULT NULL COMMENT '评论状态：讨论中：discussing；已屏蔽 :hidden', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人，评论人Id，来自user', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='烟台话题评论表'; +CREATE TABLE `yt_topic_comment_attachment` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `TOPIC_ID` varchar(64) NOT NULL COMMENT '话题Id', + `TOPIC_COMMENT_ID` varchar(64) NOT NULL COMMENT '评论Id', + `FILE_NAME` varchar(255) DEFAULT NULL COMMENT '文件名', + `ATTACHMENT_NAME` varchar(64) DEFAULT NULL COMMENT '附件名（uuid随机生成）', + `ATTACHMENT_SIZE` int(11) DEFAULT NULL COMMENT '文件大小，单位b', + `ATTACHMENT_FORMAT` varchar(64) DEFAULT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）', + `ATTACHMENT_TYPE` varchar(64) DEFAULT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））', + `ATTACHMENT_URL` varchar(255) NOT NULL COMMENT '附件地址', + `SORT` int(1) NOT NULL COMMENT '排序字段', + `DURATION` int(11) unsigned zerofill DEFAULT '00000000000' COMMENT '语音或视频时长，秒', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='烟台话题评论附件表'; +CREATE TABLE `yt_topic_vote_detail` ( + `ID` varchar(32) NOT NULL COMMENT '主键ID', + `CUSTOMER_ID` varchar(64) DEFAULT NULL COMMENT '客户ID', + `TOPIC_ID` varchar(32) NOT NULL COMMENT '话题ID', + `ATTITUDE` varchar(32) NOT NULL COMMENT '态度 - opposition（反对）support（赞成）', + `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`), + KEY `idx_topic_id` (`TOPIC_ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='话题表决记录表'; \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicAttachmentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicAttachmentDao.xml new file mode 100644 index 0000000000..1ce30b7819 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicAttachmentDao.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicCommentAttachmentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicCommentAttachmentDao.xml new file mode 100644 index 0000000000..7046356677 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicCommentAttachmentDao.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicCommentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicCommentDao.xml new file mode 100644 index 0000000000..8751ea8bb9 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicCommentDao.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml new file mode 100644 index 0000000000..3abcced9d6 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicVoteDetailDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicVoteDetailDao.xml new file mode 100644 index 0000000000..81277dd963 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicVoteDetailDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From 6d43bc53d9315f6951524783584aa8aee3ee0c12 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 2 Feb 2023 10:03:07 +0800 Subject: [PATCH 002/340] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E6=A5=BC=E9=99=A2?= =?UTF-8?q?=E5=B0=8F=E7=BB=84=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/topic/form/YtTopicPageFormDTO.java | 31 +++++++++++++- .../topic/result/YtTopicDetailResultDTO.java | 2 +- .../topic/result/YtTopicInfoResultDTO.java | 1 + .../topic/controller/YtTopicController.java | 7 +++- .../modules/topic/entity/YtTopicEntity.java | 10 +++++ .../service/impl/YtTopicServiceImpl.java | 29 +++++++++++++- .../db/migration/V0.0.28__yt_topic.sql | 2 + .../resources/mapper/topic/YtTopicDao.xml | 40 +++++++++++++------ 8 files changed, 105 insertions(+), 17 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicPageFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicPageFormDTO.java index 45a77a1c6f..b0649e5cc8 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicPageFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicPageFormDTO.java @@ -13,9 +13,13 @@ import java.io.Serializable; public class YtTopicPageFormDTO extends PageFormDTO implements Serializable{ private static final long serialVersionUID = 1L; + /** + * 组织Id + * */ + private String agencyId; /** - * 组Id + * 网格Id，source是居民端时必填 * */ @NotBlank(message = "网格Id不能为空") private String gridId; @@ -29,4 +33,29 @@ public class YtTopicPageFormDTO extends PageFormDTO implements Serializable{ * 用户Id * */ private String userId; + + /** + * 请求来源0 居民端，1 PC端 + * */ + private String source; + + /** + * 话题内容 + * */ + private String topicContent; + + /** + * 话题发表人 + * */ + private String userName; + + /** + * 发布时间 + * */ + private String startDate; + + /** + * 发布时间 + * */ + private String endDate; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java index 955d88532a..6b3aaed414 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java @@ -81,5 +81,5 @@ public class YtTopicDetailResultDTO implements Serializable { * 投票反对数 * */ private String oppositionCount; - + private String userName; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java index 4cc58aca38..b6f346b1f2 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java @@ -29,6 +29,7 @@ public class YtTopicInfoResultDTO implements Serializable { * 发布人名称 * */ private String releaseUserName; + private String userName; /** * 发布人头像 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java index 1e6ddcf394..ab324cb1b3 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java @@ -1,7 +1,9 @@ package com.epmet.modules.topic.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -76,9 +78,12 @@ public class YtTopicController { * @Date 2023/1/30 16:55 */ @PostMapping("topicList") + @MaskResponse(fieldNames = "userName", fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME}) public Result> getTopicList(@LoginUser TokenDto tokenDto, @RequestBody YtTopicPageFormDTO topicPageFormDTO) { topicPageFormDTO.setUserId(tokenDto.getUserId()); - ValidatorUtils.validateEntity(topicPageFormDTO); + if (NumConstant.ZERO_STR.equals(topicPageFormDTO.getSource())) { + ValidatorUtils.validateEntity(topicPageFormDTO); + } return new Result>().ok(ytTopicService.getTopicList(tokenDto, topicPageFormDTO)); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicEntity.java index 6ccb37a2c8..df7773368d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/YtTopicEntity.java @@ -28,6 +28,11 @@ public class YtTopicEntity extends BaseEpmetEntity { */ private String gridId; + /** + * 网格所有上级组织ID + */ + private String pids; + /** * */ @@ -88,4 +93,9 @@ public class YtTopicEntity extends BaseEpmetEntity { */ private String locateLatitude; + /** + * 话题发表人姓名 + */ + private String userName; + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java index 36d148cfc3..a2e4681dec 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java @@ -3,10 +3,14 @@ package com.epmet.modules.topic.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -71,20 +75,31 @@ public class YtTopicServiceImpl extends BaseServiceImpl TopicConstant.MAX_NUMBER_OF_CONTENT){ //内容超过最大限制 log.error(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED); throw new EpmetException(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED); } - + //1.保存话题 YtTopicEntity topic = ConvertUtils.sourceToTarget(formDTO, YtTopicEntity.class); //如果只有语音，则话题内容为语音话题 if (CollectionUtils.isNotEmpty(formDTO.getVoiceList()) && StringUtils.isBlank(formDTO.getTopicContent())) { topic.setTopicContent("语音话题"); } + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getGridId()); + if (null == gridInfo) { + String msg = "获取网格信息失败"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } + ResiUserInfoCache userInfo = CustomerResiUserRedis.getUserBaseInfo(tokenDto.getUserId()); + if (null == userInfo) { + String msg = "获取用户信息失败"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } topic.setCustomerId(tokenDto.getCustomerId()); topic.setStatus(TopicConstant.PUBLISHMENT); + topic.setPids(gridInfo.getPids()); + topic.setUserName(userInfo.getRealName()); baseDao.insert(topic); //保存图片附件 @@ -217,6 +232,16 @@ public class YtTopicServiceImpl extends BaseServiceImpl getTopicList(TokenDto tokenDto, YtTopicPageFormDTO topicPageFormDTO) { + if (NumConstant.ONE_STR.equals(topicPageFormDTO.getSource())) { + if (StringUtils.isBlank(topicPageFormDTO.getGridId())) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo) { + String msg = "获取工作人员信息失败"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } + topicPageFormDTO.setAgencyId(staffInfo.getAgencyId()); + } + } PageMethod.startPage(topicPageFormDTO.getPageNo(), topicPageFormDTO.getPageSize()); List list = baseDao.selectTopicList(topicPageFormDTO); PageInfo pageInfo = new PageInfo<>(list); diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.28__yt_topic.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.28__yt_topic.sql index 93d13f692f..d73eeef70f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.28__yt_topic.sql +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.28__yt_topic.sql @@ -2,6 +2,7 @@ CREATE TABLE `yt_topic` ( `ID` varchar(64) NOT NULL COMMENT '主键', `CUSTOMER_ID` varchar(64) DEFAULT NULL COMMENT '客户ID', `GRID_ID` varchar(64) DEFAULT NULL COMMENT '网格ID', + `PIDS` varchar(255) DEFAULT NULL COMMENT '网格所有上级组织ID', `TOPIC_CONTENT` text COMMENT '话题内容', `STATUS` varchar(32) NOT NULL COMMENT '话题状态（讨论中 - discussing、 已屏蔽 - hidden、 已关闭 - closed）', `CLOSED_STATUS` varchar(32) DEFAULT NULL COMMENT '关闭状态：已解决 resolved，未解决 unresolved', @@ -14,6 +15,7 @@ CREATE TABLE `yt_topic` ( `LOCATE_ADDRESS` varchar(255) DEFAULT NULL COMMENT '定位地址', `LOCATE_LONGITUDE` varchar(32) DEFAULT NULL COMMENT '定位经度', `LOCATE_LATITUDE` varchar(32) DEFAULT NULL COMMENT '定位维度', + `USER_NAME` varchar(20) DEFAULT NULL COMMENT '话题发表人姓名', `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', `REVISION` int(11) NOT NULL COMMENT '乐观锁', `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人，发布人Id来源于user', diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml index 3abcced9d6..46087bf06a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml @@ -2,18 +2,34 @@ - + SELECT ID AS topicId, + TOPIC_CONTENT, + STATUS, + USER_NAME, + CREATED_BY AS userId, + CREATED_TIME AS releaseTime + FROM yt_topic + WHERE + DEL_FLAG = '0' + + AND PIDS LIKE CONCAT('%', #{agencyId}, '%') + + + AND GRID_ID = #{gridId} + + + AND TOPIC_CONTENT LIKE CONCAT('%', #{topicContent}, '%') + + + AND USER_NAME LIKE CONCAT('%', #{userName}, '%') + + + AND DATE_FORMAT(CREATED_TIME, "%Y-%m-%d") >= #{startDate} + + + AND DATE_FORMAT(CREATED_TIME, "%Y-%m-%d") <= #{endDate} + ORDER BY CREATED_TIME DESC \ No newline at end of file From ad5629504dc49977e1b31e65eb544e3a33a233a4 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 2 Feb 2023 10:47:07 +0800 Subject: [PATCH 003/340] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=AE=80=E4=BB=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java | 2 ++ .../src/main/java/com/epmet/dto/result/AgencysResultDTO.java | 4 ++++ .../src/main/java/com/epmet/entity/CustomerAgencyEntity.java | 5 +++++ .../main/resources/db/migration/V0.0.48__alter_agency.sql | 2 ++ 4 files changed, 13 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.48__alter_agency.sql diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java index 57e535ad25..d57f208a53 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java @@ -110,4 +110,6 @@ public class EditAgencyFormDTO implements Serializable { private String centerAddress; private String customerId; + + private String remark; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java index 99028d23bb..f95c6349a4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java @@ -133,4 +133,8 @@ public class AgencysResultDTO implements Serializable { * 中心点位位置 */ private String centerAddress; + + private String remark; + + private String coordinates; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java index fda8070609..7bb54c8037 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java @@ -143,4 +143,9 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { * 联系电话 */ private String mobile; + + /** + * 备注 + */ + private String remark; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.48__alter_agency.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.48__alter_agency.sql new file mode 100644 index 0000000000..f6ea68999a --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.48__alter_agency.sql @@ -0,0 +1,2 @@ +ALTER TABLE `epmet_gov_org`.`customer_agency` + ADD COLUMN `REMARK` text NULL COMMENT '备注说明' AFTER `REVISION`; \ No newline at end of file From c31e7d7194d93a7f476cc0b9183fca51c8a6a081 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 2 Feb 2023 14:34:42 +0800 Subject: [PATCH 004/340] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E6=A5=BC=E9=99=A2?= =?UTF-8?q?=E5=B0=8F=E7=BB=84=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/dto/topic/result/YtTopicDetailResultDTO.java | 1 + .../group/dto/topic/result/YtTopicInfoResultDTO.java | 10 ++++++++++ .../modules/topic/service/impl/YtTopicServiceImpl.java | 10 ++++++++++ .../src/main/resources/mapper/topic/YtTopicDao.xml | 1 + 4 files changed, 22 insertions(+) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java index 6b3aaed414..d5e4675af0 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java @@ -82,4 +82,5 @@ public class YtTopicDetailResultDTO implements Serializable { * */ private String oppositionCount; private String userName; + private String gridName; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java index b6f346b1f2..a1ede2ebc7 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java @@ -31,6 +31,16 @@ public class YtTopicInfoResultDTO implements Serializable { private String releaseUserName; private String userName; + /** + * 网格ID + */ + private String gridId; + + /** + * 网格名 + */ + private String gridName; + /** * 发布人头像 * */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java index a2e4681dec..04576f0480 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java @@ -218,6 +218,12 @@ public class YtTopicServiceImpl extends BaseServiceImpl imgWrapper = new LambdaQueryWrapper<>(); imgWrapper.eq(YtTopicAttachmentEntity::getTopicId, item.getTopicId()); diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml index 46087bf06a..1d922ef955 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml @@ -4,6 +4,7 @@ + From 769305248fb253a849b72fb49c192813559c7204 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 2 Feb 2023 17:05:24 +0800 Subject: [PATCH 006/340] =?UTF-8?q?=E9=98=B2=E6=8E=A7=E6=A6=82=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcVaccineServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index 549ca8ddfe..7f1a1313b5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -625,10 +625,10 @@ public class IcVaccineServiceImpl extends BaseServiceImpl list = baseDao.getVaccinePieData(formDTO); list.forEach(item -> { - if (NumConstant.ZERO_STR.equals(item.getValue())) { + if (NumConstant.ZERO_STR.equals(item.getCode())) { item.setLabel("未接种人数"); } else { - item.setLabel("接种" + item.getValue() + "针人数"); + item.setLabel("接种" + item.getCode() + "针人数"); } }); return list; From 0c6416634c9d431f7e1dd3fd9bcac9a562258c36 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 3 Feb 2023 10:14:01 +0800 Subject: [PATCH 007/340] =?UTF-8?q?customer=5Fagency.remark=E7=94=A849?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{V0.0.48__alter_agency.sql => V0.0.49__alter_agency.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/{V0.0.48__alter_agency.sql => V0.0.49__alter_agency.sql} (100%) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.48__alter_agency.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.49__alter_agency.sql similarity index 100% rename from epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.48__alter_agency.sql rename to epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.49__alter_agency.sql From a3b7c5b3ae950fe832aaf0f08f2726ea872ca2e0 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 3 Feb 2023 14:26:32 +0800 Subject: [PATCH 008/340] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ThirdAppManageDTO.java | 112 ++++++++++++++++++ .../epmet/dto/form/ThirdAppManageFormDTO.java | 50 ++++++++ .../controller/ThirdAppManageController.java | 83 +++++++++++++ .../java/com/epmet/dao/ThirdAppManageDao.java | 16 +++ .../epmet/entity/ThirdAppManageEntity.java | 71 +++++++++++ .../epmet/service/ThirdAppManageService.java | 66 +++++++++++ .../impl/ThirdAppManageServiceImpl.java | 92 ++++++++++++++ .../db/migration/V0.0.10__third_app.sql | 20 ++++ .../resources/mapper/ThirdAppManageDao.xml | 27 +++++ 9 files changed, 537 insertions(+) create mode 100644 epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/ThirdAppManageDTO.java create mode 100644 epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/ThirdAppManageFormDTO.java create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/ThirdAppManageController.java create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/ThirdAppManageDao.java create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/ThirdAppManageEntity.java create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/ThirdAppManageService.java create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/ThirdAppManageServiceImpl.java create mode 100644 epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.10__third_app.sql create mode 100644 epmet-module/gov-access/gov-access-server/src/main/resources/mapper/ThirdAppManageDao.xml diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/ThirdAppManageDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/ThirdAppManageDTO.java new file mode 100644 index 0000000000..782e21231f --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/ThirdAppManageDTO.java @@ -0,0 +1,112 @@ +package com.epmet.dto; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.Date; + + +/** + * 烟台第三方应用管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-02-03 + */ +@Data +public class ThirdAppManageDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 应用名称 + */ + @NotBlank(message = "应用名称不能为空") + private String name; + + /** + * 应用链接 + */ + @NotBlank(message = "应用链接不能为空") + private String link; + + /** + * 账号 + */ + @NotBlank(message = "测试账号不能为空") + private String account; + + /** + * 密码 + */ + @NotBlank(message = "测试密码不能为空") + private String password; + + /** + * 应用介绍 + */ + private String remark; + + /** + * 第三方公司名 + */ + private String companyName; + + /** + * 联系人 + */ + @NotBlank(message = "联系人不能为空") + private String contacts; + + /** + * 联系电话 + */ + @NotBlank(message = "联系电话不能为空") + private String mobile; + + /** + * 状态【0:未审核;1:审核不通过;2:审核通过;3:已发布】 + */ + private String status; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 删除标识 0：未删除 1：删除 + */ + private Integer delFlag; + + /** + * 创建者 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新者 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/ThirdAppManageFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/ThirdAppManageFormDTO.java new file mode 100644 index 0000000000..6b9398b62e --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/ThirdAppManageFormDTO.java @@ -0,0 +1,50 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + + +/** + * 烟台第三方应用管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-02-03 + */ +@Data +public class ThirdAppManageFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + + /** + * 应用名称 + */ + private String name; + + /** + * 第三方公司名 + */ + private String companyName; + + /** + * 联系人 + */ + private String contacts; + + /** + * 联系电话 + */ + private String mobile; + + /** + * 状态【0:未审核;1:审核不通过;2:审核通过;3:已发布】 + */ + private String status; +} \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/ThirdAppManageController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/ThirdAppManageController.java new file mode 100644 index 0000000000..2c5b143236 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/ThirdAppManageController.java @@ -0,0 +1,83 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.ThirdAppManageDTO; +import com.epmet.dto.form.ThirdAppManageFormDTO; +import com.epmet.service.ThirdAppManageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * 烟台第三方应用管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-02-03 + */ +@RestController +@RequestMapping("thirdAppManage") +public class ThirdAppManageController { + + @Autowired + private ThirdAppManageService thirdAppManageService; + + @PostMapping("page") + public Result> page(@RequestBody ThirdAppManageFormDTO formDTO){ + PageData page = thirdAppManageService.page(formDTO); + return new Result>().ok(page); + } + + @PostMapping("detail/{id}") + public Result get(@PathVariable("id") String id){ + ThirdAppManageDTO data = thirdAppManageService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody ThirdAppManageDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + thirdAppManageService.save(dto); + return new Result(); + } + + /** + * 审核 + * + * @Param dto + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2023/2/3 14:18 + */ + @NoRepeatSubmit + @PostMapping("audit") + public Result audit(@RequestBody ThirdAppManageDTO dto){ + //效验数据 + thirdAppManageService.audit(dto); + return new Result(); + } + + /** + * 发布 + * + * @Param dto + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2023/2/3 14:18 + */ + @NoRepeatSubmit + @PostMapping("release") + public Result release(@RequestBody ThirdAppManageDTO dto){ + //效验数据 + thirdAppManageService.release(dto); + return new Result(); + } + +} diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/ThirdAppManageDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/ThirdAppManageDao.java new file mode 100644 index 0000000000..e930e21767 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/ThirdAppManageDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.ThirdAppManageEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 烟台第三方应用管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-02-03 + */ +@Mapper +public interface ThirdAppManageDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/ThirdAppManageEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/ThirdAppManageEntity.java new file mode 100644 index 0000000000..a44b474fc4 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/ThirdAppManageEntity.java @@ -0,0 +1,71 @@ +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-02-03 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("third_app_manage") +public class ThirdAppManageEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 应用名称 + */ + private String name; + + /** + * 应用链接 + */ + private String link; + + /** + * 账号 + */ + private String account; + + /** + * 密码 + */ + private String password; + + /** + * 应用介绍 + */ + private String remark; + + /** + * 第三方公司名 + */ + private String companyName; + + /** + * 联系人 + */ + private String contacts; + + /** + * 联系电话 + */ + private String mobile; + + /** + * 状态【0:未审核;1:审核不通过;2:审核通过;3:已发布】 + */ + private String status; + +} diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/ThirdAppManageService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/ThirdAppManageService.java new file mode 100644 index 0000000000..fbc7216cb8 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/ThirdAppManageService.java @@ -0,0 +1,66 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.ThirdAppManageDTO; +import com.epmet.dto.form.ThirdAppManageFormDTO; +import com.epmet.entity.ThirdAppManageEntity; + +/** + * 烟台第三方应用管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-02-03 + */ +public interface ThirdAppManageService extends BaseService { + + /** + * 默认分页 + * + * @param formDTO + * @return PageData + * @author generator + * @date 2023-02-03 + */ + PageData page(ThirdAppManageFormDTO formDTO); + + /** + * 单条查询 + * + * @param id + * @return ThirdAppManageDTO + * @author generator + * @date 2023-02-03 + */ + ThirdAppManageDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2023-02-03 + */ + void save(ThirdAppManageDTO dto); + + /** + * 审核 + * + * @Param dto + * @Return + * @Author zhaoqifeng + * @Date 2023/2/3 14:19 + */ + void audit(ThirdAppManageDTO dto); + + /** + * 发布 + * + * @Param dto + * @Return + * @Author zhaoqifeng + * @Date 2023/2/3 14:19 + */ + void release(ThirdAppManageDTO dto); +} \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/ThirdAppManageServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/ThirdAppManageServiceImpl.java new file mode 100644 index 0000000000..edfcd0c477 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/ThirdAppManageServiceImpl.java @@ -0,0 +1,92 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.ThirdAppManageDao; +import com.epmet.dto.ThirdAppManageDTO; +import com.epmet.dto.form.ThirdAppManageFormDTO; +import com.epmet.entity.ThirdAppManageEntity; +import com.epmet.service.ThirdAppManageService; +import com.github.pagehelper.PageInfo; +import com.github.pagehelper.page.PageMethod; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 烟台第三方应用管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-02-03 + */ +@Service +public class ThirdAppManageServiceImpl extends BaseServiceImpl implements ThirdAppManageService { + + @Override + public PageData page(ThirdAppManageFormDTO formDTO) { + PageMethod.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.like(StringUtils.isNotBlank(formDTO.getName()), ThirdAppManageEntity::getName, formDTO.getName()); + wrapper.like(StringUtils.isNotBlank(formDTO.getCompanyName()), ThirdAppManageEntity::getCompanyName, formDTO.getCompanyName()); + wrapper.like(StringUtils.isNotBlank(formDTO.getContacts()), ThirdAppManageEntity::getContacts, formDTO.getContacts()); + wrapper.like(StringUtils.isNotBlank(formDTO.getMobile()), ThirdAppManageEntity::getMobile, formDTO.getMobile()); + wrapper.eq(StringUtils.isNotBlank(formDTO.getStatus()), ThirdAppManageEntity::getStatus, formDTO.getStatus()); + wrapper.orderByDesc(ThirdAppManageEntity::getCreatedTime); + List list = baseDao.selectList(wrapper); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(ConvertUtils.sourceToTarget(list, ThirdAppManageDTO.class), pageInfo.getTotal()); + } + + @Override + public ThirdAppManageDTO get(String id) { + ThirdAppManageEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, ThirdAppManageDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(ThirdAppManageDTO dto) { + ThirdAppManageEntity entity = ConvertUtils.sourceToTarget(dto, ThirdAppManageEntity.class); + insert(entity); + } + + /** + * 审核 + * + * @param dto + * @Param dto + * @Return + * @Author zhaoqifeng + * @Date 2023/2/3 14:19 + */ + @Override + public void audit(ThirdAppManageDTO dto) { + ThirdAppManageEntity entity = new ThirdAppManageEntity(); + entity.setId(dto.getId()); + entity.setStatus(dto.getStatus()); + baseDao.updateById(entity); + } + + /** + * 发布 + * + * @param dto + * @Param dto + * @Return + * @Author zhaoqifeng + * @Date 2023/2/3 14:19 + */ + @Override + public void release(ThirdAppManageDTO dto) { + ThirdAppManageEntity entity = new ThirdAppManageEntity(); + entity.setId(dto.getId()); + entity.setStatus(NumConstant.THREE_STR); + baseDao.updateById(entity); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.10__third_app.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.10__third_app.sql new file mode 100644 index 0000000000..563fcf3815 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.10__third_app.sql @@ -0,0 +1,20 @@ +CREATE TABLE `third_app_manage` ( + `ID` varchar(64) NOT NULL COMMENT 'id', + `CUSTOMER_ID` varchar(64) DEFAULT NULL COMMENT '客户ID', + `NAME` varchar(64) NOT NULL COMMENT '应用名称', + `LINK` varchar(128) NOT NULL COMMENT '应用链接', + `ACCOUNT` varchar(64) NOT NULL COMMENT '账号', + `PASSWORD` varchar(64) NOT NULL COMMENT '密码', + `REMARK` text COMMENT '应用介绍', + `COMPANY_NAME` varchar(64) DEFAULT '0' COMMENT '第三方公司名', + `CONTACTS` varchar(64) NOT NULL COMMENT '联系人', + `MOBILE` varchar(32) NOT NULL COMMENT '联系电话', + `STATUS` varchar(1) DEFAULT '0' COMMENT '状态【0:未审核;1:审核不通过;2:审核通过;3:已发布】', + `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', + `DEL_FLAG` tinyint(1) unsigned DEFAULT NULL COMMENT '删除标识 0：未删除 1：删除', + `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='烟台第三方应用管理'; \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/ThirdAppManageDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/ThirdAppManageDao.xml new file mode 100644 index 0000000000..afbc2b77fa --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/ThirdAppManageDao.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 2c01732080dd62566f719fe8e9854e0d0b08b170 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 3 Feb 2023 15:01:21 +0800 Subject: [PATCH 009/340] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ThirdAppManageServiceImpl.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/ThirdAppManageServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/ThirdAppManageServiceImpl.java index edfcd0c477..db9affc717 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/ThirdAppManageServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/ThirdAppManageServiceImpl.java @@ -3,6 +3,8 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.ThirdAppManageDao; @@ -66,6 +68,12 @@ public class ThirdAppManageServiceImpl extends BaseServiceImpl Date: Fri, 3 Feb 2023 15:45:48 +0800 Subject: [PATCH 010/340] =?UTF-8?q?=E9=98=B2=E6=8E=A7=E6=A6=82=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/VaccinePieResultDTO.java | 2 + .../service/impl/IcVaccineServiceImpl.java | 49 ++++++++++++++++--- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinePieResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinePieResultDTO.java index c3844c18c3..59599b5261 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinePieResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinePieResultDTO.java @@ -19,4 +19,6 @@ public class VaccinePieResultDTO implements Serializable { private String code; private String value; private String label; + private String ratio; + private String remark; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index 7f1a1313b5..0e9c1faaf8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -54,9 +54,12 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile; import java.io.IOException; import java.io.OutputStream; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.nio.file.Files; import java.nio.file.Path; import java.util.*; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; /** @@ -624,13 +627,47 @@ public class IcVaccineServiceImpl extends BaseServiceImpl list = baseDao.getVaccinePieData(formDTO); - list.forEach(item -> { - if (NumConstant.ZERO_STR.equals(item.getCode())) { - item.setLabel("未接种人数"); - } else { - item.setLabel("接种" + item.getCode() + "针人数"); + int total = 0; + if (CollectionUtils.isNotEmpty(list)) { + total = list.stream().mapToInt(item -> Integer.parseInt(item.getValue())).sum(); + AtomicBoolean flag = new AtomicBoolean(false); + int finalTotal = total; + list.forEach(item -> { + if (NumConstant.ZERO_STR.equals(item.getCode())) { + item.setLabel("未接种人数"); + item.setRemark("未接种"+ item.getValue() +"人"); + flag.set(true); + } else { + item.setLabel("接种" + item.getCode() + "针人数"); + item.setRemark("接种" + item.getCode() + "针" + item.getValue() + "人"); + } + BigDecimal radio = new BigDecimal("0.00"); + if (NumConstant.ZERO != finalTotal) { + BigDecimal sum = new BigDecimal(finalTotal); + BigDecimal count = new BigDecimal(item.getValue()); + BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); + radio = count.multiply(hundred).divide(sum, NumConstant.TWO, RoundingMode.HALF_UP); + } + item.setRatio(radio.stripTrailingZeros().toPlainString().concat("%")); + }); + if (!flag.get()) { + VaccinePieResultDTO dto = new VaccinePieResultDTO(); + dto.setLabel("未接种人数"); + dto.setCode(NumConstant.ZERO_STR); + dto.setValue(NumConstant.ZERO_STR); + dto.setRatio("0%"); + dto.setRemark("未接种0人"); + list.add(dto); } - }); + } else { + VaccinePieResultDTO dto = new VaccinePieResultDTO(); + dto.setLabel("未接种人数"); + dto.setCode(NumConstant.ZERO_STR); + dto.setValue(NumConstant.ZERO_STR); + dto.setRatio("0%"); + dto.setRemark("未接种0人"); + list.add(dto); + } return list; } From 43a0f5005ae40e47466f3b6359022f8a27c5b250 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Feb 2023 11:10:40 +0800 Subject: [PATCH 011/340] =?UTF-8?q?=E5=A4=87=E6=B3=A8500=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/IcPublicServiceOrgFormDTO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcPublicServiceOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcPublicServiceOrgFormDTO.java index 1937aa7a4f..f5aa42b008 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcPublicServiceOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcPublicServiceOrgFormDTO.java @@ -95,6 +95,7 @@ public class IcPublicServiceOrgFormDTO { /** * 备注 */ + @Length(max = 500,message = "最多输入500字",groups ={UpdateUserShowGroup.class,AddUserShowGroup.class} ) private String remark; /** From fce690ab2161bc2d2b932069983de9e0523ca7f1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Feb 2023 15:45:06 +0800 Subject: [PATCH 012/340] customer_agency.remark 500 --- .../src/main/resources/db/migration/V0.0.49__alter_agency.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.49__alter_agency.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.49__alter_agency.sql index f6ea68999a..bcfc36cf16 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.49__alter_agency.sql +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.49__alter_agency.sql @@ -1,2 +1,2 @@ ALTER TABLE `epmet_gov_org`.`customer_agency` - ADD COLUMN `REMARK` text NULL COMMENT '备注说明' AFTER `REVISION`; \ No newline at end of file + ADD COLUMN `REMARK` varchar(512) NULL COMMENT '备注说明' AFTER `REVISION`; \ No newline at end of file From 60e2a31abd14fd89e85411dab367c457f74f2dab Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Feb 2023 16:12:44 +0800 Subject: [PATCH 013/340] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E9=99=90=E5=88=B6remark500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java index d57f208a53..2d0da966d0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java @@ -111,5 +111,6 @@ public class EditAgencyFormDTO implements Serializable { private String customerId; + @Length(max = 500,message = "最多输入500字",groups =DefaultUserShowGroup.class ) private String remark; } \ No newline at end of file From f4ca86ac68bbac1902ec1f5eae17a886497b68c1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Feb 2023 09:53:25 +0800 Subject: [PATCH 014/340] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=BB=84=E7=BB=87=EF=BC=8C=E5=A2=9E=E5=8A=A0remark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java | 6 ++++++ .../src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java | 2 +- .../main/java/com/epmet/entity/CustomerAgencyEntity.java | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java index 0cbb5c1ab5..63bf3c6e55 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java @@ -118,4 +118,10 @@ public class AddAgencyV2FormDTO implements Serializable { * 中心点位位置 */ private String centerAddress; + + /** + * 社区简介 + */ + @Length(max = 500,message ="最多输入500字",groups =DefaultUserShowGroup.class ) + private String remark; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java index 2d0da966d0..b741934f5d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java @@ -87,7 +87,7 @@ public class EditAgencyFormDTO implements Serializable { */ private String parentAreaCode; - @NotBlank(message = "组织级别不能为空;社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province", groups = AddAgencyV2FormDTO.AddUserInternalGroup.class) + @NotBlank(message = "组织级别不能为空;社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province", groups = AddUserInternalGroup.class) private String level; //02.21新增需求：小程序工作端添加组织增加中心点位置入口，点击进入地图选择点位，可以搜索，中心点为必填 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java index 7bb54c8037..a2668ae5fd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java @@ -148,4 +148,5 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { * 备注 */ private String remark; + } From cadef48cfc9274835bfe8d9b00859af402ba0035 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Feb 2023 14:19:58 +0800 Subject: [PATCH 015/340] back --- .../src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java index b741934f5d..2d0da966d0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java @@ -87,7 +87,7 @@ public class EditAgencyFormDTO implements Serializable { */ private String parentAreaCode; - @NotBlank(message = "组织级别不能为空;社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province", groups = AddUserInternalGroup.class) + @NotBlank(message = "组织级别不能为空;社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province", groups = AddAgencyV2FormDTO.AddUserInternalGroup.class) private String level; //02.21新增需求：小程序工作端添加组织增加中心点位置入口，点击进入地图选择点位，可以搜索，中心点为必填 From ebfdb94f078c40e5b6b678515a2f4b5e7ac5ebfb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Feb 2023 15:29:44 +0800 Subject: [PATCH 016/340] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/topic/form/CreateYtTopicFormDTO.java | 28 ++++++++++++++----- .../dto/topic/form/YtTopicDetailFormDTO.java | 12 +++++++- .../topic/controller/YtTopicController.java | 11 +++++--- .../modules/topic/service/YtTopicService.java | 4 +-- .../service/impl/YtTopicServiceImpl.java | 18 ++++-------- 5 files changed, 47 insertions(+), 26 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java index 83e899f647..de00da7503 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java @@ -1,6 +1,8 @@ package com.epmet.resi.group.dto.topic.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import java.io.Serializable; @@ -13,12 +15,19 @@ import java.util.List; @Data public class CreateYtTopicFormDTO implements Serializable { private static final long serialVersionUID = 1L; + public interface AddUserInternalGroup { + } + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + @NotBlank(message = "customerId不能为空",groups =AddUserInternalGroup.class ) private String customerId; + @NotBlank(message ="网格不能为空",groups =AddUserShowGroup.class ) private String gridId; - + @Length(max=3000,message ="话题内容最多输入3000字",groups =AddUserShowGroup.class ) private String topicContent; /** @@ -71,16 +80,21 @@ public class CreateYtTopicFormDTO implements Serializable { * 图片附件 */ private List imageList; - /** - * 文件附件 - */ - private List docList; + // /** + // * 文件附件 + // */ + // private List docList; /** * 语音附件 */ private List voiceList; + // /** + // * 视频附件 + // */ + // private List videoList; /** - * 视频附件 + * tokenDto.getUserId */ - private List videoList; + @NotBlank(message = "userId不能为空",groups =AddUserInternalGroup.class ) + private String userId; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java index 058b5049be..61b03690ba 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java @@ -1,6 +1,7 @@ package com.epmet.resi.group.dto.topic.form; import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -16,11 +17,20 @@ import java.io.Serializable; public class YtTopicDetailFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = 1L; + public interface AddUserInternalGroup { + } + public interface AddUserShowGroup extends CustomerClientShowGroup { + } /** * 话题Id * */ - @NotBlank(message = "话题Id不能为空") + @NotBlank(message = "话题Id不能为空",groups = AddUserShowGroup.class) private String topicId; + /** + * tokenDto.getUserId + */ + @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class ) + private String userId; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java index ab324cb1b3..d7ac74fd3b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java @@ -48,8 +48,10 @@ public class YtTopicController { @PostMapping("createTopic") @NoRepeatSubmit public Result createTopic(@LoginUser TokenDto tokenDto, @RequestBody CreateYtTopicFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); - ytTopicService.createTopic(tokenDto, formDTO); + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,CreateYtTopicFormDTO.AddUserShowGroup.class,CreateYtTopicFormDTO.AddUserInternalGroup.class); + ytTopicService.createTopic(formDTO); return new Result(); } @@ -64,8 +66,9 @@ public class YtTopicController { */ @PostMapping("topicDetail") public Result getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody YtTopicDetailFormDTO topicDetailFormDTO) { - ValidatorUtils.validateEntity(topicDetailFormDTO); - return new Result().ok(ytTopicService.getTopicDetail(tokenDto, topicDetailFormDTO)); + topicDetailFormDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(topicDetailFormDTO,YtTopicDetailFormDTO.AddUserShowGroup.class,YtTopicDetailFormDTO.AddUserInternalGroup.class); + return new Result().ok(ytTopicService.getTopicDetail(topicDetailFormDTO)); } /** diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java index b0412edfb7..23741a8a09 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java @@ -26,7 +26,7 @@ public interface YtTopicService extends BaseService { * @Author zhaoqifeng * @Date 2023/1/30 16:18 */ - void createTopic(TokenDto tokenDto, CreateYtTopicFormDTO formDTO); + void createTopic(CreateYtTopicFormDTO formDTO); /** * 话题详情 @@ -37,7 +37,7 @@ public interface YtTopicService extends BaseService { * @Author zhaoqifeng * @Date 2023/1/30 16:39 */ - YtTopicDetailResultDTO getTopicDetail(TokenDto tokenDto, YtTopicDetailFormDTO formDTO); + YtTopicDetailResultDTO getTopicDetail(YtTopicDetailFormDTO formDTO); /** * 话题列表 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java index 04576f0480..acbb9d0c62 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java @@ -68,18 +68,12 @@ public class YtTopicServiceImpl extends BaseServiceImpl TopicConstant.MAX_NUMBER_OF_CONTENT){ - //内容超过最大限制 - log.error(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED); - throw new EpmetException(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED); - } //1.保存话题 YtTopicEntity topic = ConvertUtils.sourceToTarget(formDTO, YtTopicEntity.class); //如果只有语音，则话题内容为语音话题 @@ -91,12 +85,12 @@ public class YtTopicServiceImpl extends BaseServiceImpl Date: Thu, 9 Feb 2023 14:47:30 +0800 Subject: [PATCH 017/340] =?UTF-8?q?baseinfo=E6=80=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserBaseInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 8761e6cbef..8147cd5b09 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -569,6 +569,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl Date: Wed, 8 Feb 2023 15:29:44 +0800 Subject: [PATCH 018/340] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/topic/form/CreateYtTopicFormDTO.java | 28 ++++++++++++++----- .../dto/topic/form/YtTopicDetailFormDTO.java | 12 +++++++- .../topic/controller/YtTopicController.java | 11 +++++--- .../modules/topic/service/YtTopicService.java | 4 +-- .../service/impl/YtTopicServiceImpl.java | 18 ++++-------- 5 files changed, 47 insertions(+), 26 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java index 83e899f647..de00da7503 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java @@ -1,6 +1,8 @@ package com.epmet.resi.group.dto.topic.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import java.io.Serializable; @@ -13,12 +15,19 @@ import java.util.List; @Data public class CreateYtTopicFormDTO implements Serializable { private static final long serialVersionUID = 1L; + public interface AddUserInternalGroup { + } + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + @NotBlank(message = "customerId不能为空",groups =AddUserInternalGroup.class ) private String customerId; + @NotBlank(message ="网格不能为空",groups =AddUserShowGroup.class ) private String gridId; - + @Length(max=3000,message ="话题内容最多输入3000字",groups =AddUserShowGroup.class ) private String topicContent; /** @@ -71,16 +80,21 @@ public class CreateYtTopicFormDTO implements Serializable { * 图片附件 */ private List imageList; - /** - * 文件附件 - */ - private List docList; + // /** + // * 文件附件 + // */ + // private List docList; /** * 语音附件 */ private List voiceList; + // /** + // * 视频附件 + // */ + // private List videoList; /** - * 视频附件 + * tokenDto.getUserId */ - private List videoList; + @NotBlank(message = "userId不能为空",groups =AddUserInternalGroup.class ) + private String userId; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java index 058b5049be..61b03690ba 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java @@ -1,6 +1,7 @@ package com.epmet.resi.group.dto.topic.form; import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -16,11 +17,20 @@ import java.io.Serializable; public class YtTopicDetailFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = 1L; + public interface AddUserInternalGroup { + } + public interface AddUserShowGroup extends CustomerClientShowGroup { + } /** * 话题Id * */ - @NotBlank(message = "话题Id不能为空") + @NotBlank(message = "话题Id不能为空",groups = AddUserShowGroup.class) private String topicId; + /** + * tokenDto.getUserId + */ + @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class ) + private String userId; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java index ab324cb1b3..d7ac74fd3b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java @@ -48,8 +48,10 @@ public class YtTopicController { @PostMapping("createTopic") @NoRepeatSubmit public Result createTopic(@LoginUser TokenDto tokenDto, @RequestBody CreateYtTopicFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); - ytTopicService.createTopic(tokenDto, formDTO); + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,CreateYtTopicFormDTO.AddUserShowGroup.class,CreateYtTopicFormDTO.AddUserInternalGroup.class); + ytTopicService.createTopic(formDTO); return new Result(); } @@ -64,8 +66,9 @@ public class YtTopicController { */ @PostMapping("topicDetail") public Result getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody YtTopicDetailFormDTO topicDetailFormDTO) { - ValidatorUtils.validateEntity(topicDetailFormDTO); - return new Result().ok(ytTopicService.getTopicDetail(tokenDto, topicDetailFormDTO)); + topicDetailFormDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(topicDetailFormDTO,YtTopicDetailFormDTO.AddUserShowGroup.class,YtTopicDetailFormDTO.AddUserInternalGroup.class); + return new Result().ok(ytTopicService.getTopicDetail(topicDetailFormDTO)); } /** diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java index b0412edfb7..23741a8a09 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java @@ -26,7 +26,7 @@ public interface YtTopicService extends BaseService { * @Author zhaoqifeng * @Date 2023/1/30 16:18 */ - void createTopic(TokenDto tokenDto, CreateYtTopicFormDTO formDTO); + void createTopic(CreateYtTopicFormDTO formDTO); /** * 话题详情 @@ -37,7 +37,7 @@ public interface YtTopicService extends BaseService { * @Author zhaoqifeng * @Date 2023/1/30 16:39 */ - YtTopicDetailResultDTO getTopicDetail(TokenDto tokenDto, YtTopicDetailFormDTO formDTO); + YtTopicDetailResultDTO getTopicDetail(YtTopicDetailFormDTO formDTO); /** * 话题列表 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java index 04576f0480..acbb9d0c62 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java @@ -68,18 +68,12 @@ public class YtTopicServiceImpl extends BaseServiceImpl TopicConstant.MAX_NUMBER_OF_CONTENT){ - //内容超过最大限制 - log.error(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED); - throw new EpmetException(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED); - } //1.保存话题 YtTopicEntity topic = ConvertUtils.sourceToTarget(formDTO, YtTopicEntity.class); //如果只有语音，则话题内容为语音话题 @@ -91,12 +85,12 @@ public class YtTopicServiceImpl extends BaseServiceImpl Date: Thu, 9 Feb 2023 14:47:30 +0800 Subject: [PATCH 019/340] =?UTF-8?q?baseinfo=E6=80=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserBaseInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 8761e6cbef..8147cd5b09 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -569,6 +569,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl Date: Wed, 15 Feb 2023 14:37:09 +0800 Subject: [PATCH 020/340] log --- .../com/epmet/service/impl/IcResiUserExportServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index ec754bb2b8..a2d21ceed7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -200,6 +200,12 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { result.forEach(o -> { getDataForResi(itemOriginMap, staffInfoCacheResult, resultData, showSqlColumns, hiddenColumnSet, o); }); + log.info("!@#>>>>>>>>>>"+itemOriginMap.toString()); + log.info("!@#>>>>>>>>>>"+staffInfoCacheResult.toString()); + log.info("!@#>>>>>>>>>>"+resultData.toString()); + log.info("!@#>>>>>>>>>>"+showSqlColumns.toString()); + log.info("!@#>>>>>>>>>>"+hiddenColumnSet.toString()); + log.info("!@#>>>>>>>>>>"+o.toString()); if (!onlyGetData){ excelWriter.write(resultData, writeSheet); } From 4955c6e78229e5baf781c3a834bd0fc70dfb9f3e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Feb 2023 14:54:27 +0800 Subject: [PATCH 021/340] =?UTF-8?q?=E5=BC=A0=E6=BA=90=E5=8A=A0=E7=9A=84?= =?UTF-8?q?=E6=97=A5=E5=BF=97=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserExportServiceImpl.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index a2d21ceed7..e0376d2c8b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -7,8 +7,6 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.epmet.commons.rocketmq.constants.TopicConstants; -import com.epmet.commons.rocketmq.messages.CheckMQMsg; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -22,12 +20,18 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.*; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Md5Util; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.commons.tools.utils.poi.excel.handler.ExcelFillCellMergeStrategy; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.IcResiUserConstant; -import com.epmet.dto.form.*; +import com.epmet.dto.form.ExportResiUserFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; +import com.epmet.dto.form.IcResiUserPageFormDTO; +import com.epmet.dto.form.ResiUserQueryValueDTO; import com.epmet.dto.result.FormItemResult; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.dto.result.OptionDTO; @@ -50,10 +54,7 @@ import org.apache.poi.ss.usermodel.VerticalAlignment; import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.*; @@ -198,6 +199,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { List showSqlColumns = exportConfigData.getShowSqlColumns(); Set hiddenColumnSet = exportConfigData.getHiddenSqlColumns().stream().map(IcCustomExportResultDTO.SqlColumn::getColumnName).collect(Collectors.toSet()); result.forEach(o -> { + log.info("!@#>>>>>>>>>>"+o.toString()); getDataForResi(itemOriginMap, staffInfoCacheResult, resultData, showSqlColumns, hiddenColumnSet, o); }); log.info("!@#>>>>>>>>>>"+itemOriginMap.toString()); @@ -205,7 +207,6 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { log.info("!@#>>>>>>>>>>"+resultData.toString()); log.info("!@#>>>>>>>>>>"+showSqlColumns.toString()); log.info("!@#>>>>>>>>>>"+hiddenColumnSet.toString()); - log.info("!@#>>>>>>>>>>"+o.toString()); if (!onlyGetData){ excelWriter.write(resultData, writeSheet); } From 3fd42309f7cb0db4eeb5c85ea9c9ddf4681f253a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 12:42:53 +0800 Subject: [PATCH 022/340] =?UTF-8?q?tag=5Fscope=E6=A0=87=E7=AD=BE=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E8=8C=83=E5=9B=B4=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.13__tag_scope.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql new file mode 100644 index 0000000000..14bfc748aa --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql @@ -0,0 +1,17 @@ +alter table tag_customer add COLUMN SHOW_FLAG TINYINT(1) DEFAULT 1 comment '1：展示；0：隐藏;0302因烟台需求增加此列默认1' after USE_COUNT; + +CREATE TABLE `tag_scope` ( + `ID` varchar(64) NOT NULL COMMENT '主键（0302因烟台需求增加此表）', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID（0302因烟台需求增加此表）', + `TAG_ID` varchar(64) NOT NULL COMMENT '标签ID', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '应用范围，这里只能是社区id', + `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='标签应用范围表'; + + From 95fc0a510e51c6e0808603cabe88d199b1d547cc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 12:44:35 +0800 Subject: [PATCH 023/340] =?UTF-8?q?showFlag=EF=BC=9A1=EF=BC=9A=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=EF=BC=9B0=EF=BC=9A=E9=9A=90=E8=97=8F;0302=E5=9B=A0?= =?UTF-8?q?=E7=83=9F=E5=8F=B0=E9=9C=80=E6=B1=82=E5=A2=9E=E5=8A=A0=E6=AD=A4?= =?UTF-8?q?=E5=88=97=E9=BB=98=E8=AE=A41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/TagCustomerDTO.java | 5 +++++ .../src/main/java/com/epmet/entity/TagCustomerEntity.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java index 0e7f1a5e20..0012b13dfb 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java @@ -54,6 +54,11 @@ public class TagCustomerDTO implements Serializable { */ private Integer useCount; + /** + * 1：展示；0：隐藏;0302因烟台需求增加此列默认1 + */ + private Integer showFlag; + /** * 删除标识 0.未删除 1.已删除 */ diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagCustomerEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagCustomerEntity.java index 7a2a54d7ae..e86fbb2231 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagCustomerEntity.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagCustomerEntity.java @@ -55,4 +55,8 @@ public class TagCustomerEntity extends BaseEpmetEntity { */ private Integer useCount; + /** + * 1：展示；0：隐藏;0302因烟台需求增加此列默认1 + */ + private Integer showFlag; } From bc744b3eea930d5addaf28e1f280edea4fe72662 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 13:39:59 +0800 Subject: [PATCH 024/340] =?UTF-8?q?=E8=AE=B0=E5=BD=95orgIdPath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/TagScopeDao.java | 18 ++++++++ .../java/com/epmet/entity/TagScopeEntity.java | 45 +++++++++++++++++++ .../db/migration/V0.0.13__tag_scope.sql | 2 + .../src/main/resources/mapper/TagScopeDao.xml | 24 ++++++++++ 4 files changed, 89 insertions(+) create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagScopeDao.java create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagScopeDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagScopeDao.java new file mode 100644 index 0000000000..3aecba1d55 --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagScopeDao.java @@ -0,0 +1,18 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.TagScopeEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 标签应用范围表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-03-02 + */ +@Mapper +public interface TagScopeDao extends BaseDao { + + int deleteByTagId(@Param("tagId") String tagId, @Param("customerId") String customerId); +} \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java new file mode 100644 index 0000000000..6747b64835 --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java @@ -0,0 +1,45 @@ +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-03-02 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("tag_scope") +public class TagScopeEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID（0302因烟台需求增加此表） + */ + private String customerId; + + /** + * 标签ID + */ + private String tagId; + + /** + * 应用范围，这里只能是社区id + */ + private String agencyId; + + /** + * agency_id全路径，包含自身 + */ + private String orgIdPath; + + /** + * 组织名称 + */ + private String agencyName; +} diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql index 14bfc748aa..4eb48152f6 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql @@ -5,6 +5,8 @@ CREATE TABLE `tag_scope` ( `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID（0302因烟台需求增加此表）', `TAG_ID` varchar(64) NOT NULL COMMENT '标签ID', `AGENCY_ID` varchar(64) NOT NULL COMMENT '应用范围，这里只能是社区id', + `ORG_ID_PATH` varchar(255) NOT NULL COMMENT 'agency_id全路径，包含自身', + `AGENCY_NAME` varchar(255) NOT NULL COMMENT '组织名称', `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', `REVISION` int(11) NOT NULL COMMENT '乐观锁', `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml new file mode 100644 index 0000000000..ed8f0b052a --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + delete from tag_scope + where TAG_ID=#{tagId} + and CUSTOMER_ID=#{customerId} + + \ No newline at end of file From 164ef32d2acdab02bad98858f6b95c56516ae8fb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 13:50:35 +0800 Subject: [PATCH 025/340] =?UTF-8?q?/gov/org/customeragency/staffinagencyli?= =?UTF-8?q?st=E8=BF=94=E5=9B=9EorgIdPath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/AgencyResultDTO.java | 5 ++++- .../com/epmet/dto/result/AgencySubResultDTO.java | 4 ++++ .../src/main/resources/mapper/CustomerAgencyDao.xml | 12 ++++++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java index a7aec4fa28..c40b7448d6 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java @@ -47,5 +47,8 @@ public class AgencyResultDTO implements Serializable { private String longitude; //维度【没值则取跟客户的值】 private String latitude; - + /** + * agencyId的全路径，包含自身 + */ + private String orgIdPath; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java index 08bd0683b1..1461c66fa1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java @@ -61,4 +61,8 @@ public class AgencySubResultDTO implements Serializable { * 组织维度【没值取根组织的值】 */ private String latitude = ""; + /** + * agencyId的全路径，包含自身 + */ + private String orgIdPath; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 37964a6e2c..a21e6e4e20 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -198,7 +198,11 @@ ca.pids AS "pids", ca.level level, IFNULL(ca.longitude, cc.longitude) longitude, - IFNULL(ca.latitude, cc.latitude) latitude + IFNULL(ca.latitude, cc.latitude) latitude, + ( + case when ca.pid is null or ca.pid='0' or ca.pid='' then ca.id + else concat(ca.pids,':',ca.id) + end)as orgIdPath FROM customer_agency ca INNER JOIN customer_agency cc ON cc.pid = '0' AND ca.customer_id = cc.customer_id WHERE ca.del_flag = '0' @@ -397,7 +401,11 @@ ca.pid pid, ca.level level, ca.longitude, - ca.latitude + ca.latitude, + ( + case when ca.pid is null or ca.pid='0' or ca.pid='' then ca.id + else concat(ca.pids,':',ca.id) + end)as orgIdPath FROM customer_agency ca INNER JOIN customer_staff_agency csa ON ca.id = csa.agency_id From 8931e8622dabfe20b37f80b4c54b55425d2bb0d0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 13:54:59 +0800 Subject: [PATCH 026/340] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/TagCustomerDTO.java | 7 ++ .../main/java/com/epmet/dto/TagScopeDTO.java | 33 ++++++ .../epmet/dto/form/TagCustomerFormDTO.java | 56 ++++++++++ .../dto/form/TagCustomerPageFormDTO.java | 44 ++++++++ .../com/epmet/controller/TagController.java | 61 +++++++++- .../java/com/epmet/dao/TagCustomerDao.java | 9 ++ .../com/epmet/service/TagCustomerService.java | 23 ++-- .../service/impl/TagCustomerServiceImpl.java | 105 ++++++++++++++++-- .../main/resources/mapper/TagCustomerDao.xml | 10 ++ 9 files changed, 328 insertions(+), 20 deletions(-) create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TagCustomerPageFormDTO.java diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java index 0012b13dfb..84080d204e 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java @@ -17,8 +17,11 @@ package com.epmet.dto; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; @@ -34,9 +37,12 @@ public class TagCustomerDTO implements Serializable { private static final long serialVersionUID = 1L; + public interface ChangeShowFlagGroup extends CustomerClientShowGroup { + } /** * 主键ID */ + @NotBlank(message = "id不能为空",groups = ChangeShowFlagGroup.class) private String id; /** @@ -57,6 +63,7 @@ public class TagCustomerDTO implements Serializable { /** * 1：展示；0：隐藏;0302因烟台需求增加此列默认1 */ + @NotNull(message = "showFlag不能为空",groups = ChangeShowFlagGroup.class) private Integer showFlag; /** diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java new file mode 100644 index 0000000000..a4e5052273 --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2023/3/2 13:52 + */ +@Data +public class TagScopeDTO implements Serializable { + /** + * 标签ID + */ + private String tagId; + + /** + * 应用范围，这里只能是社区id + */ + private String agencyId; + /** + * agency_id全路径，包含自身 + */ + private String orgIdPath; + + /** + * 组织名称 + */ + private String agencyName; +} + diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java new file mode 100644 index 0000000000..403b30094d --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java @@ -0,0 +1,56 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.epmet.dto.TagScopeDTO; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2023/3/2 12:47 + */ +@Data +public class TagCustomerFormDTO implements Serializable { + private static final long serialVersionUID = -5631868409077026783L; + + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + public interface UpdateUserInternalGroup { + } + + public interface UpdateUserShowGroup extends CustomerClientShowGroup { + } + + + /** + * 主键ID + */ + @NotBlank(message = "id不能为空", groups = {UpdateUserInternalGroup.class}) + private String id; + + /** + * 标签名称 + */ + @Length(max = 30, message = "标签名称最多输入30字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + @NotBlank(message = "标签名称不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String tagName; + + /** + * 应用范围,只能选社区 + */ + private List agencyIds; + /** + * 客户ID + */ + private String customerId; +} + diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TagCustomerPageFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TagCustomerPageFormDTO.java new file mode 100644 index 0000000000..04ee2370eb --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TagCustomerPageFormDTO.java @@ -0,0 +1,44 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Description pc标签管理-分页查询入参 + * @Author yzm + * @Date 2023/3/2 11:34 + */ +@Data +public class TagCustomerPageFormDTO implements Serializable { + private static final long serialVersionUID = -2311491158902019019L; + + public interface PageUserInternalGroup { + } + + public interface PageUserShowGroup extends CustomerClientShowGroup { + } + + + /** + * 客户ID + */ + @NotBlank(message = "customerId不能为空", groups = PageUserInternalGroup.class) + private String customerId; + + /** + * 标签名称 + */ + private String tagName; + + + @NotNull(message = "页码不能为空", groups = PageUserInternalGroup.class) + private Integer pageNo; + + @NotNull(message = "每页数量不能为空", groups = PageUserInternalGroup.class) + private Integer pageSize; +} + diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java index bd2603685b..b73213752b 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java @@ -1,15 +1,15 @@ 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.form.CorrelationTagListFormDTO; -import com.epmet.dto.form.InitTagFormDTO; -import com.epmet.dto.form.ResiTagListFormDTO; -import com.epmet.dto.form.TagCascadeListFormDTO; +import com.epmet.dto.TagCustomerDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.CorrelationTagListResultDTO; import com.epmet.dto.result.TagInfoResultDTO; +import com.epmet.service.TagCustomerService; import com.epmet.service.TagService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -25,6 +25,8 @@ public class TagController { @Autowired private TagService tagService; + @Autowired + private TagCustomerService tagCustomerService; /** * @Description 已发布列表页的标签——政府端 @@ -81,4 +83,55 @@ public class TagController { return new Result().ok(tagService.initTag(formDto)); } + /** + * pc标签管理-分页查询 + * @param formDTO + * @return + */ + @PostMapping("page-list") + public Result> pageList(@LoginUser TokenDto tokenDto,@RequestBody TagCustomerPageFormDTO formDTO){ + tokenDto.setCustomerId(formDTO.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,TagCustomerPageFormDTO.PageUserInternalGroup.class,TagCustomerPageFormDTO.PageUserShowGroup.class); + return new Result>().ok(tagCustomerService.page(formDTO)); + } + + /** + * 新增标签 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("save") + public Result save(@LoginUser TokenDto tokenDto,@RequestBody TagCustomerFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,TagCustomerFormDTO.AddUserShowGroup.class,TagCustomerFormDTO.AddUserInternalGroup.class); + tagCustomerService.save(formDTO); + return new Result(); + } + + /** + * 修改标签 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("update") + public Result update(@LoginUser TokenDto tokenDto,@RequestBody TagCustomerFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,TagCustomerFormDTO.UpdateUserShowGroup.class,TagCustomerFormDTO.UpdateUserInternalGroup.class); + tagCustomerService.update(formDTO); + return new Result(); + } + + /** + * 隐藏、显示 + * @param tagCustomerDTO + * @return + */ + @PostMapping("change-show-flag") + public Result changeShowFlag(@RequestBody TagCustomerDTO tagCustomerDTO){ + tagCustomerService.changeShowFlag(tagCustomerDTO.getId(),tagCustomerDTO.getShowFlag()); + return new Result(); + } + } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java index 595f2a9a18..70c29ec8a2 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.TagCustomerDTO; import com.epmet.dto.form.InitTagsFormDTO; import com.epmet.dto.form.UpdateTagFormDTO; import com.epmet.entity.TagCustomerEntity; @@ -55,4 +56,12 @@ public interface TagCustomerDao extends BaseDao { * @return */ List selectInitData(@Param("customerIdList") List customerIdList); + + /** + * pc标签管理-分页查询 + * @param customerId + * @param tagName + * @return + */ + List pageList(@Param("customerId") String customerId, @Param("tagName")String tagName); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java index 3ecb3c49c1..099df16cab 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java @@ -20,6 +20,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.TagCustomerDTO; +import com.epmet.dto.form.TagCustomerFormDTO; +import com.epmet.dto.form.TagCustomerPageFormDTO; import com.epmet.dto.result.UpdateTagUseCountsResultDTO; import com.epmet.entity.TagCustomerEntity; @@ -35,14 +37,14 @@ import java.util.Map; public interface TagCustomerService extends BaseService { /** - * 默认分页 + * pc标签管理-分页查询 * - * @param params + * @param formDTO * @return PageData * @author generator * @date 2020-06-02 */ - PageData page(Map params); + PageData page(TagCustomerPageFormDTO formDTO); /** * 默认查询 @@ -65,24 +67,24 @@ public interface TagCustomerService extends BaseService { TagCustomerDTO get(String id); /** - * 默认保存 + * 新增标签 * * @param dto * @return void * @author generator * @date 2020-06-02 */ - void save(TagCustomerDTO dto); + void save(TagCustomerFormDTO dto); /** - * 默认更新 + * 修改标签 * * @param dto * @return void * @author generator * @date 2020-06-02 */ - void update(TagCustomerDTO dto); + void update(TagCustomerFormDTO dto); /** * 批量删除 @@ -100,4 +102,11 @@ public interface TagCustomerService extends BaseService { * @author zxc */ UpdateTagUseCountsResultDTO checkTagInfo(String tagName,String customerId,String userId); + + /** + * 隐藏、显示 + * @param id + * @param showFlag + */ + void changeShowFlag(String id, Integer showFlag); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java index b5c69d76c1..219cc7616c 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java @@ -17,24 +17,39 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dao.TagCustomerDao; +import com.epmet.dao.TagScopeDao; import com.epmet.dto.TagCustomerDTO; +import com.epmet.dto.form.TagCustomerFormDTO; +import com.epmet.dto.form.TagCustomerPageFormDTO; import com.epmet.dto.form.UpdateTagFormDTO; import com.epmet.dto.result.UpdateTagUseCountsResultDTO; import com.epmet.entity.TagCustomerEntity; +import com.epmet.entity.TagScopeEntity; import com.epmet.service.TagCustomerService; import com.epmet.utils.TagColorUtils; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -46,14 +61,21 @@ import java.util.Map; */ @Service public class TagCustomerServiceImpl extends BaseServiceImpl implements TagCustomerService { + @Autowired + private TagScopeDao tagScopeDao; + + /** + * pc标签管理-分页查询 + * @param formDTO + * @return + */ @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, TagCustomerDTO.class); + public PageData page(TagCustomerPageFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize()); + List list=baseDao.pageList(formDTO.getCustomerId(),formDTO.getTagName()); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); } @Override @@ -78,18 +100,68 @@ public class TagCustomerServiceImpl extends BaseServiceImpl queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(TagCustomerEntity::getCustomerId,dto.getCustomerId()) + .eq(TagCustomerEntity::getTagName,dto.getTagName()); + if(baseDao.selectCount(queryWrapper)>0){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"标签名称已存在","标签名称已存在"); + } TagCustomerEntity entity = ConvertUtils.sourceToTarget(dto, TagCustomerEntity.class); + entity.setTagColor(StrConstant.EPMETY_STR); + entity.setUseCount(NumConstant.ZERO); + entity.setShowFlag(NumConstant.ONE); insert(entity); + if(CollectionUtils.isNotEmpty(dto.getAgencyIds())){ + dto.getAgencyIds().forEach(tagScopeDTO->{ + TagScopeEntity tagScopeEntity=new TagScopeEntity(); + tagScopeEntity.setCustomerId(entity.getCustomerId()); + tagScopeEntity.setTagId(entity.getId()); + tagScopeEntity.setAgencyId(tagScopeDTO.getAgencyId()); + tagScopeEntity.setAgencyName(tagScopeDTO.getAgencyName()); + tagScopeEntity.setOrgIdPath(tagScopeDTO.getOrgIdPath()); + tagScopeDao.insert(tagScopeEntity); + }); + } } + /** + * pc标签管理-修改 + * @param dto + */ @Override @Transactional(rollbackFor = Exception.class) - public void update(TagCustomerDTO dto) { + public void update(TagCustomerFormDTO dto) { + // 标签名称是否存在 + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(TagCustomerEntity::getCustomerId,dto.getCustomerId()) + .eq(TagCustomerEntity::getTagName,dto.getTagName()) + .ne(TagCustomerEntity::getId,dto.getId()); + if(baseDao.selectCount(queryWrapper)>0){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"标签名称已存在","标签名称已存在"); + } TagCustomerEntity entity = ConvertUtils.sourceToTarget(dto, TagCustomerEntity.class); updateById(entity); + //删除应用范围 + tagScopeDao.deleteByTagId(entity.getId(),entity.getCustomerId()); + if(CollectionUtils.isNotEmpty(dto.getAgencyIds())){ + dto.getAgencyIds().forEach(tagScopeDTO->{ + TagScopeEntity tagScopeEntity=new TagScopeEntity(); + tagScopeEntity.setCustomerId(entity.getCustomerId()); + tagScopeEntity.setTagId(entity.getId()); + tagScopeEntity.setAgencyId(tagScopeDTO.getAgencyId()); + tagScopeEntity.setAgencyName(tagScopeDTO.getAgencyName()); + tagScopeEntity.setOrgIdPath(tagScopeDTO.getOrgIdPath()); + tagScopeDao.insert(tagScopeEntity); + }); + } } @Override @@ -126,4 +198,19 @@ public class TagCustomerServiceImpl extends BaseServiceImpl tagCustomerUpdateWrapper = new LambdaUpdateWrapper<>(); + tagCustomerUpdateWrapper.eq(TagCustomerEntity::getId, id) + .set(TagCustomerEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()) + .set(TagCustomerEntity::getUpdatedTime, new Date()) + .set(TagCustomerEntity::getShowFlag,showFlag); + baseDao.update(null,tagCustomerUpdateWrapper); + } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml index 83ed4289ad..a73ca7d5b8 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml @@ -56,4 +56,14 @@ ORDER BY CUSTOMER_ID + + From 52f195a0a28fd1daec85071e48757ccee80c8c02 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 14:18:40 +0800 Subject: [PATCH 027/340] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=AE=B0=E5=BD=95org?= =?UTF-8?q?IdPath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/TagCustomerDTO.java | 16 +++++++++++ .../epmet/dto/form/TagCustomerFormDTO.java | 2 +- .../java/com/epmet/dao/TagCustomerDao.java | 1 + .../main/java/com/epmet/dao/TagScopeDao.java | 5 ++++ .../com/epmet/service/TagCustomerService.java | 13 --------- .../service/impl/TagCustomerServiceImpl.java | 28 +++---------------- .../main/resources/mapper/TagCustomerDao.xml | 11 +++++++- .../src/main/resources/mapper/TagScopeDao.xml | 12 ++++++++ 8 files changed, 49 insertions(+), 39 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java index 84080d204e..15e4d22232 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java @@ -18,12 +18,14 @@ package com.epmet.dto; import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; +import java.util.List; /** @@ -54,6 +56,10 @@ public class TagCustomerDTO implements Serializable { * 标签名称 */ private String tagName; + /** + * 标签颜色 + */ + private String tagColor; /** * 使用计数 @@ -69,31 +75,41 @@ public class TagCustomerDTO implements Serializable { /** * 删除标识 0.未删除 1.已删除 */ + @JsonIgnore private Integer delFlag; /** * 乐观锁 */ + @JsonIgnore private Integer revision; /** * 创建人 */ + @JsonIgnore private String createdBy; /** * 创建时间 */ + @JsonIgnore private Date createdTime; /** * 更新人 */ + @JsonIgnore private String updatedBy; /** * 更新时间 */ + @JsonIgnore private Date updatedTime; + /** + * 应用范围 + */ + private List agencyList; } diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java index 403b30094d..d27d57e3f4 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java @@ -47,7 +47,7 @@ public class TagCustomerFormDTO implements Serializable { /** * 应用范围,只能选社区 */ - private List agencyIds; + private List agencyList; /** * 客户ID */ diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java index 70c29ec8a2..cf3ccefc3a 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java @@ -64,4 +64,5 @@ public interface TagCustomerDao extends BaseDao { * @return */ List pageList(@Param("customerId") String customerId, @Param("tagName")String tagName); + } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagScopeDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagScopeDao.java index 3aecba1d55..411801f4b5 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagScopeDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagScopeDao.java @@ -1,10 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.TagScopeDTO; import com.epmet.entity.TagScopeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 标签应用范围表 * @@ -15,4 +18,6 @@ import org.apache.ibatis.annotations.Param; public interface TagScopeDao extends BaseDao { int deleteByTagId(@Param("tagId") String tagId, @Param("customerId") String customerId); + + List selectScope(String tagId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java index 099df16cab..eccf691c7f 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java @@ -25,9 +25,6 @@ import com.epmet.dto.form.TagCustomerPageFormDTO; import com.epmet.dto.result.UpdateTagUseCountsResultDTO; import com.epmet.entity.TagCustomerEntity; -import java.util.List; -import java.util.Map; - /** * 客户标签表 * @@ -46,16 +43,6 @@ public interface TagCustomerService extends BaseService { */ PageData page(TagCustomerPageFormDTO formDTO); - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-06-02 - */ - List list(Map params); - /** * 单条查询 * diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java index 219cc7616c..7c1befb4f2 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java @@ -18,10 +18,8 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -43,7 +41,6 @@ import com.epmet.utils.TagColorUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -51,7 +48,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.Date; import java.util.List; -import java.util.Map; /** * 客户标签表 @@ -78,22 +74,6 @@ public class TagCustomerServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, TagCustomerDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - @Override public TagCustomerDTO get(String id) { TagCustomerEntity entity = baseDao.selectById(id); @@ -119,8 +99,8 @@ public class TagCustomerServiceImpl extends BaseServiceImpl{ + if(CollectionUtils.isNotEmpty(dto.getAgencyList())){ + dto.getAgencyList().forEach(tagScopeDTO->{ TagScopeEntity tagScopeEntity=new TagScopeEntity(); tagScopeEntity.setCustomerId(entity.getCustomerId()); tagScopeEntity.setTagId(entity.getId()); @@ -151,8 +131,8 @@ public class TagCustomerServiceImpl extends BaseServiceImpl{ + if(CollectionUtils.isNotEmpty(dto.getAgencyList())){ + dto.getAgencyList().forEach(tagScopeDTO->{ TagScopeEntity tagScopeEntity=new TagScopeEntity(); tagScopeEntity.setCustomerId(entity.getCustomerId()); tagScopeEntity.setTagId(entity.getId()); diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml index a73ca7d5b8..2900561bd4 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml @@ -56,8 +56,17 @@ ORDER BY CUSTOMER_ID + + + + + + + + + - select tc.* from tag_customer tc where tc.del_flag='0' diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml index ed8f0b052a..1da2fc6eca 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml @@ -8,6 +8,8 @@ + + @@ -21,4 +23,14 @@ where TAG_ID=#{tagId} and CUSTOMER_ID=#{customerId} + + \ No newline at end of file From 8be4ecfaf24200219875f7c5c41e5a025537d2e0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 14:24:46 +0800 Subject: [PATCH 028/340] =?UTF-8?q?=E5=8E=BB=E6=8E=89agencyName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/TagScopeDTO.java | 5 ----- .../src/main/java/com/epmet/entity/TagScopeEntity.java | 4 ---- .../java/com/epmet/service/impl/TagCustomerServiceImpl.java | 2 -- .../src/main/resources/db/migration/V0.0.13__tag_scope.sql | 1 - .../src/main/resources/mapper/TagScopeDao.xml | 4 +--- 5 files changed, 1 insertion(+), 15 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java index a4e5052273..e5bf3d021a 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java @@ -24,10 +24,5 @@ public class TagScopeDTO implements Serializable { * agency_id全路径，包含自身 */ private String orgIdPath; - - /** - * 组织名称 - */ - private String agencyName; } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java index 6747b64835..7e00ef4919 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java @@ -38,8 +38,4 @@ public class TagScopeEntity extends BaseEpmetEntity { */ private String orgIdPath; - /** - * 组织名称 - */ - private String agencyName; } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java index 7c1befb4f2..cad48f6eeb 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java @@ -105,7 +105,6 @@ public class TagCustomerServiceImpl extends BaseServiceImpl - @@ -27,8 +26,7 @@ + + + diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java index b73213752b..028897d4a0 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java @@ -134,4 +134,15 @@ public class TagController { return new Result(); } + /** + * 初始化标签应用范围， + * 每个标签，和当前客户下所有社区关联 + * @param tokenDto + * @return + */ + @PostMapping("initTagScope") + public Result initTagScope(@LoginUser TokenDto tokenDto){ + tagCustomerService.initTagScope(tokenDto.getCustomerId()); + return new Result(); + } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java index eccf691c7f..670393895e 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java @@ -96,4 +96,12 @@ public interface TagCustomerService extends BaseService { * @param showFlag */ void changeShowFlag(String id, Integer showFlag); + + /** + * 初始化标签应用范围， + * 每个标签，和当前客户下所有社区关联 + * @param tokenDto + * @return + */ + void initTagScope(String customerId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java index cad48f6eeb..28997231cc 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java @@ -27,21 +27,27 @@ import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.TagCustomerDao; import com.epmet.dao.TagScopeDao; import com.epmet.dto.TagCustomerDTO; import com.epmet.dto.form.TagCustomerFormDTO; import com.epmet.dto.form.TagCustomerPageFormDTO; import com.epmet.dto.form.UpdateTagFormDTO; +import com.epmet.dto.result.AgencyResultDTO; import com.epmet.dto.result.UpdateTagUseCountsResultDTO; import com.epmet.entity.TagCustomerEntity; import com.epmet.entity.TagScopeEntity; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.TagCustomerService; import com.epmet.utils.TagColorUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -55,10 +61,13 @@ import java.util.List; * @author generator generator@elink-cn.com * @since v1.0.0 2020-06-02 */ +@Slf4j @Service public class TagCustomerServiceImpl extends BaseServiceImpl implements TagCustomerService { @Autowired private TagScopeDao tagScopeDao; + @Autowired + private GovOrgOpenFeignClient govOrgOpenFeignClient; /** @@ -191,4 +200,45 @@ public class TagCustomerServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(TagCustomerEntity::getCustomerId, customerId); + List tagList = baseDao.selectList(queryWrapper); + if (CollectionUtils.isEmpty(tagList)) { + return; + } + int tagTotal = tagList.size(); + // 获取当前客户下所有的社区组织 + Result> communityRes = govOrgOpenFeignClient.getAllCommunity(customerId); + if (communityRes.success() && CollectionUtils.isNotEmpty(communityRes.getData())) { + int communityTotal = communityRes.getData().size(); + int num = 1; + for (TagCustomerEntity tag : tagList) { + for (AgencyResultDTO agencyResultDTO : communityRes.getData()) { + TagScopeEntity tagScopeEntity = new TagScopeEntity(); + tagScopeEntity.setCustomerId(tag.getCustomerId()); + tagScopeEntity.setTagId(tag.getId()); + tagScopeEntity.setAgencyId(agencyResultDTO.getAgencyId()); + tagScopeEntity.setOrgIdPath(agencyResultDTO.getOrgIdPath()); + tagScopeDao.insert(tagScopeEntity); + num++; + } + } + log.error(String.format("customerId:%s,已经将%s个标签应用给%s个社区,tag_scope产生%s条记录", customerId, tagTotal, communityTotal, num)); + } + + } + } From df61b908953e006ed91c5687c1066dbab605e1e2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 15:38:16 +0800 Subject: [PATCH 030/340] clearCustomerTag --- .../java/com/epmet/feign/GovOrgOpenFeignClient.java | 4 ++-- .../main/java/com/epmet/controller/TagController.java | 1 + .../com/epmet/service/impl/TagCustomerServiceImpl.java | 10 ++++++++-- .../java/com/epmet/service/impl/TagServiceImpl.java | 2 ++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index f5fba673b1..3e4d5e9c7e 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -21,8 +21,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:37 */ - //@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class, url = "localhost:8092") -@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class) + @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class, url = "localhost:8092") +// @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class) public interface GovOrgOpenFeignClient { /** diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java index 028897d4a0..b075d50df7 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java @@ -32,6 +32,7 @@ public class TagController { * @Description 已发布列表页的标签——政府端 * @param tokenDto * @author zxc + * 补充：pc党建声音查询条件、新增弹框中的标签下拉框也调用的此接口 */ @PostMapping("taglist") // @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_PUBLISHED_LIST) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java index 28997231cc..986278609f 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java @@ -39,6 +39,7 @@ import com.epmet.dto.result.UpdateTagUseCountsResultDTO; import com.epmet.entity.TagCustomerEntity; import com.epmet.entity.TagScopeEntity; import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.redis.TagRedis; import com.epmet.service.TagCustomerService; import com.epmet.utils.TagColorUtils; import com.github.pagehelper.PageHelper; @@ -68,7 +69,8 @@ public class TagCustomerServiceImpl extends BaseServiceImpl> communityRes = govOrgOpenFeignClient.getAllCommunity(customerId); if (communityRes.success() && CollectionUtils.isNotEmpty(communityRes.getData())) { int communityTotal = communityRes.getData().size(); - int num = 1; + int num = 0; for (TagCustomerEntity tag : tagList) { for (AgencyResultDTO agencyResultDTO : communityRes.getData()) { TagScopeEntity tagScopeEntity = new TagScopeEntity(); diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java index cbfba74bb5..b85a637634 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java @@ -57,6 +57,7 @@ public class TagServiceImpl implements TagService { * @Description 已发布列表页的标签——政府端 * @param tokenDto * @author zxc + * 补充：pc党建声音查询条件、新增弹框中的标签下拉框也调用的此接口 */ @Override @Transactional(rollbackFor = Exception.class) @@ -64,6 +65,7 @@ public class TagServiceImpl implements TagService { String customerId = tokenDto.getCustomerId(); List resultDtos = tagRedis.zRevRange(customerId); if (resultDtos.size() == NumConstant.ZERO){ + //初始化标签 resultDtos = this.initTags(customerId); } return resultDtos; From e56d726fc6bbc46ba85d3198772ffccb53ff818d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 15:42:17 +0800 Subject: [PATCH 031/340] wuti --- .../src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 3e4d5e9c7e..0ded926d87 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -21,8 +21,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:37 */ - @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class, url = "localhost:8092") -// @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class) + // @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class, url = "localhost:8092") +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class) public interface GovOrgOpenFeignClient { /** From 6c3ccd534a03fa9fad70d06a9bcc22eb864ba3ab Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 15:47:52 +0800 Subject: [PATCH 032/340] wuti --- .../src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 3e4d5e9c7e..0ded926d87 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -21,8 +21,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:37 */ - @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class, url = "localhost:8092") -// @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class) + // @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class, url = "localhost:8092") +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class) public interface GovOrgOpenFeignClient { /** From dc5ca0295766edbadfbef27c76eb9aefb6bcc20a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 16:01:12 +0800 Subject: [PATCH 033/340] getAgencyTag/{gridId} --- .../com/epmet/controller/TagController.java | 19 +++++++++++++++---- .../java/com/epmet/dao/TagCustomerDao.java | 5 +++++ .../com/epmet/service/TagCustomerService.java | 10 ++++++++++ .../service/impl/TagCustomerServiceImpl.java | 19 +++++++++++++++++++ .../main/resources/mapper/TagCustomerDao.xml | 16 ++++++++++++++++ 5 files changed, 65 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java index b075d50df7..96adf89bbe 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java @@ -11,11 +11,9 @@ import com.epmet.dto.result.CorrelationTagListResultDTO; import com.epmet.dto.result.TagInfoResultDTO; import com.epmet.service.TagCustomerService; import com.epmet.service.TagService; +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.*; import java.util.List; @@ -146,4 +144,17 @@ public class TagController { tagCustomerService.initTagScope(tokenDto.getCustomerId()); return new Result(); } + + /** + * 钉钉实时动态，获取网格所属社区下， 的标签列表 只返回tagId，tagName + * @param gridId + * @return + */ + @PostMapping("getAgencyTag/{gridId}") + public Result> getAgencyTag(@PathVariable("gridId")String gridId){ + if(StringUtils.isBlank(gridId)){ + return new Result<>(); + } + return new Result>().ok(tagCustomerService.getAgencyTag(gridId)); + } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java index cf3ccefc3a..fcc0e268a7 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java @@ -65,4 +65,9 @@ public interface TagCustomerDao extends BaseDao { */ List pageList(@Param("customerId") String customerId, @Param("tagName")String tagName); + /** + * 钉钉实时动态，获取网格所属社区下， 的标签列表 + * 只返回tagId，tagName + */ + List getAgencyTag(@Param("agencyId")String agencyId,@Param("customerId") String customerId); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java index 670393895e..bd27a21f14 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java @@ -25,6 +25,8 @@ import com.epmet.dto.form.TagCustomerPageFormDTO; import com.epmet.dto.result.UpdateTagUseCountsResultDTO; import com.epmet.entity.TagCustomerEntity; +import java.util.List; + /** * 客户标签表 * @@ -104,4 +106,12 @@ public interface TagCustomerService extends BaseService { * @return */ void initTagScope(String customerId); + + /** + * 钉钉实时动态，获取网格所属社区下， 的标签列表 + * 只返回tagId，tagName + * @param gridId + * @return + */ + List getAgencyTag(String gridId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java index 986278609f..0ba38de2d5 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java @@ -25,6 +25,8 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; 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.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.Result; @@ -247,4 +249,21 @@ public class TagCustomerServiceImpl extends BaseServiceImpl getAgencyTag(String gridId) { + GridInfoCache gridInfoCache= CustomerOrgRedis.getGridInfo(gridId); + if(null==gridInfoCache){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"查询网格信息异常gridId:"+gridId,"查询网格信息异常"); + } + List list=baseDao.getAgencyTag(gridInfoCache.getPid(),gridInfoCache.getCustomerId()); + return list; + } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml index 2900561bd4..05778b1921 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml @@ -75,4 +75,20 @@ and tc.TAG_NAME like concat('%',#{tagName},'%') + + + From a6a614f70330851a047e4452949589222f58e66c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 16:12:30 +0800 Subject: [PATCH 034/340] /gov/voice/article/article-list-ytding --- .../epmet/dto/form/CommonArticleListFormDTO.java | 16 +++++++++++----- .../com/epmet/controller/ArticleController.java | 4 ++-- .../src/main/java/com/epmet/dao/ArticleDao.java | 3 ++- .../java/com/epmet/service/ArticleService.java | 3 ++- .../epmet/service/impl/ArticleServiceImpl.java | 4 ++-- .../src/main/resources/mapper/ArticleDao.xml | 7 +++++-- 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java index 6be60b5d1e..ee7b04d830 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java @@ -26,12 +26,12 @@ public class CommonArticleListFormDTO implements Serializable { * 烟台需求：周边疫情 就业服务 警民互动 物业通知 党务公开 居务公开 财务公开 以上标签在实时动态里写死吧 * */ - public interface YanTaiShowGroup extends CustomerClientShowGroup { + public interface YanTaiDingShowGroup extends CustomerClientShowGroup { } /** * 网格Id * */ - @NotBlank(message = "网格Id不能为空" , groups = {ArticleBannerInternalGroup.class,YanTaiShowGroup.class}) + @NotBlank(message = "网格Id不能为空" , groups = {ArticleBannerInternalGroup.class,YanTaiDingShowGroup.class}) private String gridId; /** @@ -42,7 +42,7 @@ public class CommonArticleListFormDTO implements Serializable { /** * 标签名称(高级配置里的参数) * */ - @NotBlank(message = "标签名称不能为空",groups = YanTaiShowGroup.class) + @NotBlank(message = "标签名称不能为空",groups = YanTaiDingShowGroup.class) private String tagName; /** * 排除的标签名称(高级配置里的参数) @@ -53,8 +53,14 @@ public class CommonArticleListFormDTO implements Serializable { */ private Integer isTop; - @NotNull(message = "pageNo不能为空", groups = YanTaiShowGroup.class) + @NotNull(message = "pageNo不能为空", groups = YanTaiDingShowGroup.class) private Integer pageNo; - @NotNull(message = "pageSize不能为空", groups = YanTaiShowGroup.class) + @NotNull(message = "pageSize不能为空", groups = YanTaiDingShowGroup.class) private Integer pageSize; + + /** + * 标签名称(高级配置里的参数) + * */ + @NotBlank(message = "标签名称不能为空",groups = YanTaiDingShowGroup.class) + private String tagId; } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index a984a8a42a..11d557e531 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -338,11 +338,11 @@ public class ArticleController { */ @PostMapping("article-list-ytding") public Result> pageArticleListByTagName(@RequestBody CommonArticleListFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, CommonArticleListFormDTO.YanTaiShowGroup.class); + ValidatorUtils.validateEntity(formDTO, CommonArticleListFormDTO.YanTaiDingShowGroup.class); return new Result>().ok(articleService.pageArticleListByTagName(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getGridId(), - formDTO.getTagName())); + formDTO.getTagName(),formDTO.getTagId())); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java index 53524c9bb7..c974947186 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java @@ -178,5 +178,6 @@ public interface ArticleDao extends BaseDao { List pageArticleListByTagName(@Param("gridId")String gridId, @Param("tagName")String tagName, @Param("customerId")String customerId, - @Param("agencyId")String agencyId); + @Param("agencyId")String agencyId, + @Param("tagId")String tagId); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java index d9374b1263..499ed51ab9 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java @@ -291,5 +291,6 @@ public interface ArticleService extends BaseService { PageData pageArticleListByTagName(Integer pageNo, Integer pageSize, String gridId, - String tagName); + String tagName, + String tagId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index a1777b5056..a9e3f6c953 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -2014,13 +2014,13 @@ public class ArticleServiceImpl extends BaseServiceImpl pageArticleListByTagName(Integer pageNo, Integer pageSize, String gridId, String tagName) { + public PageData pageArticleListByTagName(Integer pageNo, Integer pageSize, String gridId, String tagName,String tagId) { PageHelper.startPage(pageNo, pageSize); List list = baseDao.pageArticleListByTagName( gridId, tagName, EpmetRequestHolder.getLoginUserCustomerId(), - null); + null,tagId); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml index 5e67b953a0..b400ddd7a2 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml @@ -534,8 +534,8 @@ WHERE art.DEL_FLAG = '0' AND art.CUSTOMER_ID = #{customerId} - - AND t.TAG_NAME LIKE concat ( '%', #{tagName}, '%' ) + + AND t.TAG_ID = #{tagId} and apr.GRID_ID=#{gridId} @@ -543,6 +543,9 @@ AND art.org_id_path like concat('%',#{agencyId},'%') + + AND t.TAG_NAME LIKE concat ( '%', #{tagName}, '%' ) + ORDER BY art.PUBLISH_DATE DESC, art.CREATED_TIME DESC From f1fdc533388e2096a618c67cceacbb33988b72e9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 16:16:21 +0800 Subject: [PATCH 035/340] /gov/voice/article/article-list-ytding --- .../com/epmet/dto/form/CommonArticleListFormDTO.java | 12 +++++++----- .../java/com/epmet/controller/ArticleController.java | 5 +++-- .../src/main/java/com/epmet/dao/ArticleDao.java | 3 ++- .../main/java/com/epmet/service/ArticleService.java | 3 ++- .../com/epmet/service/impl/ArticleServiceImpl.java | 5 +++-- .../src/main/resources/mapper/ArticleDao.xml | 3 +++ 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java index 6be60b5d1e..c7addb73e8 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java @@ -26,12 +26,12 @@ public class CommonArticleListFormDTO implements Serializable { * 烟台需求：周边疫情 就业服务 警民互动 物业通知 党务公开 居务公开 财务公开 以上标签在实时动态里写死吧 * */ - public interface YanTaiShowGroup extends CustomerClientShowGroup { + public interface YanTaiDingShowGroup extends CustomerClientShowGroup { } /** * 网格Id * */ - @NotBlank(message = "网格Id不能为空" , groups = {ArticleBannerInternalGroup.class,YanTaiShowGroup.class}) + @NotBlank(message = "网格Id不能为空" , groups = {ArticleBannerInternalGroup.class,YanTaiDingShowGroup.class}) private String gridId; /** @@ -42,7 +42,7 @@ public class CommonArticleListFormDTO implements Serializable { /** * 标签名称(高级配置里的参数) * */ - @NotBlank(message = "标签名称不能为空",groups = YanTaiShowGroup.class) + @NotBlank(message = "标签名称不能为空",groups = YanTaiDingShowGroup.class) private String tagName; /** * 排除的标签名称(高级配置里的参数) @@ -53,8 +53,10 @@ public class CommonArticleListFormDTO implements Serializable { */ private Integer isTop; - @NotNull(message = "pageNo不能为空", groups = YanTaiShowGroup.class) + @NotNull(message = "pageNo不能为空", groups = YanTaiDingShowGroup.class) private Integer pageNo; - @NotNull(message = "pageSize不能为空", groups = YanTaiShowGroup.class) + @NotNull(message = "pageSize不能为空", groups = YanTaiDingShowGroup.class) private Integer pageSize; + @NotBlank(message = "tagId不能为空",groups = YanTaiDingShowGroup.class) + private String tagId; } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index a984a8a42a..77ef7f4361 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -338,11 +338,12 @@ public class ArticleController { */ @PostMapping("article-list-ytding") public Result> pageArticleListByTagName(@RequestBody CommonArticleListFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, CommonArticleListFormDTO.YanTaiShowGroup.class); + ValidatorUtils.validateEntity(formDTO, CommonArticleListFormDTO.YanTaiDingShowGroup.class); return new Result>().ok(articleService.pageArticleListByTagName(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getGridId(), - formDTO.getTagName())); + formDTO.getTagName(), + formDTO.getTagId())); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java index 53524c9bb7..c974947186 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java @@ -178,5 +178,6 @@ public interface ArticleDao extends BaseDao { List pageArticleListByTagName(@Param("gridId")String gridId, @Param("tagName")String tagName, @Param("customerId")String customerId, - @Param("agencyId")String agencyId); + @Param("agencyId")String agencyId, + @Param("tagId")String tagId); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java index d9374b1263..499ed51ab9 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java @@ -291,5 +291,6 @@ public interface ArticleService extends BaseService { PageData pageArticleListByTagName(Integer pageNo, Integer pageSize, String gridId, - String tagName); + String tagName, + String tagId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index a1777b5056..f51705afdd 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -2014,13 +2014,14 @@ public class ArticleServiceImpl extends BaseServiceImpl pageArticleListByTagName(Integer pageNo, Integer pageSize, String gridId, String tagName) { + public PageData pageArticleListByTagName(Integer pageNo, Integer pageSize, String gridId, String tagName,String tagId) { PageHelper.startPage(pageNo, pageSize); List list = baseDao.pageArticleListByTagName( gridId, tagName, EpmetRequestHolder.getLoginUserCustomerId(), - null); + null, + tagId); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml index 5e67b953a0..04b8d0d712 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml @@ -543,6 +543,9 @@ AND art.org_id_path like concat('%',#{agencyId},'%') + + AND t.tag_id =#{tagId} + ORDER BY art.PUBLISH_DATE DESC, art.CREATED_TIME DESC From 286627c5184886dd93d70cbd32624a1d4db7d241 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 16:17:53 +0800 Subject: [PATCH 036/340] formDTO --- .../src/main/java/com/epmet/controller/TagController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java index 96adf89bbe..d1964ece10 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java @@ -89,7 +89,7 @@ public class TagController { */ @PostMapping("page-list") public Result> pageList(@LoginUser TokenDto tokenDto,@RequestBody TagCustomerPageFormDTO formDTO){ - tokenDto.setCustomerId(formDTO.getCustomerId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(formDTO,TagCustomerPageFormDTO.PageUserInternalGroup.class,TagCustomerPageFormDTO.PageUserShowGroup.class); return new Result>().ok(tagCustomerService.page(formDTO)); } From 66d975ecf38a3560874f1e4d2b3ae4f6b9ebcd1a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 17:03:07 +0800 Subject: [PATCH 037/340] orgIdPath --- .../src/main/java/com/epmet/dto/TagScopeDTO.java | 6 ++++++ .../src/main/java/com/epmet/controller/TagController.java | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java index e5bf3d021a..8eacc3441e 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java @@ -1,7 +1,9 @@ package com.epmet.dto; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -11,6 +13,8 @@ import java.io.Serializable; */ @Data public class TagScopeDTO implements Serializable { + public interface AddUserShowGroup extends CustomerClientShowGroup { + } /** * 标签ID */ @@ -19,10 +23,12 @@ public class TagScopeDTO implements Serializable { /** * 应用范围，这里只能是社区id */ + @NotBlank(message = "agencyId不能为空",groups = AddUserShowGroup.class) private String agencyId; /** * agency_id全路径，包含自身 */ + @NotBlank(message = "orgIdPath不能为空",groups = AddUserShowGroup.class) private String orgIdPath; } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java index d1964ece10..a23f93d4a0 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java @@ -6,11 +6,13 @@ 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.TagCustomerDTO; +import com.epmet.dto.TagScopeDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.CorrelationTagListResultDTO; import com.epmet.dto.result.TagInfoResultDTO; import com.epmet.service.TagCustomerService; import com.epmet.service.TagService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -103,6 +105,9 @@ public class TagController { @PostMapping("save") public Result save(@LoginUser TokenDto tokenDto,@RequestBody TagCustomerFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); + if(CollectionUtils.isNotEmpty(formDTO.getAgencyList())){ + ValidatorUtils.validateEntity(formDTO.getAgencyList(), TagScopeDTO.AddUserShowGroup.class); + } ValidatorUtils.validateEntity(formDTO,TagCustomerFormDTO.AddUserShowGroup.class,TagCustomerFormDTO.AddUserInternalGroup.class); tagCustomerService.save(formDTO); return new Result(); @@ -117,6 +122,9 @@ public class TagController { @PostMapping("update") public Result update(@LoginUser TokenDto tokenDto,@RequestBody TagCustomerFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); + if(CollectionUtils.isNotEmpty(formDTO.getAgencyList())){ + ValidatorUtils.validateEntity(formDTO.getAgencyList(), TagScopeDTO.AddUserShowGroup.class); + } ValidatorUtils.validateEntity(formDTO,TagCustomerFormDTO.UpdateUserShowGroup.class,TagCustomerFormDTO.UpdateUserInternalGroup.class); tagCustomerService.update(formDTO); return new Result(); From 5b8a4850750872f8f8bc835a3b4325061644ea57 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Mar 2023 18:22:50 +0800 Subject: [PATCH 038/340] orgIdPath --- .../epmet/dto/form/GroupRentHouseFormDTO.java | 48 +++++++++++++ .../com/epmet/controller/HouseController.java | 17 +++++ .../main/java/com/epmet/dao/IcHouseDao.java | 13 ++-- .../java/com/epmet/service/HouseService.java | 7 ++ .../epmet/service/impl/HouseServiceImpl.java | 22 ++++++ .../src/main/resources/mapper/IcHouseDao.xml | 67 +++++++++++++++++++ 6 files changed, 170 insertions(+), 4 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupRentHouseFormDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupRentHouseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupRentHouseFormDTO.java new file mode 100644 index 0000000000..97c8832968 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupRentHouseFormDTO.java @@ -0,0 +1,48 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2023/3/2 17:35 + */ +@Data +public class GroupRentHouseFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = -953729855530434972L; + /** + * 组织ID + */ + private String orgId; + private String orgType; + + /** + * 房主姓名 + */ + private String ownerName; + /** + * 房主电话 + */ + private String ownerPhone; + + /** + * 房屋用途 + */ + private String purpose; + + /** + * 备注 + */ + private String remark; + + + /** + * tokenDto获取 + */ + private String customerId; + private String staffId; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 53738a3d4c..f028d098d2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -691,4 +691,21 @@ public class HouseController implements ResultDataResolver { return new Result>().ok(r); } + /** + * 群租房列表来源于烟台需求 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("group-rent-house-list") + @MaskResponse(fieldNames = {"ownerIdCard", "ownerPhone"}, + fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_MOBILE}) + public Result> groupRentHouseList(@LoginUser TokenDto tokenDto, @RequestBody GroupRentHouseFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(houseService.groupRentHouseList(formDTO)); + } + + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 1f3ceacfe5..699b91362e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -2,10 +2,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.ImportGeneralDTO; -import com.epmet.dto.form.CheckHouseInfoFormDTO; -import com.epmet.dto.form.GetHouseInfoToCollectFormDTO; -import com.epmet.dto.form.HouseChartFormDTO; -import com.epmet.dto.form.IcHouseListFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.CustomerOrgParameterEntity; import com.epmet.entity.IcHouseEntity; @@ -213,4 +210,12 @@ public interface IcHouseDao extends BaseDao { List houseStatisListDetail(HouseChartFormDTO formDTO); List selectListForRenFangStats(@Param("buildingId") String buildingId); + + /** + * 群租房列表 + * 群租房：出租状态并超过5人（≥5） + * @param formDTO + * @return + */ + List selectGroupRentHouseList(GroupRentHouseFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 1161a1ee9f..61288d60cd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -204,4 +204,11 @@ public interface HouseService { PageData houseStatisListDetail(HouseChartFormDTO formDTO); PageData usingCommunityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize); + + /** + * 群租房列表来源于烟台需求 + * @param formDTO + * @return + */ + PageData groupRentHouseList(GroupRentHouseFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index d7e3b1f8b2..8453ec895d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -1484,4 +1484,26 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { agencyNamePathList.add(agencyInfo.getOrganizationName()); return String.join("-", agencyNamePathList); } + + + /** + * 群租房列表来源于烟台需求 + * + * @param formDTO + * @return + */ + @Override + public PageData groupRentHouseList(GroupRentHouseFormDTO formDTO) { + if(StringUtils.isBlank(formDTO.getOrgId())){ + //默认查询当前组织及下级 + formDTO.setOrgType("agency"); + CustomerStaffInfoCacheResult staffInfoCacheResult=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getStaffId()); + formDTO.setOrgId(staffInfoCacheResult.getAgencyId()); + } + //群租房：出租状态并超过5人（≥5） + PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize()); + List list=icHouseDao.selectGroupRentHouseList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 6eac8ed9fd..acc3dcc874 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -701,4 +701,71 @@ CAST(a.DOOR_NAME AS SIGNED), CONVERT(a.DOOR_NAME using gbk) + + From a2c00f431fe17b0f2fbfc762cacbb7a675e63440 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 3 Mar 2023 09:47:40 +0800 Subject: [PATCH 039/340] /gov/org/house/group-rent-house-list --- .../dto/result/GroupRentHouseResultDTO.java | 77 +++++++++++++++++++ .../com/epmet/controller/HouseController.java | 4 +- .../main/java/com/epmet/dao/IcHouseDao.java | 2 +- .../java/com/epmet/service/HouseService.java | 2 +- .../epmet/service/impl/HouseServiceImpl.java | 10 ++- .../src/main/resources/mapper/IcHouseDao.xml | 10 ++- 6 files changed, 97 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupRentHouseResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupRentHouseResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupRentHouseResultDTO.java new file mode 100644 index 0000000000..febcd6e4fc --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupRentHouseResultDTO.java @@ -0,0 +1,77 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 群租房列表 + * @Author yzm + * @Date 2023/3/3 9:27 + */ +@Data +public class GroupRentHouseResultDTO implements Serializable { + private static final long serialVersionUID = 3671964765109154117L; + private String houseId; + + /** + * 所属组织 + */ + private String agencyName; + private String agencyId; + /** + * 所属网格 + */ + private String gridName; + private String gridId; + + /** + * 所属小区 + */ + private String neighborHoodName; + /** + * 所属楼栋 + */ + private String buildingName; + + private String houseName; + /** + * 房屋类型 + */ + private String houseType; + private String houseTypeKey; + /** + * 房屋用途 + */ + private String purpose; + private String purposeKey; + + /** + * 房屋状态：房屋状态:1：出租 0：自住 2：闲置 3：未售出 + */ + private String rentFlag; + + /** + * 房主姓名 + */ + private String ownerName; + /** + * 房主电话 + */ + private String ownerPhone; + /** + * 房主身份证 + */ + private String ownerIdCard; + + /** + * 备注 + */ + private String remark; + + /** + * 排序 + */ + private Double sort; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index f028d098d2..32062f26c5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -700,10 +700,10 @@ public class HouseController implements ResultDataResolver { @PostMapping("group-rent-house-list") @MaskResponse(fieldNames = {"ownerIdCard", "ownerPhone"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_MOBILE}) - public Result> groupRentHouseList(@LoginUser TokenDto tokenDto, @RequestBody GroupRentHouseFormDTO formDTO) { + public Result> groupRentHouseList(@LoginUser TokenDto tokenDto, @RequestBody GroupRentHouseFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); - return new Result>().ok(houseService.groupRentHouseList(formDTO)); + return new Result>().ok(houseService.groupRentHouseList(formDTO)); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 699b91362e..3e9d28b39f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -217,5 +217,5 @@ public interface IcHouseDao extends BaseDao { * @param formDTO * @return */ - List selectGroupRentHouseList(GroupRentHouseFormDTO formDTO); + List selectGroupRentHouseList(GroupRentHouseFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 61288d60cd..8499b55722 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -210,5 +210,5 @@ public interface HouseService { * @param formDTO * @return */ - PageData groupRentHouseList(GroupRentHouseFormDTO formDTO); + PageData groupRentHouseList(GroupRentHouseFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 8453ec895d..d31ecc0c13 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -1493,7 +1493,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { * @return */ @Override - public PageData groupRentHouseList(GroupRentHouseFormDTO formDTO) { + public PageData groupRentHouseList(GroupRentHouseFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ //默认查询当前组织及下级 formDTO.setOrgType("agency"); @@ -1502,8 +1502,12 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } //群租房：出租状态并超过5人（≥5） PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize()); - List list=icHouseDao.selectGroupRentHouseList(formDTO); - PageInfo pageInfo = new PageInfo<>(list); + List list=icHouseDao.selectGroupRentHouseList(formDTO); + list.forEach(item -> { + item.setHouseType(HouseTypeEnums.getTypeValue(item.getHouseTypeKey())); + item.setPurpose(HousePurposeEnums.getTypeValue(item.getPurposeKey())); + }); + PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index acc3dcc874..222062704a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -702,10 +702,16 @@ CONVERT(a.DOOR_NAME using gbk) - SELECT ih.ID AS houseId, + n.AGENCY_ID as agencyId, + ca.ORGANIZATION_NAME as agencyName, + n.GRID_ID as gridId, + cg.GRID_NAME as gridName, concat( n.NEIGHBOR_HOOD_NAME, ib.BUILDING_NAME, bu.UNIT_NAME, ih.DOOR_NAME ) AS houseName, + n.NEIGHBOR_HOOD_NAME as neighborHoodName, + ib.BUILDING_NAME as buildingName, ih.HOUSE_TYPE AS houseTypeKey, ih.PURPOSE AS purposeKey, ( @@ -732,6 +738,8 @@ LEFT JOIN ic_building ib ON ( ih.BUILDING_ID = ib.id ) LEFT JOIN ic_neighbor_hood n ON ( ib.NEIGHBOR_HOOD_ID = n.ID ) LEFT JOIN ic_building_unit bu ON ( ih.BUILDING_UNIT_ID = bu.id ) + left join customer_agency ca on(n.AGENCY_ID=ca.id) + left join customer_grid cg on(n.grid_id=cg.id) WHERE ih.DEL_FLAG = '0' AND ib.DEL_FLAG = '0' From a386bb2f7fd9e1f03974238e1900eb7b16f44b65 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 3 Mar 2023 09:57:20 +0800 Subject: [PATCH 040/340] listhomeuserbrief-encrypt/{houseId} --- .../controller/IcResiUserController.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 440a440fd4..407eb3c26c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1217,6 +1217,25 @@ public class IcResiUserController implements ResultDataResolver { return new Result().ok(r); } + /** + * 根据房屋主键查询户内家庭成员简信息 + * 返回的手机号、身份证加密 + * + * @param houseId 房屋主键 + * @param loginUser 登录用户 + * @return com.epmet.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2022/4/21/0021 15:00 + */ + @MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD}) + @PostMapping("listhomeuserbrief-encrypt/{houseId}") + public Result> listHomeUserBriefEncrypt(@PathVariable("houseId") String houseId, @LoginUser TokenDto loginUser) { + String customerId = loginUser.getCustomerId(); + List r = icResiUserService.listHomeUserBrief(houseId, customerId); + return new Result().ok(r); + } + + /** * 根据房屋id,查询居民信息表中-家庭信息-本人 的居民。如果有多个，返回最近一个 * From afca6dcb053eef1b60b243f58b0e335020eb6d0e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Mar 2023 10:33:52 +0800 Subject: [PATCH 041/340] =?UTF-8?q?pc=E7=AB=AF=E5=BE=BD=E7=AB=A0=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8-=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8:badge/audit-page?= =?UTF-8?q?-list=EF=BC=8Ctodo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/BadgeAuditPageFormDTO.java | 58 +++++++++++++++++++ .../dto/result/BadgeAuditRecordResultDTO.java | 14 ++++- .../com/epmet/controller/BadgeController.java | 15 +++++ .../src/main/java/com/epmet/dao/BadgeDao.java | 15 +++++ .../java/com/epmet/service/BadgeService.java | 7 +++ .../epmet/service/impl/BadgeServiceImpl.java | 28 +++++++++ .../src/main/resources/mapper/BadgeDao.xml | 55 ++++++++++++++++++ 7 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeAuditPageFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeAuditPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeAuditPageFormDTO.java new file mode 100644 index 0000000000..804f22ee8b --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeAuditPageFormDTO.java @@ -0,0 +1,58 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2023/3/6 9:58 + */ +@Data +public class BadgeAuditPageFormDTO implements Serializable { + private static final long serialVersionUID = -6908967598027076330L; + + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) + private String customerId; + /** + * 页码 + */ + @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class) + private Integer pageNo; + /** + * 每页显示数量 + */ + @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class) + private Integer pageSize; + /** + * 当前用户所属的组织id + */ + @NotBlank(message = "agencyId不能为空", groups = AddUserInternalGroup.class) + private String agencyId; + + /** + * 网格Id + */ + private String gridId; + /** + * 徽章id + */ + private String badgeId; + /** + * 审核状态 approved:审核通过，rejected:审核驳回;auditing:审核中 + */ + private String auditStatus; + + +} + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditRecordResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditRecordResultDTO.java index 7ae47fdbca..2ea48afe64 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditRecordResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditRecordResultDTO.java @@ -37,7 +37,7 @@ public class BadgeAuditRecordResultDTO implements Serializable { */ private Long createTime; /** - * 用户名 + * 审核状态 approved:审核通过，rejected:审核驳回;auditing:审核中 */ private String auditStatus; @@ -50,4 +50,16 @@ public class BadgeAuditRecordResultDTO implements Serializable { * 审核记录ID */ private String recordId; + + /** + * pc端徽章审核-分页列表赋值 + * 03.07:烟台需求pc端增加徽章审核 + */ + private String gridId; + /** + * pc端徽章审核-分页列表赋值 + * 03.07:烟台需求pc端增加徽章审核 + * 网格名称：社区-网格 + */ + private String gridName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java index 7f58178ffe..9e7f7c1582 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.RequirePermission; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.enums.RequirePermissionEnum; +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; @@ -140,6 +141,20 @@ public class BadgeController { return new Result>().ok(result); } + /** + * pc端徽章审核-分页列表 + * + * @param formDTO + * @return + */ + @PostMapping("audit-page-list") + public Result> auditPageList(@LoginUser TokenDto tokenDto,@RequestBody BadgeAuditPageFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO, BadgeAuditPageFormDTO.AddUserInternalGroup.class, BadgeAuditPageFormDTO.AddUserShowGroup.class); + return new Result>().ok(badgeService.auditPageList(formDTO)); + } + + /** * 审核 * @author zhaoqifeng diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java index 113ed28dee..528c00c45a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java @@ -213,4 +213,19 @@ public interface BadgeDao extends BaseDao { */ Integer badgeAuditReset(@Param("gridId") String gridId); + /** + * pc端徽章审核-分页列表 + * + * @param customerId + * @param agencyId + * @param gridId + * @param badgeId + * @param auditStatus + * @return + */ + List auditPageList(@Param("customerId") String customerId, + @Param("agencyId") String agencyId, + @Param("gridId") String gridId, + @Param("badgeId") String badgeId, + @Param("auditStatus") String auditStatus); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java index 379d3c8fad..d1c1dde3c2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java @@ -215,4 +215,11 @@ public interface BadgeService extends BaseService { * @return */ Integer deleteBadgeCertificateAuditing(String customerId, String gridId); + + /** + * pc端徽章审核-分页列表 + * @param formDTO + * @return + */ + PageData auditPageList(BadgeAuditPageFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java index 39359b29ea..3d1ca56f86 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java @@ -30,6 +30,8 @@ import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -49,6 +51,8 @@ import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.MessageFeignClient; import com.epmet.redis.UserBadgeRedis; import com.epmet.service.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -516,4 +520,28 @@ public class BadgeServiceImpl extends BaseServiceImpl imp public Integer deleteBadgeCertificateAuditing(String customerId, String gridId) { return userBadgeCertificateRecordService.deleteBadgeCertificateAuditing(customerId,gridId); } + + /** + * pc端徽章审核-分页列表 + * + * @param formDTO + * @return + */ + @Override + public PageData auditPageList(BadgeAuditPageFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.auditPageList(formDTO.getCustomerId(), + formDTO.getAgencyId(), + formDTO.getGridId(), + formDTO.getBadgeId(), + formDTO.getAuditStatus()); + list.forEach(dto -> { + GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfoCache) { + dto.setGridName(gridInfoCache.getGridNamePath()); + } + }); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml index 275babd61f..780e87a5c4 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml @@ -340,4 +340,59 @@ AND AUDIT_STATUS = 'auditing' AND GRID_ID = #{gridId} + + + \ No newline at end of file From e7ebf28eb73291f0d423c534ba4602f2d5d24842 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Mar 2023 12:00:29 +0800 Subject: [PATCH 042/340] =?UTF-8?q?gov-voice=E8=A1=A8=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E8=AE=A9=E6=9D=8E=E6=99=93=E5=BA=B7=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.13__tag_scope.sql | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql deleted file mode 100644 index bb41f4af36..0000000000 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql +++ /dev/null @@ -1,18 +0,0 @@ -alter table tag_customer add COLUMN SHOW_FLAG TINYINT(1) DEFAULT 1 comment '1：展示；0：隐藏;0302因烟台需求增加此列默认1' after USE_COUNT; - -CREATE TABLE `tag_scope` ( - `ID` varchar(64) NOT NULL COMMENT '主键（0302因烟台需求增加此表）', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID（0302因烟台需求增加此表）', - `TAG_ID` varchar(64) NOT NULL COMMENT '标签ID', - `AGENCY_ID` varchar(64) NOT NULL COMMENT '应用范围，这里只能是社区id', - `ORG_ID_PATH` varchar(255) NOT NULL COMMENT 'agency_id全路径，包含自身', - `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', - `REVISION` int(11) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='标签应用范围表'; - - From 20d9017c0cf2dc72aa2eef43f03e82a05cc52f50 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Mar 2023 12:51:26 +0800 Subject: [PATCH 043/340] badge-options --- .../com/epmet/dto/result/BadgeListResultDTO.java | 1 + .../java/com/epmet/controller/BadgeController.java | 8 ++++++++ .../main/java/com/epmet/service/BadgeService.java | 7 +++++++ .../com/epmet/service/impl/BadgeServiceImpl.java | 12 ++++++++++++ .../src/main/resources/mapper/BadgeDao.xml | 3 ++- 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java index 8374a6497e..015f0d9422 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java @@ -32,4 +32,5 @@ public class BadgeListResultDTO { * 固有徽章类型 党员徽章：party;无：none */ private String type; + private String customerId; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java index 9e7f7c1582..151302844d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java @@ -247,4 +247,12 @@ public class BadgeController { return new Result().ok(badgeService.deleteBadgeCertificateAuditing(customerId,gridId)); } + /** + * 查询当前客户下，所有的徽章，用于pc徽章审核查询条件 + * @return + */ + @PostMapping("badge-options") + public Result> queryBadgeOptions(@LoginUser TokenDto tokenDto){ + return new Result>().ok(badgeService.queryBadgeOptions(tokenDto.getCustomerId())); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java index d1c1dde3c2..88cfbfee15 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java @@ -222,4 +222,11 @@ public interface BadgeService extends BaseService { * @return */ PageData auditPageList(BadgeAuditPageFormDTO formDTO); + + /** + * 查询当前客户下，所有的徽章，用于pc徽章审核查询条件 + * @param customerId + * @return + */ + List queryBadgeOptions(String customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java index 3d1ca56f86..e6721412b8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java @@ -544,4 +544,16 @@ public class BadgeServiceImpl extends BaseServiceImpl imp PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } + + /** + * 查询当前客户下，所有的徽章，用于pc徽章审核查询条件 + * + * @param customerId + * @return + */ + @Override + public List queryBadgeOptions(String customerId) { + List list=baseDao.selectList(customerId); + return list; + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml index 780e87a5c4..2d9d49fd74 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml @@ -67,7 +67,8 @@ BADGE_NAME, BADGE_ICON, BADGE_STATUS, - FIXATION_BADGE_TYPE AS "type" + FIXATION_BADGE_TYPE AS "type", + CUSTOMER_ID as customerId FROM ( SELECT * FROM badge From d00f3d2e449b950a7f13e06abc6c7c780fe93a5f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Mar 2023 13:05:06 +0800 Subject: [PATCH 044/340] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9EgridName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/CertificationDetailResultDTO.java | 4 ++++ .../java/com/epmet/service/impl/UserBadgeServiceImpl.java | 6 ++++++ .../src/main/resources/mapper/UserBadgeDao.xml | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java index 63783adc2c..0cab1b7039 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java @@ -63,6 +63,8 @@ public class CertificationDetailResultDTO implements Serializable { */ private String recordId; + private String gridId; + private String gridName; public CertificationDetailResultDTO() { this.surname = ""; this.name = ""; @@ -74,5 +76,7 @@ public class CertificationDetailResultDTO implements Serializable { this.authResult = ""; this.authReason = ""; this.recordId = ""; + this.gridId=""; + this.gridName=""; } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 009870cb44..5d27aaf3ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -6,6 +6,8 @@ import com.epmet.commons.tools.constant.NumConstant; 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.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -413,6 +415,10 @@ public class UserBadgeServiceImpl implements UserBadgeService { resiResult.setIdcard(userInfo.getIdNum()); } } + GridInfoCache gridInfoCache= CustomerOrgRedis.getGridInfo(resiResult.getGridId()); + if(null!=gridInfoCache){ + resiResult.setGridName(gridInfoCache.getGridNamePath()); + } return resiResult; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml index 95b77d51a7..e95397c3bf 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml @@ -115,7 +115,8 @@ AUDIT_STATUS, AUDIT_STATUS AS authResult, AUDIT_REMARK AS authReason, - ID AS recordId + ID AS recordId, + GRID_ID as gridId FROM user_badge_certificate_record WHERE From 254c54b2f2d71513af9f50545f28fcdc087313e2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Mar 2023 13:26:38 +0800 Subject: [PATCH 045/340] epmetuser/more/badge/certification/detail;UserBaseInfoRedis.java:225;NullPointerException --- .../com/epmet/redis/UserBaseInfoRedis.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index 8b42599906..16fd4e04da 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -222,15 +222,17 @@ public class UserBaseInfoRedis { String gridFullName = gridInfoCache.getGridNamePath(); baseInfo.setRegisteredGridName(gridFullName); StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(baseInfo.getSurname()); - switch (baseInfo.getGender()) { - case NumConstant.ONE_STR: - buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE); - break; - case NumConstant.TWO_STR: - buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_FEMALE); - break; - default: - buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_GENDER_UNKNOWN); + if(null!=baseInfo.getGender()){ + switch (baseInfo.getGender()) { + case NumConstant.ONE_STR: + buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE); + break; + case NumConstant.TWO_STR: + buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_FEMALE); + break; + default: + buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_GENDER_UNKNOWN); + } } baseInfo.setShowName(buffer.toString()); } From b51d00bf19ff4a3967428c6ec915888d50e073d0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Mar 2023 13:29:02 +0800 Subject: [PATCH 046/340] epmetuser/more/badge/certification/detail;UserBaseInfoRedis.java:225;NullPointerException --- .../com/epmet/redis/UserBaseInfoRedis.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index 8b42599906..16fd4e04da 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -222,15 +222,17 @@ public class UserBaseInfoRedis { String gridFullName = gridInfoCache.getGridNamePath(); baseInfo.setRegisteredGridName(gridFullName); StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(baseInfo.getSurname()); - switch (baseInfo.getGender()) { - case NumConstant.ONE_STR: - buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE); - break; - case NumConstant.TWO_STR: - buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_FEMALE); - break; - default: - buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_GENDER_UNKNOWN); + if(null!=baseInfo.getGender()){ + switch (baseInfo.getGender()) { + case NumConstant.ONE_STR: + buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE); + break; + case NumConstant.TWO_STR: + buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_FEMALE); + break; + default: + buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_GENDER_UNKNOWN); + } } baseInfo.setShowName(buffer.toString()); } From 4eb317f1c3b8796d55031c093b24bdc490666909 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Mar 2023 13:36:38 +0800 Subject: [PATCH 047/340] =?UTF-8?q?/epmetuser/more/badge/certification/det?= =?UTF-8?q?ail=E8=BF=94=E5=9B=9EgridName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserBadgeServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 5d27aaf3ac..89ef4a4f9e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -404,7 +404,12 @@ public class UserBadgeServiceImpl implements UserBadgeService { public CertificationDetailResultDTO certificationDetail(TokenDto tokenDto, CertificationDetailFormDTO certificationDetailFormDTO) { //工作端 if (StringUtils.isNotBlank(certificationDetailFormDTO.getRecordId())){ - return userBadgeDao.selectBadgeAuthRecord(null, certificationDetailFormDTO.getBadgeId(),certificationDetailFormDTO.getRecordId()); + CertificationDetailResultDTO res= userBadgeDao.selectBadgeAuthRecord(null, certificationDetailFormDTO.getBadgeId(),certificationDetailFormDTO.getRecordId()); + GridInfoCache gridInfoCache= CustomerOrgRedis.getGridInfo(res.getGridId()); + if(null!=gridInfoCache){ + res.setGridName(gridInfoCache.getGridNamePath()); + } + return res; } //居民端 CertificationDetailResultDTO resiResult = userBadgeDao.selectBadgeAuthRecord(tokenDto.getUserId(), certificationDetailFormDTO.getBadgeId(),certificationDetailFormDTO.getRecordId()); From 43bd4612ce2e0ec2c64850ca8ba0dfed68411fde Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Mar 2023 13:56:43 +0800 Subject: [PATCH 048/340] =?UTF-8?q?certification/add-autopass=E4=B8=8D?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/UserBadgeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java index 637da83ce0..e421212c73 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java @@ -77,7 +77,7 @@ public class UserBadgeController { certificationAddFormDTO.setUserId(tokenDto.getUserId()); certificationAddFormDTO.setSendMsgFlag(false); // 是否自动通过 - certificationAddFormDTO.setAutoPassFlag(true); + certificationAddFormDTO.setAutoPassFlag(false); ValidatorUtils.validateEntity(certificationAddFormDTO, CertificationAddFormDTO.CertificationAdd.class); return userBadgeService.authBadgeRecord(certificationAddFormDTO); } From ca6d57f53365c0f3b02d41abc4eab6c58230c025 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Mar 2023 14:54:25 +0800 Subject: [PATCH 049/340] =?UTF-8?q?certification/add-autopass=E8=AE=B0?= =?UTF-8?q?=E5=BD=95agencyId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/UserBadgeCertificateRecordDTO.java | 4 ++++ .../com/epmet/entity/UserBadgeCertificateRecordEntity.java | 4 ++++ .../java/com/epmet/service/impl/UserBadgeServiceImpl.java | 5 +++++ .../src/main/resources/mapper/UserBadgeDao.xml | 2 ++ 4 files changed, 15 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserBadgeCertificateRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserBadgeCertificateRecordDTO.java index 820f0fa45c..7cef9e768f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserBadgeCertificateRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserBadgeCertificateRecordDTO.java @@ -16,6 +16,10 @@ public class UserBadgeCertificateRecordDTO implements Serializable { private String id; private String customerId; private String gridId; + /** + * 组织id;0306烟台需求增加 + */ + private String agencyId; private String userId; private String badgeId; private String surname; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java index 47ca624036..a036578581 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java @@ -47,6 +47,10 @@ public class UserBadgeCertificateRecordEntity extends BaseEpmetEntity { */ private String gridId; + /** + * 组织id;0306烟台需求增加 + */ + private String agencyId; /** * 用户ID diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 89ef4a4f9e..c9d673f8c8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -298,6 +298,11 @@ public class UserBadgeServiceImpl implements UserBadgeService { log.info(JSON.toJSONString(form)); String recordId=IdWorker.getIdStr(); form.setId(recordId); + GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(form.getGridId()); + if(null==gridInfoCache||StringUtils.isBlank(gridInfoCache.getPid())){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"查询网格缓存异常","查询网格缓存异常"); + } + form.setAgencyId(gridInfoCache.getPid()); userBadgeDao.insertUserBadgeCertificateRecord(form); if(certificationAddFormDTO.getSendMsgFlag()){ //TODO 站内信发送 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml index e95397c3bf..62d272f323 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml @@ -176,6 +176,7 @@ ID, CUSTOMER_ID, GRID_ID, + AGENCY_ID, USER_ID, BADGE_ID, SURNAME, @@ -201,6 +202,7 @@ #{id}, #{customerId}, #{gridId}, + #{agencyId}, #{userId}, #{badgeId}, #{surname}, From 36fc9b4664d47780af7be89e09a629954103523d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Mar 2023 15:38:13 +0800 Subject: [PATCH 050/340] shishi --- .../com/epmet/service/impl/UserResiInfoServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 6101e9c2d5..99ffac21ba 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -619,14 +619,14 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl registerWrapper = new LambdaQueryWrapper<>(); From 3ee0a5b718dd025f6a86351abbb08de6cf2ba4ce Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Mar 2023 16:12:27 +0800 Subject: [PATCH 051/340] dingResiLogin --- .../service/impl/UserBaseInfoServiceImpl.java | 117 ++++++++++-------- 1 file changed, 64 insertions(+), 53 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 3e6203d2c6..52930c1242 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; @@ -61,6 +62,7 @@ import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.redisson.api.RLock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -68,6 +70,7 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.*; +import java.util.concurrent.TimeUnit; /** * 用户基础信息 @@ -102,6 +105,8 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl page(Map params) { @@ -550,66 +555,72 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl registerWrapper = new LambdaQueryWrapper<>(); - registerWrapper.eq(RegisterRelationEntity::getCustomerId, formDTO.getCustomerId()); - registerWrapper.eq(RegisterRelationEntity::getUserId, baseInfo.getUserId()); - registerWrapper.eq(RegisterRelationEntity::getFirstRegister, NumConstant.ONE_STR); - RegisterRelationEntity registerRelation = registerRelationDao.selectOne(registerWrapper); - if (null != registerRelation) { - result.setAgencyId(registerRelation.getAgencyId()); - result.setGridId(registerRelation.getGridId()); - GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(registerRelation.getGridId()); - if (null == gridInfo) { - logger.error(String.format("获取用户注册网格信息为空,userId:%s,gridId:%s", baseInfo.getUserId(), registerRelation.getGridId())); - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格信息为空", "获取小程序注册网格信息失败"); + baseInfo.setGender(NumConstant.ZERO_STR); + baseDao.insert(baseInfo); + + result.setEpmetUserId(userEntity.getId()); + result.setRegFlag(false); + } else { + // 更新下user_Base_info信息 + if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getRealName())) { + baseInfo.setRealName(formDTO.getNick()); + } + if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getSurname())) { + baseInfo.setSurname(NameUtils.getSurNameComplex(formDTO.getNick())); + } + if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getName())) { + baseInfo.setName(NameUtils.getNameComplex(formDTO.getNick())); + } + if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getNickname())) { + baseInfo.setNickname(formDTO.getNick()); + } + if (StringUtils.isNotBlank(formDTO.getAvatarUrl()) && StringUtils.isBlank(baseInfo.getHeadImgUrl())) { + baseInfo.setHeadImgUrl(formDTO.getAvatarUrl()); + } + baseDao.updateById(baseInfo); + + result.setEpmetUserId(baseInfo.getUserId()); + LambdaQueryWrapper registerWrapper = new LambdaQueryWrapper<>(); + registerWrapper.eq(RegisterRelationEntity::getCustomerId, formDTO.getCustomerId()); + registerWrapper.eq(RegisterRelationEntity::getUserId, baseInfo.getUserId()); + registerWrapper.eq(RegisterRelationEntity::getFirstRegister, NumConstant.ONE_STR); + RegisterRelationEntity registerRelation = registerRelationDao.selectOne(registerWrapper); + if (null != registerRelation) { + result.setAgencyId(registerRelation.getAgencyId()); + result.setGridId(registerRelation.getGridId()); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(registerRelation.getGridId()); + if (null == gridInfo) { + logger.error(String.format("获取用户注册网格信息为空,userId:%s,gridId:%s", baseInfo.getUserId(), registerRelation.getGridId())); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格信息为空", "获取小程序注册网格信息失败"); + } + result.setGridName(gridInfo.getGridNamePath()); + result.setRegFlag(true); } - result.setGridName(gridInfo.getGridNamePath()); - result.setRegFlag(true); } + } finally { + distributedLock.unLock(lock); } return result; } From 6dd7b8be728d5025628957c63b371edb65dc255d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 7 Mar 2023 11:06:26 +0800 Subject: [PATCH 052/340] /sys/log/operation/page --- .../src/main/resources/mapper/LogOperationDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml b/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml index 749e9b4288..192e82490d 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml +++ b/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml @@ -75,10 +75,10 @@ AND lo.OPERATOR_MOBILE LIKE concat('%',#{operatorMobile},'%') - AND DATE_FORMAT( lo.OPERATING_TIME, '%Y%m%d' ) >= #{startTime} + AND DATE_FORMAT( lo.OPERATING_TIME, '%Y%m%d%H%i' ) >= #{startTime} - AND DATE_FORMAT( lo.OPERATING_TIME, '%Y%m%d' ) <= #{endTime} + AND DATE_FORMAT( lo.OPERATING_TIME, '%Y%m%d%H%i' ) <= #{endTime} ORDER BY lo.OPERATING_TIME DESC From ec98876849fdf8647f6537bb67ab826316fbafcf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 7 Mar 2023 12:50:47 +0800 Subject: [PATCH 053/340] 2023-03-08 00:00 --- .../src/main/resources/mapper/LogOperationDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml b/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml index 192e82490d..032973b7fe 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml +++ b/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml @@ -75,10 +75,10 @@ AND lo.OPERATOR_MOBILE LIKE concat('%',#{operatorMobile},'%') - AND DATE_FORMAT( lo.OPERATING_TIME, '%Y%m%d%H%i' ) >= #{startTime} + AND DATE_FORMAT( lo.OPERATING_TIME, '%Y-%m-%d %H:%i' ) >= #{startTime} - AND DATE_FORMAT( lo.OPERATING_TIME, '%Y%m%d%H%i' ) <= #{endTime} + AND DATE_FORMAT( lo.OPERATING_TIME, '%Y-%m-%d %H:%i' ) <= #{endTime} ORDER BY lo.OPERATING_TIME DESC From a570c3fb34d3d5dcdf1bd43f74c8adff3491b129 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Mar 2023 11:24:59 +0800 Subject: [PATCH 054/340] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=BE=BD=E7=AB=A0=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/CertificationDetailResultDTO.java | 5 +++ .../main/resources/mapper/UserBadgeDao.xml | 45 ++++++++++--------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java index 0cab1b7039..abb08847ba 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java @@ -65,6 +65,9 @@ public class CertificationDetailResultDTO implements Serializable { private String gridId; private String gridName; + + private String badgeId; + private String badgeName; public CertificationDetailResultDTO() { this.surname = ""; this.name = ""; @@ -78,5 +81,7 @@ public class CertificationDetailResultDTO implements Serializable { this.recordId = ""; this.gridId=""; this.gridName=""; + this.badgeId=""; + this.badgeName=""; } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml index 62d272f323..3a19f2e354 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml @@ -102,32 +102,35 @@ From cdd94bd7e94482823ea3484a2bf9de33e5b46258 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Mar 2023 09:03:11 +0800 Subject: [PATCH 055/340] /gov/voice/tag/queryAgencyTag --- .../com/epmet/controller/TagController.java | 11 ++++++++ .../com/epmet/service/TagCustomerService.java | 8 ++++++ .../service/impl/TagCustomerServiceImpl.java | 25 +++++++++++++++++++ .../main/resources/mapper/TagCustomerDao.xml | 3 ++- 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java index a23f93d4a0..42b845210c 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java @@ -165,4 +165,15 @@ public class TagController { } return new Result>().ok(tagCustomerService.getAgencyTag(gridId)); } + + /** + * 工作端获取登录用户所属组织下的标签列表 + * + * @param tokenDto + * @return + */ + @PostMapping("queryAgencyTag") + public Result> queryAgencyTag(@LoginUser TokenDto tokenDto) { + return new Result>().ok(tagCustomerService.queryAgencyTag(tokenDto.getCustomerId(),tokenDto.getUserId())); + } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java index bd27a21f14..9bf4022967 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/TagCustomerService.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.dto.TagCustomerDTO; import com.epmet.dto.form.TagCustomerFormDTO; import com.epmet.dto.form.TagCustomerPageFormDTO; +import com.epmet.dto.result.TagInfoResultDTO; import com.epmet.dto.result.UpdateTagUseCountsResultDTO; import com.epmet.entity.TagCustomerEntity; @@ -114,4 +115,11 @@ public interface TagCustomerService extends BaseService { * @return */ List getAgencyTag(String gridId); + + /** + * 工作端获取登录用户所属组织下的标签列表 + * @param staffId + * @return + */ + List queryAgencyTag(String customerId,String staffId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java index 0ba38de2d5..dd37b13abf 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java @@ -22,10 +22,12 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; 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.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; 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.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; @@ -37,6 +39,7 @@ import com.epmet.dto.form.TagCustomerFormDTO; import com.epmet.dto.form.TagCustomerPageFormDTO; import com.epmet.dto.form.UpdateTagFormDTO; import com.epmet.dto.result.AgencyResultDTO; +import com.epmet.dto.result.TagInfoResultDTO; import com.epmet.dto.result.UpdateTagUseCountsResultDTO; import com.epmet.entity.TagCustomerEntity; import com.epmet.entity.TagScopeEntity; @@ -54,6 +57,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -266,4 +270,25 @@ public class TagCustomerServiceImpl extends BaseServiceImpl list=baseDao.getAgencyTag(gridInfoCache.getPid(),gridInfoCache.getCustomerId()); return list; } + + /** + * 工作端获取登录用户所属组织下的标签列表 + * + * @param staffId + * @return + */ + @Override + public List queryAgencyTag(String customerId,String staffId) { + CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(customerId,staffId); + List list=baseDao.getAgencyTag(staffInfoCacheResult.getAgencyId(),customerId); + List resultDTOList=new ArrayList<>(); + list.forEach(tagCustomerDTO->{ + TagInfoResultDTO resultDTO=new TagInfoResultDTO(); + resultDTO.setTagId(tagCustomerDTO.getId()); + resultDTO.setTagColor(tagCustomerDTO.getTagColor()); + resultDTO.setTagName(tagCustomerDTO.getTagName()); + resultDTOList.add(resultDTO); + }); + return resultDTOList; + } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml index 05778b1921..8d10cda3fa 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml @@ -80,7 +80,8 @@ From 00623752b609420f84bd67ec9568645ce8441a11 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Mar 2023 15:09:52 +0800 Subject: [PATCH 062/340] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?agencyName,pid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/TagScopeDTO.java | 9 +++++++++ .../src/main/java/com/epmet/entity/TagScopeEntity.java | 9 ++++++++- .../com/epmet/service/impl/TagCustomerServiceImpl.java | 4 ++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java index 8eacc3441e..bda0ab9c9b 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java @@ -30,5 +30,14 @@ public class TagScopeDTO implements Serializable { */ @NotBlank(message = "orgIdPath不能为空",groups = AddUserShowGroup.class) private String orgIdPath; + + /** + * agencyId的直属上级 + */ + private String pid; + /** + * 社区名称 + */ + private String agencyName; } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java index 7e00ef4919..309d677c3b 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java @@ -37,5 +37,12 @@ public class TagScopeEntity extends BaseEpmetEntity { * agency_id全路径，包含自身 */ private String orgIdPath; - + /** + * agencyId的直属上级 + */ + private String pid; + /** + * 社区名称 + */ + private String agencyName; } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java index dd37b13abf..1f1da57623 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java @@ -123,6 +123,8 @@ public class TagCustomerServiceImpl extends BaseServiceImpl Date: Thu, 9 Mar 2023 15:49:43 +0800 Subject: [PATCH 063/340] /gov/voice/tag/initTagScope --- .../java/com/epmet/service/impl/TagCustomerServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java index 1f1da57623..380ac1c679 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java @@ -242,12 +242,15 @@ public class TagCustomerServiceImpl extends BaseServiceImpl Date: Thu, 9 Mar 2023 16:04:19 +0800 Subject: [PATCH 064/340] =?UTF-8?q?/tag/page-list=E8=BF=94=E5=9B=9EagencyN?= =?UTF-8?q?ame,pid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/TagScopeDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml index 3d132f74c5..a298dc5db0 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml @@ -26,7 +26,9 @@ + SELECT + m.USER_ID, + m.USER_NAME, + m.MOBILE, + m.GRID_ID, + m.GRID_NAME, + m.SIGN_UP_TIME + FROM + ic_party_activity_sign_up_record m + WHERE + m.ACTIVITY_ID = #{activityId} + ORDER BY + m.SIGN_UP_TIME DESC + + \ No newline at end of file From 5af9229dea509ba879fbcf6de252d048b8adf27f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Mar 2023 14:12:40 +0800 Subject: [PATCH 072/340] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcPartyActivitySignUpRecordDao.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivitySignUpRecordDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivitySignUpRecordDao.xml index d0b9f998a6..c28b63da6c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivitySignUpRecordDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivitySignUpRecordDao.xml @@ -21,6 +21,9 @@ + select u.UNIT_NAME from ic_party_unit u + where u.id in( + select r.UNIT_ID from ic_activity_unit_relation r + where r.ACTIVITY_ID=#{activityId} + and r.DEL_FLAG='0' + ) + \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml index 4582741dbb..8359370be2 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml @@ -41,4 +41,19 @@ d.CUSTOMER_ID = #{customerId} AND d.CATEGORY_CODE = #{categoryCode} + + + \ No newline at end of file From 2c1acc7af8e6c6ea248a13d41b542fe6912f184c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Mar 2023 16:58:04 +0800 Subject: [PATCH 075/340] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=80=BB=E4=BA=BA?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcPartyActivityServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index c0a8b816ee..8e0ab3ac4d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -617,7 +617,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl countWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(IcPartyActivitySignUpRecordEntity::getActivityId, activityId); + countWrapper.eq(IcPartyActivitySignUpRecordEntity::getActivityId, activityId); resDTO.setSignUpCount(partyActivitySignUpRecordDao.selectCount(countWrapper)); return resDTO; } From 082efc43875329307ff992034d0bff2937ed3f3a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Mar 2023 17:42:04 +0800 Subject: [PATCH 076/340] =?UTF-8?q?baoming=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/PartyActivityFormDTO.java | 16 +++++++- .../controller/IcPartyActivityController.java | 16 ++++++++ .../com/epmet/dao/IcPartyActivityDao.java | 14 +++++++ .../epmet/service/IcPartyActivityService.java | 11 +++++ .../impl/IcPartyActivityServiceImpl.java | 28 ++++++++++++- .../resources/mapper/IcPartyActivityDao.xml | 40 +++++++++++++++++++ 6 files changed, 123 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java index 76f6d485db..76fef2c33b 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java @@ -18,8 +18,16 @@ import java.util.Date; @Data public class PartyActivityFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = -2510068555703677L; - @NotBlank(message = "组织Id不能为空" ) + + public interface ResiDingQueryInternalGroup { + } + + + @NotBlank(message = "组织Id不能为空",groups = {ResiDingQueryInternalGroup.class}) private String agencyId; + + @NotBlank(message = "gridId不能为空",groups = {ResiDingQueryInternalGroup.class}) + private String gridId; private String unitId; private String title; @@ -31,4 +39,10 @@ public class PartyActivityFormDTO extends PageFormDTO implements Serializable { // private Integer pageNo; // private Integer pageSize; private String customerId; + + /** + * 居民端钉钉，传userId + */ + @NotBlank(message = "userId不能为空",groups = {ResiDingQueryInternalGroup.class}) + private String userId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index 34a74214c4..2c6c6917e3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java @@ -300,4 +300,20 @@ public class IcPartyActivityController implements ResultDataResolver { return new Result().ok(icPartyActivityService.queryActDetailForResi(tokenDto.getCustomerId(),tokenDto.getUserId(),activityId)); } + /** + * 居民端钉钉，分页查询联建活动 + * + * @param formDTO + * @return + */ + @PostMapping("page-all-act") + public Result> pageAllAct(@RequestBody PartyActivityFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, PartyActivityFormDTO.ResiDingQueryInternalGroup.class); + return new Result>().ok( + icPartyActivityService.pageAllAct(formDTO.getPageNo(), + formDTO.getPageSize(), + formDTO.getGridId(), + formDTO.getAgencyId(), + formDTO.getUserId())); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java index c8fba2ffed..2027a97c68 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java @@ -20,8 +20,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.PartyActivityFormDTO; import com.epmet.dto.result.ActivityStatisticsDTO; +import com.epmet.dto.result.PartyActivityResDTO; import com.epmet.entity.IcPartyActivityEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -54,4 +56,16 @@ public interface IcPartyActivityDao extends BaseDao { List getActivityList(PartyActivityFormDTO formDTO); + + /** + * + * @param gridId 当前用户所在网格id + * @param agencyId 当前用户所在网格所属组织id + * @param userId 居民端用户id,校验当前用户是否报名 + * @return 居民端钉钉-分页查询全部联建活动 + */ + List pageAllAct(@Param("customerId")String customerId, + @Param("gridId") String gridId, + @Param("agencyId")String agencyId, + @Param("userId")String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java index 1cd0819acf..b93f8f56ee 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java @@ -153,4 +153,15 @@ public interface IcPartyActivityService extends BaseService pageAllAct(Integer pageNo, Integer pageSize, String gridId, String agencyId,String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 8e0ab3ac4d..b93b2efa4c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -623,5 +623,31 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl pageAllAct(Integer pageNo, Integer pageSize, String gridId,String agencyId, String userId) { + PageHelper.startPage(pageNo,pageSize); + List list=baseDao.pageAllAct(EpmetRequestHolder.getLoginUserCustomerId(),gridId,agencyId,userId); + list.forEach(resDTO->{ + // 主办方:组织名称 + AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(resDTO.getAgencyId()); + if (null != agencyInfoCache) { + resDTO.setAgencyName(agencyInfoCache.getOrganizationName()); + } + // 联建单位： + resDTO.setUnitNameList(icActivityUnitRelationService.getActivityUntiNames(resDTO.getActivityId())); + // 服务事项 + resDTO.setServiceMatterNameList(SpringContextUtils.getBean(IcServiceItemDictService.class).getByActivityId(resDTO.getActivityId(),EpmetRequestHolder.getLoginUserCustomerId())); + }); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index 1d7d847e1e..524dbbbe59 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -164,4 +164,44 @@ + + \ No newline at end of file From 1eeb5609ad5ea73d012356f893d247d3212d7081 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Mar 2023 17:42:59 +0800 Subject: [PATCH 077/340] =?UTF-8?q?baoming=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcPartyActivityServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index b93b2efa4c..8513ea5f03 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -648,6 +648,6 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal()); + return new PageData<>(list, pageInfo.getTotal(),pageSize); } } From dabf87287fd2683c78995b013c725fb868e8c816 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Mar 2023 09:25:54 +0800 Subject: [PATCH 078/340] =?UTF-8?q?=E5=B7=B2=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartyActivityController.java | 17 ++++++++ .../com/epmet/dao/IcPartyActivityDao.java | 13 +++++++ .../epmet/service/IcPartyActivityService.java | 15 +++++++ .../impl/IcPartyActivityServiceImpl.java | 29 ++++++++++++++ .../resources/mapper/IcPartyActivityDao.xml | 39 +++++++++++++++++++ 5 files changed, 113 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index 2c6c6917e3..0ed2488b12 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java @@ -316,4 +316,21 @@ public class IcPartyActivityController implements ResultDataResolver { formDTO.getAgencyId(), formDTO.getUserId())); } + + /** + * 居民端钉钉，已报名列表 + * @param formDTO + * @return + */ + @PostMapping("applied-act") + public Result> appliedAct(@RequestBody PartyActivityFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, PartyActivityFormDTO.ResiDingQueryInternalGroup.class); + return new Result>().ok( + icPartyActivityService.appliedAct(formDTO.getPageNo(), + formDTO.getPageSize(), + formDTO.getGridId(), + formDTO.getAgencyId(), + formDTO.getUserId())); + } + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java index 2027a97c68..23e764e4ec 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java @@ -68,4 +68,17 @@ public interface IcPartyActivityDao extends BaseDao { @Param("gridId") String gridId, @Param("agencyId")String agencyId, @Param("userId")String userId); + + /** + * 居民端钉钉，已报名列表 + * @param customerId + * @param gridId + * @param agencyId + * @param userId + * @return + */ + List selectAppliedAct(@Param("customerId")String customerId, + @Param("gridId") String gridId, + @Param("agencyId")String agencyId, + @Param("userId")String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java index b93f8f56ee..41f597fb07 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java @@ -164,4 +164,19 @@ public interface IcPartyActivityService extends BaseService pageAllAct(Integer pageNo, Integer pageSize, String gridId, String agencyId,String userId); + + /** + * 居民端钉钉，已报名列表 + * @param pageNo + * @param pageSize + * @param gridId + * @param agencyId + * @param userId + * @return + */ + PageData appliedAct(Integer pageNo, + Integer pageSize, + String gridId, + String agencyId, + String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 8513ea5f03..70996fe308 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -650,4 +650,33 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(),pageSize); } + + /** + * 居民端钉钉，已报名列表 + * + * @param pageNo + * @param pageSize + * @param gridId + * @param agencyId + * @param userId + * @return + */ + @Override + public PageData appliedAct(Integer pageNo, Integer pageSize, String gridId, String agencyId, String userId) { + PageHelper.startPage(pageNo, pageSize); + List list = baseDao.selectAppliedAct(EpmetRequestHolder.getLoginUserCustomerId(), gridId, agencyId, userId); + list.forEach(resDTO -> { + // 主办方:组织名称 + AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(resDTO.getAgencyId()); + if (null != agencyInfoCache) { + resDTO.setAgencyName(agencyInfoCache.getOrganizationName()); + } + // 联建单位： + resDTO.setUnitNameList(icActivityUnitRelationService.getActivityUntiNames(resDTO.getActivityId())); + // 服务事项 + resDTO.setServiceMatterNameList(SpringContextUtils.getBean(IcServiceItemDictService.class).getByActivityId(resDTO.getActivityId(), EpmetRequestHolder.getLoginUserCustomerId())); + }); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal(), pageSize); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index 524dbbbe59..8ae5aca768 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -204,4 +204,43 @@ ) order by a.ACTIVITY_END_TIME desc,a.CREATED_TIME desc + + + + + \ No newline at end of file From 78be98f049aa162ff8416daa85e554cadc1b6edd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Mar 2023 10:34:09 +0800 Subject: [PATCH 079/340] /heart/icpartyactivity/search --- .../src/main/resources/mapper/IcPartyActivityDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index 8ae5aca768..0d96fac179 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -52,7 +52,7 @@ a.ACT_ID, a.GRID_ID, ur.UNIT_ID, - GROUP_CONCAT( sr.SERVICE_MATTER ) AS serviceMatter, + GROUP_CONCAT( distinct sr.SERVICE_MATTER ) AS serviceMatter, a.TITLE, a.TARGET, a.CONTENT, From 490390f9fc15fd3e2b18046be466b131531763ac Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 3 Apr 2023 17:05:51 +0800 Subject: [PATCH 080/340] =?UTF-8?q?/resi/mine/badge/operlist=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=97=B6=E9=97=B4=E5=92=8C=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/CertificationDetailResultDTO.java | 6 ++++++ .../java/com/epmet/dto/result/UserOperListResultDTO.java | 9 ++++++++- .../src/main/resources/mapper/UserBadgeDao.xml | 6 +++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java index abb08847ba..575302ac5c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @Author zxc @@ -68,6 +70,9 @@ public class CertificationDetailResultDTO implements Serializable { private String badgeId; private String badgeName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createdTime; + public CertificationDetailResultDTO() { this.surname = ""; this.name = ""; @@ -83,5 +88,6 @@ public class CertificationDetailResultDTO implements Serializable { this.gridName=""; this.badgeId=""; this.badgeName=""; + this.createdTime=null; } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java index 49bbf6be77..88e7216b47 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java @@ -51,10 +51,17 @@ public class UserOperListResultDTO implements Serializable { @JsonIgnore private String customerId; + /** + * 是否开启(点亮) 1:点亮；0:未点亮 + */ @JsonIgnore private String isOpened; - @JsonIgnore + /** + * 认证(审核)状态 待审核:auditing;审核通过: approved;驳回:rejected; + */ + // @JsonIgnore private String auditStatus; + @JsonIgnore private Integer sort; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml index f9f8390cd1..74eb17d92f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml @@ -73,7 +73,7 @@ CREATED_TIME DESC - + @@ -118,7 +117,8 @@ r.ID AS recordId, r.GRID_ID as gridId, r.BADGE_ID as badgeId, - b.BADGE_NAME as badgeName + b.BADGE_NAME as badgeName, + r.CREATED_TIME as createdTime FROM user_badge_certificate_record r left join badge b on(r.BADGE_ID=b.id and r.CUSTOMER_ID=b.CUSTOMER_ID) From 2a01e968b28177de10bad78930c31dab9e5d72aa Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 3 Apr 2023 17:30:06 +0800 Subject: [PATCH 081/340] =?UTF-8?q?/resi/mine/badge/operlist=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=97=B6=E9=97=B4=E5=92=8C=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/resi/mine/dto/result/OperListResultDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java index d202918818..178c11390b 100644 --- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java @@ -48,4 +48,9 @@ public class OperListResultDTO implements Serializable { */ private String badgeType; + /** + * 认证(审核)状态 待审核:auditing;审核通过: approved;驳回:rejected; + */ + // @JsonIgnore + private String auditStatus; } From 53584a65b62b1aadc62de50bcbe46e01ffa9adc7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 4 Apr 2023 09:12:01 +0800 Subject: [PATCH 082/340] =?UTF-8?q?/resi/mine/badge/operlist=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/UserBadgeCertificateRecordDao.java | 2 ++ .../service/impl/UserBadgeServiceImpl.java | 30 +++++++++++++++++-- .../mapper/UserBadgeCertificateRecordDao.xml | 14 ++++++++- .../main/resources/mapper/UserBadgeDao.xml | 3 +- 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeCertificateRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeCertificateRecordDao.java index 2d73b4bac6..947fc5fb02 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeCertificateRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeCertificateRecordDao.java @@ -40,4 +40,6 @@ public interface UserBadgeCertificateRecordDao extends BaseDao { - userAuthBadgeList.forEach(u -> { - if (ub.getBadgeId().equals(u.getBadgeId())){ + Boolean authFlag=false; + for (UserOperListResultDTO u : userAuthBadgeList) { + ub.setAuditStatus(StrConstant.EPMETY_STR); + if (ub.getBadgeId().equals(u.getBadgeId())) { ub.setIsReject(u.getAuditStatus().equals(BadgeConstant.REJECTED)); ub.setIsCertificated(u.getAuditStatus().equals(BadgeConstant.APPROVED) ? BadgeConstant.YES : BadgeConstant.NO); ub.setIsLighted(u.getIsOpened().equals(NumConstant.ZERO_STR) ? BadgeConstant.NO : BadgeConstant.YES); + ub.setAuditStatus(u.getAuditStatus()); + authFlag = true; } - }); + } + if (!authFlag) { + UserBadgeCertificateRecordEntity entity = userBadgeCertificateRecordDao.selectCertificateRecord(ub.getBadgeId(), userOperListFormDTO.getUserId()); + if (null == entity) { + //未申请 + ub.setIsReject(null); + ub.setIsLighted(BadgeConstant.NO); + ub.setAuditStatus(StrConstant.EPMETY_STR); + ub.setIsCertificated(BadgeConstant.NO); + } else { + //申请了 + ub.setIsReject(entity.getAuditStatus().equals(BadgeConstant.REJECTED)); + ub.setIsLighted(BadgeConstant.NO); + ub.setAuditStatus(entity.getAuditStatus()); + ub.setIsCertificated(BadgeConstant.YES); + } + } + }); Map> collect = userOperListResultDTOS.stream().collect(Collectors.groupingBy(UserOperListResultDTO::getIsLighted)); List result = collect.get(BadgeConstant.YES); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeCertificateRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeCertificateRecordDao.xml index 2a58027d9c..bd895279b0 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeCertificateRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeCertificateRecordDao.xml @@ -40,5 +40,17 @@ AND (AUDIT_STATUS = 'approved' OR AUDIT_STATUS = 'auditing') - + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml index 74eb17d92f..fb8acd52bb 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml @@ -73,7 +73,7 @@ CREATED_TIME DESC - + From 5d242ab0e408651bcfe1baf8512d2654abb30bdd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 4 Apr 2023 10:46:57 +0800 Subject: [PATCH 083/340] =?UTF-8?q?/resi/mine/badge/operlist=EF=BC=8C?= =?UTF-8?q?=E5=B7=B2=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=9C=AA=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=9A=84=EF=BC=8C"isCertificated":=20"no"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserBadgeServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 3154e8c774..d36bd4dcb9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -167,11 +167,11 @@ public class UserBadgeServiceImpl implements UserBadgeService { ub.setAuditStatus(StrConstant.EPMETY_STR); ub.setIsCertificated(BadgeConstant.NO); } else { - //申请了 + //申请了，但是未通过的：rejected:审核驳回;auditing:审核中 ub.setIsReject(entity.getAuditStatus().equals(BadgeConstant.REJECTED)); ub.setIsLighted(BadgeConstant.NO); ub.setAuditStatus(entity.getAuditStatus()); - ub.setIsCertificated(BadgeConstant.YES); + ub.setIsCertificated(BadgeConstant.NO); } } From 0af33c7ad2dc6c5bf923262952257f09602d38a8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 4 Apr 2023 10:51:30 +0800 Subject: [PATCH 084/340] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=BE=BD=E7=AB=A0?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=EF=BC=8C=E4=B8=8D=E6=A0=A1=E9=AA=8C=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/CertificationAddFormDTO.java | 9 +++++---- .../com/epmet/service/impl/UserBadgeServiceImpl.java | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java index 85ed907b4a..48365aa8a6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java @@ -60,10 +60,11 @@ public class CertificationAddFormDTO implements Serializable { */ private String remark; - /** - * 验证码 - */ - private String code; + // 烟台不校验验证码 + // /** + // * 验证码 + // */ + // private String code; /** * 是否需要发送站内信： diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index d36bd4dcb9..faf959d7a7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -298,12 +298,13 @@ public class UserBadgeServiceImpl implements UserBadgeService { authFieldFormDTO.setBadgeId(certificationAddFormDTO.getBadgeId()); validateParams(certificationAddFormDTO, authFieldFormDTO); - if (StringUtils.isNotBlank(certificationAddFormDTO.getMobile())) { + //烟台不校验验证码 + /*if (StringUtils.isNotBlank(certificationAddFormDTO.getMobile())) { String smsCode = userBadgeRedis.getBadgeSmsCode(certificationAddFormDTO.getMobile()); if (!StringUtils.isNotBlank(smsCode)) { return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode()); } - } + }*/ // 0309:如果是党员徽章去判断居民信息-类别是否是党员 String auditRemark=""; BadgeEntity badgeEntity = badgeDao.selectBadgeInfo(EpmetRequestHolder.getLoginUserCustomerId(),certificationAddFormDTO.getBadgeId()); From d646c1244baa988bff883ea71517ee130467bdc4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 4 Apr 2023 15:47:20 +0800 Subject: [PATCH 085/340] staff_login_log --- .../controller/StaffLoginLogController.java | 22 ++++++ .../java/com/epmet/dao/StaffLoginLogDao.java | 16 ++++ .../com/epmet/entity/StaffLoginLogEntity.java | 73 +++++++++++++++++++ .../epmet/service/StaffLoginLogService.java | 15 ++++ .../impl/StaffLoginLogServiceImpl.java | 19 +++++ .../resources/mapper/StaffLoginLogDao.xml | 26 +++++++ 6 files changed, 171 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffLoginLogEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java new file mode 100644 index 0000000000..557d4d3dec --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java @@ -0,0 +1,22 @@ +package com.epmet.controller; + +import com.epmet.service.StaffLoginLogService; +import org.springframework.beans.factory.annotation.Autowired; +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-04-04 + */ +@RestController +@RequestMapping("staffLoginLog") +public class StaffLoginLogController { + + @Autowired + private StaffLoginLogService staffLoginLogService; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java new file mode 100644 index 0000000000..c7c38f7bbd --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.StaffLoginLogEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 工作人员登录日志表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-04-04 + */ +@Mapper +public interface StaffLoginLogDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffLoginLogEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffLoginLogEntity.java new file mode 100644 index 0000000000..35926c1c78 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffLoginLogEntity.java @@ -0,0 +1,73 @@ +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-04-04 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("staff_login_log") +public class StaffLoginLogEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 工作端用户id + */ + private String staffId; + + /** + * 工作人员姓名 + */ + private String staffName; + + /** + * 工作人员手机号 + */ + private String mobile; + + /** + * 工作人员所属组织id；组织名称在customer_agency + */ + private String agencyId; + + /** + * 组织级别（社区级：community， +乡（镇、街道）级:street, +区县级: district, +市级: city +省级:province） + */ + private String agencyLevel; + + /** + * agency_id的直属上级；如果是根组织的用户登录，pid=0或者pid='' + */ + private String pid; + + /** + * AGENCY_ID全路径，包含agency_id自身 + */ + private String orgIdPath; + + /** + * 登录时间 + */ + private Date loginTime; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java new file mode 100644 index 0000000000..a7f3e17e45 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java @@ -0,0 +1,15 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.entity.StaffLoginLogEntity; + +/** + * 工作人员登录日志表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-04-04 + */ +public interface StaffLoginLogService extends BaseService { + + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java new file mode 100644 index 0000000000..ac58b38f7c --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -0,0 +1,19 @@ +package com.epmet.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.dao.StaffLoginLogDao; +import com.epmet.entity.StaffLoginLogEntity; +import com.epmet.service.StaffLoginLogService; +import org.springframework.stereotype.Service; + +/** + * 工作人员登录日志表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-04-04 + */ +@Service +public class StaffLoginLogServiceImpl extends BaseServiceImpl implements StaffLoginLogService { + + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml new file mode 100644 index 0000000000..bba55ac5d9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 36ca5271b654b17b61bf43a1f9f7fb89d9a2c0fe Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 4 Apr 2023 16:46:37 +0800 Subject: [PATCH 086/340] =?UTF-8?q?=E6=8F=92=E5=85=A5=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constants/ConsomerGroupConstants.java | 5 + .../epmet/mq/RocketMQConsumerRegister.java | 6 + .../mq/listener/StaffLoginLogListener.java | 110 ++++++++++++++++++ .../epmet/service/StaffLoginLogService.java | 9 +- .../impl/StaffLoginLogServiceImpl.java | 56 +++++++++ 5 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/StaffLoginLogListener.java diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java index c4f43a03b2..b4a31a96d1 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java @@ -36,6 +36,11 @@ public interface ConsomerGroupConstants { */ String AUTH_OPERATION_LOG_GROUP = "auth_operation_log_group"; + /** + * 数字社区web端工作人员登录 + */ + String STAFF_LOGIN_LOG_GROUP = "staff_login_log_group"; + /** * 项目操作日志消费组 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java index 86f257d9aa..f05f5e0098 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java @@ -5,6 +5,7 @@ import com.epmet.commons.rocketmq.constants.TopicConstants; import com.epmet.commons.rocketmq.register.MQAbstractRegister; import com.epmet.commons.rocketmq.register.MQConsumerProperties; import com.epmet.mq.listener.InitCustomerOrgRolesListener; +import com.epmet.mq.listener.StaffLoginLogListener; import org.apache.rocketmq.common.protocol.heartbeat.MessageModel; import org.springframework.stereotype.Component; @@ -32,5 +33,10 @@ public class RocketMQConsumerRegister extends MQAbstractRegister { new InitCustomerOrgRolesListener()); // ...其他监听器类似 + register(consumerProperties, + ConsomerGroupConstants.STAFF_LOGIN_LOG_GROUP, + MessageModel.CLUSTERING, + TopicConstants.AUTH, "login", + new StaffLoginLogListener()); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/StaffLoginLogListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/StaffLoginLogListener.java new file mode 100644 index 0000000000..6f850bf554 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/StaffLoginLogListener.java @@ -0,0 +1,110 @@ +package com.epmet.mq.listener; + +import com.alibaba.fastjson.JSON; +import com.epmet.commons.rocketmq.constants.MQUserPropertys; +import com.epmet.commons.rocketmq.messages.LoginMQMsg; +import com.epmet.commons.tools.distributedlock.DistributedLock; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.utils.SpringContextUtils; +import com.epmet.service.StaffLoginLogService; +import org.apache.commons.lang3.StringUtils; +import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; +import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; +import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently; +import org.apache.rocketmq.common.message.MessageExt; +import org.redisson.api.RLock; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; +import java.util.concurrent.TimeUnit; + +/** + * @author wxz + * @Description 登录操作日志监听器 + + * @return + * @date 2021.06.07 16:12 + */ +public class StaffLoginLogListener implements MessageListenerConcurrently { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + private RedisUtils redisUtils; + + @Override + public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { + + if (redisUtils == null) { + redisUtils = SpringContextUtils.getBean(RedisUtils.class); + } + + try { + msgs.forEach(msg -> consumeMessage(msg)); + } catch (Exception e) { + logger.error(ExceptionUtils.getErrorStackTrace(e)); + return ConsumeConcurrentlyStatus.RECONSUME_LATER; + } + return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; + } + + private void consumeMessage(MessageExt messageExt) { + String tags = messageExt.getTags(); + // msg示例： + // { + // "userId": "5198ef9e3644c4f49457d2b551a1432e", + // "appId": "数字社区登录", + // "loginTime": "2023-04-04 14:05:37", + // "ip": "219.146.91.110", + // "fromApp": "gov", + // "fromClient": "web" + // } + String msg = new String(messageExt.getBody()); + String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL); + logger.info("工作人员登录操作日志监听器-收到消息内容:{}", msg); + LoginMQMsg msgObj = JSON.parseObject(msg, LoginMQMsg.class); + + DistributedLock distributedLock = null; + RLock lock = null; + try { + distributedLock = SpringContextUtils.getBean(DistributedLock.class); + lock = distributedLock.getLock(String.format("lock:staff_login_log:%s:%s", tags, msgObj.getUserId()), + 30L, 30L, TimeUnit.SECONDS); + SpringContextUtils.getBean(StaffLoginLogService.class).saveLog(msgObj.getUserId(),msgObj.getLoginTime()); + } catch (RenException e) { + // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 + logger.error("【RocketMQ】工作人员登录添加操作日志失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + } catch (Exception e) { + // 不是我们自己抛出的异常，可以让MQ重试 + logger.error("【RocketMQ】工作人员登录添加操作日志失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + throw e; + } finally { + distributedLock.unLock(lock); + } + + if (StringUtils.isNotBlank(pendingMsgLabel)) { + try { + removePendingMqMsgCache(pendingMsgLabel); + } catch (Exception e) { + logger.error("【工作人员登录操作事件监听器】-删除mq阻塞消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + } + + /** + * @description + * + * @param pendingMsgLabel + * @return + * @author wxz + * @date 2021.10.14 16:32:32 + */ + private void removePendingMqMsgCache(String pendingMsgLabel) { + String key = RedisKeys.blockedMqMsgKey(pendingMsgLabel); + redisUtils.delete(key); + //logger.info("【登录操作事件监听器】删除pendingMsgLabel成功:{}", pendingMsgLabel); + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java index a7f3e17e45..4594c9cedd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java @@ -3,6 +3,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.entity.StaffLoginLogEntity; +import java.util.Date; + /** * 工作人员登录日志表 * @@ -10,6 +12,11 @@ import com.epmet.entity.StaffLoginLogEntity; * @since v1.0.0 2023-04-04 */ public interface StaffLoginLogService extends BaseService { - + /** + * 登录，插入记录 + * @param staffId + * @param loginTime + */ + void saveLog(String staffId, Date loginTime); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index ac58b38f7c..52bd7a38f1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -1,10 +1,25 @@ 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.constant.StrConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.dao.StaffLoginLogDao; +import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.dto.CustomerStaffDTO; import com.epmet.entity.StaffLoginLogEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.service.CustomerAgencyService; import com.epmet.service.StaffLoginLogService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; /** * 工作人员登录日志表 @@ -14,6 +29,47 @@ import org.springframework.stereotype.Service; */ @Service public class StaffLoginLogServiceImpl extends BaseServiceImpl implements StaffLoginLogService { + @Autowired + private EpmetUserOpenFeignClient userOpenFeignClient; + + + /** + * 登录，插入记录 + * + * @param staffId + * @param loginTime + */ + @Transactional(rollbackFor = Exception.class) + @Override + public void saveLog(String staffId, Date loginTime) { + CustomerStaffDTO form = new CustomerStaffDTO(); + form.setUserId(staffId); + Result result = userOpenFeignClient.getCustomerStaffInfoByUserId(form); + if (!result.success() || null == result.getData()) { + return; + } + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(result.getData().getCustomerId(), staffId); + + StaffLoginLogEntity logEntity = new StaffLoginLogEntity(); + logEntity.setCustomerId(result.getData().getCustomerId()); + logEntity.setStaffId(staffId); + logEntity.setStaffName(staffInfoCacheResult.getRealName()); + logEntity.setMobile(staffInfoCacheResult.getMobile()); + logEntity.setAgencyId(staffInfoCacheResult.getAgencyId()); + CustomerAgencyDTO customerAgencyDTO = SpringContextUtils.getBean(CustomerAgencyService.class).get(staffInfoCacheResult.getAgencyId()); + logEntity.setAgencyLevel(customerAgencyDTO.getLevel()); + logEntity.setPid(customerAgencyDTO.getPid()); + if (StringUtils.isBlank(customerAgencyDTO.getPid()) || NumConstant.ZERO_STR.equals(customerAgencyDTO.getPid())) { + logEntity.setOrgIdPath(customerAgencyDTO.getId()); + } else { + logEntity.setOrgIdPath(customerAgencyDTO.getPids().concat(StrConstant.COLON).concat(customerAgencyDTO.getId())); + } + logEntity.setLoginTime(loginTime); + baseDao.insert(logEntity); + } + + + } \ No newline at end of file From bee178b830140bde06b7d17cca0377cdcf77547e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Apr 2023 13:14:51 +0800 Subject: [PATCH 087/340] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B8=82=E7=BA=A7?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7/=E5=8C=BA=E5=8E=BF=E7=BA=A7=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7/=E9=95=87=E8=A1=97=E7=BA=A7=E8=B4=A6=E5=8F=B7/?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=BA=A7=E8=B4=A6=E5=8F=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/yt/LoginLogCountByLevelFormDTO.java | 35 ++++++ .../yt/LoginLogCountByLevelResultDTO.java | 29 +++++ .../controller/StaffLoginLogController.java | 18 ++++ .../epmet/service/CustomerAgencyService.java | 9 +- .../epmet/service/StaffLoginLogService.java | 11 ++ .../impl/CustomerAgencyServiceImpl.java | 17 +++ .../impl/StaffLoginLogServiceImpl.java | 102 ++++++++++++++++++ 7 files changed, 220 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/LoginLogCountByLevelFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/LoginLogCountByLevelResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/LoginLogCountByLevelFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/LoginLogCountByLevelFormDTO.java new file mode 100644 index 0000000000..6681005be5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/LoginLogCountByLevelFormDTO.java @@ -0,0 +1,35 @@ +package com.epmet.dto.form.yt; + +import lombok.Data; + +import java.util.Date; + +/** + * @Description 账号登录情况，查询市级账号/区县级账号/镇街级账号/社区级账号登录次数，入参dto + * @Author yzm + * @Date 2023/4/6 10:09 + */ +@Data +public class LoginLogCountByLevelFormDTO { + /** + * 所选择的组织id + */ + private String orgId; + + /** + * 组织类型 + */ + private String orgType; + + /** + * 开始日期：yyyy-MM-dd + */ + private Date startDate; + + /** + * 截止日期：yyyy-MM-dd + */ + private Date endDate; + +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/LoginLogCountByLevelResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/LoginLogCountByLevelResultDTO.java new file mode 100644 index 0000000000..b1a4c33c42 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/LoginLogCountByLevelResultDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.result.yt; + +import lombok.Data; + +/** + * @Description 账号登录情况，查询市级账号/区县级账号/镇街级账号/社区级账号登录次数，返参dto + * @Author yzm + * @Date 2023/4/6 10:13 + */ +@Data +public class LoginLogCountByLevelResultDTO { + /** + * 市级账号登录总次数；-1时不展示 + */ + private Integer cityCount; + /** + * 区县级账号登录总次数；-1时不展示 + */ + private Integer districtCount; + /** + * 镇街级账号登录总次数；-1时不展示 + */ + private Integer streetCount; + /** + * 社区级账号登录总次数；-1时不展示 + */ + private Integer communityCount; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java index 557d4d3dec..252acd3e4e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java @@ -1,7 +1,12 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.yt.LoginLogCountByLevelFormDTO; +import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO; import com.epmet.service.StaffLoginLogService; 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; @@ -19,4 +24,17 @@ public class StaffLoginLogController { @Autowired private StaffLoginLogService staffLoginLogService; + + /** + * 返回市级账号登录总次数、区县级账号登录总次数、镇街级账号登录总次数、社区级账号登录总次数 + * + * @param formDTO + * @return + */ + @PostMapping("count-level") + public Result countLevel(@RequestBody LoginLogCountByLevelFormDTO formDTO) { + return new Result().ok(staffLoginLogService.countLevel(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStartDate(), formDTO.getEndDate())); + } + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index f9ac7182e7..39111b0efa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -18,7 +18,6 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; -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; @@ -355,4 +354,12 @@ public interface CustomerAgencyService extends BaseService * @Date 2022/11/30 22:41 **/ Result> getCurrentUserCommunityInfo(TokenDto tokenDTO); + + /** + * 返回组织的orgIdPath：包含自身 + * + * @param orgId + * @return + */ + String getOrgIdPath(String orgId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java index 4594c9cedd..1604d34e14 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java @@ -1,6 +1,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO; import com.epmet.entity.StaffLoginLogEntity; import java.util.Date; @@ -19,4 +20,14 @@ public interface StaffLoginLogService extends BaseService { */ void saveLog(String staffId, Date loginTime); + /** + * 返回市级账号登录总次数、区县级账号登录总次数、镇街级账号登录总次数、社区级账号登录总次数 + * + * @param orgId 为空时，默认当前登录用户所属组织id + * @param orgType + * @param startDate yyyy-MM-dd + * @param endDate yyyy-MM-dd + * @return + */ + LoginLogCountByLevelResultDTO countLevel(String orgId, String orgType, Date startDate, Date endDate); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index a6702963c4..f164b34328 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1607,4 +1607,21 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl>().ok(list); } + /** + * 返回组织的orgIdPath：包含自身 + * + * @param orgId + * @return + */ + @Override + public String getOrgIdPath(String orgId) { + CustomerAgencyEntity customerAgencyEntity = baseDao.selectById(orgId); + if (null == customerAgencyEntity) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode()); + } + if (StringUtils.isBlank(customerAgencyEntity.getPid()) || NumConstant.ZERO_STR.equals(customerAgencyEntity.getPid())) { + return orgId; + } + return customerAgencyEntity.getPids().concat(StrConstant.COLON).concat(orgId); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index 52bd7a38f1..982be9b1e3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -1,15 +1,19 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +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.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.dao.StaffLoginLogDao; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerStaffDTO; +import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO; import com.epmet.entity.StaffLoginLogEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.CustomerAgencyService; @@ -69,7 +73,105 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl cityWrapper = new LambdaQueryWrapper<>(); + cityWrapper.eq(StaffLoginLogEntity::getAgencyId, orgId) + .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); + resultDTO.setCityCount(baseDao.selectCount(cityWrapper)); + + // 市下面区县账号 + LambdaQueryWrapper districtWrapper = new LambdaQueryWrapper<>(); + districtWrapper.eq(StaffLoginLogEntity::getPid, orgId) + .eq(StaffLoginLogEntity::getAgencyLevel,Constant.DISTRICT) + .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); + resultDTO.setDistrictCount(baseDao.selectCount(districtWrapper)); + + // 市级下面所有街道 + LambdaQueryWrapper streetWrapper = new LambdaQueryWrapper<>(); + streetWrapper.like(StaffLoginLogEntity::getOrgIdPath, orgIdPath) + .eq(StaffLoginLogEntity::getAgencyLevel,Constant.STREET) + .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); + resultDTO.setStreetCount(baseDao.selectCount(streetWrapper)); + + // 市级下面所有社区 + LambdaQueryWrapper communityWrapper = new LambdaQueryWrapper<>(); + communityWrapper.like(StaffLoginLogEntity::getOrgIdPath, orgIdPath) + .eq(StaffLoginLogEntity::getAgencyLevel,Constant.COMMUNITY) + .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); + resultDTO.setCommunityCount(baseDao.selectCount(communityWrapper)); + + } else if (Constant.DISTRICT.equals(orgType)) { + resultDTO.setCityCount(NumConstant.ONE_NEG); + //只展示本区县的登录情况 + LambdaQueryWrapper districtWrapper = new LambdaQueryWrapper<>(); + districtWrapper.eq(StaffLoginLogEntity::getAgencyId, orgId) + .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); + resultDTO.setDistrictCount(baseDao.selectCount(districtWrapper)); + + // 区县下所有的街道 + LambdaQueryWrapper streetWrapper = new LambdaQueryWrapper<>(); + streetWrapper.like(StaffLoginLogEntity::getOrgIdPath, orgIdPath) + .eq(StaffLoginLogEntity::getAgencyLevel,Constant.STREET) + .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); + resultDTO.setStreetCount(baseDao.selectCount(streetWrapper)); + + // 去线下所有社区 + LambdaQueryWrapper communityWrapper = new LambdaQueryWrapper<>(); + communityWrapper.like(StaffLoginLogEntity::getOrgIdPath, orgIdPath) + .eq(StaffLoginLogEntity::getAgencyLevel,Constant.COMMUNITY) + .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); + resultDTO.setCommunityCount(baseDao.selectCount(communityWrapper)); + + } else if (Constant.STREET.equals(orgType)) { + resultDTO.setCityCount(NumConstant.ONE_NEG); + resultDTO.setDistrictCount(NumConstant.ONE_NEG); + + // 只展示本街道的登录情况 + LambdaQueryWrapper streetWrapper = new LambdaQueryWrapper<>(); + streetWrapper.eq(StaffLoginLogEntity::getAgencyId, orgId) + .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); + resultDTO.setStreetCount(baseDao.selectCount(streetWrapper)); + + // 街道下所有社区 + LambdaQueryWrapper communityWrapper = new LambdaQueryWrapper<>(); + communityWrapper.like(StaffLoginLogEntity::getOrgIdPath, orgIdPath) + .eq(StaffLoginLogEntity::getAgencyLevel,Constant.COMMUNITY) + .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); + resultDTO.setCommunityCount(baseDao.selectCount(communityWrapper)); + + } else if (Constant.COMMUNITY.equals(orgType)) { + resultDTO.setCityCount(NumConstant.ONE_NEG); + resultDTO.setDistrictCount(NumConstant.ONE_NEG); + resultDTO.setStreetCount(NumConstant.ONE_NEG); + + // 只展示本社区的登录情况 + LambdaQueryWrapper communityWrapper = new LambdaQueryWrapper<>(); + communityWrapper.eq(StaffLoginLogEntity::getAgencyId, orgId) + .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); + resultDTO.setCommunityCount(baseDao.selectCount(communityWrapper)); + } + return resultDTO; + } } \ No newline at end of file From 4a3b8375f170ec658c3e40f44999136044f7cd39 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Apr 2023 14:09:00 +0800 Subject: [PATCH 088/340] level --- .../tools/redis/common/bean/CustomerStaffInfoCache.java | 5 +++++ 1 file changed, 5 insertions(+) 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..bb5526afe6 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 @@ -32,6 +32,11 @@ public class CustomerStaffInfoCache implements Serializable { */ private String agencyName; + /** + * 组织级别 + */ + private String level; + /** * 2级组织名称 根据添加的来源返回（xx组织-组织/网格/部门） */ From c84d31ea7e75a03bbac3d9501ade4431e77233ba Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 6 Apr 2023 14:29:36 +0800 Subject: [PATCH 089/340] =?UTF-8?q?=E8=A1=A5=E5=85=85YanTaiTripReportSyncP?= =?UTF-8?q?rocessor=E7=9A=84@Component?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/processor/YanTaiTripReportSyncProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java index e6a1995948..6b1d4a028d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java @@ -16,7 +16,7 @@ import static com.epmet.constant.EpidemicConstant.JOB_TYPE_VACCINE; * @Author zxc * @Date 2022/11/22 14:08 */ -// @Component +@Component @Slf4j public class YanTaiTripReportSyncProcessor extends AbstractDataSyncJobProcessor { From c59a56e09b44e93e93091248c0c08296b5bd8c37 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Apr 2023 14:39:15 +0800 Subject: [PATCH 090/340] level --- .../dto/form/yt/CommunityLoginFormDTO.java | 35 ++++++++++++++++++ .../result/yt/CommunityLoginResultDTO.java | 37 +++++++++++++++++++ .../controller/StaffLoginLogController.java | 11 ++++++ .../java/com/epmet/dao/StaffLoginLogDao.java | 17 ++++++++- .../epmet/service/StaffLoginLogService.java | 11 ++++++ .../impl/StaffLoginLogServiceImpl.java | 34 +++++++++++++++++ .../resources/mapper/StaffLoginLogDao.xml | 29 ++++++++++++++- 7 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityLoginResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java new file mode 100644 index 0000000000..132d4178e7 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java @@ -0,0 +1,35 @@ +package com.epmet.dto.form.yt; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.util.Date; + +/** + * @Description 下级社区账号登录次数排名入参 + * @Author yzm + * @Date 2023/4/6 14:18 + */ +@Data +public class CommunityLoginFormDTO extends PageFormDTO { + /** + * 所选择的组织id + */ + private String orgId; + + /** + * 组织类型 + */ + private String orgType; + + /** + * 开始日期：yyyy-MM-dd + */ + private Date startDate; + + /** + * 截止日期：yyyy-MM-dd + */ + private Date endDate; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityLoginResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityLoginResultDTO.java new file mode 100644 index 0000000000..e1cb00a765 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityLoginResultDTO.java @@ -0,0 +1,37 @@ +package com.epmet.dto.result.yt; + +import lombok.Data; + +/** + * @Description 下级社区账号登录次数排名 + * @Author yzm + * @Date 2023/4/6 14:15 + */ +@Data +public class CommunityLoginResultDTO { + /** + * 组织id + */ + private String agencyId; + /** + * 组织名称 + */ + private String agencyName; + /** + * 组织级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province） + */ + private String agencyLevel; + /** + * 所属街道名称； + */ + private String streetName; + /** + * 所属区县名称； + */ + private String districtName; + /** + * 登录次数 + */ + private Integer count; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java index 252acd3e4e..19385e1298 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java @@ -1,7 +1,10 @@ package com.epmet.controller; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.yt.CommunityLoginFormDTO; import com.epmet.dto.form.yt.LoginLogCountByLevelFormDTO; +import com.epmet.dto.result.yt.CommunityLoginResultDTO; import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO; import com.epmet.service.StaffLoginLogService; import org.springframework.beans.factory.annotation.Autowired; @@ -36,5 +39,13 @@ public class StaffLoginLogController { return new Result().ok(staffLoginLogService.countLevel(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStartDate(), formDTO.getEndDate())); } + /** + * 下级社区账号登录次数排名 + * @return + */ + @PostMapping("community-count") + public Result> communityCount(@RequestBody CommunityLoginFormDTO formDTO) { + return new Result>().ok(staffLoginLogService.pageCommunityCount(formDTO)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java index c7c38f7bbd..43e5479aa7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java @@ -1,8 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.yt.CommunityLoginResultDTO; import com.epmet.entity.StaffLoginLogEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; /** * 工作人员登录日志表 @@ -12,5 +17,15 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface StaffLoginLogDao extends BaseDao { - + + /** + * 各社区登录总次数 + * @param orgIdPath + * @param startDate + * @param endDate + * @return + */ + List pageCommunityCount(@Param("orgIdPath") String orgIdPath, + @Param("startDate") Date startDate, + @Param("endDate") Date endDate); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java index 1604d34e14..25c5fe48f8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java @@ -1,6 +1,9 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.form.yt.CommunityLoginFormDTO; +import com.epmet.dto.result.yt.CommunityLoginResultDTO; import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO; import com.epmet.entity.StaffLoginLogEntity; @@ -30,4 +33,12 @@ public interface StaffLoginLogService extends BaseService { * @return */ LoginLogCountByLevelResultDTO countLevel(String orgId, String orgType, Date startDate, Date endDate); + + /** + * 下级社区账号登录次数排名 + * + * @param formDTO + * @return + */ + PageData pageCommunityCount(CommunityLoginFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index 982be9b1e3..007b7d572a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -6,6 +6,7 @@ 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.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.Result; @@ -13,17 +14,23 @@ import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.dao.StaffLoginLogDao; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerStaffDTO; +import com.epmet.dto.form.yt.CommunityLoginFormDTO; +import com.epmet.dto.result.yt.CommunityLoginResultDTO; import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO; import com.epmet.entity.StaffLoginLogEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.CustomerAgencyService; import com.epmet.service.StaffLoginLogService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.util.Date; +import java.util.List; /** * 工作人员登录日志表 @@ -173,5 +180,32 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl pageCommunityCount(CommunityLoginFormDTO formDTO) { + if (StringUtils.isBlank(formDTO.getOrgId())) { + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); + formDTO.setOrgId(staffInfoCacheResult.getAgencyId()); + formDTO.setOrgType(staffInfoCacheResult.getLevel()); + } + String orgIdPath = SpringContextUtils.getBean(CustomerAgencyService.class).getOrgIdPath(formDTO.getOrgId()); + if (formDTO.getIsPage()) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.pageCommunityCount(orgIdPath, formDTO.getStartDate(), formDTO.getEndDate()); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + // 不分页 + List list = baseDao.pageCommunityCount(orgIdPath, formDTO.getStartDate(), formDTO.getEndDate()); + int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size(); + return new PageData<>(list, total, total); + } + + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index bba55ac5d9..c0af48c5b3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -22,5 +22,32 @@ - + + \ No newline at end of file From d764bd8db198ec5276448c87aa1d421757d59f61 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Apr 2023 14:55:12 +0800 Subject: [PATCH 091/340] kaishijieshu --- .../main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java | 3 +++ .../com/epmet/dto/form/yt/LoginLogCountByLevelFormDTO.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java index 132d4178e7..35aa64951f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.form.yt; import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -25,11 +26,13 @@ public class CommunityLoginFormDTO extends PageFormDTO { /** * 开始日期：yyyy-MM-dd */ + @DateTimeFormat(pattern="yyyy-MM-dd") private Date startDate; /** * 截止日期：yyyy-MM-dd */ + @DateTimeFormat(pattern="yyyy-MM-dd") private Date endDate; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/LoginLogCountByLevelFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/LoginLogCountByLevelFormDTO.java index 6681005be5..ff485c832a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/LoginLogCountByLevelFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/LoginLogCountByLevelFormDTO.java @@ -1,6 +1,7 @@ package com.epmet.dto.form.yt; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -24,11 +25,13 @@ public class LoginLogCountByLevelFormDTO { /** * 开始日期：yyyy-MM-dd */ + @DateTimeFormat(pattern="yyyy-MM-dd") private Date startDate; /** * 截止日期：yyyy-MM-dd */ + @DateTimeFormat(pattern="yyyy-MM-dd") private Date endDate; } From 4ab42c4dc15f365d0a622c709f6007247f21ed4f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Apr 2023 15:56:15 +0800 Subject: [PATCH 092/340] kaishijieshu --- .../dto/form/yt/CommunityLoginFormDTO.java | 9 ++++++--- .../form/yt/LoginLogCountByLevelFormDTO.java | 9 ++++++--- .../controller/StaffLoginLogController.java | 2 +- .../epmet/service/StaffLoginLogService.java | 4 ++-- .../service/impl/StaffLoginLogServiceImpl.java | 18 +++++++++--------- .../main/resources/mapper/StaffLoginLogDao.xml | 4 ++-- 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java index 35aa64951f..5fc00d0691 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java @@ -1,6 +1,7 @@ package com.epmet.dto.form.yt; import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -21,18 +22,20 @@ public class CommunityLoginFormDTO extends PageFormDTO { /** * 组织类型 */ - private String orgType; + private String level; /** * 开始日期：yyyy-MM-dd */ - @DateTimeFormat(pattern="yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date startDate; /** * 截止日期：yyyy-MM-dd */ - @DateTimeFormat(pattern="yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date endDate; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/LoginLogCountByLevelFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/LoginLogCountByLevelFormDTO.java index ff485c832a..c115f530c9 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/LoginLogCountByLevelFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/LoginLogCountByLevelFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form.yt; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -20,18 +21,20 @@ public class LoginLogCountByLevelFormDTO { /** * 组织类型 */ - private String orgType; + private String level; /** * 开始日期：yyyy-MM-dd */ - @DateTimeFormat(pattern="yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date startDate; /** * 截止日期：yyyy-MM-dd */ - @DateTimeFormat(pattern="yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date endDate; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java index 19385e1298..deb09b74d5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java @@ -36,7 +36,7 @@ public class StaffLoginLogController { */ @PostMapping("count-level") public Result countLevel(@RequestBody LoginLogCountByLevelFormDTO formDTO) { - return new Result().ok(staffLoginLogService.countLevel(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStartDate(), formDTO.getEndDate())); + return new Result().ok(staffLoginLogService.countLevel(formDTO.getOrgId(), formDTO.getLevel(), formDTO.getStartDate(), formDTO.getEndDate())); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java index 25c5fe48f8..901abab32d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java @@ -27,12 +27,12 @@ public interface StaffLoginLogService extends BaseService { * 返回市级账号登录总次数、区县级账号登录总次数、镇街级账号登录总次数、社区级账号登录总次数 * * @param orgId 为空时，默认当前登录用户所属组织id - * @param orgType + * @param level * @param startDate yyyy-MM-dd * @param endDate yyyy-MM-dd * @return */ - LoginLogCountByLevelResultDTO countLevel(String orgId, String orgType, Date startDate, Date endDate); + LoginLogCountByLevelResultDTO countLevel(String orgId, String level, Date startDate, Date endDate); /** * 下级社区账号登录次数排名 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index 007b7d572a..bb2f33a8b5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -84,21 +84,21 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl cityWrapper = new LambdaQueryWrapper<>(); cityWrapper.eq(StaffLoginLogEntity::getAgencyId, orgId) @@ -126,7 +126,7 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl list = baseDao.pageCommunityCount(orgIdPath, formDTO.getStartDate(), formDTO.getEndDate()); PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal()); + return new PageData<>(list, pageInfo.getTotal(),formDTO.getPageSize()); } // 不分页 List list = baseDao.pageCommunityCount(orgIdPath, formDTO.getStartDate(), formDTO.getEndDate()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index c0af48c5b3..54980a8b24 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -41,10 +41,10 @@ AND l.ORG_ID_PATH LIKE concat( #{orgIdPath}, '%' ) AND l.AGENCY_LEVEL = 'community' - l.LOGIN_TIME >= #{startDate} + and l.LOGIN_TIME >= #{startDate} - l.LOGIN_TIME <= #{endDate} + and l.LOGIN_TIME <= #{endDate} GROUP BY l.AGENCY_ID From 13043a967b0fa6a5b9fa62c3da1faa585a4c9e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 7 Apr 2023 11:05:25 +0800 Subject: [PATCH 093/340] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/StaffLoginLogDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index 70d53a5d5b..a906683282 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -68,7 +68,7 @@ AND ag.DEL_FLAG = '0' WHERE a.DEL_FLAG = '0' - a.`LEVEL` = 'community' + AND a.`LEVEL` = 'community' AND a.PIDS LIKE CONCAT('%',#{orgId},'%') From d4525b4e53bd0805bb24f8f657739024f309cc80 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Apr 2023 16:12:52 +0800 Subject: [PATCH 094/340] =?UTF-8?q?=E6=9F=B1=E5=AD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StaffLoginLogController.java | 12 ++++++++++ .../java/com/epmet/dao/StaffLoginLogDao.java | 11 ++++++++++ .../epmet/service/StaffLoginLogService.java | 10 +++++++++ .../impl/StaffLoginLogServiceImpl.java | 20 ++++++++++++++++- .../resources/mapper/StaffLoginLogDao.xml | 22 +++++++++++++++++++ 5 files changed, 74 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java index deb09b74d5..03984e80fb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java @@ -48,4 +48,16 @@ public class StaffLoginLogController { return new Result>().ok(staffLoginLogService.pageCommunityCount(formDTO)); } + /** + * 柱状图：下级组织账号登录次数汇总 + * + * @param formDTO + * @return + */ + @PostMapping("sub-count") + public Result> querySubCount(@RequestBody LoginLogCountByLevelFormDTO formDTO) { + return new Result>().ok(staffLoginLogService.querySubCount(formDTO.getOrgId(), formDTO.getLevel(), formDTO.getStartDate(), formDTO.getEndDate())); + } + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java index 43e5479aa7..2ad70b214e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java @@ -28,4 +28,15 @@ public interface StaffLoginLogDao extends BaseDao { List pageCommunityCount(@Param("orgIdPath") String orgIdPath, @Param("startDate") Date startDate, @Param("endDate") Date endDate); + + /** + * 柱状图：下级组织账号登录次数汇总 + * @param orgId + * @param startDate + * @param endDate + * @return + */ + List querySubCount(@Param("orgId") String orgId, + @Param("startDate") Date startDate, + @Param("endDate") Date endDate); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java index 901abab32d..50bf65c8fa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java @@ -41,4 +41,14 @@ public interface StaffLoginLogService extends BaseService { * @return */ PageData pageCommunityCount(CommunityLoginFormDTO formDTO); + + /** + * 柱状图：下级组织账号登录次数汇总 + * @param orgId + * @param level + * @param startDate + * @param endDate + * @return + */ + PageData querySubCount(String orgId, String level, Date startDate, Date endDate); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index bb2f33a8b5..c22cbb8d21 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -207,5 +207,23 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl querySubCount(String orgId, String level, Date startDate, Date endDate) { + if (StringUtils.isBlank(orgId)) { + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); + orgId = staffInfoCacheResult.getAgencyId(); + } + List list = baseDao.querySubCount(orgId, startDate, endDate); + int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size(); + return new PageData(list, total, total); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index 54980a8b24..6ef4d35ded 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -50,4 +50,26 @@ l.AGENCY_ID order by count(1) desc + + + \ No newline at end of file From 20e05cc0725894ebaf770d4c91d3c4014861d7c6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Apr 2023 16:42:48 +0800 Subject: [PATCH 095/340] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StaffLoginLogController.java | 25 +++++++ .../java/com/epmet/dao/StaffLoginLogDao.java | 19 ++++- .../epmet/service/StaffLoginLogService.java | 25 +++++++ .../impl/StaffLoginLogServiceImpl.java | 67 +++++++++++++++++- .../resources/mapper/StaffLoginLogDao.xml | 69 ++++++++++++++++--- 5 files changed, 191 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java index 03984e80fb..eb2d5ed42b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java @@ -59,5 +59,30 @@ public class StaffLoginLogController { return new Result>().ok(staffLoginLogService.querySubCount(formDTO.getOrgId(), formDTO.getLevel(), formDTO.getStartDate(), formDTO.getEndDate())); } + /** + * 查看区县 + * + * @param formDTO + * @return + */ + @PostMapping("district-count") + public Result> districtCount(@RequestBody CommunityLoginFormDTO formDTO) { + return new Result>().ok(staffLoginLogService.pageDistrictCount(formDTO.getOrgId(), + formDTO.getLevel(), formDTO.getStartDate(), + formDTO.getEndDate(), formDTO.getIsPage(), + formDTO.getPageNo(), formDTO.getPageSize())); + } + /** + * 查看街镇 + * @param formDTO + * @return + */ + @PostMapping("street-count") + public Result> streetCount(@RequestBody CommunityLoginFormDTO formDTO) { + return new Result>().ok(staffLoginLogService.streetCount(formDTO.getOrgId(), + formDTO.getStartDate(), + formDTO.getEndDate(), formDTO.getIsPage(), + formDTO.getPageNo(), formDTO.getPageSize())); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java index 2ad70b214e..99be414369 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java @@ -20,12 +20,12 @@ public interface StaffLoginLogDao extends BaseDao { /** * 各社区登录总次数 - * @param orgIdPath + * @param orgId * @param startDate * @param endDate * @return */ - List pageCommunityCount(@Param("orgIdPath") String orgIdPath, + List pageCommunityCount(@Param("orgId") String orgId, @Param("startDate") Date startDate, @Param("endDate") Date endDate); @@ -39,4 +39,19 @@ public interface StaffLoginLogDao extends BaseDao { List querySubCount(@Param("orgId") String orgId, @Param("startDate") Date startDate, @Param("endDate") Date endDate); + + /** + * 各区县登录总次数 + * @param orgIdPath + * @param startDate + * @param endDate + * @return + */ + List pageDistrictCount(@Param("orgIdPath")String orgIdPath, + @Param("startDate")Date startDate, + @Param("endDate")Date endDate); + + List pageStreetCount(@Param("orgIdPath")String orgIdPath, + @Param("startDate")Date startDate, + @Param("endDate")Date endDate); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java index 50bf65c8fa..d7d21d53db 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java @@ -51,4 +51,29 @@ public interface StaffLoginLogService extends BaseService { * @return */ PageData querySubCount(String orgId, String level, Date startDate, Date endDate); + + /** + * 查看区县 + * @param orgId + * @param level + * @param startDate + * @param endDate + * @param isPage + * @param pageNo + * @param pageSize + * @return + */ + PageData pageDistrictCount(String orgId, String level, Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize); + + /** + * 查看街镇 + * @param orgId + * @param startDate + * @param endDate + * @param isPage + * @param pageNo + * @param pageSize + * @return + */ + PageData streetCount(String orgId, Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index c22cbb8d21..71472344a7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -193,15 +193,14 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl list = baseDao.pageCommunityCount(orgIdPath, formDTO.getStartDate(), formDTO.getEndDate()); + List list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate()); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(),formDTO.getPageSize()); } // 不分页 - List list = baseDao.pageCommunityCount(orgIdPath, formDTO.getStartDate(), formDTO.getEndDate()); + List list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate()); int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size(); return new PageData<>(list, total, total); } @@ -226,4 +225,66 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl(list, total, total); } + + + /** + * 查看区县 + * + * @param orgId + * @param level + * @param startDate + * @param endDate + * @param isPage + * @param pageNo + * @param pageSize + * @return 返回agencyId，agencyName，count + */ + @Override + public PageData pageDistrictCount(String orgId, String level, Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize) { + if (StringUtils.isBlank(orgId)) { + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); + orgId=staffInfoCacheResult.getAgencyId(); + } + String orgIdPath = SpringContextUtils.getBean(CustomerAgencyService.class).getOrgIdPath(orgId); + if (isPage) { + PageHelper.startPage(pageNo, pageSize); + List list = baseDao.pageDistrictCount(orgIdPath, startDate, endDate); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal(),pageSize); + } + // 不分页 + List list = baseDao.pageDistrictCount(orgIdPath,startDate, endDate); + int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size(); + return new PageData<>(list, total, total); + } + + /** + * 查看街镇 + * + * @param orgId + * @param startDate + * @param endDate + * @param isPage + * @param pageNo + * @param pageSize + * @return + */ + @Override + public PageData streetCount(String orgId,Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize) { + if (StringUtils.isBlank(orgId)) { + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); + orgId=staffInfoCacheResult.getAgencyId(); + } + String orgIdPath = SpringContextUtils.getBean(CustomerAgencyService.class).getOrgIdPath(orgId); + if (isPage) { + PageHelper.startPage(pageNo, pageSize); + List list = baseDao.pageStreetCount(orgIdPath, startDate, endDate); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal(),pageSize); + } + // 不分页 + List list = baseDao.pageStreetCount(orgIdPath,startDate, endDate); + int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size(); + return new PageData<>(list, total, total); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index 6ef4d35ded..9173035123 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -25,21 +25,21 @@ @@ -72,4 +72,55 @@ group by ca.id order by count(l.ID) desc + + + + + \ No newline at end of file From e3b2c9f302dbae183fdf48bad3f54873fa484d72 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Apr 2023 16:47:58 +0800 Subject: [PATCH 096/340] =?UTF-8?q?=E8=A1=97=E9=95=87=E3=80=81=E5=8C=BA?= =?UTF-8?q?=E5=8E=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/StaffLoginLogDao.java | 4 +- .../impl/StaffLoginLogServiceImpl.java | 5 +- .../resources/mapper/StaffLoginLogDao.xml | 46 +++++++++---------- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java index 99be414369..27db5ce3ce 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java @@ -42,12 +42,12 @@ public interface StaffLoginLogDao extends BaseDao { /** * 各区县登录总次数 - * @param orgIdPath + * @param orgId * @param startDate * @param endDate * @return */ - List pageDistrictCount(@Param("orgIdPath")String orgIdPath, + List pageDistrictCount(@Param("orgId")String orgId, @Param("startDate")Date startDate, @Param("endDate")Date endDate); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index 71472344a7..a94484e4a7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -245,15 +245,14 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl list = baseDao.pageDistrictCount(orgIdPath, startDate, endDate); + List list = baseDao.pageDistrictCount(orgId, startDate, endDate); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(),pageSize); } // 不分页 - List list = baseDao.pageDistrictCount(orgIdPath,startDate, endDate); + List list = baseDao.pageDistrictCount(orgId,startDate, endDate); int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size(); return new PageData<>(list, total, total); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index 9173035123..61c0254db3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -48,7 +48,7 @@ GROUP BY ca.id - order by count(1) desc + order by count(l.id) desc @@ -75,17 +75,16 @@ \ No newline at end of file From 9952976aa6f7d0a3296590b3ed4304b536203f46 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Apr 2023 16:59:32 +0800 Subject: [PATCH 097/340] and --- .../src/main/resources/mapper/StaffLoginLogDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index 61c0254db3..d0f43fb828 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -82,7 +82,7 @@ FROM customer_agency ca left join staff_login_log l ON ( ca.ID =l.AGENCY_ID and l.DEL_FLAG = '0') WHERE - and ca.DEL_FLAG = '0' + ca.DEL_FLAG = '0' and (ca.id=#{orgId} or ca.pids like concat('%',#{orgId},'%') ) AND ca.LEVEL = 'district' @@ -106,7 +106,7 @@ FROM customer_agency ca left join staff_login_log l ON ( ca.ID =l.AGENCY_ID and l.DEL_FLAG = '0') WHERE - and ca.DEL_FLAG = '0' + ca.DEL_FLAG = '0' and (ca.id = #{orgId} or ca.pids like concat('%',#{orgId},'%') ) AND ca.LEVEL = 'street' From d1b3ecdc4554535f33f2f91d7a6871833aadb507 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Apr 2023 17:09:21 +0800 Subject: [PATCH 098/340] orgId --- .../src/main/java/com/epmet/dao/StaffLoginLogDao.java | 2 +- .../com/epmet/service/impl/StaffLoginLogServiceImpl.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java index 27db5ce3ce..ea6fbcab85 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java @@ -51,7 +51,7 @@ public interface StaffLoginLogDao extends BaseDao { @Param("startDate")Date startDate, @Param("endDate")Date endDate); - List pageStreetCount(@Param("orgIdPath")String orgIdPath, + List pageStreetCount(@Param("orgId")String orgId, @Param("startDate")Date startDate, @Param("endDate")Date endDate); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index a94484e4a7..b362881243 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -274,15 +274,14 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl list = baseDao.pageStreetCount(orgIdPath, startDate, endDate); + List list = baseDao.pageStreetCount(orgId, startDate, endDate); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(),pageSize); } // 不分页 - List list = baseDao.pageStreetCount(orgIdPath,startDate, endDate); + List list = baseDao.pageStreetCount(orgId,startDate, endDate); int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size(); return new PageData<>(list, total, total); } From c092c37e150f3f07513695acd6a3db0c88ba3ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Thu, 6 Apr 2023 17:45:49 +0800 Subject: [PATCH 099/340] =?UTF-8?q?=E6=B4=BB=E8=B7=83=E5=BA=A6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/yt/CountActivityFormDTO.java | 37 ++++ .../dto/result/yt/AccountActivityInfo.java | 44 +++++ .../dto/result/yt/ActivityTatalInfo.java | 30 ++++ .../controller/StaffLoginLogController.java | 30 ++++ .../java/com/epmet/dao/StaffLoginLogDao.java | 30 +++- .../epmet/service/StaffLoginLogService.java | 18 ++ .../impl/StaffLoginLogServiceImpl.java | 46 +++-- .../resources/mapper/StaffLoginLogDao.xml | 165 ++++++++++++------ 8 files changed, 325 insertions(+), 75 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CountActivityFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/AccountActivityInfo.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/ActivityTatalInfo.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CountActivityFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CountActivityFormDTO.java new file mode 100644 index 0000000000..ab3996a085 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CountActivityFormDTO.java @@ -0,0 +1,37 @@ +package com.epmet.dto.form.yt; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @Description 下级社区账号登录次数排名入参 + * @Author yzm + * @Date 2023/4/6 14:18 + */ +@Data +public class CountActivityFormDTO extends PageFormDTO { + /** + * 所选择的组织id + */ + private String orgId; + + + /** + * 开始日期：yyyy-MM-dd + */ + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date startDate; + + /** + * 截止日期：yyyy-MM-dd + */ + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date endDate; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/AccountActivityInfo.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/AccountActivityInfo.java new file mode 100644 index 0000000000..b63ed0c20f --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/AccountActivityInfo.java @@ -0,0 +1,44 @@ +package com.epmet.dto.result.yt; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * @author: qushutong + * @Date: 2023/4/6 13:33 + * @Description: 账户活跃情况 + */ +@Data +public class AccountActivityInfo implements Serializable { + private static final long serialVersionUID = -918630886413844674L; + + /** + * 组织名称 + */ + private String agencyName = ""; + + /** + * 登陆次数 + */ + private String loginCount = ""; + + /** + * 活跃账号数 + */ + private String accountActivityCount = ""; + + + /** + * 总账号数 + */ + private String accountCount = ""; + + /** + * 组织id + */ + private String agencyId = ""; + + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/ActivityTatalInfo.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/ActivityTatalInfo.java new file mode 100644 index 0000000000..a92b42661d --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/ActivityTatalInfo.java @@ -0,0 +1,30 @@ +package com.epmet.dto.result.yt; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * @author: qushutong + * @Date: 2023/4/6 13:33 + * @Description: 账户活跃总数 + */ +@Data +public class ActivityTatalInfo implements Serializable { + private static final long serialVersionUID = -918630886413844674L; + + + /** + * 不活跃账号总数 + */ + private String inactivityCount = ""; + + /** + * 活跃账号总数 + */ + private String activityCount = ""; + + + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java index eb2d5ed42b..38a466d3c2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java @@ -3,7 +3,9 @@ package com.epmet.controller; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.yt.CommunityLoginFormDTO; +import com.epmet.dto.form.yt.CountActivityFormDTO; import com.epmet.dto.form.yt.LoginLogCountByLevelFormDTO; +import com.epmet.dto.result.yt.ActivityTatalInfo; import com.epmet.dto.result.yt.CommunityLoginResultDTO; import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO; import com.epmet.service.StaffLoginLogService; @@ -12,6 +14,7 @@ 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 com.epmet.dto.result.yt.AccountActivityInfo; /** @@ -41,6 +44,7 @@ public class StaffLoginLogController { /** * 下级社区账号登录次数排名 + * * @return */ @PostMapping("community-count") @@ -75,6 +79,7 @@ public class StaffLoginLogController { /** * 查看街镇 + * * @param formDTO * @return */ @@ -85,4 +90,29 @@ public class StaffLoginLogController { formDTO.getEndDate(), formDTO.getIsPage(), formDTO.getPageNo(), formDTO.getPageSize())); } + + /*** + * 获取当前agencyid下 下级组织活跃情况 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author qushutong + * @date 2023/4/6 13:41 + */ + @PostMapping("getAccountActivityInfo") + public Result> getAccountActivityInfo(@RequestBody CountActivityFormDTO formDTO) { + return new Result>().ok(staffLoginLogService.getAccountActivityInfo(formDTO)); + } + + /*** + * 获取活跃度总数 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + * @author qushutong + * @date 2023/4/6 17:35 + */ + @PostMapping("getActivityTotal") + public Result getActivityTotal(@RequestBody CountActivityFormDTO formDTO) { + return new Result().ok(staffLoginLogService.getActivityTotal(formDTO)); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java index ea6fbcab85..0db1338752 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java @@ -1,7 +1,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.yt.CountActivityFormDTO; +import com.epmet.dto.result.yt.ActivityTatalInfo; import com.epmet.dto.result.yt.CommunityLoginResultDTO; +import com.epmet.dto.result.yt.AccountActivityInfo; import com.epmet.entity.StaffLoginLogEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -20,6 +23,7 @@ public interface StaffLoginLogDao extends BaseDao { /** * 各社区登录总次数 + * * @param orgId * @param startDate * @param endDate @@ -31,6 +35,7 @@ public interface StaffLoginLogDao extends BaseDao { /** * 柱状图：下级组织账号登录次数汇总 + * * @param orgId * @param startDate * @param endDate @@ -42,16 +47,29 @@ public interface StaffLoginLogDao extends BaseDao { /** * 各区县登录总次数 + * * @param orgId * @param startDate * @param endDate * @return */ - List pageDistrictCount(@Param("orgId")String orgId, - @Param("startDate")Date startDate, - @Param("endDate")Date endDate); + List pageDistrictCount(@Param("orgId") String orgId, + @Param("startDate") Date startDate, + @Param("endDate") Date endDate); - List pageStreetCount(@Param("orgId")String orgId, - @Param("startDate")Date startDate, - @Param("endDate")Date endDate); + List pageStreetCount(@Param("orgId") String orgId, + @Param("startDate") Date startDate, + @Param("endDate") Date endDate); + + /*** + * 获取登陆情况 + * @param formDTO + * @return com.epmet.dto.result.yt.AccountActivityInfo + * @author qushutong + * @date 2023/4/6 13:47 + */ + List selectListActivityInfo(CountActivityFormDTO formDTO); + + + ActivityTatalInfo selectOneActivityTotal(CountActivityFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java index d7d21d53db..5d39463647 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java @@ -3,8 +3,11 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.form.yt.CommunityLoginFormDTO; +import com.epmet.dto.form.yt.CountActivityFormDTO; +import com.epmet.dto.result.yt.ActivityTatalInfo; import com.epmet.dto.result.yt.CommunityLoginResultDTO; import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO; +import com.epmet.dto.result.yt.AccountActivityInfo; import com.epmet.entity.StaffLoginLogEntity; import java.util.Date; @@ -18,6 +21,7 @@ import java.util.Date; public interface StaffLoginLogService extends BaseService { /** * 登录，插入记录 + * * @param staffId * @param loginTime */ @@ -44,6 +48,7 @@ public interface StaffLoginLogService extends BaseService { /** * 柱状图：下级组织账号登录次数汇总 + * * @param orgId * @param level * @param startDate @@ -54,6 +59,7 @@ public interface StaffLoginLogService extends BaseService { /** * 查看区县 + * * @param orgId * @param level * @param startDate @@ -67,6 +73,7 @@ public interface StaffLoginLogService extends BaseService { /** * 查看街镇 + * * @param orgId * @param startDate * @param endDate @@ -76,4 +83,15 @@ public interface StaffLoginLogService extends BaseService { * @return */ PageData streetCount(String orgId, Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize); + + /*** + * 获取登陆情况 + * @param formDTO + * @return com.epmet.dto.result.yt.AccountActivityInfo + * @author qushutong + * @date 2023/4/6 13:47 + */ + PageData getAccountActivityInfo(CountActivityFormDTO formDTO); + + ActivityTatalInfo getActivityTotal(CountActivityFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index b362881243..85e498a6c3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -15,8 +15,11 @@ import com.epmet.dao.StaffLoginLogDao; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.form.yt.CommunityLoginFormDTO; +import com.epmet.dto.form.yt.CountActivityFormDTO; +import com.epmet.dto.result.yt.ActivityTatalInfo; import com.epmet.dto.result.yt.CommunityLoginResultDTO; import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO; +import com.epmet.dto.result.yt.AccountActivityInfo; import com.epmet.entity.StaffLoginLogEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.CustomerAgencyService; @@ -84,7 +87,7 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl districtWrapper = new LambdaQueryWrapper<>(); districtWrapper.eq(StaffLoginLogEntity::getPid, orgId) - .eq(StaffLoginLogEntity::getAgencyLevel,Constant.DISTRICT) + .eq(StaffLoginLogEntity::getAgencyLevel, Constant.DISTRICT) .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); resultDTO.setDistrictCount(baseDao.selectCount(districtWrapper)); // 市级下面所有街道 LambdaQueryWrapper streetWrapper = new LambdaQueryWrapper<>(); streetWrapper.like(StaffLoginLogEntity::getOrgIdPath, orgIdPath) - .eq(StaffLoginLogEntity::getAgencyLevel,Constant.STREET) + .eq(StaffLoginLogEntity::getAgencyLevel, Constant.STREET) .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); resultDTO.setStreetCount(baseDao.selectCount(streetWrapper)); // 市级下面所有社区 LambdaQueryWrapper communityWrapper = new LambdaQueryWrapper<>(); communityWrapper.like(StaffLoginLogEntity::getOrgIdPath, orgIdPath) - .eq(StaffLoginLogEntity::getAgencyLevel,Constant.COMMUNITY) + .eq(StaffLoginLogEntity::getAgencyLevel, Constant.COMMUNITY) .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); resultDTO.setCommunityCount(baseDao.selectCount(communityWrapper)); @@ -138,14 +141,14 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl streetWrapper = new LambdaQueryWrapper<>(); streetWrapper.like(StaffLoginLogEntity::getOrgIdPath, orgIdPath) - .eq(StaffLoginLogEntity::getAgencyLevel,Constant.STREET) + .eq(StaffLoginLogEntity::getAgencyLevel, Constant.STREET) .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); resultDTO.setStreetCount(baseDao.selectCount(streetWrapper)); // 去线下所有社区 LambdaQueryWrapper communityWrapper = new LambdaQueryWrapper<>(); communityWrapper.like(StaffLoginLogEntity::getOrgIdPath, orgIdPath) - .eq(StaffLoginLogEntity::getAgencyLevel,Constant.COMMUNITY) + .eq(StaffLoginLogEntity::getAgencyLevel, Constant.COMMUNITY) .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); resultDTO.setCommunityCount(baseDao.selectCount(communityWrapper)); @@ -159,10 +162,11 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl communityWrapper = new LambdaQueryWrapper<>(); communityWrapper.like(StaffLoginLogEntity::getOrgIdPath, orgIdPath) - .eq(StaffLoginLogEntity::getAgencyLevel,Constant.COMMUNITY) + .eq(StaffLoginLogEntity::getAgencyLevel, Constant.COMMUNITY) .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate); resultDTO.setCommunityCount(baseDao.selectCount(communityWrapper)); @@ -180,6 +184,18 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl getAccountActivityInfo(CountActivityFormDTO formDTO) { + List accountActivityInfos = baseDao.selectListActivityInfo(formDTO); + int total = CollectionUtils.isEmpty(accountActivityInfos) ? NumConstant.ZERO : accountActivityInfos.size(); + return new PageData<>(accountActivityInfos, total); + } + + @Override + public ActivityTatalInfo getActivityTotal(CountActivityFormDTO formDTO) { + return baseDao.selectOneActivityTotal(formDTO); + } + /** * 下级社区账号登录次数排名 * @@ -197,7 +213,7 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate()); PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal(),formDTO.getPageSize()); + return new PageData<>(list, pageInfo.getTotal(), formDTO.getPageSize()); } // 不分页 List list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate()); @@ -243,16 +259,16 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl pageDistrictCount(String orgId, String level, Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize) { if (StringUtils.isBlank(orgId)) { CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); - orgId=staffInfoCacheResult.getAgencyId(); + orgId = staffInfoCacheResult.getAgencyId(); } if (isPage) { PageHelper.startPage(pageNo, pageSize); List list = baseDao.pageDistrictCount(orgId, startDate, endDate); PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal(),pageSize); + return new PageData<>(list, pageInfo.getTotal(), pageSize); } // 不分页 - List list = baseDao.pageDistrictCount(orgId,startDate, endDate); + List list = baseDao.pageDistrictCount(orgId, startDate, endDate); int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size(); return new PageData<>(list, total, total); } @@ -269,19 +285,19 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl streetCount(String orgId,Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize) { + public PageData streetCount(String orgId, Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize) { if (StringUtils.isBlank(orgId)) { CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); - orgId=staffInfoCacheResult.getAgencyId(); + orgId = staffInfoCacheResult.getAgencyId(); } if (isPage) { PageHelper.startPage(pageNo, pageSize); List list = baseDao.pageStreetCount(orgId, startDate, endDate); PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal(),pageSize); + return new PageData<>(list, pageInfo.getTotal(), pageSize); } // 不分页 - List list = baseDao.pageStreetCount(orgId,startDate, endDate); + List list = baseDao.pageStreetCount(orgId, startDate, endDate); int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size(); return new PageData<>(list, total, total); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index d0f43fb828..8bf8d36d2e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -25,49 +25,81 @@ + + SELECT - ca.id AS agencyId, - ca.ORGANIZATION_NAME AS agencyName, - ca.LEVEL AS agencyLevel, - count(l.id) AS count + ca.id AS agencyId, + ca.ORGANIZATION_NAME AS agencyName, + ca.LEVEL AS agencyLevel, + count(l.id) AS count FROM customer_agency ca left join staff_login_log l ON ( ca.ID =l.AGENCY_ID and l.DEL_FLAG = '0') WHERE - ca.DEL_FLAG = '0' - and (ca.id=#{orgId} or ca.pids like concat('%',#{orgId},'%') ) + ca.DEL_FLAG = '0' + and (ca.id=#{orgId} or ca.pids like concat('%',#{orgId},'%') ) AND ca.LEVEL = 'district' - + and l.LOGIN_TIME >= #{startDate} - - and l.LOGIN_TIME <= #{endDate} + + and l.LOGIN_TIME <= #{endDate} GROUP BY - ca.id - order by count(l.id) desc + ca.id + order by count(l.id) desc + + \ No newline at end of file From 4f43d087e1ff284cd52e112faba525850b8c31c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Thu, 6 Apr 2023 18:26:29 +0800 Subject: [PATCH 100/340] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/yt/CountActivityFormDTO.java | 13 ++++++--- .../controller/StaffLoginLogController.java | 27 ++++++++++++++++++- .../resources/mapper/StaffLoginLogDao.xml | 8 ++++++ 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CountActivityFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CountActivityFormDTO.java index ab3996a085..a1ef997fc0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CountActivityFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CountActivityFormDTO.java @@ -19,19 +19,24 @@ public class CountActivityFormDTO extends PageFormDTO { */ private String orgId; + /** + * 是否活跃 1 活跃 0 不活跃 + */ + private String isActivity; + /** * 开始日期：yyyy-MM-dd */ - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startDate; /** * 截止日期：yyyy-MM-dd */ - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endDate; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java index 38a466d3c2..c1b2a226f8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java @@ -1,6 +1,10 @@ package com.epmet.controller; +import com.alibaba.nacos.client.naming.utils.CollectionUtils; +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.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.yt.CommunityLoginFormDTO; import com.epmet.dto.form.yt.CountActivityFormDTO; @@ -16,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.epmet.dto.result.yt.AccountActivityInfo; +import javax.servlet.http.HttpServletResponse; + /** * 工作人员登录日志表 @@ -106,7 +112,7 @@ public class StaffLoginLogController { /*** * 获取活跃度总数 * @param formDTO - * @return com.epmet.commons.tools.utils.Result> + * @return com.epmet.commons.tools.utils.Result> * @author qushutong * @date 2023/4/6 17:35 */ @@ -115,4 +121,23 @@ public class StaffLoginLogController { return new Result().ok(staffLoginLogService.getActivityTotal(formDTO)); } + + /*** + * 导出活跃 + * @param response + * @param tokenDto + * @param formDTO + * @return void + * @author qushutong + * @date 2023/4/6 18:04 + */ + @PostMapping("accountActivityInfo-export") + public void analysisExport(HttpServletResponse response, @LoginUser TokenDto tokenDto, @RequestBody CountActivityFormDTO formDTO) throws Exception { + formDTO.setIsPage(false); + PageData res = staffLoginLogService.getAccountActivityInfo(formDTO); + if (!CollectionUtils.isEmpty(res.getList())) { + ExcelUtils.exportExcelToTarget(response, null, res.getList(), AccountActivityInfo.class); + } + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index 8bf8d36d2e..b956a42611 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -77,6 +77,14 @@ and l.LOGIN_TIME <= #{endDate} + + + AND l.AGENCY_ID is NOT NULL + + + AND l.AGENCY_ID is NULL + + GROUP BY a.ID ORDER BY From 944b8a7a519b2f0f48cb7e8d693f4ac0e54d4bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 7 Apr 2023 09:45:27 +0800 Subject: [PATCH 101/340] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StaffLoginLogController.java | 33 +++++++++----- .../epmet/excel/yt/AccountActivityExcel.java | 45 +++++++++++++++++++ .../excel/yt/AccountInactivityExcel.java | 28 ++++++++++++ .../resources/mapper/StaffLoginLogDao.xml | 2 +- 4 files changed, 96 insertions(+), 12 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/AccountActivityExcel.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/AccountInactivityExcel.java diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java index c1b2a226f8..aab97c99fc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java @@ -4,6 +4,7 @@ import com.alibaba.nacos.client.naming.utils.CollectionUtils; 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.ConvertUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.yt.CommunityLoginFormDTO; @@ -12,6 +13,8 @@ import com.epmet.dto.form.yt.LoginLogCountByLevelFormDTO; import com.epmet.dto.result.yt.ActivityTatalInfo; import com.epmet.dto.result.yt.CommunityLoginResultDTO; import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO; +import com.epmet.excel.yt.AccountActivityExcel; +import com.epmet.excel.yt.AccountInactivityExcel; import com.epmet.service.StaffLoginLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -21,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController; import com.epmet.dto.result.yt.AccountActivityInfo; import javax.servlet.http.HttpServletResponse; +import java.util.List; /** @@ -112,7 +116,7 @@ public class StaffLoginLogController { /*** * 获取活跃度总数 * @param formDTO - * @return com.epmet.commons.tools.utils.Result> + * @return com.epmet.commons.tools.utils.Result> * @author qushutong * @date 2023/4/6 17:35 */ @@ -122,21 +126,28 @@ public class StaffLoginLogController { } - /*** - * 导出活跃 - * @param response - * @param tokenDto - * @param formDTO - * @return void - * @author qushutong - * @date 2023/4/6 18:04 - */ + /*** + * 导出活跃 + * @param response + * @param tokenDto + * @param formDTO + * @return void + * @author qushutong + * @date 2023/4/6 18:04 + */ @PostMapping("accountActivityInfo-export") public void analysisExport(HttpServletResponse response, @LoginUser TokenDto tokenDto, @RequestBody CountActivityFormDTO formDTO) throws Exception { formDTO.setIsPage(false); PageData res = staffLoginLogService.getAccountActivityInfo(formDTO); if (!CollectionUtils.isEmpty(res.getList())) { - ExcelUtils.exportExcelToTarget(response, null, res.getList(), AccountActivityInfo.class); + if("1".equals(formDTO.getIsActivity())){ + List accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountActivityExcel.class); + ExcelUtils.exportExcelToTarget(response, null, accountActivityExcels, AccountActivityInfo.class); + }else { + List accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountInactivityExcel.class); + ExcelUtils.exportExcelToTarget(response, null, accountActivityExcels, AccountActivityInfo.class); + } + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/AccountActivityExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/AccountActivityExcel.java new file mode 100644 index 0000000000..4c7d6bd6f5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/AccountActivityExcel.java @@ -0,0 +1,45 @@ +package com.epmet.excel.yt; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + + +/** + * @author: qushutong + * @Date: 2023/4/6 13:33 + * @Description: 账户活跃情况 + */ +@Data +public class AccountActivityExcel implements Serializable { + private static final long serialVersionUID = -918630886413844674L; + + /** + * 组织名称 + */ + @Excel(name = "组织名称") + private String agencyName = ""; + + /** + * 登陆次数 + */ + @Excel(name = "登陆次数") + private String loginCount = ""; + + /** + * 活跃账号数 + */ + @Excel(name = "活跃账号数") + private String accountActivityCount = ""; + + + /** + * 总账号数 + */ + @Excel(name = "总账号数") + private String accountCount = ""; + + + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/AccountInactivityExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/AccountInactivityExcel.java new file mode 100644 index 0000000000..6635ab63c9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/AccountInactivityExcel.java @@ -0,0 +1,28 @@ +package com.epmet.excel.yt; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + + +/** + * @author: qushutong + * @Date: 2023/4/6 13:33 + * @Description: 账户不活跃情况 + */ +@Data +public class AccountInactivityExcel implements Serializable { + private static final long serialVersionUID = -918630886413844674L; + + /** + * 组织名称 + */ + @Excel(name = "组织名称") + private String agencyName = ""; + + + + + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index b956a42611..c63b1025d3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -57,7 +57,7 @@ COUNT(DISTINCT(l.STAFF_ID)) accountActivityCount, COUNT(DISTINCT(ag.USER_ID)) accountCount, a.ID agencyId, - a.ORGANIZATION_NAME agencyName + a.ALL_PARENT_NAME agencyName FROM customer_agency a LEFT JOIN staff_login_log l ON a.ID = l.AGENCY_ID From 66d543e9a0b9cfa3b3f2e6af857c51d52e018f2b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Apr 2023 09:56:08 +0800 Subject: [PATCH 102/340] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/StaffLoginLogDao.xml | 141 +++++++++--------- 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index b956a42611..b7c5b34a43 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -22,32 +22,33 @@ - + @@ -91,72 +92,72 @@ COUNT(DISTINCT(l.id)) DESC; - + + - + From 7c7ff004200d541bfd12076346772f1d4fbc230e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 7 Apr 2023 10:51:09 +0800 Subject: [PATCH 103/340] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/StaffLoginLogDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index dc274ec1b8..70d53a5d5b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -69,7 +69,7 @@ WHERE a.DEL_FLAG = '0' a.`LEVEL` = 'community' - + AND a.PIDS LIKE CONCAT('%',#{orgId},'%') From 75d0c883066e97a18e2ea0a0dde955e973c9e088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 7 Apr 2023 11:09:34 +0800 Subject: [PATCH 104/340] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/StaffLoginLogDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index 70d53a5d5b..a906683282 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -68,7 +68,7 @@ AND ag.DEL_FLAG = '0' WHERE a.DEL_FLAG = '0' - a.`LEVEL` = 'community' + AND a.`LEVEL` = 'community' AND a.PIDS LIKE CONCAT('%',#{orgId},'%') From e8b16f1d910e72f72b5e344d764d32e9c33a0f26 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Apr 2023 13:41:30 +0800 Subject: [PATCH 105/340] =?UTF-8?q?=E8=A1=97=E9=95=87=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=8C=BA=E5=8E=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/StaffLoginLogDao.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index a906683282..6ed487ad44 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -143,10 +143,13 @@ ca.id AS agencyId, ca.ORGANIZATION_NAME AS agencyName, ca.LEVEL AS agencyLevel, + pa.ORGANIZATION_NAME as districtName, count(l.id) AS count FROM customer_agency ca left join staff_login_log l ON ( ca.ID =l.AGENCY_ID and l.DEL_FLAG = '0') + left join customer_agency pa + on(ca.pid=pa.id) WHERE ca.DEL_FLAG = '0' and (ca.id = #{orgId} or ca.pids like concat('%',#{orgId},'%') ) From 0916cce841128f43b059a2111c0d67635903527d Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 7 Apr 2023 13:42:20 +0800 Subject: [PATCH 106/340] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=BC=80=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/AgencyCountCensusResultDTO.java | 17 ++++++++++++ .../controller/CustomerAgencyController.java | 7 +++++ .../java/com/epmet/dao/CustomerAgencyDao.java | 2 ++ .../epmet/service/CustomerAgencyService.java | 2 ++ .../impl/CustomerAgencyServiceImpl.java | 27 +++++++++++++++++++ .../resources/mapper/CustomerAgencyDao.xml | 9 +++++++ 6 files changed, 64 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyCountCensusResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyCountCensusResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyCountCensusResultDTO.java new file mode 100644 index 0000000000..9f453b4a09 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyCountCensusResultDTO.java @@ -0,0 +1,17 @@ +package com.epmet.dto.result; + +import java.io.Serializable; + +/** + * @ClassName AgencyCountCensus$ + * @Description + * @Date 2023/4/6 16:46 + * @Author lichao + **/ +public class AgencyCountCensusResultDTO implements Serializable { + + private static final long serialVersionUID = 4360690752084258055L; + + private String level; + private Integer count; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index ba94cc12ab..2f70dc04ce 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -518,4 +518,11 @@ public class CustomerAgencyController { } + @GetMapping("getAgencyCountList") + public Result> getAgencyCountList(@RequestParam String agencyId){ + return new Result>().ok(customerAgencyService.getAgencyCountList(agencyId)); + } + + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 2ef0034462..7d01383272 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -429,5 +429,7 @@ public interface CustomerAgencyDao extends BaseDao { * @return */ List getAllCommunity(String customerId); + + Integer agencyCount(@Param("pids") String pids,@Param("level") String level); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index f9ac7182e7..37dbd8d699 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -355,4 +355,6 @@ public interface CustomerAgencyService extends BaseService * @Date 2022/11/30 22:41 **/ Result> getCurrentUserCommunityInfo(TokenDto tokenDTO); + + List getAgencyCountList(String agencyId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index a6702963c4..e52a6ddf6a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1607,4 +1607,31 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl>().ok(list); } + @Override + public List getAgencyCountList(String agencyId) { + + List agencyCountCensusResultDTOS = new ArrayList<>(); + + CustomerAgencyEntity customerAgency = baseDao.selectById(agencyId); + if (customerAgency != null){ +// pidu + // 区县级 + if (customerAgency.getLevel().equals("district")){ +// Integer count = baseDao.agencyCount() + // 镇街级 + }else if (customerAgency.getLevel().equals("street")){ + + + }else{ + + + } + + }else{ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取用户组织信息异常","获取用户组织信息异常"); + } + + return agencyCountCensusResultDTOS; + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 882249b1ad..3c1b1d9068 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -863,6 +863,15 @@ AND CUSTOMER_ID = #{customerId} AND pids LIKE concat('%',#{agencyId}, '%' ) + + + + + + From b4421edf19630fd2855c40ba4639bc3e3d66df89 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Apr 2023 15:33:11 +0800 Subject: [PATCH 109/340] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E4=BD=8F=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/StaffLoginLogDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index 6ed487ad44..01bca24b0f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -49,7 +49,7 @@ and l.LOGIN_TIME <= #{endDate} GROUP BY ca.id - order by count(l.id) desc + order by count(l.id) desc,ca.CREATED_TIME desc From c7a88c15a077e359cbd3cba121dbda71da12efb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 7 Apr 2023 16:08:24 +0800 Subject: [PATCH 110/340] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/StaffLoginLogServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index 86d033d3a9..418d03e1cf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -186,8 +186,8 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl getAccountActivityInfo(CountActivityFormDTO formDTO) { - if (formDTO.getIsPage()) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); List accountActivityInfos = baseDao.selectListActivityInfo(formDTO); int total = CollectionUtils.isEmpty(accountActivityInfos) ? NumConstant.ZERO : accountActivityInfos.size(); return new PageData<>(accountActivityInfos, total); From 774d1ab2faefaa505d7d898330c1e4b0f264324c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 7 Apr 2023 16:18:20 +0800 Subject: [PATCH 111/340] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/StaffLoginLogDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index 255e5e67bb..13a1b5da8e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -89,7 +89,7 @@ GROUP BY a.ID ORDER BY - COUNT(DISTINCT(l.id)) DESC; + COUNT(DISTINCT(l.id)) DESC From bd4f4e830cde5c8873fc89e421772375fe98d44f Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 7 Apr 2023 16:19:25 +0800 Subject: [PATCH 112/340] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/CommunityCountCensusFormDTO.java | 28 +++++++++++++++++ .../result/CommunityCountCensusResultDTO.java | 23 ++++++++++++++ .../controller/CustomerAgencyController.java | 13 ++++++++ .../java/com/epmet/dao/CustomerAgencyDao.java | 2 ++ .../epmet/service/CustomerAgencyService.java | 9 ++++++ .../impl/CustomerAgencyServiceImpl.java | 30 +++++++++++++++++++ .../resources/mapper/CustomerAgencyDao.xml | 14 +++++++++ 7 files changed, 119 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommunityCountCensusFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityCountCensusResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommunityCountCensusFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommunityCountCensusFormDTO.java new file mode 100644 index 0000000000..0455ff705b --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommunityCountCensusFormDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.Date; + +/** + * @ClassName AgencyCountCensus$ + * @Description + * @Date 2023/4/6 16:46 + * @Author lichao + **/ +@Data +public class CommunityCountCensusFormDTO implements Serializable { + + + + private static final long serialVersionUID = 4360690752084258055L; + + @NotBlank(message = "组织Id不能为空") + private String agencyId; + + private Date timeStart; + + private Date timeEnd; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityCountCensusResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityCountCensusResultDTO.java new file mode 100644 index 0000000000..5788007304 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityCountCensusResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @ClassName AgencyCountCensus$ + * @Description + * @Date 2023/4/6 16:46 + * @Author lichao + **/ +@Data +public class CommunityCountCensusResultDTO implements Serializable { + + private static final long serialVersionUID = 4360690752084258055L; + + private String agencyId; + + private String agencyName; + + private Integer count; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index b60cf26230..a0d3e86daa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -529,6 +529,19 @@ public class CustomerAgencyController { return new Result>().ok(customerAgencyService.getAgencyCountList(agencyId)); } + /** + * @Description: 获取下级组织数量统计 + * @param dto: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/4/7 15:08 + */ + @PostMapping("getCommunityCountList") + public Result> getCommunityCountList(@RequestBody CommunityCountCensusFormDTO dto){ + return new Result>().ok(customerAgencyService.getCommunityCountList(dto)); + } + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index ef13f0573d..dab9acb81a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -435,5 +435,7 @@ public interface CustomerAgencyDao extends BaseDao { Integer agencyGridCount(@Param("pids") String pids); Integer agencyStaffCount(@Param("pids") String pids); + + Integer getCommunityCount(@Param("pids")String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index 0426634026..6f49d292fd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -369,4 +369,13 @@ public interface CustomerAgencyService extends BaseService * @return */ List getAgencyCountList(String agencyId); + + /** + * @Description: 获取下级组织的社区数量 + * @param dto: + * @Return java.util.List + * @Author: lichao + * @Date: 2023/4/7 15:09 + */ + List getCommunityCountList(CommunityCountCensusFormDTO dto); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index aac48182eb..c28d00c0cb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -1658,4 +1659,33 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl getCommunityCountList(CommunityCountCensusFormDTO dto) { + + List resultDTOS = new ArrayList<>(); + + CustomerAgencyEntity customerAgency = baseDao.selectById(dto.getAgencyId()); + if (customerAgency!=null){ + String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids()); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper().eq(CustomerAgencyEntity::getPids,pids); + List agencyEntityList = baseDao.selectList(queryWrapper); + agencyEntityList.forEach( + entity->{ + CommunityCountCensusResultDTO communityCountCensusResultDTO = new CommunityCountCensusResultDTO(); + communityCountCensusResultDTO.setAgencyId(entity.getId()); + communityCountCensusResultDTO.setAgencyName(entity.getOrganizationName()); + String agencyPids = PidUtils.convertPid2OrgIdPath(entity.getId(),entity.getPids()); + communityCountCensusResultDTO.setCount(baseDao.getCommunityCount(agencyPids,dto.getTimeStart(),dto.getTimeEnd())); + resultDTOS.add(communityCountCensusResultDTO); + } + ); + + }else { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取用户组织信息异常","获取用户组织信息异常"); + } + + return resultDTOS; + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 5070e25e8f..65b36753c0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -1184,4 +1184,18 @@ ca.del_flag = '0' AND ca.customer_id = #{customerId} + From b6884fadc95485c590ff3406c707c570223e7511 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Apr 2023 17:49:51 +0800 Subject: [PATCH 113/340] bingtu --- .../yt/EnterpriseCountPlaceTypeFormDTO.java | 15 ++++++ .../yt/EnterpriseCountPlaceTypeDetailDTO.java | 24 +++++++++ .../yt/EnterpriseCountPlaceTypeResDTO.java | 17 ++++++ .../controller/IcEnterpriseController.java | 17 +++++- .../java/com/epmet/dao/IcEnterpriseDao.java | 11 ++++ .../epmet/service/IcEnterpriseService.java | 12 +++-- .../service/impl/IcEnterpriseServiceImpl.java | 52 +++++++++++++++++-- .../main/resources/mapper/IcEnterpriseDao.xml | 20 +++++++ 8 files changed, 159 insertions(+), 9 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/EnterpriseCountPlaceTypeFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/EnterpriseCountPlaceTypeDetailDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/EnterpriseCountPlaceTypeResDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/EnterpriseCountPlaceTypeFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/EnterpriseCountPlaceTypeFormDTO.java new file mode 100644 index 0000000000..be4e1aac78 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/EnterpriseCountPlaceTypeFormDTO.java @@ -0,0 +1,15 @@ +package com.epmet.dto.form.yt; + +import lombok.Data; + +/** + * @Description 九小场所分析 + * @Author yzm + * @Date 2023/4/7 16:47 + */ +@Data +public class EnterpriseCountPlaceTypeFormDTO { + private String orgId; + private String orgType; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/EnterpriseCountPlaceTypeDetailDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/EnterpriseCountPlaceTypeDetailDTO.java new file mode 100644 index 0000000000..f92834a43b --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/EnterpriseCountPlaceTypeDetailDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dto.result.yt; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.Data; + +/** + * @Description 九小场所分析 + * @Author yzm + * @Date 2023/4/7 16:48 + */ +@Data +public class EnterpriseCountPlaceTypeDetailDTO { + private String placeType; + private String placeTypeName; + private Integer total; + + + public EnterpriseCountPlaceTypeDetailDTO() { + this.total = NumConstant.ZERO; + } + + +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/EnterpriseCountPlaceTypeResDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/EnterpriseCountPlaceTypeResDTO.java new file mode 100644 index 0000000000..865a2f481a --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/EnterpriseCountPlaceTypeResDTO.java @@ -0,0 +1,17 @@ +package com.epmet.dto.result.yt; + +import lombok.Data; + +import java.util.List; + +/** + * @Description 九小场所分析 + * @Author yzm + * @Date 2023/4/7 16:47 + */ +@Data +public class EnterpriseCountPlaceTypeResDTO { + private Integer total; + private List list; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java index 7d9afd1a83..ab66b5aa4f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java @@ -22,14 +22,15 @@ import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; -import com.epmet.dto.IcEnterpriseChangeRecordDTO; import com.epmet.dto.form.EnterpriseFormDTO; import com.epmet.dto.form.EnterprisePageFormDTO; import com.epmet.dto.form.EnterprisePatrolFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.form.yt.EnterpriseCountPlaceTypeFormDTO; import com.epmet.dto.result.EnterpriseDetailDTO; import com.epmet.dto.result.EnterprisePatrolResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; +import com.epmet.dto.result.yt.EnterpriseCountPlaceTypeResDTO; import com.epmet.excel.EnterpriseExportExcelDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcEnterpriseService; @@ -69,6 +70,7 @@ public class IcEnterpriseController implements ResultDataResolver { private IcEnterpriseService icEnterpriseService; @Autowired private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + /** * 企事业单位巡查】新增/编辑 * @@ -359,4 +361,17 @@ public class IcEnterpriseController implements ResultDataResolver { icEnterpriseService.qrCodeExport(formDTO,response); } + /** + * 九小场所分析:返回各个场所类型的数量 + * + * @param formDTO + * @return + */ + @PostMapping("count-type") + public Result countType(@RequestBody EnterpriseCountPlaceTypeFormDTO formDTO) { + return new Result().ok(icEnterpriseService.countType(formDTO.getOrgId(), formDTO.getOrgType())); + } + + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseDao.java index 40bdde151e..95d7119471 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.EnterprisePageFormDTO; import com.epmet.dto.result.EnterpriseDetailDTO; +import com.epmet.dto.result.yt.EnterpriseCountPlaceTypeDetailDTO; import com.epmet.entity.IcEnterpriseEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,4 +33,14 @@ public interface IcEnterpriseDao extends BaseDao { List selectList(EnterprisePageFormDTO formDTO); List selectForUniqueName(@Param("gridId") String gridId, @Param("placeOrgName") String placeOrgName, @Param("enterpriseId") String enterpriseId); + + /** + * 按场所类型 + * @param orgId + * @param orgType + * @return + */ + List selectCountByPlaceType(@Param("customerId")String customerId, + @Param("orgId") String orgId, + @Param("orgType") String orgType); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java index e141e008e3..5868cb805b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java @@ -2,19 +2,17 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.IcEnterpriseChangeRecordDTO; import com.epmet.dto.form.EnterpriseFormDTO; import com.epmet.dto.form.EnterprisePageFormDTO; import com.epmet.dto.form.EnterprisePatrolFormDTO; import com.epmet.dto.result.EnterpriseDetailDTO; import com.epmet.dto.result.EnterprisePatrolResultDTO; +import com.epmet.dto.result.yt.EnterpriseCountPlaceTypeResDTO; import com.epmet.entity.IcEnterpriseEntity; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.nio.file.Path; -import java.util.List; import java.util.Map; /** @@ -103,4 +101,12 @@ public interface IcEnterpriseService extends BaseService { */ void qrCodeExport(EnterprisePageFormDTO formDTO, HttpServletResponse response) throws IOException; + /** + * 九小场所分析:返回各个场所类型的数量 + * + * @param orgId + * @param orgType + * @return + */ + EnterpriseCountPlaceTypeResDTO countType(String orgId, String orgType); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 7867b1434b..f5da256144 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -29,10 +29,11 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.yt.EnterpriseCountPlaceTypeDetailDTO; +import com.epmet.dto.result.yt.EnterpriseCountPlaceTypeResDTO; import com.epmet.entity.*; import com.epmet.excel.EnterpriseImportExcelDTO; import com.epmet.excel.handler.IcEnterpriseExcelImportListener; -import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.OssFeignClient; @@ -85,8 +86,6 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl dictList = SpringContextUtils.getBean(CoverageService.class).dictMap(EpmetRequestHolder.getLoginUserCustomerId(), CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode()); + if (CollectionUtils.isEmpty(dictList)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "场所类型字典为空", "场所类型字典为空"); + } + // + List placeTypeCountList = baseDao.selectCountByPlaceType(EpmetRequestHolder.getLoginUserCustomerId(),orgId, orgType); + Map map = CollectionUtils.isEmpty(placeTypeCountList) ? new HashMap<>() : placeTypeCountList.stream().collect(Collectors.toMap(EnterpriseCountPlaceTypeDetailDTO::getPlaceType, o -> o));; + List list = new ArrayList<>(); + int total = 0; + for (IcCoverageCategoryDictListResultDTO placeType : dictList) { + EnterpriseCountPlaceTypeDetailDTO detailDTO = new EnterpriseCountPlaceTypeDetailDTO(); + detailDTO.setPlaceType(placeType.getValue()); + detailDTO.setPlaceTypeName(placeType.getLabel()); + detailDTO.setTotal(NumConstant.ZERO); + if (map.containsKey(placeType.getValue())) { + detailDTO.setTotal(map.get(placeType.getValue()).getTotal()); + } + list.add(detailDTO); + total += detailDTO.getTotal(); + } + EnterpriseCountPlaceTypeResDTO resDTO = new EnterpriseCountPlaceTypeResDTO(); + resDTO.setList(list); + resDTO.setTotal(total); + + return resDTO; + } + + + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml index 2b14cedbbb..faf1414459 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml @@ -108,4 +108,24 @@ and ie.id != #{enterpriseId} + + + \ No newline at end of file From 0d37f89d241a82c0cac16d85a34c108a32412beb Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 7 Apr 2023 17:51:24 +0800 Subject: [PATCH 114/340] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunityListByAgencyIdResultDTO.java | 24 +++++++++++++++++++ .../controller/CustomerAgencyController.java | 16 +++++++++---- .../epmet/service/CustomerAgencyService.java | 9 +++++++ .../impl/CustomerAgencyServiceImpl.java | 16 +++++++++++++ 4 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityListByAgencyIdResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityListByAgencyIdResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityListByAgencyIdResultDTO.java new file mode 100644 index 0000000000..086f41476f --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityListByAgencyIdResultDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dto.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description: + * @Author: lichao + * @Date: 2023/4/7 16:43 + */ +@Data +public class CommunityListByAgencyIdResultDTO implements Serializable { + private static final long serialVersionUID = -1677303397440121269L; + + private String name; + + private String streeName; + + private String districtName; + + private String createTime; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index a0d3e86daa..82be2d9c0f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -541,10 +541,16 @@ public class CustomerAgencyController { return new Result>().ok(customerAgencyService.getCommunityCountList(dto)); } - - - - - + /** + * @Description: 根据agencyId获取下级社区列表 + * @param dto: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/4/7 16:49 + */ + @GetMapping("getCommunityList") + public Result> getCommunityList(@RequestBody CommunityCountCensusFormDTO dto){ + return new Result>().ok(customerAgencyService.getCommunityList(dto)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index 6f49d292fd..cbc769dc76 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -378,4 +378,13 @@ public interface CustomerAgencyService extends BaseService * @Date: 2023/4/7 15:09 */ List getCommunityCountList(CommunityCountCensusFormDTO dto); + + /** + * @Description: 根据agencyId获取下级社区列表 + * @param dto: + * @Return java.util.List + * @Author: lichao + * @Date: 2023/4/7 16:49 + */ + List getCommunityList(CommunityCountCensusFormDTO dto); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index c28d00c0cb..47db02c8ee 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1688,4 +1688,20 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl getCommunityList(CommunityCountCensusFormDTO dto) { + + CustomerAgencyEntity customerAgency = baseDao.selectById(dto.getAgencyId()); + if (customerAgency!=null){ + + String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids()); + + + }else { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取用户组织信息异常","获取用户组织信息异常"); + } + + return null; + } + } From ec089412f6a75e87ab5f6e4b2fcebb24eefac183 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 10 Apr 2023 09:20:01 +0800 Subject: [PATCH 115/340] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CustomerAgencyServiceImpl.java | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index a6702963c4..245dcf24c5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1607,4 +1607,100 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl>().ok(list); } + /** + * 返回组织的orgIdPath：包含自身 + * + * @param orgId + * @return + */ + @Override + public String getOrgIdPath(String orgId) { + CustomerAgencyEntity customerAgencyEntity = baseDao.selectById(orgId); + if (null == customerAgencyEntity) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode()); + } + if (StringUtils.isBlank(customerAgencyEntity.getPid()) || NumConstant.ZERO_STR.equals(customerAgencyEntity.getPid())) { + return orgId; + } + return customerAgencyEntity.getPids().concat(StrConstant.COLON).concat(orgId); + } + + /** + * @Description: + * @param agencyId: + * @Return java.util.List + * @Author: lichao + * @Date: 2023/4/7 14:17 + */ + @Override + public List getAgencyCountList(String agencyId) { + + List agencyCountCensusResultDTOS = new ArrayList<>(); + + CustomerAgencyEntity customerAgency = baseDao.selectById(agencyId); + if (customerAgency != null){ + String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids()); + agencyCountCensusResultDTOS = baseDao.agencyCount(pids); + AgencyCountCensusResultDTO agencyCountCensusResultDTOGrid = new AgencyCountCensusResultDTO(); + agencyCountCensusResultDTOGrid.setLevel("grid"); + agencyCountCensusResultDTOGrid.setCount(baseDao.agencyGridCount(pids)); + agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOGrid); + + AgencyCountCensusResultDTO agencyCountCensusResultDTOStaff = new AgencyCountCensusResultDTO(); + agencyCountCensusResultDTOStaff.setLevel("staff"); + agencyCountCensusResultDTOStaff.setCount(baseDao.agencyStaffCount(pids)); + agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOStaff); + + }else{ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取用户组织信息异常","获取用户组织信息异常"); + } + return agencyCountCensusResultDTOS; + } + + @Override + public List getCommunityCountList(CommunityCountCensusFormDTO dto) { + + List resultDTOS = new ArrayList<>(); + + CustomerAgencyEntity customerAgency = baseDao.selectById(dto.getAgencyId()); + if (customerAgency!=null){ + String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids()); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper().eq(CustomerAgencyEntity::getPids,pids); + List agencyEntityList = baseDao.selectList(queryWrapper); + agencyEntityList.forEach( + entity->{ + CommunityCountCensusResultDTO communityCountCensusResultDTO = new CommunityCountCensusResultDTO(); + communityCountCensusResultDTO.setAgencyId(entity.getId()); + communityCountCensusResultDTO.setAgencyName(entity.getOrganizationName()); + String agencyPids = PidUtils.convertPid2OrgIdPath(entity.getId(),entity.getPids()); + communityCountCensusResultDTO.setCount(baseDao.getCommunityCount(agencyPids,dto.getTimeStart(),dto.getTimeEnd())); + resultDTOS.add(communityCountCensusResultDTO); + } + ); + + }else { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取用户组织信息异常","获取用户组织信息异常"); + } + + return resultDTOS; + } + + @Override + public List getCommunityList(CommunityCountCensusFormDTO dto) { + + CustomerAgencyEntity customerAgency = baseDao.selectById(dto.getAgencyId()); + if (customerAgency!=null){ + + String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids()); + + + + }else { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取用户组织信息异常","获取用户组织信息异常"); + } + + return null; + } + } From 0a2d4fd4aeef4c669c5f59b5aaa82cec3fd17f38 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Apr 2023 10:11:28 +0800 Subject: [PATCH 116/340] =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/EnterprisePageFormDTO.java | 13 +++++++++++++ .../main/resources/mapper/IcEnterpriseDao.xml | 16 ++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java index 15bf7a402a..623af190db 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java @@ -10,6 +10,19 @@ import java.io.Serializable; */ @Data public class EnterprisePageFormDTO implements Serializable { + + /** + * 组织id或者网格id + * 04.10添加次入参，原型地址：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvzaghxlqxhe + */ + private String orgId; + /** + * 组织：agency + * 网格：grid + * 04.10添加次入参，原型地址：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvzaghxlqxhe + */ + private String orgType; + /** * 场所区域 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml index faf1414459..029fb23169 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml @@ -66,10 +66,18 @@ LEFT JOIN ic_enterprise_patrol_record r ON ( ie.id = r.ENTERPRISE_ID AND r.DEL_FLAG = '0' ) WHERE ie.DEL_FLAG = '0' - AND ( - ie.AGENCY_ID = #{staffAgencyId} - OR ie.AGENCY_PIDS LIKE concat( '%', #{staffAgencyId}, '%' ) - ) + + AND ie.GRID_ID = #{orgId} + + + AND (ie.AGENCY_ID = #{orgId} or ie.AGENCY_PIDS like concat('%',#{orgId},'%')) + + + AND ( + ie.AGENCY_ID = #{staffAgencyId} + OR ie.AGENCY_PIDS LIKE concat( '%', #{staffAgencyId}, '%' ) + ) + AND ie.GRID_ID = #{gridId} From c0d9dac17dfb99f41bd1757c796e3a62c7832568 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 10 Apr 2023 11:01:51 +0800 Subject: [PATCH 117/340] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/CommunityCountCensusFormDTO.java | 4 +++ .../CommunityListByAgencyIdResultDTO.java | 11 +++++++- .../controller/CustomerAgencyController.java | 6 ++-- .../java/com/epmet/dao/CustomerAgencyDao.java | 2 ++ .../epmet/service/CustomerAgencyService.java | 2 +- .../impl/CustomerAgencyServiceImpl.java | 28 +++++++++++++++++-- .../resources/mapper/CustomerAgencyDao.xml | 15 ++++++++++ 7 files changed, 61 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommunityCountCensusFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommunityCountCensusFormDTO.java index 0455ff705b..d9e7f7d4e4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommunityCountCensusFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommunityCountCensusFormDTO.java @@ -25,4 +25,8 @@ public class CommunityCountCensusFormDTO implements Serializable { private Date timeStart; private Date timeEnd; + + private Integer pageNum; + + private Integer pageSize; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityListByAgencyIdResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityListByAgencyIdResultDTO.java index 086f41476f..f256fbe316 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityListByAgencyIdResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityListByAgencyIdResultDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.Date; /** * @Description: @@ -14,11 +15,19 @@ import java.io.Serializable; public class CommunityListByAgencyIdResultDTO implements Serializable { private static final long serialVersionUID = -1677303397440121269L; + private String id; + + private String pids; + private String name; private String streeName; +// private String streeId; + private String districtName; - private String createTime; +// private String districtId; + + private Date createTime; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 82be2d9c0f..3ba5fd1138 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -548,9 +548,9 @@ public class CustomerAgencyController { * @Author: lichao * @Date: 2023/4/7 16:49 */ - @GetMapping("getCommunityList") - public Result> getCommunityList(@RequestBody CommunityCountCensusFormDTO dto){ - return new Result>().ok(customerAgencyService.getCommunityList(dto)); + @PostMapping("getCommunityList") + public Result> getCommunityList(@RequestBody CommunityCountCensusFormDTO dto){ + return new Result>().ok(customerAgencyService.getCommunityList(dto)); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index dab9acb81a..f7f3a4cbef 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -437,5 +437,7 @@ public interface CustomerAgencyDao extends BaseDao { Integer agencyStaffCount(@Param("pids") String pids); Integer getCommunityCount(@Param("pids")String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); + + List getCommunityByPidList (@Param("pids")String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index cbc769dc76..e96f706acf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -386,5 +386,5 @@ public interface CustomerAgencyService extends BaseService * @Author: lichao * @Date: 2023/4/7 16:49 */ - List getCommunityList(CommunityCountCensusFormDTO dto); + PageData getCommunityList(CommunityCountCensusFormDTO dto); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 47db02c8ee..ed50e7d140 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -45,6 +45,7 @@ import com.epmet.constant.CustomerGridConstant; import com.epmet.dao.*; import com.epmet.dto.*; import com.epmet.dto.form.*; +import com.epmet.dto.region.LogOperationResultDTO; import com.epmet.dto.result.*; import com.epmet.entity.CustomerAgencyEntity; import com.epmet.entity.CustomerDepartmentEntity; @@ -58,6 +59,8 @@ import com.epmet.feign.OperCrmFeignClient; import com.epmet.redis.CustomerAgencyRedis; import com.epmet.service.CustomerAgencyService; import com.epmet.util.ModuleConstant; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -1689,19 +1692,40 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl getCommunityList(CommunityCountCensusFormDTO dto) { + public PageData getCommunityList(CommunityCountCensusFormDTO dto) { CustomerAgencyEntity customerAgency = baseDao.selectById(dto.getAgencyId()); if (customerAgency!=null){ String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids()); + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List entityList = baseDao.getCommunityByPidList(pids,dto.getTimeStart(),dto.getTimeEnd()); + + entityList.forEach( + entity->{ + String[] pidArray = entity.getPids().split(":"); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper().in(CustomerAgencyEntity::getId,pidArray); + List customerAgencyEntities = baseDao.selectList(queryWrapper); + for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) { + if (customerAgencyEntity.getLevel().equals("district")){ + entity.setDistrictName(customerAgencyEntity.getOrganizationName()); + } + if (customerAgencyEntity.getLevel().equals("street")){ + entity.setStreeName(customerAgencyEntity.getOrganizationName()); + } + } + } + ); + + PageInfo pageInfo = new PageInfo<>(entityList); + return new PageData<>(entityList, pageInfo.getTotal(),dto.getPageSize()); }else { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取用户组织信息异常","获取用户组织信息异常"); } - return null; } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 65b36753c0..dec4462b39 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -1198,4 +1198,19 @@ and agency.CREATED_TIME <= #{timeEnd} + From fd3fb8a513743cc4a165423398c1b4adbc6cdcb4 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 10 Apr 2023 13:59:57 +0800 Subject: [PATCH 118/340] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8C=BA=E5=8E=BF?= =?UTF-8?q?=E7=BA=A7=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerAgencyController.java | 11 +++++++ .../java/com/epmet/dao/CustomerAgencyDao.java | 4 +++ .../epmet/service/CustomerAgencyService.java | 3 ++ .../impl/CustomerAgencyServiceImpl.java | 29 +++++++++++++++++++ .../resources/mapper/CustomerAgencyDao.xml | 20 +++++++++++++ 5 files changed, 67 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 3ba5fd1138..e0d4f9f644 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -251,6 +251,17 @@ public class CustomerAgencyController { return new Result().ok(customerAgencyService.staffInAgencyList(tokenDTO.getUserId())); } + /** + * @param tokenDTO + * @return + * @Author sun + * @Description 工作端-查询当前人员所属组织及所有下级组织（到区县级） + **/ + @PostMapping("staffinAgencyLevelList") + public Result staffinAgencyLevelList(@LoginUser TokenDto tokenDTO) { + return new Result().ok(customerAgencyService.staffinAgencyLevelList(tokenDTO.getUserId())); + } + /** * @Description 对外接口，根据customerId返回Element UI中Tree结构的agency列表 * @param map diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index f7f3a4cbef..9570c05747 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -108,6 +108,8 @@ public interface CustomerAgencyDao extends BaseDao { **/ List selectSubAgencyList(@Param("subAgencyPids") String subAgencyPids); + List selectSubAgencyLevelList(@Param("subAgencyPids") String subAgencyPids); + /** * 查询客户根级组织 * @@ -195,6 +197,8 @@ public interface CustomerAgencyDao extends BaseDao { **/ AgencyResultDTO selectAgencyByStaffId(@Param("staffId") String staffId); + AgencyResultDTO selectAgencyByLevelStaffId(@Param("staffId") String staffId); + /** * @param customerId * @param pid diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index e96f706acf..f43de77102 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -215,6 +215,9 @@ public interface CustomerAgencyService extends BaseService **/ StaffInAgencyListResultDTO staffInAgencyList(String staffId); + StaffInAgencyListResultDTO staffinAgencyLevelList(String staffId); + + /** * @Description 运营端-返回element ui - tree 结构agency列表 * @param customerId diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index ed50e7d140..75ae8a84d2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -686,6 +686,17 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl getDepartmentLevelList(String subAgencyPids) { + List subAgencyList = baseDao.selectSubAgencyLevelList(subAgencyPids); + if (subAgencyList.size() > NumConstant.ZERO) { + for (AgencySubResultDTO sub : subAgencyList) { + List subAgency = getDepartmentLevelList(sub.getPids() + ":" + sub.getAgencyId()); + sub.setSubAgencyList(subAgency); + } + } + return subAgencyList; + } + /** * @param staffId * @return @@ -1057,6 +1068,24 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl%s", staffId)); + throw new RenException(CustomerAgencyConstant.SELECT_STAFF_AGENCY_EXCEPTION); + } + resultDTO.setAgencyList(agencyList); + + //2.递归查询所有下级组织信息 + List subAgencyList = getDepartmentLevelList(("".equals(agencyList.getPids()) ? "" : agencyList.getPids() + ":") + agencyList.getAgencyId()); + resultDTO.setSubAgencyList(subAgencyList); + + return resultDTO; + } + /** * @param customerId * @return com.epmet.dto.result.AgencyElementTreeResultDTO diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index dec4462b39..606215ba94 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -210,6 +210,26 @@ ORDER BY ca.created_time DESC + + - select level,count(*) + select level as level,count(*) as count from customer_agency where DEL_FLAG = 0 and PIDS like concat(#{pids},'%') From edfcc7f798bfea1373c1eaef08ba2c455beb48d9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Apr 2023 10:00:14 +0800 Subject: [PATCH 122/340] =?UTF-8?q?=E6=B2=A1=E7=94=A8=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/StaffLoginLogServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index 418d03e1cf..f1a00216b5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -213,7 +213,7 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl Date: Tue, 11 Apr 2023 14:11:46 +0800 Subject: [PATCH 123/340] =?UTF-8?q?orgIdpath=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerAgencyServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 49fb08d023..7a651ecc9a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1227,6 +1227,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl Date: Tue, 11 Apr 2023 14:19:27 +0800 Subject: [PATCH 124/340] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=94=BB=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/HouseCountPictureFormDTO.java | 22 ++++++++++++++ .../result/HouseCountPictureResultDTO.java | 23 ++++++++++++++ .../epmet/controller/IcHouseController.java | 30 ++++++++++++++++--- .../main/java/com/epmet/dao/IcHouseDao.java | 5 ++++ .../com/epmet/service/IcHouseService.java | 4 +++ .../service/impl/IcHouseServiceImpl.java | 11 +++++++ .../src/main/resources/mapper/IcHouseDao.xml | 30 +++++++++++++++++++ 7 files changed, 121 insertions(+), 4 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java new file mode 100644 index 0000000000..77d7201a25 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 根据小区，楼宇，单元名称校验是否存在 + * @Author wgf + * @Date 2022/8/24 9:03 + */ +@Data +public class HouseCountPictureFormDTO implements Serializable { + private static final long serialVersionUID = 2636608477324780974L; + + private String orgIdPath; + + private Date timeStart; + + private Date timeEnd; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java new file mode 100644 index 0000000000..ef9edb5adc --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2021/11/5 15:59 + */ +@NoArgsConstructor +@Data +public class HouseCountPictureResultDTO implements Serializable { + + private static final long serialVersionUID = 2063032844842070847L; + + private String type; + + private Integer count; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index c2420c0832..69eb81e2cd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java @@ -26,11 +26,9 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; +import com.epmet.dto.form.HouseCountPictureFormDTO; import com.epmet.dto.form.HouseFormDTO; -import com.epmet.dto.result.HouseAgencyInfoResultDTO; -import com.epmet.dto.result.HouseInfoDTO; -import com.epmet.dto.result.HouseListResultDTO; -import com.epmet.dto.result.HousesNameResultDTO; +import com.epmet.dto.result.*; import com.epmet.service.IcHouseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -161,4 +159,28 @@ public class IcHouseController { return icHouseService.checkHomeInfo(formDTO); } + /** + * @Description: 房屋画像-用途统计 + * @param dto: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/4/11 10:35 + */ + @PostMapping("getHousePurposeCount") + public Result> getHousePurposeCount(@RequestBody HouseCountPictureFormDTO dto){ + return new Result>().ok(icHouseService.getHousePurposeCount(dto)); + } + + + /** + * @Description: 房屋画像-用途统计 + * @param dto: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/4/11 10:41 + */ + @PostMapping("getHouseStatusCount") + public Result> getHouseStatusCount(@RequestBody HouseCountPictureFormDTO dto){ + return new Result>().ok(icHouseService.getHouseStatusCount(dto)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 3e9d28b39f..e771af793e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; +import java.util.Date; import java.util.List; import java.util.Set; @@ -218,4 +219,8 @@ public interface IcHouseDao extends BaseDao { * @return */ List selectGroupRentHouseList(GroupRentHouseFormDTO formDTO); + + List getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); + + List getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index 0855d78104..4f431e77bf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -8,6 +8,7 @@ import com.epmet.dto.IcHouseDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.DetailByTypeFormDTO; +import com.epmet.dto.form.HouseCountPictureFormDTO; import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcHouseEntity; @@ -139,4 +140,7 @@ public interface IcHouseService extends BaseService { Result checkHomeInfo(CheckHouseInfoFormDTO formDTO); + List getHousePurposeCount(HouseCountPictureFormDTO dto); + + List getHouseStatusCount(HouseCountPictureFormDTO dto); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 93322c7ed6..e88b9fe522 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -23,6 +23,7 @@ import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; +import com.epmet.dto.form.HouseCountPictureFormDTO; import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcBuildingEntity; @@ -405,4 +406,14 @@ public class IcHouseServiceImpl extends BaseServiceImpl().ok(checkHomeInfoResultInfo); } + + @Override + public List getHousePurposeCount(HouseCountPictureFormDTO dto) { + return baseDao.getHousePurposeCount(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd()); + } + + @Override + public List getHouseStatusCount(HouseCountPictureFormDTO dto) { + return baseDao.getHouseStatusCount(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd()); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 222062704a..9c2ad9e6a6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -776,4 +776,34 @@ CONVERT ( ih.DOOR_NAME USING gbk ), ih.SORT ASC + + From 8a92034aecec3eece4d2498e91bcd73eb70988d7 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 11 Apr 2023 15:15:01 +0800 Subject: [PATCH 125/340] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=94=BB=E5=83=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/HouseCountPictureFormDTO.java | 4 +++ .../result/HouseCountPictureResultDTO.java | 18 +++++++--- .../dto/result/HousePictureListResultDTO.java | 33 +++++++++++++++++ .../epmet/controller/IcHouseController.java | 28 ++++++++++----- .../main/java/com/epmet/dao/IcHouseDao.java | 4 +-- .../com/epmet/service/IcHouseService.java | 6 ++-- .../service/impl/IcHouseServiceImpl.java | 35 ++++++++++++++++--- 7 files changed, 106 insertions(+), 22 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HousePictureListResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java index 77d7201a25..8abe03ed70 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java @@ -19,4 +19,8 @@ public class HouseCountPictureFormDTO implements Serializable { private Date timeStart; private Date timeEnd; + + private Integer pageSize; + + private Integer pageNo; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java index ef9edb5adc..b5dadea13a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java @@ -7,9 +7,9 @@ import java.io.Serializable; import java.util.List; /** - * @Description - * @Author zhaoqifeng - * @Date 2021/11/5 15:59 + * @Description: + * @Author: lichao + * @Date: 2023/4/11 15:05 */ @NoArgsConstructor @Data @@ -17,7 +17,15 @@ public class HouseCountPictureResultDTO implements Serializable { private static final long serialVersionUID = 2063032844842070847L; - private String type; + private Integer total; - private Integer count; + private List list; + + @Data + public static class HouseCountPictureCount{ + + private String type; + + private Integer count; + } } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HousePictureListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HousePictureListResultDTO.java new file mode 100644 index 0000000000..9bc481c068 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HousePictureListResultDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dto.result; + + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description: + * @Author: lichao + * @Date: 2023/4/11 14:41 + */ +@NoArgsConstructor +@Data +public class HousePictureListResultDTO implements Serializable { + + private static final long serialVersionUID = 2063032844842070847L; + + private String houseId; + + private String districtName; + + private String neighborName; + + private String gridName; + + private String houseName; + + private String purpose; + + private Integer rentFlag; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index 69eb81e2cd..4459e958b3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java @@ -162,25 +162,35 @@ public class IcHouseController { /** * @Description: 房屋画像-用途统计 * @param dto: - * @Return com.epmet.commons.tools.utils.Result> + * @Return com.epmet.commons.tools.utils.Result * @Author: lichao - * @Date: 2023/4/11 10:35 + * @Date: 2023/4/11 15:08 */ @PostMapping("getHousePurposeCount") - public Result> getHousePurposeCount(@RequestBody HouseCountPictureFormDTO dto){ - return new Result>().ok(icHouseService.getHousePurposeCount(dto)); + public Result getHousePurposeCount(@RequestBody HouseCountPictureFormDTO dto){ + return new Result().ok(icHouseService.getHousePurposeCount(dto)); } /** - * @Description: 房屋画像-用途统计 + * @Description: 房屋画像-状态统计 * @param dto: - * @Return com.epmet.commons.tools.utils.Result> + * @Return com.epmet.commons.tools.utils.Result * @Author: lichao - * @Date: 2023/4/11 10:41 + * @Date: 2023/4/11 15:07 */ @PostMapping("getHouseStatusCount") - public Result> getHouseStatusCount(@RequestBody HouseCountPictureFormDTO dto){ - return new Result>().ok(icHouseService.getHouseStatusCount(dto)); + public Result getHouseStatusCount(@RequestBody HouseCountPictureFormDTO dto){ + return new Result().ok(icHouseService.getHouseStatusCount(dto)); + } + + /** + * 房屋画像-列表 + * @param dto + * @return + */ + @PostMapping("getHousePictureList") + public Result> getHousePictureList(@RequestBody HouseCountPictureFormDTO dto){ + return new Result>().ok(icHouseService.getHousePictureList(dto)); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index e771af793e..0937f3c23f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -220,7 +220,7 @@ public interface IcHouseDao extends BaseDao { */ List selectGroupRentHouseList(GroupRentHouseFormDTO formDTO); - List getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); + List getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); - List getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); + List getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index 4f431e77bf..09b1c4799e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -140,7 +140,9 @@ public interface IcHouseService extends BaseService { Result checkHomeInfo(CheckHouseInfoFormDTO formDTO); - List getHousePurposeCount(HouseCountPictureFormDTO dto); + HouseCountPictureResultDTO getHousePurposeCount(HouseCountPictureFormDTO dto); - List getHouseStatusCount(HouseCountPictureFormDTO dto); + HouseCountPictureResultDTO getHouseStatusCount(HouseCountPictureFormDTO dto); + + List getHousePictureList(HouseCountPictureFormDTO dto); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index e88b9fe522..307eb63149 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -408,12 +408,39 @@ public class IcHouseServiceImpl extends BaseServiceImpl getHousePurposeCount(HouseCountPictureFormDTO dto) { - return baseDao.getHousePurposeCount(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd()); + public HouseCountPictureResultDTO getHousePurposeCount(HouseCountPictureFormDTO dto) { + + HouseCountPictureResultDTO resultDTO = new HouseCountPictureResultDTO(); + + resultDTO.setTotal(0); + + resultDTO.setList(baseDao.getHousePurposeCount(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd())); + + resultDTO.getList().forEach( + result->resultDTO.setTotal(resultDTO.getTotal()+result.getCount()) + ); + + return resultDTO; + } + + @Override + public HouseCountPictureResultDTO getHouseStatusCount(HouseCountPictureFormDTO dto) { + + HouseCountPictureResultDTO resultDTO = new HouseCountPictureResultDTO(); + + resultDTO.setTotal(0); + + resultDTO.setList(baseDao.getHouseStatusCount(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd())); + + resultDTO.getList().forEach( + result->resultDTO.setTotal(resultDTO.getTotal()+result.getCount()) + ); + + return resultDTO; } @Override - public List getHouseStatusCount(HouseCountPictureFormDTO dto) { - return baseDao.getHouseStatusCount(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd()); + public List getHousePictureList(HouseCountPictureFormDTO dto) { + return null; } } From a9547f5e7bbcb092a9b3ef92dee7721f314f6627 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 11 Apr 2023 15:21:46 +0800 Subject: [PATCH 126/340] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=9F=B1=E7=8A=B6?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/IcHouseController.java | 5 +++-- .../src/main/java/com/epmet/dao/IcHouseDao.java | 2 ++ .../main/java/com/epmet/service/IcHouseService.java | 3 ++- .../com/epmet/service/impl/IcHouseServiceImpl.java | 13 +++++++++++-- .../src/main/resources/mapper/IcHouseDao.xml | 5 +++-- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index 4459e958b3..55c09259ae 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java @@ -21,6 +21,7 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO; +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; @@ -190,7 +191,7 @@ public class IcHouseController { * @return */ @PostMapping("getHousePictureList") - public Result> getHousePictureList(@RequestBody HouseCountPictureFormDTO dto){ - return new Result>().ok(icHouseService.getHousePictureList(dto)); + public Result> getHousePictureList(@RequestBody HouseCountPictureFormDTO dto){ + return new Result>().ok(icHouseService.getHousePictureList(dto)); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 0937f3c23f..f39418ef99 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -223,4 +223,6 @@ public interface IcHouseDao extends BaseDao { List getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); List getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); + + List getHousePictureList(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index 09b1c4799e..72fa7d2674 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -2,6 +2,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.dto.result.OptionResultDTO; +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.dto.IcHouseDTO; @@ -144,5 +145,5 @@ public interface IcHouseService extends BaseService { HouseCountPictureResultDTO getHouseStatusCount(HouseCountPictureFormDTO dto); - List getHousePictureList(HouseCountPictureFormDTO dto); + PageData getHousePictureList(HouseCountPictureFormDTO dto); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 307eb63149..e2e68a5487 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.dto.result.OptionResultDTO; 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.CustomerIcHouseRedis; import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; @@ -25,6 +26,7 @@ import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.HouseCountPictureFormDTO; import com.epmet.dto.form.HouseFormDTO; +import com.epmet.dto.region.LogOperationResultDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcBuildingEntity; import com.epmet.entity.IcBuildingUnitEntity; @@ -38,6 +40,8 @@ import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.redis.IcHouseRedis; import com.epmet.service.IcHouseService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -440,7 +444,12 @@ public class IcHouseServiceImpl extends BaseServiceImpl getHousePictureList(HouseCountPictureFormDTO dto) { - return null; + public PageData getHousePictureList(HouseCountPictureFormDTO dto) { + // 列表/导出查询 + PageHelper.startPage(dto.getPageNo(), dto.getPageSize()); + List list = baseDao.getHousePictureList(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd()); + PageInfo pageInfo = new PageInfo<>(list); + + return new PageData<>(list,pageInfo.getTotal()); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 9c2ad9e6a6..77b630cd86 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -776,7 +776,7 @@ CONVERT ( ih.DOOR_NAME USING gbk ), ih.SORT ASC - select count (*) as count , PURPOSE as type from ic_house @@ -792,7 +792,7 @@ group by PURPOSE - select count (*) as count , RENT_FLAG as type from ic_house where DEL_FLAG = 0 @@ -806,4 +806,5 @@ group by RENT_FLAG + From 96fb95949187d5949a0b9ce1ffbd82d83fb68679 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 11 Apr 2023 15:43:41 +0800 Subject: [PATCH 127/340] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HouseCountPictureListResultDTO.java | 23 +++++++++++++++++++ .../result/HouseCountPictureResultDTO.java | 9 +------- .../java/com/epmet/dao/CustomerAgencyDao.java | 2 +- .../main/java/com/epmet/dao/IcHouseDao.java | 4 ++-- .../src/main/resources/mapper/IcHouseDao.xml | 4 ++-- 5 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureListResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureListResultDTO.java new file mode 100644 index 0000000000..e90cd207a7 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureListResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description: + * @Author: lichao + * @Date: 2023/4/11 15:05 + */ +@NoArgsConstructor +@Data +public class HouseCountPictureListResultDTO implements Serializable { + + private static final long serialVersionUID = 2063032844842070847L; + + private String type; + + private Integer count; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java index b5dadea13a..998776fffb 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java @@ -19,13 +19,6 @@ public class HouseCountPictureResultDTO implements Serializable { private Integer total; - private List list; + private List list; - @Data - public static class HouseCountPictureCount{ - - private String type; - - private Integer count; - } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 9570c05747..5639d33894 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -197,7 +197,7 @@ public interface CustomerAgencyDao extends BaseDao { **/ AgencyResultDTO selectAgencyByStaffId(@Param("staffId") String staffId); - AgencyResultDTO selectAgencyByLevelStaffId(@Param("staffId") String staffId); +// AgencyResultDTO selectAgencyByLevelStaffId(@Param("staffId") String staffId); /** * @param customerId diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index f39418ef99..05e277c000 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -220,9 +220,9 @@ public interface IcHouseDao extends BaseDao { */ List selectGroupRentHouseList(GroupRentHouseFormDTO formDTO); - List getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); + List getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); - List getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); + List getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); List getHousePictureList(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 77b630cd86..14764ca723 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -776,7 +776,7 @@ CONVERT ( ih.DOOR_NAME USING gbk ), ih.SORT ASC - select count (*) as count , PURPOSE as type from ic_house @@ -792,7 +792,7 @@ group by PURPOSE - select count (*) as count , RENT_FLAG as type from ic_house where DEL_FLAG = 0 From e8629d3b89983c556bd923176058e68c6aa74a91 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 11 Apr 2023 16:08:43 +0800 Subject: [PATCH 128/340] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=94=BB=E5=83=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/HouseCountPictureFormDTO.java | 1 + .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java index 8abe03ed70..f5d0ae18c1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java @@ -20,6 +20,7 @@ public class HouseCountPictureFormDTO implements Serializable { private Date timeEnd; + private Integer pageSize; private Integer pageNo; diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 14764ca723..0c33139712 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -778,7 +778,7 @@ - + From 8ea8b638631f7ed1471738ea12bca8442d3f4177 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 11 Apr 2023 17:42:54 +0800 Subject: [PATCH 130/340] =?UTF-8?q?excel=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcHouseController.java | 70 +++++++++++++++++++ .../epmet/excel/HousePictureListExcelDTO.java | 50 +++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/HousePictureListExcelDTO.java diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index 99c296e496..7c8bdc939f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java @@ -17,23 +17,47 @@ package com.epmet.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.metadata.style.WriteCellStyle; +import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; 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.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.HouseCountPictureFormDTO; import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.result.*; +import com.epmet.excel.EnterpriseExportExcelDTO; +import com.epmet.excel.HousePictureListExcelDTO; import com.epmet.service.IcHouseService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.ss.usermodel.VerticalAlignment; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; import java.util.List; import java.util.Map; @@ -44,6 +68,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-10-25 */ +@Slf4j @RestController @RequestMapping("ichouse") public class IcHouseController { @@ -196,4 +221,49 @@ public class IcHouseController { public Result> getHousePictureList(@RequestBody HouseCountPictureFormDTO dto){ return new Result>().ok(icHouseService.getHousePictureList(dto)); } + + @PostMapping("export") + public void export(@RequestBody HouseCountPictureFormDTO formDTO, HttpServletResponse response) throws IOException { + ExcelWriter excelWriter = null; + formDTO.setPageNo(NumConstant.ONE); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + try { + String fileName = "房屋列表" + DateUtils.format(new Date()) + ".xlsx"; + // 头的策略 + WriteCellStyle headWriteCellStyle = new WriteCellStyle(); + // 背景设置为红色 + headWriteCellStyle.setFillForegroundColor(IndexedColors.PALE_BLUE.getIndex()); + WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); + contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); + HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); + FreezeAndFilter writeHandler = new FreezeAndFilter(); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), HousePictureListExcelDTO.class) + .registerWriteHandler(horizontalCellStyleStrategy) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .registerWriteHandler(writeHandler).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icHouseService.getHousePictureList(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), HousePictureListExcelDTO.class); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("房屋列表导出异常export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/HousePictureListExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/HousePictureListExcelDTO.java new file mode 100644 index 0000000000..b6cc195a81 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/HousePictureListExcelDTO.java @@ -0,0 +1,50 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +import java.util.Date; + +/** + * 企事业单位导出excel + */ +@Data +public class HousePictureListExcelDTO { + + + @ExcelIgnore + private String houseId; + + @ExcelProperty(value = "区县") + @ColumnWidth(25) + private String districtName; + + @ExcelProperty(value = "镇街") + @ColumnWidth(25) + private String streetName; + + @ExcelProperty(value = "社区") + @ColumnWidth(25) + private String communityName; + + @ExcelProperty(value = "网格") + @ColumnWidth(25) + private String gridName; + + @ExcelProperty(value = "房屋名称") + @ColumnWidth(25) + private String houseName; + + @ExcelProperty(value = "房屋用途") + @ColumnWidth(25) + private String purposeName; + + @ExcelProperty(value = "房屋状态") + @ColumnWidth(25) + private String rentFlagName; + @ExcelIgnore + private String orgIdPath; + +} From 72830128d6a2d2f9f91eaa987657c915d3e9f0b8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Apr 2023 18:20:03 +0800 Subject: [PATCH 131/340] =?UTF-8?q?=E7=83=9F=E5=8F=B0=EF=BC=9A=E5=AD=A6?= =?UTF-8?q?=E5=8E=86=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/resi/ResiPortrayalCommonFormDTO.java | 21 +++++++ .../result/resi/ResiPortrayalResultDTO.java | 28 +++++++++ .../controller/IcResiUserController.java | 29 +++++++++ .../java/com/epmet/dao/IcResiUserDao.java | 11 ++++ .../com/epmet/service/IcResiUserService.java | 22 +++++++ .../service/impl/IcResiUserServiceImpl.java | 60 +++++++++++++++++++ .../main/resources/mapper/IcResiUserDao.xml | 24 ++++++++ 7 files changed, 195 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/resi/ResiPortrayalCommonFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/resi/ResiPortrayalCommonFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/resi/ResiPortrayalCommonFormDTO.java new file mode 100644 index 0000000000..9679258c91 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/resi/ResiPortrayalCommonFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form.resi; + +import lombok.Data; + +/** + * @Description 烟台居民画像入参 + * @Author yzm + * @Date 2023/4/11 17:03 + */ +@Data +public class ResiPortrayalCommonFormDTO { + /** + * /gov/org/customeragency/agencygridtree返回的agencyId + */ + private String orgId; + /** + * /gov/org/customeragency/agencygridtree返回level=grid时，orgType:grid；其他情况orgType：agency + */ + private String orgType; +} + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalResultDTO.java new file mode 100644 index 0000000000..4f0b95072a --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.result.resi; + +import lombok.Data; + +/** + * @Description 烟台居民画像返参 + * @Author yzm + * @Date 2023/4/11 17:04 + */ +@Data +public class ResiPortrayalResultDTO { + /** + * 居民数量 + */ + private Integer totalResi; + /** + * 年龄分布：50岁以下：0；50-59岁：1；60-69岁：2；70-79岁：3；80岁以上：4 + * 学历分布：学历key + */ + private String code; + + /** + * 学历分布：小学及文盲/初中..... + * 年龄分布：50岁以下/50-59岁/60-69岁/70-79岁/80岁以上 + */ + private String codeName; +} + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 407eb3c26c..e0e653a016 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -59,9 +59,11 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.form.*; import com.epmet.dto.form.resi.IcResiPageNonDynamicFormDTO; +import com.epmet.dto.form.resi.ResiPortrayalCommonFormDTO; import com.epmet.dto.result.*; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; +import com.epmet.dto.result.resi.ResiPortrayalResultDTO; import com.epmet.enums.IcResiUserTableEnum; import com.epmet.excel.PartyMemberAgeExportExcel; import com.epmet.excel.PartyMemberEducationExportExcel; @@ -1527,4 +1529,31 @@ public class IcResiUserController implements ResultDataResolver { return new Result>().ok(icResiUserService.renHuConditionList(formDTO)); } + /** + * 烟台需求：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvoz5w4z9f98 + * 接口地址：http://yapi.elinkservice.cn/project/356/interface/api/cat_1370 + * 居民年龄分布饼图 + * + * @param formDTO + * @return + */ + @PostMapping("age-distribute") + public Result> queryAgeDistribute(@RequestBody ResiPortrayalCommonFormDTO formDTO) { + return new Result>().ok(icResiUserService.queryAgeDistribute(formDTO.getOrgId(), formDTO.getOrgType())); + } + + /** + * 烟台需求：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvoz5w4z9f98 + * 接口地址：http://yapi.elinkservice.cn/project/356/interface/api/cat_1370 + * 居民学历分布饼图 + * + * @param formDTO + * @return + */ + @PostMapping("education-distribute") + public Result> queryEducationDistribute(@LoginUser TokenDto tokenDto,@RequestBody ResiPortrayalCommonFormDTO formDTO) { + return new Result>().ok(icResiUserService.queryEducationDistribute(tokenDto.getCustomerId(),tokenDto.getUserId(),formDTO.getOrgId(), formDTO.getOrgType())); + } + + } 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 7ea3b00fbb..51510944dd 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 @@ -24,6 +24,7 @@ import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.IcVolunteerPolyDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.resi.ResiPortrayalResultDTO; import com.epmet.entity.IcResiUserEntity; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; @@ -451,4 +452,14 @@ public interface IcResiUserDao extends BaseDao { List getImportUserList(@Param("customerId")String customerId,@Param("agencyId")String agencyId); + /** + * 烟台居民画像：按照学历分组，查询居民数量 + * @param customerId + * @param orgId + * @param orgType:agency/grid + * @return + */ + List queryEducationDistribute(@Param("customerId") String customerId, + @Param("orgId") String orgId, + @Param("orgType") String orgType); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index c29d0cb69d..86fdc0e0d3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -28,6 +28,7 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; +import com.epmet.dto.result.resi.ResiPortrayalResultDTO; import com.epmet.entity.IcResiUserEntity; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; @@ -542,4 +543,25 @@ public interface IcResiUserService extends BaseService { List renHuConditionList(RHZKStatisticsFormDTO formDTO); + /** + * 烟台需求：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvoz5w4z9f98 + * 接口地址：http://yapi.elinkservice.cn/project/356/interface/api/cat_1370 + * 居民年龄分布饼图 + * + * @param orgId + * @param orgType + * @return + */ + List queryAgeDistribute(String orgId, String orgType); + + /** + * 烟台需求：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvoz5w4z9f98 + * 接口地址：http://yapi.elinkservice.cn/project/356/interface/api/cat_1370 + * 居民学历分布饼图 + * + * @param orgId + * @param orgType agency/grid + * @return + */ + List queryEducationDistribute(String customerId,String staffId,String orgId, String orgType); } 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 d8e5ea3c17..8ac46dc8d7 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 @@ -62,6 +62,7 @@ import com.epmet.dto.result.*; import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; +import com.epmet.dto.result.resi.ResiPortrayalResultDTO; import com.epmet.entity.*; import com.epmet.enums.RenHuConditionEnum; import com.epmet.excel.EpidemicPreventionExportExcel; @@ -81,6 +82,7 @@ import com.google.common.cache.CacheBuilder; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; @@ -3890,4 +3892,62 @@ public class IcResiUserServiceImpl extends BaseServiceImpl queryAgeDistribute(String orgId, String orgType) { + // todo + + + return null; + } + + /** + * 烟台需求：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvoz5w4z9f98 + * 接口地址：http://yapi.elinkservice.cn/project/356/interface/api/cat_1370 + * 居民学历分布饼图 + * + * @param orgId + * @param orgType agency/grid + * @return + */ + @Override + public List queryEducationDistribute(String customerId, String staffId, String orgId, String orgType) { + if (StringUtils.isBlank(orgId)) { + orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId(); + orgType = OrgTypeEnum.AGENCY.getCode(); + } + // 获取文化程度字典 + DictListFormDTO dictFormDTO = new DictListFormDTO(); + dictFormDTO.setDictType(DictTypeEnum.EDUCATION.getCode()); + Result> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); + if (!dictResult.success() || CollectionUtils.isEmpty(dictResult.getData())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "学历字典获取失败", "学历字典获取失败"); + } + //按照学历分组，查询居民数量 + List totalList = baseDao.queryEducationDistribute(customerId, orgId, orgType); + Map map = totalList.stream().collect(Collectors.toMap(ResiPortrayalResultDTO::getCode,ResiPortrayalResultDTO::getTotalResi)); + List resultDTOList = new ArrayList<>(); + dictResult.getData().forEach(dict -> { + ResiPortrayalResultDTO resultDTO = new ResiPortrayalResultDTO(); + resultDTO.setCode(dict.getValue()); + resultDTO.setCodeName(dict.getLabel()); + resultDTO.setTotalResi(NumConstant.ZERO); + if(MapUtils.isNotEmpty(map)&&map.containsKey(dict.getValue())){ + resultDTO.setTotalResi(map.get(dict.getValue())); + } + resultDTOList.add(resultDTO); + }); + return resultDTOList; + } + + + } 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 5f1104ddce..07278b80aa 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 @@ -1515,4 +1515,28 @@ + + + + From 0ec1b79de032b95e5c7bf673d94326b7e4e3c544 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Apr 2023 18:33:18 +0800 Subject: [PATCH 132/340] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserExportServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index 8d794ab21b..261687fcbd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -22,10 +22,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.security.dto.TokenDto; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Md5Util; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.utils.SpringContextUtils; +import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.ExcelFillCellMergeStrategy; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; From c59fb318761015129fe25c1fe463adbf236dd7cf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Apr 2023 09:51:41 +0800 Subject: [PATCH 133/340] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E5=B9=B4=E9=BE=84=E5=88=86=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcResiUserController.java | 4 +- .../java/com/epmet/dao/IcResiUserDao.java | 4 ++ .../com/epmet/service/IcResiUserService.java | 4 +- .../service/impl/IcResiUserServiceImpl.java | 48 +++++++++++++++++-- .../main/resources/mapper/IcResiUserDao.xml | 34 ++++++++++++- 5 files changed, 86 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index e0e653a016..b06cd27b4e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1538,8 +1538,8 @@ public class IcResiUserController implements ResultDataResolver { * @return */ @PostMapping("age-distribute") - public Result> queryAgeDistribute(@RequestBody ResiPortrayalCommonFormDTO formDTO) { - return new Result>().ok(icResiUserService.queryAgeDistribute(formDTO.getOrgId(), formDTO.getOrgType())); + public Result> queryAgeDistribute(@LoginUser TokenDto tokenDto,@RequestBody ResiPortrayalCommonFormDTO formDTO) { + return new Result>().ok(icResiUserService.queryAgeDistribute(tokenDto.getCustomerId(),tokenDto.getUserId(),formDTO.getOrgId(), formDTO.getOrgType())); } /** 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 51510944dd..a351127c33 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 @@ -462,4 +462,8 @@ public interface IcResiUserDao extends BaseDao { List queryEducationDistribute(@Param("customerId") String customerId, @Param("orgId") String orgId, @Param("orgType") String orgType); + + List selectAgeAgeDistribute(@Param("customerId") String customerId, + @Param("orgId") String orgId, + @Param("orgType") String orgType); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 86fdc0e0d3..98b9e2acf1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -548,11 +548,13 @@ public interface IcResiUserService extends BaseService { * 接口地址：http://yapi.elinkservice.cn/project/356/interface/api/cat_1370 * 居民年龄分布饼图 * + * @param customerId + * @param staffId * @param orgId * @param orgType * @return */ - List queryAgeDistribute(String orgId, String orgType); + List queryAgeDistribute(String customerId,String staffId,String orgId, String orgType); /** * 烟台需求：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvoz5w4z9f98 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 8ac46dc8d7..b6bd46e8fa 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 @@ -3897,18 +3897,58 @@ public class IcResiUserServiceImpl extends BaseServiceImpl queryAgeDistribute(String orgId, String orgType) { - // todo - + public List queryAgeDistribute(String customerId,String staffId,String orgId, String orgType) { + if (StringUtils.isBlank(orgId)) { + orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId(); + orgType = OrgTypeEnum.AGENCY.getCode(); + } + List resultList=getDefaultAgeDistribute(); + List list=baseDao.selectAgeAgeDistribute(customerId,orgId,orgType); + if(CollectionUtils.isEmpty(list)){ + return resultList; + } + Map resultMap = list.stream().collect(Collectors.toMap(ResiPortrayalResultDTO::getCode,ResiPortrayalResultDTO::getTotalResi)); + resultList.forEach(result->{ + if (MapUtils.isNotEmpty(resultMap) && resultMap.containsKey(result.getCode())) { + result.setTotalResi(resultMap.get(result.getCode())); + } + }); + return resultList; + } - return null; + private List getDefaultAgeDistribute() { + List list = new ArrayList<>(); + for (int code = 0; code <= 4; code++) { + ResiPortrayalResultDTO resultDTO = new ResiPortrayalResultDTO(); + resultDTO.setTotalResi(NumConstant.ZERO); + resultDTO.setCode(String.valueOf(code)); + switch (code) { + case 0: + resultDTO.setCodeName("50岁以下"); + case 1: + resultDTO.setCodeName("50-59岁"); + case 2: + resultDTO.setCodeName("60-69岁"); + case 3: + resultDTO.setCodeName("70-79岁"); + case 4: + resultDTO.setCodeName("80岁以上"); + default: + resultDTO.setCodeName(StrConstant.EPMETY_STR); + } + list.add(resultDTO); + } + return list; } + /** * 烟台需求：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvoz5w4z9f98 * 接口地址：http://yapi.elinkservice.cn/project/356/interface/api/cat_1370 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 07278b80aa..107980a03c 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 @@ -1538,5 +1538,37 @@ r.CULTURE - + + From 221b500a8673d3a44779674f5e17338108a2fbad Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Apr 2023 12:47:44 +0800 Subject: [PATCH 134/340] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/resi/ResiPortrayalCommonFormDTO.java | 14 +++- .../result/resi/ResiPortrayalDetailDTO.java | 51 ++++++++++++ .../controller/IcResiUserController.java | 18 +++++ .../java/com/epmet/dao/IcResiUserDao.java | 15 ++++ .../com/epmet/service/IcResiUserService.java | 16 +++- .../service/impl/IcResiUserServiceImpl.java | 49 ++++++++++++ .../main/resources/mapper/IcResiUserDao.xml | 77 +++++++++++++++++-- 7 files changed, 230 insertions(+), 10 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/resi/ResiPortrayalCommonFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/resi/ResiPortrayalCommonFormDTO.java index 9679258c91..d5f763ceb4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/resi/ResiPortrayalCommonFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/resi/ResiPortrayalCommonFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form.resi; +import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; /** @@ -8,7 +9,7 @@ import lombok.Data; * @Date 2023/4/11 17:03 */ @Data -public class ResiPortrayalCommonFormDTO { +public class ResiPortrayalCommonFormDTO extends PageFormDTO { /** * /gov/org/customeragency/agencygridtree返回的agencyId */ @@ -17,5 +18,16 @@ public class ResiPortrayalCommonFormDTO { * /gov/org/customeragency/agencygridtree返回level=grid时，orgType:grid；其他情况orgType：agency */ private String orgType; + + /** + * 查询居民列表 + * 年龄饼图/学历饼图返回的code + */ + private String code; + /** + * 学历：education + * 年龄：age + */ + private String codeType; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java new file mode 100644 index 0000000000..a2f606cb3a --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java @@ -0,0 +1,51 @@ +package com.epmet.dto.result.resi; + +import lombok.Data; + +/** + * @Description 烟台居民画像，居民列表 + * @Author yzm + * @Date 2023/4/12 10:10 + */ +@Data +public class ResiPortrayalDetailDTO { + /** + * 居民id + */ + private String icResiUserId; + /** + * 姓名 + */ + private String name; + /** + * 手机号 + */ + private String mobile; + /** + * 性别：1男；2女；0未知 + */ + private String gender; + /** + * 性别名称 + */ + private String genderName; + /** + * 身份证 + */ + private String idCard; + /** + * 年龄 + */ + private Integer age; + /** + * 学历key + */ + private String educationCode; + /** + * 学历 + */ + private String educationName; + + private String birthday; +} + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index b06cd27b4e..15c9688fe1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -63,6 +63,7 @@ import com.epmet.dto.form.resi.ResiPortrayalCommonFormDTO; import com.epmet.dto.result.*; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; +import com.epmet.dto.result.resi.ResiPortrayalDetailDTO; import com.epmet.dto.result.resi.ResiPortrayalResultDTO; import com.epmet.enums.IcResiUserTableEnum; import com.epmet.excel.PartyMemberAgeExportExcel; @@ -1555,5 +1556,22 @@ public class IcResiUserController implements ResultDataResolver { return new Result>().ok(icResiUserService.queryEducationDistribute(tokenDto.getCustomerId(),tokenDto.getUserId(),formDTO.getOrgId(), formDTO.getOrgType())); } + /** + * 烟台需求：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvoz5w4z9f98 + * 居民画像，居民列表 + * + * @param tokenDto + * @param formDTO + * @return + */ + @MaskResponse(fieldNames = {"mobile", "idCard"},fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + @PostMapping("portrayal-list") + public Result> queryPortrayalResiList(@LoginUser TokenDto tokenDto, @RequestBody ResiPortrayalCommonFormDTO formDTO) { + return new Result>().ok(icResiUserService.queryPortrayalResiList(tokenDto.getCustomerId(), tokenDto.getUserId(), + formDTO.getPageNo(), formDTO.getPageSize(), + formDTO.getOrgId(), formDTO.getOrgType(), + formDTO.getCodeType(), + formDTO.getCode())); + } } 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 a351127c33..f69b949563 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 @@ -24,6 +24,7 @@ import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.IcVolunteerPolyDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.resi.ResiPortrayalDetailDTO; import com.epmet.dto.result.resi.ResiPortrayalResultDTO; import com.epmet.entity.IcResiUserEntity; import org.apache.ibatis.annotations.MapKey; @@ -466,4 +467,18 @@ public interface IcResiUserDao extends BaseDao { List selectAgeAgeDistribute(@Param("customerId") String customerId, @Param("orgId") String orgId, @Param("orgType") String orgType); + + /** + * @param customerId + * @param orgId + * @param orgType + * @param codeType 学历：education 年龄：age + * @param code + * @return 居民画像，居民列表 + */ + List selectPortrayalResiList(@Param("customerId") String customerId, + @Param("orgId") String orgId, + @Param("orgType") String orgType, + @Param("codeType")String codeType, + @Param("code") String code); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 98b9e2acf1..c43853500a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -28,6 +28,7 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; +import com.epmet.dto.result.resi.ResiPortrayalDetailDTO; import com.epmet.dto.result.resi.ResiPortrayalResultDTO; import com.epmet.entity.IcResiUserEntity; import com.epmet.excel.support.ExportResiUserItemDTO; @@ -554,7 +555,7 @@ public interface IcResiUserService extends BaseService { * @param orgType * @return */ - List queryAgeDistribute(String customerId,String staffId,String orgId, String orgType); + List queryAgeDistribute(String customerId, String staffId, String orgId, String orgType); /** * 烟台需求：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvoz5w4z9f98 @@ -565,5 +566,16 @@ public interface IcResiUserService extends BaseService { * @param orgType agency/grid * @return */ - List queryEducationDistribute(String customerId,String staffId,String orgId, String orgType); + List queryEducationDistribute(String customerId, String staffId, String orgId, String orgType); + + /** + * 烟台需求：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvoz5w4z9f98 + * 居民画像，居民列表 + * + * @return + */ + PageData queryPortrayalResiList(String customerId, String staffId, + Integer pageNo, Integer pageSize, + String orgId, String orgType, + String codeType,String code); } 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 b6bd46e8fa..97867f7508 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 @@ -62,6 +62,7 @@ import com.epmet.dto.result.*; import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; +import com.epmet.dto.result.resi.ResiPortrayalDetailDTO; import com.epmet.dto.result.resi.ResiPortrayalResultDTO; import com.epmet.entity.*; import com.epmet.enums.RenHuConditionEnum; @@ -3932,14 +3933,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl queryPortrayalResiList(String customerId, String staffId, + Integer pageNo, Integer pageSize, + String orgId, String orgType, + String codeType, + String code) { + // 获取文化程度字典 + DictListFormDTO dictFormDTO = new DictListFormDTO(); + dictFormDTO.setDictType(DictTypeEnum.EDUCATION.getCode()); + Result> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); + if (!dictResult.success() || CollectionUtils.isEmpty(dictResult.getData())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "学历字典获取失败", "学历字典获取失败"); + } + Map educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel)); + + if (StringUtils.isBlank(orgId)) { + orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId(); + orgType = OrgTypeEnum.AGENCY.getCode(); + } + PageHelper.startPage(pageNo, pageSize); + List list = baseDao.selectPortrayalResiList(customerId, orgId, orgType,codeType, code); + list.forEach(resi -> { + // 学历名称 + resi.setEducationName(educationMap.get(resi.getEducationCode())); + }); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal(), pageSize); + } + } 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 107980a03c..3ca4f4c8cc 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 @@ -1546,13 +1546,13 @@ from ( SELECT u.ID, - YEAR(NOW())-SUBSTR(u.ID_CARD, 7, 4) as age, + YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) as age, ( - case when YEAR(NOW())-SUBSTR(u.ID_CARD, 7, 4) < 50 then '0' - when YEAR(NOW())-SUBSTR(u.ID_CARD, 7, 4) >=50 and YEAR(NOW())-SUBSTR(u.ID_CARD, 7, 4) <=59 then '1' - when YEAR(NOW())-SUBSTR(u.ID_CARD, 7, 4) >=60 and YEAR(NOW())-SUBSTR(u.ID_CARD, 7, 4) <=69 then '2' - when YEAR(NOW())-SUBSTR(u.ID_CARD, 7, 4) >=70 and YEAR(NOW())-SUBSTR(u.ID_CARD, 7, 4) <=79 then '3' - when YEAR(NOW())-SUBSTR(u.ID_CARD, 7, 4) >=80 then '4' + case when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) < 50 then '0' + when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=50 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) <=59 then '1' + when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=60 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) <=69 then '2' + when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=70 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) <=79 then '3' + when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=80 then '4' end ) as `code` FROM @@ -1560,8 +1560,9 @@ WHERE u.DEL_FLAG = '0' AND u.CUSTOMER_ID = #{customerId} - AND u.ID_CARD IS NOT NULL and u.`STATUS`='0' + and u.BIRTHDAY is not null + and u.BIRTHDAY !='' AND ( u.AGENCY_ID = #{orgId} OR u.PIDS LIKE concat('%',#{orgId},'%') ) @@ -1571,4 +1572,66 @@ )temp group by temp.`code` + + + From 45a7faa6c1a376aae2b6fbe8bbe3770257432c37 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Apr 2023 13:25:44 +0800 Subject: [PATCH 135/340] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E5=88=97=E8=A1=A8daochu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/resi/ResiPortrayalDetailDTO.java | 25 +++++++++- .../controller/IcResiUserController.java | 50 +++++++++++++++++-- 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java index a2f606cb3a..e002b95d5d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java @@ -1,5 +1,8 @@ package com.epmet.dto.result.resi; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; /** @@ -12,40 +15,60 @@ public class ResiPortrayalDetailDTO { /** * 居民id */ + @ExcelIgnore private String icResiUserId; /** * 姓名 */ + @ExcelProperty(value = "姓名") + @ColumnWidth(25) private String name; /** * 手机号 */ + @ExcelProperty(value = "手机号") + @ColumnWidth(25) private String mobile; /** * 性别：1男；2女；0未知 */ + @ExcelIgnore private String gender; /** * 性别名称 */ + @ExcelProperty(value = "性别") + @ColumnWidth(25) private String genderName; /** * 身份证 */ + @ExcelProperty(value = "身份证号") + @ColumnWidth(25) private String idCard; + + @ExcelProperty(value = "出生日期") + @ColumnWidth(25) + private String birthday; + /** * 年龄 */ + @ExcelProperty(value = "年龄") + @ColumnWidth(10) private Integer age; /** * 学历key */ + @ExcelIgnore private String educationCode; /** * 学历 */ + @ExcelProperty(value = "学历") + @ColumnWidth(25) private String educationName; - private String birthday; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 15c9688fe1..68aef04cda 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -466,7 +466,6 @@ public class IcResiUserController implements ResultDataResolver { /** * desc: 导出居民信息 * - * @param customerId * @param tokenDto * @param pageFormDTO * @param response @@ -621,7 +620,6 @@ public class IcResiUserController implements ResultDataResolver { * * @param tokenDto * @param pageFormDTO - * @param response * @return void * @author LiuJanJun * @date 2021/11/19 4:24 下午 @@ -1452,7 +1450,6 @@ public class IcResiUserController implements ResultDataResolver { /** * Desc: 居民首次进入小程序，可以根据输入身份证信息查询在数字社区居民信息中的网格，匹配不成功提示 - * @param tokenDto * @param formDTO * @author zxc * @date 2022/8/5 11:17 @@ -1574,4 +1571,51 @@ public class IcResiUserController implements ResultDataResolver { formDTO.getCode())); } + /** + * 11、导出列表数据 + * + * @param response + * @param formDTO + * @throws Exception + */ + @PostMapping("portrayal-listexport") + public void exportMonitoringEquipment(HttpServletResponse response, + @RequestBody ResiPortrayalCommonFormDTO formDTO) throws Exception { + formDTO.setIsPage(false); + ExcelWriter excelWriter = null; + formDTO.setPageNo(NumConstant.ONE); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + try { + String fileName = "居民画像-居民列表" + DateUtils.format(new Date()) + ".xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), ResiPortrayalDetailDTO.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + // 默认查询本组织及下级 + data = icResiUserService.queryPortrayalResiList(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId(), + formDTO.getPageNo(),formDTO.getPageSize(), + formDTO.getOrgId(),formDTO.getOrgType(), + formDTO.getCodeType(),formDTO.getCode()); + list = data.getList(); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("居民画像-居民列表export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + } From 82db8148f669060094416d291a753ba0062a190c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Apr 2023 14:36:47 +0800 Subject: [PATCH 136/340] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=94=BB=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcResiUserDao.xml | 44 ++++++++----------- 1 file changed, 19 insertions(+), 25 deletions(-) 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 3ca4f4c8cc..aa43c3eea9 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 @@ -125,6 +125,8 @@ + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]} @@ -180,6 +182,8 @@ + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]} @@ -1548,11 +1552,11 @@ u.ID, YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) as age, ( - case when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) < 50 then '0' - when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=50 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) <=59 then '1' - when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=60 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) <=69 then '2' - when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=70 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) <=79 then '3' - when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=80 then '4' + case when u.BIRTHDAY > DATE_SUB(CURDATE(),INTERVAL 50 year) then '0' + when u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 59 year) AND DATE_SUB(CURDATE(),INTERVAL 50 year) then '1' + when u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 69 year) AND DATE_SUB(CURDATE(),INTERVAL 60 year) then '2' + when u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 79 year) AND DATE_SUB(CURDATE(),INTERVAL 70 year) then '3' + when u.BIRTHDAY <= DATE_SUB(CURDATE(),INTERVAL 80 year) then '4' end ) as `code` FROM @@ -1606,30 +1610,20 @@ - - and u.BIRTHDAY is not null - and u.BIRTHDAY !='' - and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) < 50 + + and u.BIRTHDAY > DATE_SUB(CURDATE(),INTERVAL 50 year) - - and u.BIRTHDAY is not null - and u.BIRTHDAY !='' - and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=50 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) <=59 + + and u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 59 year) AND DATE_SUB(CURDATE(),INTERVAL 50 year) - - and u.BIRTHDAY is not null - and u.BIRTHDAY !='' - and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=60 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) <=69 + + and u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 69 year) AND DATE_SUB(CURDATE(),INTERVAL 60 year) - - and u.BIRTHDAY is not null - and u.BIRTHDAY !='' - and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=70 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) <=79 + + and u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 79 year) AND DATE_SUB(CURDATE(),INTERVAL 70 year) - - and u.BIRTHDAY is not null - and u.BIRTHDAY !='' - and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=80 + + and u.BIRTHDAY <= DATE_SUB(CURDATE(),INTERVAL 80 year) order by u.ID asc From d94b5bf94cb5ffcb835d604a667666a2273cfdc4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Apr 2023 15:56:34 +0800 Subject: [PATCH 137/340] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=94=BB=E5=83=8Fdc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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 aa43c3eea9..ec82b7ce45 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 @@ -127,7 +127,12 @@ and ${subCondition.tableName}.${subCondition.columnName} is not null and ${subCondition.tableName}.${subCondition.columnName} !='' - and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]} + + and ${subCondition.tableName}.${subCondition.columnName} >= #{subCondition.columnValue[0]} + + + and ${subCondition.tableName}.${subCondition.columnName} <= #{subCondition.columnValue[1]} + @@ -184,7 +189,12 @@ and ${subCondition.tableName}.${subCondition.columnName} is not null and ${subCondition.tableName}.${subCondition.columnName} !='' - and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]} + + and ${subCondition.tableName}.${subCondition.columnName} >= #{subCondition.columnValue[0]} + + + and ${subCondition.tableName}.${subCondition.columnName} <= #{subCondition.columnValue[1]} + From f44383ff8edbc067ba3b85aba8dd8619990e6bdc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Apr 2023 09:25:33 +0800 Subject: [PATCH 138/340] =?UTF-8?q?/epmetuser/icresiuser/portrayal-list?= =?UTF-8?q?=E8=BF=94=E5=9B=9EgridId=E3=80=81gridName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/resi/ResiPortrayalDetailDTO.java | 9 ++++++++- .../com/epmet/service/impl/IcResiUserServiceImpl.java | 4 ++++ .../src/main/resources/mapper/IcResiUserDao.xml | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java index e002b95d5d..6d7f2b1a63 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java @@ -12,6 +12,14 @@ import lombok.Data; */ @Data public class ResiPortrayalDetailDTO { + + @ExcelIgnore + private String gridId; + + @ExcelProperty(value = "所属网格") + @ColumnWidth(30) + private String gridName; + /** * 居民id */ @@ -69,6 +77,5 @@ public class ResiPortrayalDetailDTO { @ColumnWidth(25) private String educationName; - } 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 97867f7508..dd5b44c54a 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 @@ -4033,6 +4033,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl { // 学历名称 resi.setEducationName(educationMap.get(resi.getEducationCode())); + GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(resi.getGridId()); + if (null != gridInfoCache) { + resi.setGridName(gridInfoCache.getGridNamePath()); + } }); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(), pageSize); 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 ec82b7ce45..ff5f663dc9 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 @@ -1601,7 +1601,8 @@ u.CULTURE AS educationCode, '' AS educationName, IFNULL(u.CULTURE,'')AS educationCode, - u.BIRTHDAY AS birthday + u.BIRTHDAY AS birthday, + u.grid_id as gridId FROM ic_resi_user u WHERE From abb44b810fafcf54f3f77cb27db73058656daf8e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Apr 2023 09:56:35 +0800 Subject: [PATCH 139/340] =?UTF-8?q?/epmetuser/icresiuser/portrayal-list?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=89=80=E5=B1=9E=E5=B0=8F=E5=8C=BA=E3=80=81?= =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E3=80=81=E5=8D=95=E5=85=83=E3=80=81=E9=97=A8?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/resi/ResiPortrayalDetailDTO.java | 44 ++++++++++++++++++- .../service/impl/IcResiUserServiceImpl.java | 39 ++++++++++++---- .../main/resources/mapper/IcResiUserDao.xml | 8 +++- 3 files changed, 79 insertions(+), 12 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java index 6d7f2b1a63..caf44943fe 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java @@ -12,6 +12,11 @@ import lombok.Data; */ @Data public class ResiPortrayalDetailDTO { + /** + * 居民id + */ + @ExcelIgnore + private String icResiUserId; @ExcelIgnore private String gridId; @@ -21,10 +26,45 @@ public class ResiPortrayalDetailDTO { private String gridName; /** - * 居民id + * 所属小区ID */ @ExcelIgnore - private String icResiUserId; + private String villageId; + @ExcelIgnore + private String villageName; + /** + * 所属楼宇Id + */ + @ExcelIgnore + private String buildId; + @ExcelIgnore + private String buildName; + /** + * 单元id + */ + @ExcelIgnore + private String unitId; + @ExcelIgnore + private String unitName; + + /** + * 所属家庭Id + */ + @ExcelIgnore + private String homeId; + + @ExcelProperty(value = "所属房屋") + @ColumnWidth(30) + private String homeName; + + /** + * 所属家庭号 + * 101 + */ + @ExcelIgnore + private String doorName; + + /** * 姓名 */ 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 dd5b44c54a..22e10b0101 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 @@ -4030,14 +4030,37 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectPortrayalResiList(customerId, orgId, orgType,codeType, code); - list.forEach(resi -> { - // 学历名称 - resi.setEducationName(educationMap.get(resi.getEducationCode())); - GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(resi.getGridId()); - if (null != gridInfoCache) { - resi.setGridName(gridInfoCache.getGridNamePath()); - } - }); + if(CollectionUtils.isNotEmpty(list)){ + Set houseIds=list.stream().map(m -> m.getHomeId()).collect(Collectors.toSet()); + //查询房子名称 + Result> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, customerId); + List houseInfoDTOList = houseInfoRes.success() && !CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>(); + Map houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity())); + + list.forEach(resi -> { + // 学历名称 + resi.setEducationName(educationMap.get(resi.getEducationCode())); + GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(resi.getGridId()); + if (null != gridInfoCache) { + resi.setGridName(gridInfoCache.getGridNamePath()); + } + if (houseInfoMap.containsKey(resi.getHomeId()) && null != houseInfoMap.get(resi.getHomeId())) { + HouseInfoDTO houseInfoDTO = houseInfoMap.get(resi.getHomeId()); + String buildName = StringUtils.isNotBlank(houseInfoDTO.getBuildingName()) ? houseInfoDTO.getBuildingName() : StrConstant.EPMETY_STR; + resi.setBuildName(buildName); + + String neighBorName = StringUtils.isNotBlank(houseInfoDTO.getNeighborHoodName()) ? houseInfoDTO.getNeighborHoodName() : StrConstant.EPMETY_STR; + resi.setVillageName(neighBorName); + + String unitName = StringUtils.isNotBlank(houseInfoDTO.getUnitName()) ? houseInfoDTO.getUnitName() : StrConstant.EPMETY_STR; + resi.setUnitName(unitName); + + String doorName = StringUtils.isNotBlank(houseInfoDTO.getDoorName()) ? houseInfoDTO.getDoorName() : StrConstant.EPMETY_STR; + resi.setDoorName(doorName); + resi.setHomeName(neighBorName.concat(buildName).concat(unitName).concat(doorName)); + } + }); + } PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(), pageSize); } 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 ff5f663dc9..b3812ddf38 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 @@ -1591,6 +1591,11 @@ @@ -1601,8 +1605,7 @@ u.ID_CARD AS idCard, u.GENDER AS gender, ( CASE WHEN u.GENDER = '1' THEN '男' WHEN u.GENDER = '2' THEN '女' ELSE '未知' END ) AS genderName, - YEAR ( - NOW())- SUBSTR( u.BIRTHDAY, 1, 4 ) AS age, + YEAR (NOW())- SUBSTR( u.BIRTHDAY, 1, 4 ) AS age, u.CULTURE AS educationCode, '' AS educationName, IFNULL(u.CULTURE,'')AS educationCode, @@ -1626,19 +1629,19 @@ - and u.BIRTHDAY > DATE_SUB(CURDATE(),INTERVAL 50 year) + and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) < 50 - and u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 59 year) AND DATE_SUB(CURDATE(),INTERVAL 50 year) + and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=50 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) <=59 - and u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 69 year) AND DATE_SUB(CURDATE(),INTERVAL 60 year) + and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >= 60 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) <= 69 - and u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 79 year) AND DATE_SUB(CURDATE(),INTERVAL 70 year) + and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=70 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) <=79 - and u.BIRTHDAY <= DATE_SUB(CURDATE(),INTERVAL 80 year) + and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) >=80 order by u.ID asc From 58300a046625b89070e1639bc7978a0b37d3611a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Apr 2023 12:21:03 +0800 Subject: [PATCH 142/340] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4agerange?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcResiUserDao.xml | 62 ++++++++++++++++--- 1 file changed, 54 insertions(+), 8 deletions(-) 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 9b30ddb1a8..f94e97f38a 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 @@ -127,11 +127,34 @@ and ${subCondition.tableName}.${subCondition.columnName} is not null and ${subCondition.tableName}.${subCondition.columnName} !='' - - and ${subCondition.tableName}.${subCondition.columnName} >= #{subCondition.columnValue[0]} + + + and ${subCondition.tableName}.${subCondition.columnName} >= #{subCondition.columnValue[0]} + + + and ${subCondition.tableName}.${subCondition.columnName} <= #{subCondition.columnValue[1]} + - - and ${subCondition.tableName}.${subCondition.columnName} <= #{subCondition.columnValue[1]} + + + and ${subCondition.tableName}.${subCondition.columnName} >= #{subCondition.columnValue[0]} + + + + + + + + and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) >= #{subCondition.columnValue[0]} + + + and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) <= #{subCondition.columnValue[1]} + + + + + and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) >= #{subCondition.columnValue[0]} + @@ -189,11 +212,34 @@ and ${subCondition.tableName}.${subCondition.columnName} is not null and ${subCondition.tableName}.${subCondition.columnName} !='' - - and ${subCondition.tableName}.${subCondition.columnName} >= #{subCondition.columnValue[0]} + + + and ${subCondition.tableName}.${subCondition.columnName} >= #{subCondition.columnValue[0]} + + + and ${subCondition.tableName}.${subCondition.columnName} <= #{subCondition.columnValue[1]} + + + + + and ${subCondition.tableName}.${subCondition.columnName} >= #{subCondition.columnValue[0]} + + + + + + + + and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) >= #{subCondition.columnValue[0]} + + + and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) <= #{subCondition.columnValue[1]} + - - and ${subCondition.tableName}.${subCondition.columnName} <= #{subCondition.columnValue[1]} + + + and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) >= #{subCondition.columnValue[0]} + From 65cc3a319a2cb5c7e49b4f94602830358a88b8aa Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Apr 2023 12:27:59 +0800 Subject: [PATCH 143/340] /gov/org/enterprise/list --- .../src/main/resources/mapper/IcEnterpriseDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml index 029fb23169..235c9e2d70 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml @@ -70,7 +70,9 @@ AND ie.GRID_ID = #{orgId} - AND (ie.AGENCY_ID = #{orgId} or ie.AGENCY_PIDS like concat('%',#{orgId},'%')) + + AND (ie.AGENCY_ID = #{orgId} or ie.AGENCY_PIDS like concat('%',#{orgId},'%')) + AND ( From 40820a8b88163ce59089b9831e0e7ba0bf8cdc7b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Apr 2023 12:41:25 +0800 Subject: [PATCH 144/340] /gov/org/enterprise/list --- .../main/resources/mapper/IcEnterpriseDao.xml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml index 235c9e2d70..af1f9bd464 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml @@ -73,12 +73,20 @@ AND (ie.AGENCY_ID = #{orgId} or ie.AGENCY_PIDS like concat('%',#{orgId},'%')) + + AND ( + ie.AGENCY_ID = #{staffAgencyId} + OR ie.AGENCY_PIDS LIKE concat( '%', #{staffAgencyId}, '%' ) + ) + - AND ( - ie.AGENCY_ID = #{staffAgencyId} - OR ie.AGENCY_PIDS LIKE concat( '%', #{staffAgencyId}, '%' ) - ) + + AND ( + ie.AGENCY_ID = #{staffAgencyId} + OR ie.AGENCY_PIDS LIKE concat( '%', #{staffAgencyId}, '%' ) + ) + AND ie.GRID_ID = #{gridId} From 2709356787267f6e886029484e9dd0befc06c8c3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Apr 2023 12:47:29 +0800 Subject: [PATCH 145/340] /gov/org/enterprise/list --- .../src/main/resources/mapper/IcEnterpriseDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml index af1f9bd464..52945262d5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml @@ -67,7 +67,9 @@ WHERE ie.DEL_FLAG = '0' - AND ie.GRID_ID = #{orgId} + + AND ie.GRID_ID = #{orgId} + From 601d806ce42045da19d371a0a4949e9c00c2162c Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Thu, 13 Apr 2023 15:48:59 +0800 Subject: [PATCH 146/340] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=94=BB=E5=83=8F?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcHouseDao.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 4e90e15af8..97054c2ea5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -817,18 +817,18 @@ where house.DEL_FLAG = '0' and - ORG_ID_PATH like concat(#{orgId},'%') + house.ORG_ID_PATH like concat(#{orgId},'%') - and CREATED_TIME >= #{timeStart} + and house.CREATED_TIME >= #{timeStart} - and CREATED_TIME <= #{timeEnd} + and house.CREATED_TIME <= #{timeEnd} - and PURPOSE = #{purpose} + and house.PURPOSE = #{purpose} - and RENT_FLAG = #{rentFlag} + and house.RENT_FLAG = #{rentFlag} From a72325db6fe261ae7b5eb7056a45dabeea0cd191 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Thu, 13 Apr 2023 16:14:12 +0800 Subject: [PATCH 147/340] =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 97054c2ea5..23027ad996 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -827,7 +827,7 @@ and house.PURPOSE = #{purpose} - + and house.RENT_FLAG = #{rentFlag} From 89b777e13bc88279428d5840417af5bc8325c7d9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Apr 2023 17:32:53 +0800 Subject: [PATCH 148/340] =?UTF-8?q?=E6=8E=92=E9=99=A4=E4=B8=8D=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcResiUserDao.xml | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) 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 f94e97f38a..799138ef77 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 @@ -125,18 +125,22 @@ - and ${subCondition.tableName}.${subCondition.columnName} is not null - and ${subCondition.tableName}.${subCondition.columnName} !='' + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' and ${subCondition.tableName}.${subCondition.columnName} >= #{subCondition.columnValue[0]} + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' and ${subCondition.tableName}.${subCondition.columnName} <= #{subCondition.columnValue[1]} + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' and ${subCondition.tableName}.${subCondition.columnName} >= #{subCondition.columnValue[0]} @@ -145,14 +149,20 @@ + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) >= #{subCondition.columnValue[0]} + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) <= #{subCondition.columnValue[1]} + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) >= #{subCondition.columnValue[0]} @@ -210,18 +220,22 @@ - and ${subCondition.tableName}.${subCondition.columnName} is not null - and ${subCondition.tableName}.${subCondition.columnName} !='' + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' and ${subCondition.tableName}.${subCondition.columnName} >= #{subCondition.columnValue[0]} + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' and ${subCondition.tableName}.${subCondition.columnName} <= #{subCondition.columnValue[1]} + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' and ${subCondition.tableName}.${subCondition.columnName} >= #{subCondition.columnValue[0]} @@ -230,14 +244,20 @@ + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) >= #{subCondition.columnValue[0]} + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) <= #{subCondition.columnValue[1]} + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) >= #{subCondition.columnValue[0]} From d21542e49f8827e7cd56e1cec2fb14d8d59072a4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Apr 2023 17:41:54 +0800 Subject: [PATCH 149/340] agerange:ic_resi_user.BIRTHDAY --- .../main/resources/mapper/IcResiUserDao.xml | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) 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 799138ef77..229652a45f 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 @@ -149,21 +149,21 @@ - and ${subCondition.tableName}.${subCondition.columnName} is not null - and ${subCondition.tableName}.${subCondition.columnName} !='' - and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) >= #{subCondition.columnValue[0]} + and ic_resi_user.BIRTHDAY is not null + and ic_resi_user.BIRTHDAY !='' + and YEAR(NOW())-SUBSTR(ic_resi_user.BIRTHDAY, 1, 4) >= #{subCondition.columnValue[0]} - and ${subCondition.tableName}.${subCondition.columnName} is not null - and ${subCondition.tableName}.${subCondition.columnName} !='' - and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) <= #{subCondition.columnValue[1]} + and ic_resi_user.BIRTHDAY is not null + and ic_resi_user.BIRTHDAY !='' + and YEAR(NOW())-SUBSTR(ic_resi_user.BIRTHDAY, 1, 4) <= #{subCondition.columnValue[1]} - and ${subCondition.tableName}.${subCondition.columnName} is not null - and ${subCondition.tableName}.${subCondition.columnName} !='' - and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) >= #{subCondition.columnValue[0]} + and ic_resi_user.BIRTHDAY is not null + and ic_resi_user.BIRTHDAY !='' + and YEAR(NOW())-SUBSTR(ic_resi_user.BIRTHDAY, 1, 4) >= #{subCondition.columnValue[0]} @@ -244,21 +244,21 @@ - and ${subCondition.tableName}.${subCondition.columnName} is not null - and ${subCondition.tableName}.${subCondition.columnName} !='' - and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) >= #{subCondition.columnValue[0]} + and ic_resi_user.BIRTHDAY is not null + and ic_resi_user.BIRTHDAY !='' + and YEAR(NOW())-SUBSTR(ic_resi_user.BIRTHDAY, 1, 4) >= #{subCondition.columnValue[0]} - and ${subCondition.tableName}.${subCondition.columnName} is not null - and ${subCondition.tableName}.${subCondition.columnName} !='' - and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) <= #{subCondition.columnValue[1]} + and ic_resi_user.BIRTHDAY is not null + and ic_resi_user.BIRTHDAY !='' + and YEAR(NOW())-SUBSTR(ic_resi_user.BIRTHDAY, 1, 4) <= #{subCondition.columnValue[1]} - and ${subCondition.tableName}.${subCondition.columnName} is not null - and ${subCondition.tableName}.${subCondition.columnName} !='' - and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) >= #{subCondition.columnValue[0]} + and ic_resi_user.BIRTHDAY is not null + and ic_resi_user.BIRTHDAY !='' + and YEAR(NOW())-SUBSTR(ic_resi_user.BIRTHDAY, 1, 4) >= #{subCondition.columnValue[0]} From 1350ff99535eadfa3fbe85f8824057232a29afd1 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 14 Apr 2023 10:40:36 +0800 Subject: [PATCH 150/340] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/HouseCountPictureFormDTO.java | 4 + .../main/java/com/epmet/dao/IcHouseDao.java | 6 +- .../service/impl/IcHouseServiceImpl.java | 18 +++- .../src/main/resources/mapper/IcHouseDao.xml | 84 +++++++++++++++++-- 4 files changed, 100 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java index e71cf1dfd6..451c5c6790 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java @@ -16,6 +16,10 @@ public class HouseCountPictureFormDTO implements Serializable { private String orgIdPath; + private String orgId; + + private String orgType; + private Date timeStart; private Date timeEnd; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index f28987ad72..9f76843368 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -220,9 +220,9 @@ public interface IcHouseDao extends BaseDao { */ List selectGroupRentHouseList(GroupRentHouseFormDTO formDTO); - List getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); + List getHousePurposeCount(@Param("orgId") String orgId,@Param("orgType") String orgType, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); - List getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); + List getHouseStatusCount(@Param("orgId") String orgId,@Param("orgType") String orgType, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); - List getHousePictureList(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd,@Param("purpose") String purpose,@Param("rentFlag") Integer rentFlag); + List getHousePictureList(@Param("orgId") String orgId,@Param("orgType") String orgType, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd,@Param("purpose") String purpose,@Param("rentFlag") Integer rentFlag); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 654304466c..c29c3b24e0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -418,7 +418,10 @@ public class IcHouseServiceImpl extends BaseServiceImplresultDTO.setTotal(resultDTO.getTotal()+result.getCount()) @@ -434,7 +437,11 @@ public class IcHouseServiceImpl extends BaseServiceImplresultDTO.setTotal(resultDTO.getTotal()+result.getCount()) @@ -447,7 +454,12 @@ public class IcHouseServiceImpl extends BaseServiceImpl getHousePictureList(HouseCountPictureFormDTO dto) { // 列表/导出查询 PageHelper.startPage(dto.getPageNo(), dto.getPageSize()); - List list = baseDao.getHousePictureList(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd(),dto.getPurpose(),dto.getRentFlag()); + + if (dto.getOrgType().equals("community") || dto.getOrgType().equals("street") ||dto.getOrgType().equals("district") ||dto.getOrgType().equals("city")){ + dto.setOrgType("agency"); + } + + List list = baseDao.getHousePictureList(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd(),dto.getPurpose(),dto.getRentFlag()); list.forEach(entity->{ String[] agencyIds = entity.getOrgIdPath().split(":"); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 23027ad996..b3ae7973eb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -781,8 +781,32 @@ select count(*) as count,PURPOSE as type from ic_house where DEL_FLAG = 0 - and - ORG_ID_PATH like concat(#{orgId},'%') + + + AND neighbor_hood_id IN ( + select a.id from ic_neighbor_hood a + + inner join customer_agency b on a.agency_id = b.id and b.del_flag = '0' + inner join customer_grid c on a.grid_id = c.id and c.del_flag = '0' + where a.del_flag = '0' + and (a.agency_id = #{orgId} OR a.agency_pids LIKE CONCAT('%', #{orgId}, '%')) + ) + + + AND neighbor_hood_id IN ( + select id from ic_neighbor_hood + where del_flag = '0' + and grid_id = #{orgId} + ) + + + AND neighbor_hood_id IN ( + select id from ic_neighbor_hood + where del_flag = '0' + and id = #{orgId} + ) + + and CREATED_TIME >= #{timeStart} @@ -796,8 +820,32 @@ select count(*) as count,RENT_FLAG as type from ic_house where DEL_FLAG = 0 - and - ORG_ID_PATH like concat(#{orgId},'%') + + + AND neighbor_hood_id IN ( + select a.id from ic_neighbor_hood a + + inner join customer_agency b on a.agency_id = b.id and b.del_flag = '0' + inner join customer_grid c on a.grid_id = c.id and c.del_flag = '0' + where a.del_flag = '0' + and (a.agency_id = #{orgId} OR a.agency_pids LIKE CONCAT('%', #{orgId}, '%')) + ) + + + AND neighbor_hood_id IN ( + select id from ic_neighbor_hood + where del_flag = '0' + and grid_id = #{orgId} + ) + + + AND neighbor_hood_id IN ( + select id from ic_neighbor_hood + where del_flag = '0' + and id = #{orgId} + ) + + and CREATED_TIME >= #{timeStart} @@ -816,8 +864,32 @@ left join customer_grid grid on grid.id = hood.GRID_ID where house.DEL_FLAG = '0' - and - house.ORG_ID_PATH like concat(#{orgId},'%') + + + AND neighbor_hood_id IN ( + select a.id from ic_neighbor_hood a + + inner join customer_agency b on a.agency_id = b.id and b.del_flag = '0' + inner join customer_grid c on a.grid_id = c.id and c.del_flag = '0' + where a.del_flag = '0' + and (a.agency_id = #{orgId} OR a.agency_pids LIKE CONCAT('%', #{orgId}, '%')) + ) + + + AND neighbor_hood_id IN ( + select id from ic_neighbor_hood + where del_flag = '0' + and grid_id = #{orgId} + ) + + + AND neighbor_hood_id IN ( + select id from ic_neighbor_hood + where del_flag = '0' + and id = #{orgId} + ) + + and house.CREATED_TIME >= #{timeStart} From 7c5fe9adaa602b26ef367adf0e0bff623ca27028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 14 Apr 2023 11:09:37 +0800 Subject: [PATCH 151/340] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/StaffLoginLogServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index f1a00216b5..af6b191963 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -189,8 +189,8 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl accountActivityInfos = baseDao.selectListActivityInfo(formDTO); - int total = CollectionUtils.isEmpty(accountActivityInfos) ? NumConstant.ZERO : accountActivityInfos.size(); - return new PageData<>(accountActivityInfos, total); + PageInfo pageInfo = new PageInfo<>(accountActivityInfos); + return new PageData<>(accountActivityInfos, pageInfo.getSize()); } List accountActivityInfos = baseDao.selectListActivityInfo(formDTO); int total = CollectionUtils.isEmpty(accountActivityInfos) ? NumConstant.ZERO : accountActivityInfos.size(); From b63c85081092691092735da5f016fb3f3ed0f4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 14 Apr 2023 13:27:06 +0800 Subject: [PATCH 152/340] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/StaffLoginLogServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index af6b191963..52a8522bb4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -190,7 +190,7 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl accountActivityInfos = baseDao.selectListActivityInfo(formDTO); PageInfo pageInfo = new PageInfo<>(accountActivityInfos); - return new PageData<>(accountActivityInfos, pageInfo.getSize()); + return new PageData<>(accountActivityInfos, pageInfo.getSize(),formDTO.getPageSize()); } List accountActivityInfos = baseDao.selectListActivityInfo(formDTO); int total = CollectionUtils.isEmpty(accountActivityInfos) ? NumConstant.ZERO : accountActivityInfos.size(); From 2e6b2d5953c805acc8dc834d94c6af255d9dbb60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 14 Apr 2023 13:38:19 +0800 Subject: [PATCH 153/340] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/StaffLoginLogServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index 52a8522bb4..a47241caf1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -190,7 +190,7 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl accountActivityInfos = baseDao.selectListActivityInfo(formDTO); PageInfo pageInfo = new PageInfo<>(accountActivityInfos); - return new PageData<>(accountActivityInfos, pageInfo.getSize(),formDTO.getPageSize()); + return new PageData<>(accountActivityInfos, pageInfo.getTotal(),formDTO.getPageSize()); } List accountActivityInfos = baseDao.selectListActivityInfo(formDTO); int total = CollectionUtils.isEmpty(accountActivityInfos) ? NumConstant.ZERO : accountActivityInfos.size(); From 62b0b7e44bfc449578b42d44682b47087bfafa93 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Apr 2023 10:14:15 +0800 Subject: [PATCH 154/340] =?UTF-8?q?/resi/mine/personalcenter/initinfo?= =?UTF-8?q?=E8=BF=94=E5=9B=9EgridId,gridName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/mine/dto/result/InitInfoResultDTO.java | 11 +++++++++++ .../service/impl/PersonalCenterServiceImpl.java | 13 +++++++++++++ .../epmet/service/impl/UserBaseInfoServiceImpl.java | 12 +++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java index 36b860a3e9..c55c4d41fb 100644 --- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java @@ -53,4 +53,15 @@ public class InitInfoResultDTO implements Serializable { * 手机号 */ private String mobile; + + /** + * 2023.04.18烟台需求增加 + * 用于完善信息界面展示 + */ + private String gridId; + /** + * 2023.04.18烟台需求增加 + * 用于完善信息界面展示 + */ + private String gridName; } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java index 5c4788f7b7..29f2eecffe 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java @@ -1,6 +1,8 @@ package com.epmet.modules.mine.service.impl; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.EditInfoFormDTO; @@ -11,6 +13,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.modules.mine.service.PersonalCenterService; import com.epmet.resi.mine.dto.result.InitInfoResultDTO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,6 +49,16 @@ public class PersonalCenterServiceImpl implements PersonalCenterService { resultDTO.setIdNum(baseInfoResult.getData().getIdNum()); resultDTO.setMobile(baseInfoResult.getData().getMobile()); resultDTO.setRealName(baseInfoResult.getData().getRealName()); + // start + // 2023.04.18烟台需求增加 + // 用于完善信息界面展示 + resultDTO.setGridId(baseInfoResult.getData().getGridId()); + if (StringUtils.isNotBlank(resultDTO.getGridId())) { + GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(resultDTO.getGridId()); + if (null != gridInfoCache) { + resultDTO.setGridName(gridInfoCache.getGridNamePath()); + } + }// end return resultDTO; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 52930c1242..4cfde975f4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -365,7 +365,17 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl selecUserBaseInfoByUserId(String userId) { - return new Result().ok(baseDao.selecUserBaseInfoByUserId(userId)); + ResiUserBaseInfoResultDTO resultDTO=baseDao.selecUserBaseInfoByUserId(userId); + // start + // 2023.04.18烟台需求增加 + // 用于完善信息界面展示 + if (null != resultDTO) { + RegisterRelationEntity registerRelation = registerRelationDao.selectRegisteredGridIdByUserId(userId); + if (null != registerRelation) { + resultDTO.setGridId(registerRelation.getGridId()); + } + }// end + return new Result().ok(resultDTO); } From d715eeedc2bceaf5414381d503e906713798c48d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Apr 2023 11:03:50 +0800 Subject: [PATCH 155/340] =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcEnterpriseController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java index ab66b5aa4f..7e11a2d995 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java @@ -147,7 +147,7 @@ public class IcEnterpriseController implements ResultDataResolver { formDTO.setPageNo(NumConstant.ONE); formDTO.setPageSize(NumConstant.TEN_THOUSAND); try { - String fileName = "企事业单位" + DateUtils.format(new Date()) + ".xlsx"; + String fileName = "九小场所" + DateUtils.format(new Date()) + ".xlsx"; // 头的策略 WriteCellStyle headWriteCellStyle = new WriteCellStyle(); // 背景设置为红色 From 86e770d7870a80577cb3292539d7c4636173bc6b Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 18 Apr 2023 15:01:09 +0800 Subject: [PATCH 156/340] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=BC=80=E9=80=9A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerAgencyController.java | 6 ++--- .../java/com/epmet/dao/CustomerAgencyDao.java | 6 ++--- .../epmet/service/CustomerAgencyService.java | 4 ++-- .../impl/CustomerAgencyServiceImpl.java | 12 +++++----- .../resources/mapper/CustomerAgencyDao.xml | 22 +++++++++++++++++-- 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index e0d4f9f644..1e0a66ddd8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -535,9 +535,9 @@ public class CustomerAgencyController { * @Author: lichao * @Date: 2023/4/7 14:48 */ - @GetMapping("getAgencyCountList") - public Result> getAgencyCountList(@RequestParam String agencyId){ - return new Result>().ok(customerAgencyService.getAgencyCountList(agencyId)); + @PostMapping("getAgencyCountList") + public Result> getAgencyCountList(@RequestBody CommunityCountCensusFormDTO dto){ + return new Result>().ok(customerAgencyService.getAgencyCountList(dto)); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 5639d33894..1b21c0059c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -434,11 +434,11 @@ public interface CustomerAgencyDao extends BaseDao { */ List getAllCommunity(String customerId); - List agencyCount(@Param("pids") String pids); + List agencyCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); - Integer agencyGridCount(@Param("pids") String pids); + Integer agencyGridCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); - Integer agencyStaffCount(@Param("pids") String pids); + Integer agencyStaffCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); Integer getCommunityCount(@Param("pids")String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index f43de77102..ceac3653a9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -368,10 +368,10 @@ public interface CustomerAgencyService extends BaseService /** * 返回下级数量 - * @param agencyId + * @param dto * @return */ - List getAgencyCountList(String agencyId); + List getAgencyCountList(CommunityCountCensusFormDTO dto); /** * @Description: 获取下级组织的社区数量 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 7a651ecc9a..cfb2dcda25 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1662,29 +1662,29 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl * @Author: lichao * @Date: 2023/4/7 14:17 */ @Override - public List getAgencyCountList(String agencyId) { + public List getAgencyCountList(CommunityCountCensusFormDTO dto) { List agencyCountCensusResultDTOS = new ArrayList<>(); - CustomerAgencyEntity customerAgency = baseDao.selectById(agencyId); + CustomerAgencyEntity customerAgency = baseDao.selectById(dto.getAgencyId()); if (customerAgency != null){ String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids()); - agencyCountCensusResultDTOS = baseDao.agencyCount(pids); + agencyCountCensusResultDTOS = baseDao.agencyCount(pids,dto.getTimeStart(),dto.getTimeEnd()); AgencyCountCensusResultDTO agencyCountCensusResultDTOGrid = new AgencyCountCensusResultDTO(); agencyCountCensusResultDTOGrid.setLevel("grid"); - agencyCountCensusResultDTOGrid.setCount(baseDao.agencyGridCount(pids)); + agencyCountCensusResultDTOGrid.setCount(baseDao.agencyGridCount(pids,dto.getTimeStart(),dto.getTimeEnd())); agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOGrid); AgencyCountCensusResultDTO agencyCountCensusResultDTOStaff = new AgencyCountCensusResultDTO(); agencyCountCensusResultDTOStaff.setLevel("staff"); - agencyCountCensusResultDTOStaff.setCount(baseDao.agencyStaffCount(pids)); + agencyCountCensusResultDTOStaff.setCount(baseDao.agencyStaffCount(pids,dto.getTimeStart(),dto.getTimeEnd())); agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOStaff); }else{ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 7f3f76b2d0..08252c1b5c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -889,6 +889,12 @@ from customer_agency where DEL_FLAG = 0 and PIDS like concat(#{pids},'%') + + and agency.UPDATED_TIME >= #{timeStart} + + + and agency.UPDATED_TIME <= #{timeEnd} + group by level @@ -899,6 +905,12 @@ from customer_grid where DEL_FLAG = 0 and PIDS like concat(#{pids},'%') + + and UPDATED_TIME >= #{timeStart} + + + and UPDATED_TIME <= #{timeEnd} + @@ -911,6 +923,12 @@ and staff.DEL_FLAG = 0 and agency.PIDS like concat(#{pids},'%') + + and agency.UPDATED_TIME >= #{timeStart} + + + and agency.UPDATED_TIME <= #{timeEnd} + @@ -1212,10 +1230,10 @@ and agency.LEVEL = 'community' and agency.PIDS like concat(#{pids},'%') - and agency.CREATED_TIME >= #{timeStart} + and agency.UPDATED_TIME >= #{timeStart} - and agency.CREATED_TIME <= #{timeEnd} + and agency.UPDATED_TIME <= #{timeEnd} + + + + + + \ No newline at end of file From dfb74fedc8d5771faa909069e2e28265b049895e Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 18 Apr 2023 15:14:01 +0800 Subject: [PATCH 158/340] =?UTF-8?q?=E9=95=87=E8=A1=97=E6=95=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerAgencyDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 08252c1b5c..0329a58092 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -890,10 +890,10 @@ where DEL_FLAG = 0 and PIDS like concat(#{pids},'%') - and agency.UPDATED_TIME >= #{timeStart} + and UPDATED_TIME >= #{timeStart} - and agency.UPDATED_TIME <= #{timeEnd} + and UPDATED_TIME <= #{timeEnd} group by level From 24fc1b1af5e26b79b7a0eedab6dabe830c2236b0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Apr 2023 15:20:04 +0800 Subject: [PATCH 159/340] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=94=BB=E5=83=8Forg?= =?UTF-8?q?IdPathlike?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcResiUserDao.java | 7 +++++-- .../service/impl/IcResiUserServiceImpl.java | 18 +++++++++++++++--- .../main/resources/mapper/IcResiUserDao.xml | 6 +++--- 3 files changed, 23 insertions(+), 8 deletions(-) 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 1f78eb3726..a3a2f9d40d 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,11 +464,13 @@ public interface IcResiUserDao extends BaseDao { */ List queryEducationDistribute(@Param("customerId") String customerId, @Param("orgId") String orgId, - @Param("orgType") String orgType); + @Param("orgType") String orgType, + @Param("orgIdPath")String orgIdPath); List selectAgeAgeDistribute(@Param("customerId") String customerId, @Param("orgId") String orgId, - @Param("orgType") String orgType); + @Param("orgType") String orgType, + @Param("orgIdPath")String orgIdPath); /** * @param customerId @@ -481,6 +483,7 @@ public interface IcResiUserDao extends BaseDao { List selectPortrayalResiList(@Param("customerId") String customerId, @Param("orgId") String orgId, @Param("orgType") String orgType, + @Param("orgIdPath") String orgIdPath, @Param("codeType")String codeType, @Param("code") String code); } 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 1c459733ee..7088071b64 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 @@ -3919,8 +3919,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resultList=getDefaultAgeDistribute(); - List list=baseDao.selectAgeAgeDistribute(customerId,orgId,orgType); + List list=baseDao.selectAgeAgeDistribute(customerId,orgId,orgType,orgIdPath); if(CollectionUtils.isEmpty(list)){ return resultList; } @@ -3986,8 +3990,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl totalList = baseDao.queryEducationDistribute(customerId, orgId, orgType); + List totalList = baseDao.queryEducationDistribute(customerId, orgId, orgType,orgIdPath); Map map = totalList.stream().collect(Collectors.toMap(ResiPortrayalResultDTO::getCode,ResiPortrayalResultDTO::getTotalResi)); List resultDTOList = new ArrayList<>(); dictResult.getData().forEach(dict -> { @@ -4037,8 +4045,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectPortrayalResiList(customerId, orgId, orgType,codeType, code); + List list = baseDao.selectPortrayalResiList(customerId, orgId, orgType,orgIdPath,codeType, code); if(CollectionUtils.isNotEmpty(list)){ Set houseIds=list.stream().map(m -> m.getHomeId()).collect(Collectors.toSet()); //查询房子名称 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 229652a45f..5db97e1f5e 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 @@ -1606,7 +1606,7 @@ r.DEL_FLAG = '0' AND r.CUSTOMER_ID = #{customerId} - AND ( r.AGENCY_ID = #{orgId} OR r.PIDS LIKE concat('%',#{orgId},'%') ) + and r.PIDS LIKE concat(#{orgIdPath},'%') and r.GRID_ID = #{orgId} @@ -1647,7 +1647,7 @@ and u.BIRTHDAY is not null and u.BIRTHDAY !='' - AND ( u.AGENCY_ID = #{orgId} OR u.PIDS LIKE concat('%',#{orgId},'%') ) + and u.PIDS LIKE concat(#{orgIdPath},'%') and u.GRID_ID = #{orgId} @@ -1683,7 +1683,7 @@ AND u.CUSTOMER_ID = #{customerId} AND u.`STATUS` = '0' - AND ( u.AGENCY_ID = #{orgId} OR u.PIDS LIKE concat('%',#{orgId},'%') ) + and u.PIDS LIKE concat(#{orgIdPath},'%') and u.GRID_ID = #{orgId} From b35a699620b9b6b2d7d78a57459bb996191cf259 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Apr 2023 15:31:24 +0800 Subject: [PATCH 160/340] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=8F=8A=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E7=99=BB=E5=BD=95=EF=BC=8C=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/yt/CommunityLoginResultDTO.java | 13 +++++ .../controller/StaffLoginLogController.java | 53 +++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityLoginResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityLoginResultDTO.java index e1cb00a765..a8c1e4fb76 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityLoginResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityLoginResultDTO.java @@ -1,5 +1,8 @@ package com.epmet.dto.result.yt; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; /** @@ -12,26 +15,36 @@ public class CommunityLoginResultDTO { /** * 组织id */ + @ExcelIgnore private String agencyId; /** * 组织名称 */ + @ColumnWidth(20) + @ExcelProperty(value = "社区名称") private String agencyName; /** * 组织级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province） */ + @ExcelIgnore private String agencyLevel; /** * 所属街道名称； */ + @ColumnWidth(20) + @ExcelProperty(value = "所属街道") private String streetName; /** * 所属区县名称； */ + @ColumnWidth(20) + @ExcelProperty(value = "所属区县") private String districtName; /** * 登录次数 */ + @ColumnWidth(20) + @ExcelProperty(value = "登录次数") private Integer count; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java index c2967945f7..12bb6d4cb4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java @@ -1,12 +1,21 @@ package com.epmet.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.fastjson.JSON; import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; 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.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.dto.form.yt.CommunityLoginFormDTO; import com.epmet.dto.form.yt.CountActivityFormDTO; import com.epmet.dto.form.yt.LoginLogCountByLevelFormDTO; @@ -16,6 +25,7 @@ import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO; import com.epmet.excel.yt.AccountActivityExcel; import com.epmet.excel.yt.AccountInactivityExcel; import com.epmet.service.StaffLoginLogService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -24,6 +34,8 @@ import org.springframework.web.bind.annotation.RestController; import com.epmet.dto.result.yt.AccountActivityInfo; import javax.servlet.http.HttpServletResponse; +import java.io.PrintWriter; +import java.util.Date; import java.util.List; @@ -33,6 +45,7 @@ import java.util.List; * @author generator generator@elink-cn.com * @since v1.0.0 2023-04-04 */ +@Slf4j @RestController @RequestMapping("staffLoginLog") public class StaffLoginLogController { @@ -62,6 +75,46 @@ public class StaffLoginLogController { return new Result>().ok(staffLoginLogService.pageCommunityCount(formDTO)); } + /** + * 下级社区账号登录次数排名 + * + * @return + */ + @PostMapping("community-count-export") + public void communityCount(HttpServletResponse response, @RequestBody CommunityLoginFormDTO formDTO) throws Exception { + ExcelWriter excelWriter = null; + formDTO.setPageNo(NumConstant.ONE); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + try { + String fileName = "社区级账号登录情况" + DateUtils.format(new Date()) + ".xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), CommunityLoginResultDTO.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + // 默认查询本组织及下级 + data = staffLoginLogService.pageCommunityCount(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), CommunityLoginResultDTO.class); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("社区级账号登录情况export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + /** * 柱状图：下级组织账号登录次数汇总 * From 818722d2f8ca71b8476c30e578ebb49935ceedf1 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 18 Apr 2023 15:48:24 +0800 Subject: [PATCH 161/340] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E3=80=81=E7=BB=84?= =?UTF-8?q?=E7=BB=87=200=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerAgencyController.java | 2 +- .../impl/CustomerAgencyServiceImpl.java | 20 +++++ .../service/impl/IcHouseServiceImpl.java | 85 +++++++++++++++++-- 3 files changed, 100 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 1e0a66ddd8..3d26395c0e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -530,7 +530,7 @@ public class CustomerAgencyController { /** * @Description: 返回下级数量统计 - * @param agencyId: + * @param dto: * @Return com.epmet.commons.tools.utils.Result> * @Author: lichao * @Date: 2023/4/7 14:48 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index cfb2dcda25..42205950d8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1674,9 +1674,16 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl type = new HashMap<>(); String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids()); agencyCountCensusResultDTOS = baseDao.agencyCount(pids,dto.getTimeStart(),dto.getTimeEnd()); + agencyCountCensusResultDTOS.forEach( + agencyCountCensusResultDTO ->{ + type.put(agencyCountCensusResultDTO.getLevel(),agencyCountCensusResultDTO.getLevel()); + } + ); AgencyCountCensusResultDTO agencyCountCensusResultDTOGrid = new AgencyCountCensusResultDTO(); agencyCountCensusResultDTOGrid.setLevel("grid"); agencyCountCensusResultDTOGrid.setCount(baseDao.agencyGridCount(pids,dto.getTimeStart(),dto.getTimeEnd())); @@ -1687,9 +1694,22 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl type = new HashMap<>(); + resultDTO.setTotal(0); if (dto.getOrgType().equals("community") || dto.getOrgType().equals("street") ||dto.getOrgType().equals("district") ||dto.getOrgType().equals("city")){ dto.setOrgType("agency"); } - resultDTO.setList(baseDao.getHousePurposeCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd())); - resultDTO.getList().forEach( - result->resultDTO.setTotal(resultDTO.getTotal()+result.getCount()) - ); + List list = baseDao.getHousePurposeCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd()); + list.forEach( + result->{ + resultDTO.setTotal(resultDTO.getTotal()+result.getCount()); + type.put(result.getType(),result.getType()); + } + ); + HouseCountPictureListResultDTO houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + if (type.get("1") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("1"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("2") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("2"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("3") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("3"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("4") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("4"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("5") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("5"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("6") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("6"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("7") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("7"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + } + resultDTO.setList(list); return resultDTO; } @@ -435,18 +478,48 @@ public class IcHouseServiceImpl extends BaseServiceImpl type = new HashMap<>(); + resultDTO.setTotal(0); if (dto.getOrgType().equals("community") || dto.getOrgType().equals("street") ||dto.getOrgType().equals("district") ||dto.getOrgType().equals("city")){ dto.setOrgType("agency"); } - resultDTO.setList(baseDao.getHouseStatusCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd())); + List list =baseDao.getHouseStatusCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd()); resultDTO.getList().forEach( - result->resultDTO.setTotal(resultDTO.getTotal()+result.getCount()) + result->{ + type.put(result.getType(),result.getType()); + resultDTO.setTotal(resultDTO.getTotal()+result.getCount()); + } + ); + HouseCountPictureListResultDTO houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + if (type.get("1") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("1"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("2") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("2"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("3") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("3"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("0") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("0"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + } + resultDTO.setList(list); + return resultDTO; } From 8eb3267532e1775ca9937ba6e199595da05fc131 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 18 Apr 2023 16:00:47 +0800 Subject: [PATCH 162/340] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CustomerAgencyServiceImpl.java | 3 ++- .../service/impl/IcHouseServiceImpl.java | 27 ++++++++++++------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 42205950d8..4585f7481d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1699,7 +1699,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl Date: Tue, 18 Apr 2023 16:08:08 +0800 Subject: [PATCH 163/340] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcHouseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 02edf85863..9c844639ec 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -494,7 +494,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl list =baseDao.getHouseStatusCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd()); - resultDTO.getList().forEach( + list.forEach( result->{ type.put(result.getType(),result.getType()); resultDTO.setTotal(resultDTO.getTotal()+result.getCount()); From d3e4887835ae011306f451d0dace7c220454bb24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 18 Apr 2023 16:13:01 +0800 Subject: [PATCH 164/340] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/StaffLoginLogController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java index 12bb6d4cb4..c8c7267101 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java @@ -194,11 +194,9 @@ public class StaffLoginLogController { PageData res = staffLoginLogService.getAccountActivityInfo(formDTO); if (!CollectionUtils.isEmpty(res.getList())) { if("1".equals(formDTO.getIsActivity())){ -// List accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountActivityExcel.class); - ExcelUtils.exportExcelToTarget(response, null, res.getList(), AccountActivityExcel.class); + ExcelUtils.exportExcelToTarget(response, "社区活跃数据", res.getList(), AccountActivityExcel.class); }else { -// List accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountInactivityExcel.class); - ExcelUtils.exportExcelToTarget(response, null, res.getList(), AccountInactivityExcel.class); + ExcelUtils.exportExcelToTarget(response, "社区不活跃数据", res.getList(), AccountInactivityExcel.class); } } From a7e0d2e89800080a114ff89def346875e9c3b699 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Apr 2023 16:28:58 +0800 Subject: [PATCH 165/340] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=83=85=E5=86=B5=EF=BC=8C=E5=B7=A6=E4=B8=8B=E8=A7=92=E4=B8=8B?= =?UTF-8?q?=E7=BA=A7=E7=A4=BE=E5=8C=BA=E8=B4=A6=E5=8F=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=E5=B1=95=E7=A4=BA=E5=89=8D10=EF=BC=8C?= =?UTF-8?q?=E4=B8=94=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=AC=A1=E6=95=B00?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/yt/CommunityLoginFormDTO.java | 6 ++++++ .../src/main/java/com/epmet/dao/StaffLoginLogDao.java | 4 +++- .../com/epmet/service/impl/StaffLoginLogServiceImpl.java | 4 ++-- .../src/main/resources/mapper/StaffLoginLogDao.xml | 9 ++++++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java index 5fc00d0691..81b4135d52 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java @@ -37,5 +37,11 @@ public class CommunityLoginFormDTO extends PageFormDTO { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date endDate; + + /** + * exclude_zero:不展示登录次数为0的社区 + * all：全部展示 + */ + private String dataRange; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java index e3f1252b8f..0bd7263a29 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java @@ -27,11 +27,13 @@ public interface StaffLoginLogDao extends BaseDao { * @param orgId * @param startDate * @param endDate + * @param dataRange exclude_zero:不展示登录次数为0的社区 all：全部展示 * @return */ List pageCommunityCount(@Param("orgId") String orgId, @Param("startDate") Date startDate, - @Param("endDate") Date endDate); + @Param("endDate") Date endDate, + @Param("dataRange")String dataRange); List selectCommunityCount(@Param("orgId") String orgId, @Param("startDate") Date startDate, diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index 37e27b83b1..d295661263 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -223,12 +223,12 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate()); + List list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate(),formDTO.getDataRange()); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(), formDTO.getPageSize()); } // 不分页 - List list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate()); + List list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate(),formDTO.getDataRange()); int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size(); return new PageData<>(list, total, total); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index 9eddf595fa..98d0c99cf1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -48,7 +48,14 @@ and l.LOGIN_TIME <= #{endDate} - GROUP BY ca.id + + + GROUP BY ca.id having count( l.id )>0 + + + GROUP BY ca.id + + order by count(l.id) desc,ca.CREATED_TIME desc From c31da6b3515b78af48b8f7c84ea8681aaa2bd14a Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Wed, 19 Apr 2023 10:37:28 +0800 Subject: [PATCH 166/340] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=95=B0=E7=BB=9F?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/CustomerAgencyDao.java | 2 + .../epmet/service/impl/AgencyServiceImpl.java | 9 +- .../resources/mapper/CustomerAgencyDao.xml | 196 +++++++++--------- 3 files changed, 111 insertions(+), 96 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 1b21c0059c..b17ddb6de6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -436,6 +436,8 @@ public interface CustomerAgencyDao extends BaseDao { List agencyCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); + Integer communityCount(@Param("pids") String pids); + Integer agencyGridCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); Integer agencyStaffCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index 31d49852b7..a972cd9797 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -1147,12 +1147,15 @@ public class AgencyServiceImpl implements AgencyService { calendar.set(Calendar.MILLISECOND, 0); Date endTime = calendar.getTime(); - AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); +/* AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); agencyOrgIdPath = getOrgIdPath(agencyInfo.getPids(), agencyInfo.getId()); - List currentUsingCommunityList = customerAgencyDao.getUsingCommunityList(customerId, orgId, agencyOrgIdPath, null); + List currentUsingCommunityList = customerAgencyDao.getUsingCommunityList(customerId, orgId, agencyOrgIdPath, null);*/ // List preferUsingCommunityList = customerAgencyDao.getUsingCommunityList(customerId, orgId, agencyOrgIdPath, endTime); // return new UsingCommunityStatsResultDTO(currentUsingCommunityList.size(), currentUsingCommunityList.size() - preferUsingCommunityList.size()); - return new UsingCommunityStatsResultDTO(currentUsingCommunityList.size(), 0); + CustomerAgencyEntity customerAgency = customerAgencyDao.selectById(orgId); + String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids()); + + return new UsingCommunityStatsResultDTO(customerAgencyDao.communityCount(pids), 0); } else if ("grid".equals(orgType)) { // 网格下不会有该数据，给个0 return new UsingCommunityStatsResultDTO(0, 0); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 0329a58092..8005814843 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -899,6 +899,16 @@ + + - + + + - - - - + (SELECT ca.ID as id, ca.ORGANIZATION_NAME as label, - ca.LONGITUDE as longitude, - ca.LATITUDE as latitude, - ca.`LEVEL` as level, - ca.PID as pId, - 'agency' AS orgType - FROM - customer_agency ca - WHERE - ca.ID = #{agencyId} - AND ca.DEL_FLAG = '0' - - - - - - - + ca.LONGITUDE as longitude, + ca.LATITUDE as latitude, + ca.`LEVEL` as level, + ca.PID as pId, + 'agency' AS orgType + FROM customer_agency ca + WHERE ca.PID = #{agencyId} + AND ca.DEL_FLAG = '0' + ORDER BY CAST(ca.organization_name AS SIGNED), CONVERT(ca.organization_name using gbk)) + union all + (SELECT cg.id, + cg.GRID_NAME AS label, + cg.LONGITUDE, + cg.LATITUDE, + 'grid' AS LEVEL, + cg.PID, + 'grid' AS orgType + FROM customer_grid cg + WHERE cg.DEL_FLAG = '0' + AND cg.PID = #{agencyId} + ORDER BY cg.sort, CAST(cg.GRID_NAME AS SIGNED), CONVERT(cg.GRID_NAME using gbk)) + + + + + SELECT - CONCAT( n.NEIGHBOR_HOOD_NAME, b.BUILDING_NAME ) AS label, - b.id AS buildingId, - b.BUILDING_NAME AS buildingName, - n.id AS neighborhoodId, - n.NEIGHBOR_HOOD_NAME AS neighborhoodName, - n.GRID_ID, - g.GRID_NAME, - a.ALL_PARENT_NAME, - a.ORGANIZATION_NAME AS AGENCY_NAME, - n.CUSTOMER_ID - FROM - ic_building b - LEFT JOIN ic_neighbor_hood n ON b.NEIGHBOR_HOOD_ID = n.id - LEFT JOIN customer_grid g ON n.GRID_ID = g.id - LEFT JOIN customer_agency a ON a.id = g.pid + CONCAT( n.NEIGHBOR_HOOD_NAME, b.BUILDING_NAME ) AS label, + b.id AS buildingId, + b.BUILDING_NAME AS buildingName, + n.id AS neighborhoodId, + n.NEIGHBOR_HOOD_NAME AS neighborhoodName, + n.GRID_ID, + g.GRID_NAME, + a.ALL_PARENT_NAME, + a.ORGANIZATION_NAME AS AGENCY_NAME, + n.CUSTOMER_ID + FROM ic_building b + LEFT JOIN ic_neighbor_hood n + ON b.NEIGHBOR_HOOD_ID = n.id + LEFT JOIN customer_grid g + ON n.GRID_ID = g.id + LEFT JOIN customer_agency a + ON a.id = g.pid WHERE - n.DEL_FLAG = '0' - AND b.DEL_FLAG = '0' - AND g.DEL_FLAG = '0' - AND a.DEL_FLAG = '0' - AND n.CUSTOMER_ID = #{customerId} - - AND n.GRID_ID = #{gridId} - - - AND (n.NEIGHBOR_HOOD_NAME LIKE CONCAT('%', #{buildingName}, '%') OR b.BUILDING_NAME LIKE CONCAT('%', #{buildingName}, '%')) - - - AND ( - n.AGENCY_ID = #{agencyId} - OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%')) - + n.DEL_FLAG = '0' + AND b.DEL_FLAG = '0' + AND g.DEL_FLAG = '0' + AND a.DEL_FLAG = '0' + AND n.CUSTOMER_ID = #{customerId} + + AND n.GRID_ID = #{gridId} + + + AND n.NEIGHBOR_HOOD_NAME LIKE CONCAT('%', #{buildingName}, '%') + + + AND ( + n.AGENCY_ID = #{agencyId} + OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%')) + + order by n.CREATED_TIME asc,n.id asc + + \ No newline at end of file From 1f675bf4c46a6118fbc7de229769065402df8f5e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Apr 2023 12:30:06 +0800 Subject: [PATCH 174/340] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=94=BB=E5=83=8F?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=A6=E5=8E=86sql=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E5=86=99=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserServiceImpl.java | 32 +++++++++---------- .../main/resources/mapper/IcResiUserDao.xml | 12 +++++++ 2 files changed, 28 insertions(+), 16 deletions(-) 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 d87b068e73..1d9b9a8a25 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 @@ -4046,13 +4046,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); - if (!dictResult.success() || CollectionUtils.isEmpty(dictResult.getData())) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "学历字典获取失败", "学历字典获取失败"); - } - Map educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel)); + // DictListFormDTO dictFormDTO = new DictListFormDTO(); + // dictFormDTO.setDictType(DictTypeEnum.EDUCATION.getCode()); + // Result> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); + // if (!dictResult.success() || CollectionUtils.isEmpty(dictResult.getData())) { + // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "学历字典获取失败", "学历字典获取失败"); + // } + // Map educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel)); if (StringUtils.isBlank(orgId)) { orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId(); @@ -4073,7 +4073,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl { // 学历名称 - resi.setEducationName(educationMap.get(resi.getEducationCode())); + // resi.setEducationName(educationMap.get(resi.getEducationCode())); GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(resi.getGridId()); if (null != gridInfoCache) { resi.setGridName(gridInfoCache.getGridNamePath()); @@ -4106,13 +4106,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); if (!dictResult.success() || CollectionUtils.isEmpty(dictResult.getData())) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "学历字典获取失败", "学历字典获取失败"); } - Map educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel)); + Map educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel));*/ if (StringUtils.isBlank(orgId)) { orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId(); @@ -4124,12 +4124,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectPortrayalResiList(customerId, orgId, orgType,orgIdPath,codeType, code); - if(CollectionUtils.isNotEmpty(list)){ - list.forEach(resi -> { - // 学历名称 - resi.setEducationName(educationMap.get(resi.getEducationCode())); - }); - } + // if(CollectionUtils.isNotEmpty(list)){ + // list.forEach(resi -> { + // // 学历名称 + // resi.setEducationName(educationMap.get(resi.getEducationCode())); + // }); + // } PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(), pageSize); } 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 5db97e1f5e..b5e5b604d2 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 @@ -1673,6 +1673,18 @@ ( CASE WHEN u.GENDER = '1' THEN '男' WHEN u.GENDER = '2' THEN '女' ELSE '未知' END ) AS genderName, YEAR (NOW())- SUBSTR( u.BIRTHDAY, 1, 4 ) AS age, u.CULTURE AS educationCode, + ( + case when u.CULTURE='0' then '小学及文盲' + when u.CULTURE='1' then '初中' + when u.CULTURE='2' then '高中' + when u.CULTURE='3' then '大专' + when u.CULTURE='4' then '本科' + when u.CULTURE='5' then '硕士' + when u.CULTURE='6' then '博士' + when u.CULTURE='7' then '中专' + else '' + end + )as educationName, '' AS educationName, IFNULL(u.CULTURE,'')AS educationCode, u.BIRTHDAY AS birthday From cda40ad9d556f7d0b9ad9ef1df9b9b5415af6f78 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Apr 2023 14:03:08 +0800 Subject: [PATCH 175/340] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=8E=8B=E7=AB=A5?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/IcPartyOrgService.java | 8 ++ .../service/impl/IcPartyOrgServiceImpl.java | 24 ++++++ .../controller/IcPartyMemberController.java | 81 ++++++++++--------- .../service/IcPartyMemberService.java | 8 ++ .../impl/IcPartyMemberServiceImpl.java | 13 ++- .../dto/form/IcPartyMemberListFormDTO.java | 11 +++ .../dto/result/PartyMemberAgeResultDTO.java | 9 +++ .../result/PartyMemberEducationResultDTO.java | 7 ++ .../resi/PartymemberPortraitResultDTO.java | 19 +++++ 9 files changed, 139 insertions(+), 41 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java index aa13fbfec8..5764d703d3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java @@ -158,4 +158,12 @@ public interface IcPartyOrgService extends BaseService { */ void editPrincipal(EditPrincipalFormDTO formDTO); + /** + * 获取工作人员所属组织下的党组织 + * @param customerId + * @param staffId + * @return + */ + IcPartyOrgEntity getIcPartyOrg(String customerId,String staffId); + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 0b18281ce5..b13a9b573a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -503,4 +503,28 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl orgWrapper = new LambdaQueryWrapper<>(); + orgWrapper.eq(IcPartyOrgEntity::getCustomerId, customerId); + orgWrapper.eq(IcPartyOrgEntity::getAgencyId, staffInfo.getAgencyId()); + orgWrapper.ne(IcPartyOrgEntity::getPartyOrgType, NumConstant.FIVE_STR); + IcPartyOrgEntity icPartyOrgEntity = baseDao.selectOne(orgWrapper); + if (null == icPartyOrgEntity) { + log.warn("当前工作人员所属组织下，暂无党组织，当前"); + } + return icPartyOrgEntity; + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 7628cfbb82..1965fd546b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -4,21 +4,18 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; 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.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; @@ -33,8 +30,9 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; -import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; +import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; +import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.modules.partymember.excel.IcPartyMemberExcel; import com.epmet.modules.partymember.service.IcPartyMemberService; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; @@ -79,8 +77,10 @@ public class IcPartyMemberController implements ResultDataResolver { @Autowired private IcPartyMemberService icPartyMemberService; + // @Autowired + // private IcPartyOrgDao icPartyOrgDao; @Autowired - private IcPartyOrgDao icPartyOrgDao; + private IcPartyOrgService icPartyOrgService; @RequestMapping("page") @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @@ -230,6 +230,26 @@ public class IcPartyMemberController implements ResultDataResolver { return new Result(); } + + /** + * @describe: 统计分析-党员年龄范围统计 + * @author wangtong + * @date 2022/5/23 10:19 + * @params [formDTO] + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("partymemberagestatistics") + public Result> partyMemberAgeStatistics(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberFormDTO formDTO) { + if(StringUtils.isBlank(formDTO.getOrgId())){ + IcPartyOrgEntity org =icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); + if (null == org) { + return new Result>().ok(new ArrayList<>()); + } + formDTO.setOrgId(org.getId()); + } + return new Result>().ok(icPartyMemberService.partyMemberAgeStatistics(formDTO)); + } + /** * @describe: 统计分析-党员学历统计 * @author wangtong @@ -240,7 +260,7 @@ public class IcPartyMemberController implements ResultDataResolver { @PostMapping("partymembereducationstatistics") public Result> partyMemberEducationStatistics(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ - IcPartyOrgEntity org = setOrgId(tokenDto); + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); if (null == org) { return new Result>().ok(new ArrayList<>()); } @@ -260,7 +280,7 @@ public class IcPartyMemberController implements ResultDataResolver { @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberAgelist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ - IcPartyOrgEntity org = setOrgId(tokenDto); + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); if (null == org) { return new Result>().ok(new PageData<>(Collections.emptyList(), 0)); } @@ -280,7 +300,7 @@ public class IcPartyMemberController implements ResultDataResolver { @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberEducationlist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ - IcPartyOrgEntity org = setOrgId(tokenDto); + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); if (null == org) { return new Result>().ok(new PageData<>(Collections.emptyList(), 0)); } @@ -290,42 +310,23 @@ public class IcPartyMemberController implements ResultDataResolver { } /** - * @describe: 统计分析-党员年龄范围统计 - * @author wangtong - * @date 2022/5/23 10:19 - * @params [formDTO] - * @return com.epmet.commons.tools.utils.Result> - */ - @PostMapping("partymemberagestatistics") - public Result> partyMemberAgeStatistics(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberFormDTO formDTO) { - if(StringUtils.isBlank(formDTO.getOrgId())){ - IcPartyOrgEntity org = setOrgId(tokenDto); + * 烟台党员画像列表接口，将上方两个接口，合为一个 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("partymember-portrait-list") + @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + public Result> queryPartymemberPortraitList(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberListFormDTO formDTO) { + if (StringUtils.isBlank(formDTO.getOrgId())) { + // 当前工作人员所属组织下的，党组织 + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); if (null == org) { - return new Result>().ok(new ArrayList<>()); + return new Result>().ok(new PageData<>(Collections.emptyList(), 0)); } formDTO.setOrgId(org.getId()); } - return new Result>().ok(icPartyMemberService.partyMemberAgeStatistics(formDTO)); - } - - /** - * @describe: 组装党组织信息 - * @author wangtong - * @date 2022/7/8 16:46 - * @params [tokenDto, formDTO] - * @return com.epmet.modules.partyOrg.entity.IcPartyOrgEntity - */ - public IcPartyOrgEntity setOrgId(TokenDto tokenDto){ - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(),tokenDto.getUserId()); - if (null == staffInfo) { - throw new EpmetException("获取工作人员信息失败"); - } - //获取工作人员所属组织同级的党组织 - LambdaQueryWrapper orgWrapper = new LambdaQueryWrapper<>(); - orgWrapper.eq(IcPartyOrgEntity::getCustomerId, tokenDto.getCustomerId()); - orgWrapper.eq(IcPartyOrgEntity::getAgencyId, staffInfo.getAgencyId()); - orgWrapper.ne(IcPartyOrgEntity::getPartyOrgType, NumConstant.FIVE_STR); - return icPartyOrgDao.selectOne(orgWrapper); + return new Result>().ok(icPartyMemberService.queryPartymemberPortraitList(formDTO)); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java index c88113ae6a..a02c753a8c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java @@ -8,6 +8,7 @@ import com.epmet.dto.form.IcPartyMemberFormDTO; import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; +import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO; @@ -150,4 +151,11 @@ public interface IcPartyMemberService extends BaseService { void execAsyncExcelImport(Path filePath, String importTaskId); IcPartyInfoResultDTO partyInfo(TokenDto tokenDto); + + /** + * 烟台管理平台党员画像，列表查询 + * @param formDTO + * @return + */ + PageData queryPartymemberPortraitList(IcPartyMemberListFormDTO formDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index d9d43ea387..db0f496c26 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -32,6 +32,7 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; import com.epmet.dto.result.UploadImgResultDTO; +import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; import com.epmet.feign.*; import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; @@ -734,5 +735,15 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl queryPartymemberPortraitList(IcPartyMemberListFormDTO formDTO) { + // todo + return null; + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcPartyMemberListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcPartyMemberListFormDTO.java index b2dbe3f596..93eea73c4e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcPartyMemberListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcPartyMemberListFormDTO.java @@ -15,9 +15,20 @@ public class IcPartyMemberListFormDTO extends PageFormDTO implements Serializabl private static final long serialVersionUID = -6085134769034337175L; + /** + * 党组织id + */ private String orgId; private String code; private String agencyId; + + /** + * 烟台党员画像列表接口，将上方两个接口，合为一个 + * 年龄：age + * 学历：education + * 如果不传默认查询所有党员 + */ + private String codeType; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java index a700a87a91..baf2e68550 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java @@ -14,7 +14,16 @@ public class PartyMemberAgeResultDTO implements Serializable { private static final long serialVersionUID = 3421162784157903637L; private String userId; private String name; + + private String age; + /** + * 烟台党员画像列表接口，将上方两个接口，合为一个 + * 在这个dto里增加了education + */ + private String education; + + private String mobile; private String icResiUser; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java index f686a1ce43..3df9d895ac 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java @@ -14,6 +14,13 @@ public class PartyMemberEducationResultDTO implements Serializable { private static final long serialVersionUID = -5042362121277863249L; private String userId; private String name; + + /** + * 烟台党员画像列表接口，将上方两个接口，合为一个 + * 在这个dto里增加了age + */ + private String age; + private String education; private String mobile; private String icResiUser; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java new file mode 100644 index 0000000000..6c55a6e8d0 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result.resi; + +import lombok.Data; + +/** + * @Description 烟台管理平台党员画像 + * @Author yzm + * @Date 2023/4/20 13:32 + */ +@Data +public class PartymemberPortraitResultDTO { + private String userId; + private String name; + private String age; + private String education; + private String mobile; + private String icResiUser; +} + From a80f024c3fd2e1e96382470ce040740ca8543345 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Apr 2023 14:06:03 +0800 Subject: [PATCH 176/340] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=85=9A=E5=91=98?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E5=88=97=E8=A1=A8=E8=BF=94=E5=8F=82dto?= =?UTF-8?q?=E5=9B=9E=E5=BD=92=E6=AD=A3=E5=B8=B8=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partymember/result}/PartymemberPortraitResultDTO.java | 2 +- .../modules/partymember/controller/IcPartyMemberController.java | 2 +- .../epmet/modules/partymember/service/IcPartyMemberService.java | 2 +- .../partymember/service/impl/IcPartyMemberServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename {epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi => epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result}/PartymemberPortraitResultDTO.java (84%) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java similarity index 84% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java rename to epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java index 6c55a6e8d0..b66a0adf0a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java @@ -1,4 +1,4 @@ -package com.epmet.dto.result.resi; +package com.epmet.resi.partymember.dto.partymember.result; import lombok.Data; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 1965fd546b..10c6f302f9 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -30,7 +30,7 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; -import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.modules.partymember.excel.IcPartyMemberExcel; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java index a02c753a8c..2fd029d03e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java @@ -8,7 +8,7 @@ import com.epmet.dto.form.IcPartyMemberFormDTO; import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; -import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index db0f496c26..296fbad057 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -32,7 +32,7 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.feign.*; import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; From 79a5c62b625b6e72167d0e9e3df8b5b4b3bdb768 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 20 Apr 2023 14:23:50 +0800 Subject: [PATCH 177/340] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8C=89=E7=85=A7id=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/ImportTaskCommonResultDTO.java | 3 +++ .../com/epmet/controller/ImportTaskController.java | 13 +++++++++++++ .../java/com/epmet/entity/ImportTaskEntity.java | 3 +++ .../java/com/epmet/service/ImportTaskService.java | 2 ++ .../epmet/service/impl/ImportTaskServiceImpl.java | 8 ++++++++ .../src/main/resources/mapper/ImportTaskDao.xml | 2 ++ 6 files changed, 31 insertions(+) diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ImportTaskCommonResultDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ImportTaskCommonResultDTO.java index 9812f1abbc..22264424a2 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ImportTaskCommonResultDTO.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ImportTaskCommonResultDTO.java @@ -40,4 +40,7 @@ public class ImportTaskCommonResultDTO implements Serializable { */ private String resultDescFile; + private Integer successItemsQty; + private Integer failItemsQty; + } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java index d1d43b148b..5519578120 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java @@ -21,6 +21,19 @@ public class ImportTaskController { @Autowired private ImportTaskService importTaskService; + /** + * @description: 通过id查找 + * @param taskId: + * @return + * @author: WangXianZhang + * @date: 2023/4/20 2:17 PM + */ + @RequestMapping("/getById") + public Result getById(@RequestParam("taskId") String taskId) { + ImportTaskCommonResultDTO r = importTaskService.getById(taskId); + return new Result().ok(r); + } + /** * desc:分页获取个人导入记录 * @param tokenDto diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ImportTaskEntity.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ImportTaskEntity.java index 0602a42963..756d5a7937 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ImportTaskEntity.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ImportTaskEntity.java @@ -54,4 +54,7 @@ public class ImportTaskEntity extends BaseEpmetEntity { private String resultDesc; + private Integer successItemsQty; + private Integer failItemsQty; + } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java index bb1acf5c36..74ceb6a3f4 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java @@ -52,4 +52,6 @@ public interface ImportTaskService { * @return */ Boolean processingTaskCheck(String bizType); + + ImportTaskCommonResultDTO getById(String taskId); } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java index f81e4cc949..6d37dab168 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java @@ -121,4 +121,12 @@ public class ImportTaskServiceImpl implements ImportTaskService { return importRecordDao.selectCount(query) > 0; } + + @Override + public ImportTaskCommonResultDTO getById(String taskId) { + ImportTaskEntity task = importRecordDao.selectById(taskId); + ImportTaskCommonResultDTO r = ConvertUtils.sourceToTarget(task, ImportTaskCommonResultDTO.class); + r.setTaskId(taskId); + return r; + } } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml index df58afb615..8c17d0d858 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml @@ -12,6 +12,8 @@ + + From b9605d967d3eda9730634767d6af3875478ac66b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Apr 2023 15:52:31 +0800 Subject: [PATCH 178/340] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=85=9A=E5=91=98?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E5=88=97=E8=A1=A8=EF=BC=8C=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/PartymemberPortraitResultDTO.java | 24 +++- .../controller/IcPartyMemberController.java | 119 +++++++++++++++--- .../partymember/dao/IcPartyMemberDao.java | 5 +- .../service/IcPartyMemberService.java | 2 +- .../impl/IcPartyMemberServiceImpl.java | 64 +++++++--- .../mapper/partymember/IcPartyMemberDao.xml | 54 ++++++-- .../dto/result/PartyMemberAgeResultDTO.java | 1 + .../result/PartyMemberEducationResultDTO.java | 2 +- 8 files changed, 221 insertions(+), 50 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java index b66a0adf0a..9989ef8f5e 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java @@ -1,5 +1,8 @@ package com.epmet.resi.partymember.dto.partymember.result; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; /** @@ -9,11 +12,30 @@ import lombok.Data; */ @Data public class PartymemberPortraitResultDTO { + @ExcelIgnore private String userId; + + @ColumnWidth(15) + @ExcelProperty(value = "姓名",order = 1) private String name; + + @ColumnWidth(20) + @ExcelProperty(value = "手机号",order = 2) + private String mobile; + + @ColumnWidth(20) + @ExcelProperty(value = "证件号",order = 3) + private String idCard; + + @ColumnWidth(15) + @ExcelProperty(value = "年龄",order = 4) private String age; + + @ColumnWidth(15) + @ExcelProperty(value = "学历",order = 5) private String education; - private String mobile; + + @ExcelIgnore private String icResiUser; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 10c6f302f9..0330f3b9d3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -30,7 +30,6 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; -import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.modules.partymember.excel.IcPartyMemberExcel; @@ -39,6 +38,7 @@ import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO; import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO; import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -57,10 +57,7 @@ import java.io.InputStream; import java.io.PrintWriter; import java.net.URLEncoder; import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.UUID; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; @@ -309,24 +306,116 @@ public class IcPartyMemberController implements ResultDataResolver { return new Result>().ok(icPartyMemberService.getPartyMemberEducationList(formDTO)); } + /** * 烟台党员画像列表接口，将上方两个接口，合为一个 - * @param tokenDto * @param formDTO * @return */ @PostMapping("partymember-portrait-list") - @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) - public Result> queryPartymemberPortraitList(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberListFormDTO formDTO) { - if (StringUtils.isBlank(formDTO.getOrgId())) { - // 当前工作人员所属组织下的，党组织 - IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); - if (null == org) { - return new Result>().ok(new PageData<>(Collections.emptyList(), 0)); + @MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD}) + public Result> queryPartyMemberPortraitList(@RequestBody IcPartyMemberListFormDTO formDTO) { + return new Result>().ok(icPartyMemberService.queryPartyMemberPortraitList(formDTO)); + } + + + /** + * 烟台党员画像列表-导出 + * @param formDTO + * @return + */ + @NoRepeatSubmit + @PostMapping("partymember-portrait-export") + public void partymemberPortraitExport(@RequestBody IcPartyMemberListFormDTO formDTO, HttpServletResponse response) throws Exception { + ExcelWriter excelWriter = null; + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + formDTO.setIsPage(true); + String fileName=getPartymemberPortraitFileName(formDTO.getCodeType(),formDTO.getCode()); + try { + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), PartymemberPortraitResultDTO.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icPartyMemberService.queryPartyMemberPortraitList(formDTO); + list = data.getList(); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("党员画像列表导出exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + + /** + * 烟台党员画像列表-导出 + * @return 返回导出excel的文件名 + */ + private String getPartymemberPortraitFileName(String codeType, String code) { + String name = "党员画像"; + if ("age".equals(codeType)) { + switch (code) { + case NumConstant.ZERO_STR: + name = "50岁以下党员信息"; + break; + case NumConstant.ONE_STR: + name = "50-59岁党员信息"; + break; + case NumConstant.TWO_STR: + name = "60-69岁党员信息"; + break; + case NumConstant.THREE_STR: + name = "70-79岁党员信息"; + break; + case NumConstant.FOUR_STR: + name = "80岁以上党员信息"; + break; + default: + name = ""; + break; + } + }else if ("education".equals(codeType)) { + switch (code) { + case NumConstant.ZERO_STR: + name = "小学及文盲党员信息"; + break; + case NumConstant.ONE_STR: + name = "初中学历党员信息"; + break; + case NumConstant.TWO_STR: + name = "高中学历党员信息"; + break; + case NumConstant.THREE_STR: + name = "大专学历党员信息"; + break; + case NumConstant.FOUR_STR: + name = "本科学历党员信息"; + break; + case NumConstant.FIVE_STR: + name = "硕士学历党员信息"; + break; + case NumConstant.SIX_STR: + name = "博士学历党员信息"; + break; + default: + name = "党员画像"; + break; } - formDTO.setOrgId(org.getId()); } - return new Result>().ok(icPartyMemberService.queryPartymemberPortraitList(formDTO)); + String fileName=name+DateUtils.format(new Date()) + ".xlsx"; + return fileName; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java index 0f18a60ac5..740128a912 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java @@ -65,7 +65,10 @@ public interface IcPartyMemberDao extends BaseDao { * @params [orgId, code] * @return java.util.List */ - List getPartyMemberEducationList(@Param("agencyId") String agencyId,@Param("orgId") String orgId,@Param("code") String code); + List getPartyMemberEducationList(@Param("agencyId") String agencyId, + @Param("orgId") String orgId, + @Param("code") String code, + @Param("codeType") String codeType); /** * @describe: 党员年龄范围统计 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java index 2fd029d03e..1ff8c2dece 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java @@ -157,5 +157,5 @@ public interface IcPartyMemberService extends BaseService { * @param formDTO * @return */ - PageData queryPartymemberPortraitList(IcPartyMemberListFormDTO formDTO); + PageData queryPartyMemberPortraitList(IcPartyMemberListFormDTO formDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index 296fbad057..07a405b0a4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -451,7 +451,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl list = baseDao.getPartyMemberAgeList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal()); + return new PageData<>(list, pageInfo.getTotal(),formDTO.getPageSize()); } List list = baseDao.getPartyMemberAgeList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); return new PageData<>(list, null == list?NumConstant.ZERO:list.size()); @@ -461,23 +461,23 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl getPartyMemberEducationList(IcPartyMemberListFormDTO formDTO) { if (formDTO.getIsPage()) { PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); - List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); - Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); + List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode(),"education"); PageInfo pageInfo = new PageInfo<>(list); - if (CollectionUtils.isNotEmpty(list)) { - list.forEach(item -> { - item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); - }); - } - return new PageData<>(list, pageInfo.getTotal()); - } - List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); - Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); - if (CollectionUtils.isNotEmpty(list)) { - list.forEach(item -> { - item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); - }); - } + // Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); + // if (CollectionUtils.isNotEmpty(list)) { + // list.forEach(item -> { + // item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); + // }); + // } + return new PageData<>(list, pageInfo.getTotal(),formDTO.getPageSize()); + } + List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode(),"education"); + // Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); + // if (CollectionUtils.isNotEmpty(list)) { + // list.forEach(item -> { + // item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); + // }); + // } return new PageData<>(list, null == list?NumConstant.ZERO:list.size()); } @@ -742,8 +742,32 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl queryPartymemberPortraitList(IcPartyMemberListFormDTO formDTO) { - // todo - return null; + public PageData queryPartyMemberPortraitList(IcPartyMemberListFormDTO formDTO) { + if (StringUtils.isBlank(formDTO.getOrgId())) { + // 当前工作人员所属组织下的，党组织 + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId()); + if (null == org) { + return new PageData<>(Collections.emptyList(), 0, formDTO.getPageSize()); + } + formDTO.setOrgId(org.getId()); + } + if ("age".equals(formDTO.getCodeType())) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.getPartyMemberAgeList(formDTO.getAgencyId(), formDTO.getOrgId(), formDTO.getCode()); + PageInfo pageInfo = new PageInfo<>(list); + + List resultDTOList = ConvertUtils.sourceToTarget(list, PartymemberPortraitResultDTO.class); + return new PageData<>(resultDTOList, pageInfo.getTotal(), formDTO.getPageSize()); + + } + // else if ("education".equals(formDTO.getCodeType())) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(), formDTO.getOrgId(), formDTO.getCode(),formDTO.getCodeType()); + PageInfo pageInfo = new PageInfo<>(list); + + List resultDTOList = ConvertUtils.sourceToTarget(list, PartymemberPortraitResultDTO.class); + return new PageData<>(resultDTOList, pageInfo.getTotal(), formDTO.getPageSize()); } + + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml index a9d4f8c583..962f962a8b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml @@ -164,7 +164,9 @@ NAME, MOBILE, age, - IC_RESI_USER + IC_RESI_USER, + ID_CARD, + education FROM ( SELECT @@ -172,14 +174,16 @@ NAME, MOBILE, age, - CASE + (CASE WHEN age < 50 THEN '0' WHEN age >= 50 AND age <= 59 THEN '1' WHEN age >= 60 AND age <= 69 THEN '2' WHEN age >= 70 AND age <= 79 THEN '3' ELSE '4' - END AS ageGroup, - IC_RESI_USER + END )AS ageGroup, + IC_RESI_USER, + ID_CARD, + education FROM ( SELECT @@ -187,7 +191,20 @@ NAME, MOBILE, YEAR (FROM_DAYS(DATEDIFF(NOW(),SUBSTRING( ID_CARD, 7, 8 )))) AS age, - IC_RESI_USER + IC_RESI_USER, + ID_CARD, + ( + case when CULTURE='0' then '小学及文盲' + when CULTURE='1' then '初中' + when CULTURE='2' then '高中' + when CULTURE='3' then '大专' + when CULTURE='4' then '本科' + when CULTURE='5' then '硕士' + when CULTURE='6' then '博士' + when CULTURE='7' then '中专' + else '' + end + )as education FROM ic_party_member WHERE @@ -205,22 +222,37 @@ WHERE ageGroup = #{code} - ORDER BY CONVERT(NAME USING GBK) ASC + ORDER BY ID ASC + select + distinct om.ID as messageId, + om.PUBLISH_DITCH as publishDitch, + om.CONTENT as content, + om.PUBLISH_TIME as publishTime, + om.PUBLISH_STAFF_ID as publishStaffId, + om.PUBLISH_ORG_ID as publishStaffName, + om.PUBLISH_ORG_ID_PATH as publishOrgIdPath, + OM.PUBLISH_ORG_NAME as publishOrgName, + GROUP_CONCAT(r.ORG_NAME) as publishRangeName + from organization_message om + left join organization_message_publish_range r + on(om.id=r.MESSAGE_ID and r.del_flag='0') + where om.DEL_FLAG='0' + and om.CUSTOMER_ID =#{customerId} + + and om.PUBLISH_ORG_ID_PATH like concat(#{staffOrgIdPath},'%') + + + and om.PUBLISH_DITCH =#{publishDitch} + + + and r.ORG_ID =#{orgId} + + + AND DATE_FORMAT(om.PUBLISH_TIME,'%Y-%m-%d') >= #{startDate} + + + AND DATE_FORMAT(om.PUBLISH_TIME,'%Y-%m-%d') #{endDate} + + + and om.id =#{messageId} + + order by om.PUBLISH_TIME desc + \ 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 192/340] =?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 193/340] 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 194/340] /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 195/340] 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 Date: Sat, 6 May 2023 10:52:52 +0800 Subject: [PATCH 196/340] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=83=9F=E5=8F=B0=E9=9C=80=E6=B1=82=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/AddStaffV2FromDTO.java | 34 +++++++++++++++++++ .../epmet/dto/form/StaffSubmitFromDTO.java | 33 ++++++++++++++++++ .../java/com/epmet/dto/CustomerStaffDTO.java | 25 ++++++++++++++ .../com/epmet/entity/CustomerStaffEntity.java | 28 +++++++++++++++ .../impl/CustomerStaffServiceImpl.java | 24 +++++++++++++ 5 files changed, 144 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java index 7bc3b93076..4250c5ca61 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java @@ -78,4 +78,38 @@ public class AddStaffV2FromDTO implements Serializable { * 烟台用：当前登录用户 */ private String currentUserId; + + /** + * 烟台需求：党组织职务 + */ + private String partyPosition; + + /** + * 烟台需求：村居委员职务 + */ + private String viliagePosition; + + /** + * 烟台需求：工作职责 + */ + private String duty; + + /** + * 烟台需求：备注 + */ + private String remark; + /** + * 文化程度 + */ + private String culture; + /** + * 身份证 + */ + private String idCard; + + /** + * 居住地址 + */ + private String address; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java index f39bde7aab..a3ecf0f06f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java @@ -74,4 +74,37 @@ public class StaffSubmitFromDTO implements Serializable { * 社会自组织: community_org */ private String deptType; + + /** + * 烟台需求：党组织职务 + */ + private String partyPosition; + + /** + * 烟台需求：村居委员职务 + */ + private String viliagePosition; + + /** + * 烟台需求：工作职责 + */ + private String duty; + + /** + * 烟台需求：备注 + */ + private String remark; + /** + * 文化程度 + */ + private String culture; + /** + * 身份证 + */ + private String idCard; + + /** + * 居住地址 + */ + private String address; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java index cd042877ab..fddf4fc83d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java @@ -150,4 +150,29 @@ public class CustomerStaffDTO implements Serializable { */ private String idCard; + /** + * 烟台需求：党组织职务 + */ + private String partyPosition; + + /** + * 烟台需求：村居委员职务 + */ + private String viliagePosition; + + /** + * 烟台需求：工作职责 + */ + private String duty; + + /** + * 烟台需求：备注 + */ + private String remark; + /** + * 文化程度 + */ + private String culture; + + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java index aa19464f9e..3d26a85c76 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java @@ -111,4 +111,32 @@ public class CustomerStaffEntity extends BaseEpmetEntity { * 身份证号 */ private String idCard; + + + /** + * 烟台需求：党组织职务 + */ + private String partyPosition; + + /** + * 烟台需求：村居委员职务 + */ + private String viliagePosition; + + /** + * 烟台需求：工作职责 + */ + private String duty; + + /** + * 烟台需求：备注 + */ + private String remark; + /** + * 文化程度 + */ + private String culture; + + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 1ff4560c99..0212da4168 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -370,6 +370,30 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl Date: Sat, 6 May 2023 11:02:07 +0800 Subject: [PATCH 197/340] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/CustomerStaffDTO.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java index 32f05ca6e6..ce231a91f4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java @@ -149,7 +149,6 @@ public class CustomerStaffDTO implements Serializable { * 身份证号 */ private String idCard; - private String culture; private Date birthday; /** From 52c573be1847ed0815d992568ee854d90b03b0e0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 13:04:35 +0800 Subject: [PATCH 198/340] =?UTF-8?q?ic=5Fproperty=5Fmanagement=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=81=94=E7=B3=BB=E4=BA=BA=EF=BC=8C=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/IcPropertyManagementDTO.java | 10 ++++++++ .../dto/form/IcPropertyManagementFormDTO.java | 12 +++++++++ .../PropertyManagementController.java | 15 +++++++++-- .../entity/IcPropertyManagementEntity.java | 9 +++++++ .../impl/PropertyManagementServiceImpl.java | 25 ++++++++++++++++--- 5 files changed, 66 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java index a276e36387..171cbeb01c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java @@ -48,6 +48,16 @@ public class IcPropertyManagementDTO implements Serializable { */ private String customerId; + /** + * 烟台需求：物业联系人姓名 + */ + private String contactName; + + /** + * 烟台需求：物业联系人电话 + */ + private String contactMobile; + /** * 删除标识 0未删除、1已删除 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java index bbc2cd7152..220a2b7488 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java @@ -52,6 +52,18 @@ public class IcPropertyManagementFormDTO implements Serializable { @Length(max = 50, message = "物业名称不能超过50个字", groups = {AddShowGroup.class}) private String name; + /** + * 烟台需求：物业联系人姓名 + */ + @Length(max = 30, message = "物业联系人不能超过30个字", groups = {AddShowGroup.class, UpdateShowGroup.class}) + private String contactName; + + /** + * 烟台需求：物业联系人电话 + */ + @Length(max = 30, message = "联系电话不能超过30个字",groups = {AddShowGroup.class, UpdateShowGroup.class}) + private String contactMobile; + private String customerId; @NotNull(message = "pageNo不能为空", groups = PageGroup.class) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index ba24389143..047a98d802 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -49,8 +49,9 @@ public class PropertyManagementController { @Autowired private PropertyManagementService propertyManagementService; + /** - * 分页查询物业列表 + * 物业管理-分页查询物业列表 */ @PostMapping("page") public Result> page(@RequestBody IcPropertyManagementFormDTO formDTO){ @@ -68,7 +69,7 @@ public class PropertyManagementController { } /** - * 新增物业 + * 物业管理-新增物业 * 新增小区页面，添加小区也调用此接口 * @param tokenDTO * @param formDTO @@ -84,6 +85,11 @@ public class PropertyManagementController { return new Result().ok(map); } + /** + * 物业管理-修改 + * @param formDTO + * @return + */ @PostMapping("update") public Result update(@RequestBody IcPropertyManagementFormDTO formDTO){ //效验数据 @@ -92,6 +98,11 @@ public class PropertyManagementController { return new Result(); } + /** + * 物业管理-删除 + * @param formDTO + * @return + */ @PostMapping("delete") public Result delete(@RequestBody IcPropertyManagementFormDTO formDTO){ //效验数据 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java index 239fce61cc..c0ea9df16d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java @@ -40,4 +40,13 @@ public class IcPropertyManagementEntity extends BaseEpmetEntity { */ private String name; private String customerId; + /** + * 烟台需求：物业联系人姓名 + */ + private String contactName; + + /** + * 烟台需求：物业联系人电话 + */ + private String contactMobile; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 41d2f7bfbc..cb782f36d7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -1,6 +1,7 @@ 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.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; @@ -22,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Date; import java.util.List; @Slf4j @@ -73,6 +75,10 @@ public class PropertyManagementServiceImpl implements PropertyManagementService return icPropertyManagementEntity.getId(); } + /** + * 物业管理-修改 + * @param formDTO + */ @Override @Transactional(rollbackFor = Exception.class) public void update(IcPropertyManagementFormDTO formDTO) { @@ -80,8 +86,14 @@ public class PropertyManagementServiceImpl implements PropertyManagementService if (null != entity) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"物业名称已存在","物业名称已存在"); } - IcPropertyManagementEntity icPropertyManagementEntity = ConvertUtils.sourceToTarget(formDTO, IcPropertyManagementEntity.class); - icPropertyManagementDao.updateById(icPropertyManagementEntity); + LambdaUpdateWrapper updateWrapper=new LambdaUpdateWrapper<>(); + updateWrapper.eq(IcPropertyManagementEntity::getId,formDTO.getId()) + .set(IcPropertyManagementEntity::getName,formDTO.getName()) + .set(IcPropertyManagementEntity::getContactName,formDTO.getContactName()) + .set(IcPropertyManagementEntity::getContactMobile,formDTO.getContactMobile()) + .set(IcPropertyManagementEntity::getUpdatedTime,new Date()) + .set(IcPropertyManagementEntity::getUpdatedBy,EpmetRequestHolder.getLoginUserId()); + icPropertyManagementDao.update(null,updateWrapper); } /** @@ -99,11 +111,18 @@ public class PropertyManagementServiceImpl implements PropertyManagementService icPropertyManagementDao.deleteById(formDTO.getId()); } + /** + * 物业管理-列表查询 + * @param pageNo + * @param pageSize + * @param name + * @return + */ @Override public PageData page(Integer pageNo, Integer pageSize, String name) { PageHelper.startPage(pageNo,pageSize); List list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name); PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal()); + return new PageData<>(list, pageInfo.getTotal(),pageSize); } } From 8ae98006d230d3f8c95b33e9cd18aa468629d632 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sat, 6 May 2023 13:27:12 +0800 Subject: [PATCH 199/340] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/epmetuser/CustomerStaffDTO.java | 35 +++++++++++++++++ .../dto/govorg/form/StaffDetailV2FormDTO.java | 39 +++++++++++++++++++ .../epmet/dto/result/StaffInitResultDTO.java | 29 ++++++++++++++ .../impl/CustomerStaffServiceImpl.java | 13 +++++++ 4 files changed, 116 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java index dec7a89cc7..61df5ba791 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java @@ -134,4 +134,39 @@ public class CustomerStaffDTO implements Serializable { */ private String password; + /** + * 烟台用：当前登录用户 + */ + private String currentUserId; + + /** + * 烟台需求：党组织职务 + */ + private String partyPosition; + + /** + * 烟台需求：村居委员职务 + */ + private String viliagePosition; + + /** + * 烟台需求：工作职责 + */ + private String duty; + + /** + * 烟台需求：备注 + */ + private String remark; + /** + * 文化程度 + */ + private String culture; + /** + * 身份证 + */ + private String idCard; + + + } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java index ea1763af18..5e75cbdeab 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java @@ -48,4 +48,43 @@ public class StaffDetailV2FormDTO implements Serializable { private List szsqRoles; private String customerId; + /** + * 烟台用：当前登录用户 + */ + private String currentUserId; + + /** + * 烟台需求：党组织职务 + */ + private String partyPosition; + + /** + * 烟台需求：村居委员职务 + */ + private String viliagePosition; + + /** + * 烟台需求：工作职责 + */ + private String duty; + + /** + * 烟台需求：备注 + */ + private String remark; + /** + * 文化程度 + */ + private String culture; + /** + * 身份证 + */ + private String idCard; + + /** + * 居住地址 + */ + private String address; + + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java index 87b641b564..90e325a2f1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java @@ -55,4 +55,33 @@ public class StaffInitResultDTO implements Serializable { * xxx-xxx */ private String agencyName; + + + /** + * 烟台需求：党组织职务 + */ + private String partyPosition; + + /** + * 烟台需求：村居委员职务 + */ + private String viliagePosition; + + /** + * 烟台需求：工作职责 + */ + private String duty; + + /** + * 烟台需求：备注 + */ + private String remark; + /** + * 文化程度 + */ + private String culture; + + private String address; + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 0212da4168..8f308d06ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -304,6 +304,12 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl Date: Sat, 6 May 2023 13:29:43 +0800 Subject: [PATCH 200/340] =?UTF-8?q?gov/org/propertymanagement/page?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=81=94=E7=B3=BB=E4=BA=BA=EF=BC=8C=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/PropertyManagementController.java | 3 ++- .../main/java/com/epmet/dao/IcPropertyManagementDao.java | 5 ++++- .../java/com/epmet/service/PropertyManagementService.java | 2 +- .../epmet/service/impl/PropertyManagementServiceImpl.java | 2 +- .../src/main/resources/mapper/IcPropertyManagementDao.xml | 6 ++++++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index 047a98d802..d65ba66296 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -56,7 +56,8 @@ public class PropertyManagementController { @PostMapping("page") public Result> page(@RequestBody IcPropertyManagementFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO,IcPropertyManagementFormDTO.PageGroup.class); - return new Result>().ok(propertyManagementService.page(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getName())); + return new Result>().ok(propertyManagementService.page(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getName(), + formDTO.getContactName(),formDTO.getContactMobile())); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java index 915b2f6d7d..69124d0459 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java @@ -59,5 +59,8 @@ public interface IcPropertyManagementDao extends BaseDao selectPropertyNameList(String neighborhoodId); - List queryList(@Param("customerId") String customerId,@Param("name")String name); + List queryList(@Param("customerId") String customerId, + @Param("name")String name, + @Param("contactName") String contactName, + @Param("contactMobile") String contactMobile); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java index f3f77cde27..cae9715bd1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java @@ -39,5 +39,5 @@ public interface PropertyManagementService { void update(IcPropertyManagementFormDTO formDTO); void delete(IcPropertyManagementFormDTO formDTO); - PageData page(Integer pageNo, Integer pageSize, String name); + PageData page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index cb782f36d7..643cdbacb9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -119,7 +119,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService * @return */ @Override - public PageData page(Integer pageNo, Integer pageSize, String name) { + public PageData page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile) { PageHelper.startPage(pageNo,pageSize); List list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name); PageInfo pageInfo = new PageInfo<>(list); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml index 045514482f..2035e53020 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml @@ -80,6 +80,12 @@ and m.name like concat('%',#{name},'%') + + and m.CONTACT_NAME like concat('%',#{contactName},'%') + + + and m.CONTACT_MOBILE like concat('%',#{contactMobile},'%') + order by m.CREATED_TIME desc \ No newline at end of file From 31fee9c480500ecdbc4aa1ca3e9ee3e4d88f9210 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sat, 6 May 2023 14:26:36 +0800 Subject: [PATCH 201/340] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E7=BB=84=E7=BB=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/AddAgencyV2FormDTO.java | 26 ++++++++++++++++++ .../epmet/entity/CustomerAgencyEntity.java | 27 +++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java index 63bf3c6e55..1427330c53 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java @@ -124,4 +124,30 @@ public class AddAgencyV2FormDTO implements Serializable { */ @Length(max = 500,message ="最多输入500字",groups =DefaultUserShowGroup.class ) private String remark; + + /** + * 村居/社区书记姓名 + */ + private String secretaryName; + /** + * 村居/社区书记电话 + */ + private String secretaryMobile; + /** + * 值班电话 + */ + private String dutyMobile; + /** + * 统一社会信用代码 + */ + private String unifiedSocialCreditCode; + /** + * 统一社会信用代码证书（图片附件） + */ + private String unifiedSocialCreditCodeCertificate; + + /** + * 详细地址 + */ + private String fullAddress; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java index a2668ae5fd..236a8c3181 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java @@ -149,4 +149,31 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { */ private String remark; + + /** + * 村居/社区书记姓名 + */ + private String secretaryName; + /** + * 村居/社区书记电话 + */ + private String secretaryMobile; + /** + * 值班电话 + */ + private String dutyMobile; + /** + * 统一社会信用代码 + */ + private String unifiedSocialCreditCode; + /** + * 统一社会信用代码证书（图片附件） + */ + private String unifiedSocialCreditCodeCertificate; + + /** + * 详细地址 + */ + private String fullAddress; + } From 2a2511d3e12135455b23fe6d2d7c5f9181b39d8f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 14:33:08 +0800 Subject: [PATCH 202/340] =?UTF-8?q?gov/org/propertymanagement/page?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=81=94=E7=B3=BB=E4=BA=BA=EF=BC=8C=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/PropertyManagementServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 643cdbacb9..e816556e07 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -121,7 +121,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService @Override public PageData page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile) { PageHelper.startPage(pageNo,pageSize); - List list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name); + List list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name,contactName,contactMobile); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(),pageSize); } From 0efcc3578f48c3b0e8221af89475eb5a275598d5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 14:58:57 +0800 Subject: [PATCH 203/340] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../CommunityBuildingManagerPageFormDTO.java | 80 ++++++++++ .../result/CommunityBuildingManagerDTO.java | 110 +++++++++++++ .../yt/CommunityBuildingManagerResultDTO.java | 102 +++++++++++++ .../CommunityBuildingManagerController.java | 111 ++++++++++++++ .../dao/CommunityBuildingManagerDao.java | 50 ++++++ .../CommunityBuildingManagerEntity.java | 86 +++++++++++ .../CommunityBuildingManagerService.java | 66 ++++++++ .../CommunityBuildingManagerServiceImpl.java | 144 ++++++++++++++++++ .../mapper/CommunityBuildingManagerDao.xml | 94 ++++++++++++ 10 files changed, 844 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityBuildingManagerPageFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CommunityBuildingManagerDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml diff --git a/epmet-cloud-generator/src/main/resources/application.yml b/epmet-cloud-generator/src/main/resources/application.yml index 86b39b69c8..186ba27276 100644 --- a/epmet-cloud-generator/src/main/resources/application.yml +++ b/epmet-cloud-generator/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://118.190.150.119:43306/epmet_gov_org?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://192.168.1.140:3306/epmet_gov_org?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: root password: root #oracle配置 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityBuildingManagerPageFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityBuildingManagerPageFormDTO.java new file mode 100644 index 0000000000..f4fd8bbbda --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityBuildingManagerPageFormDTO.java @@ -0,0 +1,80 @@ +package com.epmet.dto.form.yt; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/6 13:53 + */ +@Data +public class CommunityBuildingManagerPageFormDTO extends PageFormDTO { + // start + private String customerId; + private String staffId; + /** + * 工作人员所属组织的org_id_path + * 列表数据应查询本组织及下级 + * 网格的全路径，包含网格id + */ + private String orgIdPath; + // end + + + /** + * 姓名 + */ + private String name; + + /** + * 联系电话 + */ + private String phone; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 类型：0楼长；1单元长 + */ + private String type; + + /** + * 所属区县id；取名字关联customer_agency + */ + private String districtId; + + /** + * 所属街道id；取名字关联customer_agency + */ + private String streetId; + + /** + * 所属社区id；取名字关联customer_agency + */ + private String communityId; + + /** + * 所属网格id；取名字关联customer_grid + */ + private String gridId; + + /** + * 所属小区id + */ + private String viliageId; + + /** + * 所属楼栋id + */ + private String buildingId; + + /** + * 所属单元id; 单元长时必填此列 + */ + private String unitId; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java new file mode 100644 index 0000000000..062fe0b7b7 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java @@ -0,0 +1,110 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +/** + * 楼长单元长信息表（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-06 + */ +@Data +public class CommunityBuildingManagerDTO implements Serializable { + + private static final long serialVersionUID = -2526419541953300212L; + public interface AddShowGroup extends CustomerClientShowGroup { + } + + public interface UpdateShowGroup extends CustomerClientShowGroup { + } + /** + * 主键（烟台需求） + */ + @NotBlank(message ="id不能为空" ,groups = {UpdateShowGroup.class}) + private String id; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 姓名 + */ + @Length(max = 50,message = "姓名最多输入50字",groups = {AddShowGroup.class,UpdateShowGroup.class}) + @NotBlank(message ="姓名不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String name; + + /** + * 联系电话 + */ + @Length(max = 50,message = "联系电话最多输入50字",groups = {AddShowGroup.class,UpdateShowGroup.class}) + @NotBlank(message ="联系电话不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String phone; + + /** + * 身份证号 + */ + @Length(max = 50,message = "身份证号最多输入50字",groups = {AddShowGroup.class,UpdateShowGroup.class}) + @NotBlank(message ="身份证号不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String idCard; + + /** + * 类型：0楼长；1单元长 + */ + @NotBlank(message ="类型不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String type; + + /** + * 所属区县id；取名字关联customer_agency + */ + @NotBlank(message ="所属区县不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String districtId; + + /** + * 所属街道id；取名字关联customer_agency + */ + @NotBlank(message ="所属街道不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String streetId; + + /** + * 所属社区id；取名字关联customer_agency + */ + @NotBlank(message ="所属社区不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String communityId; + + /** + * 所属网格id；取名字关联customer_grid + */ + @NotBlank(message ="所属网格不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String gridId; + + /** + * 网格的全路径，包含网格id + */ + private String orgIdPath; + + /** + * 所属小区id + */ + @NotBlank(message ="所属小区不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String viliageId; + + /** + * 所属楼栋id + */ + @NotBlank(message ="楼栋不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String buildingId; + + /** + * 所属单元id; 单元长时必填此列 + */ + private String unitId; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java new file mode 100644 index 0000000000..1d2df38f08 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java @@ -0,0 +1,102 @@ +package com.epmet.dto.result.yt; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 楼长单元长信息表（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-06 + */ +@Data +public class CommunityBuildingManagerResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键（烟台需求） + */ + private String id; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 姓名 + */ + private String name; + + /** + * 联系电话 + */ + private String phone; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 类型：0楼长；1单元长 + */ + private String type; + + /** + * 所属区县id；取名字关联customer_agency + */ + private String districtId; + private String districtName; + /** + * 所属街道id；取名字关联customer_agency + */ + private String streetId; + private String streetName; + + /** + * 所属社区id；取名字关联customer_agency + */ + private String communityId; + private String communityName; + + /** + * 所属网格id；取名字关联customer_grid + */ + private String gridId; + private String gridName; + + /** + * 网格的全路径，包含网格id + */ + private String orgIdPath; + + /** + * 所属小区id + */ + private String viliageId; + /** + * 所属小区id + */ + private String viliageName; + + /** + * 所属楼栋id + */ + private String buildingId; + private String buildingName; + + /** + * 所属单元id; 单元长时必填此列 + */ + private String unitId; + /** + * 所属单元id; 单元长时必填此列 + */ + private String unitName; + + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java new file mode 100644 index 0000000000..264e37c895 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -0,0 +1,111 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +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.form.yt.CommunityBuildingManagerPageFormDTO; +import com.epmet.dto.result.CommunityBuildingManagerDTO; +import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; +import com.epmet.service.CommunityBuildingManagerService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * 楼长单元长信息表（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-06 + */ +@RestController +@RequestMapping("communityBuildingManager") +public class CommunityBuildingManagerController { + + @Autowired + private CommunityBuildingManagerService communityBuildingManagerService; + + /** + * 列表分页查询 + * @param formDTO + * @return + */ + @RequestMapping("page") + public Result> page(@LoginUser TokenDto tokenDto, @RequestBody CommunityBuildingManagerPageFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + PageData page = communityBuildingManagerService.page(formDTO); + return new Result>().ok(page); + } + + /** + * 查看详情 + * @param id + * @return + */ + @RequestMapping(value = "detail/{id}",method = {RequestMethod.POST}) + public Result get(@PathVariable("id") String id){ + CommunityBuildingManagerResultDTO data = communityBuildingManagerService.get(id); + return new Result().ok(data); + } + + /** + * 新增楼长/单元长 + * todo: 同步到具体的楼栋 + * @param dto + * @return + */ + @NoRepeatSubmit + @PostMapping("save") + public Result save(@LoginUser TokenDto tokenDto,@RequestBody CommunityBuildingManagerDTO dto){ + dto.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(dto, CommunityBuildingManagerDTO.AddShowGroup.class); + //类型：0楼长；1单元长 + if("1".equals(dto.getType())&& StringUtils.isBlank(dto.getUnitId())){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"单元长必须选择所属单元","单元长必须选择所属单元"); + } + communityBuildingManagerService.save(dto); + return new Result(); + } + + /** + * 编辑楼长/单元长 + * todo: 同步到具体的楼栋 + * @param dto + * @return + */ + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody CommunityBuildingManagerDTO dto){ + ValidatorUtils.validateEntity(dto, CommunityBuildingManagerDTO.UpdateShowGroup.class); + //类型：0楼长；1单元长 + if("1".equals(dto.getType())&& StringUtils.isBlank(dto.getUnitId())){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"单元长必须选择所属单元","单元长必须选择所属单元"); + } + communityBuildingManagerService.update(dto); + return new Result(); + } + + /** + * 批量删除楼长/单元长 + * todo: 同时清空楼栋表里的信息 + * @param ids + * @return + */ + @PostMapping("delete") + public Result delete(@RequestBody List ids){ + if(!CollectionUtils.isEmpty(ids)){ + communityBuildingManagerService.delete(ids); + } + return new Result(); + } + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CommunityBuildingManagerDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CommunityBuildingManagerDao.java new file mode 100644 index 0000000000..e6c19b0d26 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CommunityBuildingManagerDao.java @@ -0,0 +1,50 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; +import com.epmet.entity.CommunityBuildingManagerEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 楼长单元长信息表（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-06 + */ +@Mapper +public interface CommunityBuildingManagerDao extends BaseDao { + /** + * 楼长单元长分页列表查询 + * @param customerId + * @param orgIdPath + * @param name + * @param phone + * @param idCard + * @param type + * @param districtId + * @param streetId + * @param communityId + * @param gridId + * @param viliageId + * @param buildingId + * @param unitId + * @return + */ + List pageList(@Param("customerId") String customerId, + @Param("orgIdPath")String orgIdPath, + @Param("name")String name, + @Param("phone")String phone, + @Param("idCard")String idCard, + @Param("type")String type, + @Param("districtId")String districtId, + @Param("streetId")String streetId, + @Param("communityId")String communityId, + @Param("gridId")String gridId, + @Param("viliageId")String viliageId, + @Param("buildingId")String buildingId, + @Param("unitId")String unitId, + @Param("id")String id); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java new file mode 100644 index 0000000000..c2ac9184b9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java @@ -0,0 +1,86 @@ +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-06 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("community_building_manager") +public class CommunityBuildingManagerEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 姓名 + */ + private String name; + + /** + * 联系电话 + */ + private String phone; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 类型：0楼长；1单元长 + */ + private String type; + + /** + * 所属区县id；取名字关联customer_agency + */ + private String districtId; + + /** + * 所属街道id；取名字关联customer_agency + */ + private String streetId; + + /** + * 所属社区id；取名字关联customer_agency + */ + private String communityId; + + /** + * 所属网格id；取名字关联customer_grid + */ + private String gridId; + + /** + * 网格的全路径，包含网格id + */ + private String orgIdPath; + + /** + * 所属小区id + */ + private String viliageId; + + /** + * 所属楼栋id + */ + private String buildingId; + + /** + * 所属单元id; 单元长时必填此列 + */ + private String unitId; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java new file mode 100644 index 0000000000..b67d4d0d35 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java @@ -0,0 +1,66 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; +import com.epmet.dto.result.CommunityBuildingManagerDTO; +import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; +import com.epmet.entity.CommunityBuildingManagerEntity; + +import java.util.List; + +/** + * 楼长单元长信息表（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-06 + */ +public interface CommunityBuildingManagerService extends BaseService { + + /** + * 默认分页 + * + * @param formDTO + * @return PageData + * @author generator + * @date 2023-05-06 + */ + PageData page(CommunityBuildingManagerPageFormDTO formDTO); + + /** + * 查看详情 + * + * @param id + * @return CommunityBuildingManagerResultDTO + * @author generator + * @date 2023-05-06 + */ + CommunityBuildingManagerResultDTO get(String id); + + /** + * 新增楼长/单元长 + * todo: 同步到具体的楼栋表 + * + * @param dto + * @return + */ + void save(CommunityBuildingManagerDTO dto); + + /** + * 编辑楼长/单元长 + * todo: 同步到具体的楼栋 + * + * @param dto + * @return + */ + void update(CommunityBuildingManagerDTO dto); + + /** + * 批量删除楼长/单元长 + * todo: 同时清空楼栋表里的信息 + * + * @param ids + * @return + */ + void delete(List ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java new file mode 100644 index 0000000000..4693ce14b3 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -0,0 +1,144 @@ +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.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +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.SpringContextUtils; +import com.epmet.dao.CommunityBuildingManagerDao; +import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; +import com.epmet.dto.result.CommunityBuildingManagerDTO; +import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; +import com.epmet.entity.CommunityBuildingManagerEntity; +import com.epmet.service.CommunityBuildingManagerService; +import com.epmet.service.CustomerGridService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.List; + +/** + * 楼长单元长信息表（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-06 + */ +@Service +public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl implements CommunityBuildingManagerService { + + /** + * 列表分页查询 + * + * @param formDTO + * @return + */ + @Override + public PageData page(CommunityBuildingManagerPageFormDTO formDTO) { + // 默认查询本组织及下级 + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfoCacheResult) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询工作人员信息异常staffId:" + formDTO.getStaffId(), "查询工作人员信息异常"); + } + formDTO.setOrgIdPath(PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds())); + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List resList = baseDao.pageList(formDTO.getCustomerId(), + formDTO.getOrgIdPath(), + formDTO.getName(), + formDTO.getPhone(), + formDTO.getIdCard(), + formDTO.getType(), + formDTO.getDistrictId(), + formDTO.getStreetId(), + formDTO.getCommunityId(), + formDTO.getGridId(), + formDTO.getViliageId(), + formDTO.getBuildingId(), + formDTO.getUnitId(), null); + PageInfo pageInfo = new PageInfo<>(resList); + return new PageData<>(resList, pageInfo.getTotal()); + } + + /** + * 查看详情 + * + * @param id + * @return + */ + @Override + public CommunityBuildingManagerResultDTO get(String id) { + List resList = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(), + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, id); + if (CollectionUtils.isEmpty(resList)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "community_building_manager表记录不存在：id:" + id, "记录不存在"); + } + return resList.get(NumConstant.ZERO); + } + + /** + * 新增楼长/单元长 + * todo: 同步到具体的楼栋表 + * + * @param addFormDto + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void save(CommunityBuildingManagerDTO addFormDto) { + // 唯一性判断，同一个楼可以有多个楼长吗？待定。。。 + CommunityBuildingManagerEntity entity = ConvertUtils.sourceToTarget(addFormDto, CommunityBuildingManagerEntity.class); + CustomerGridDTO gridDTO = SpringContextUtils.getBean(CustomerGridService.class).get(addFormDto.getGridId()); + entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(gridDTO.getId(), gridDTO.getPids())); + insert(entity); + } + + /** + * 编辑楼长/单元长 + * todo: 同步到具体的楼栋 + * + * @param updateFormDto + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void update(CommunityBuildingManagerDTO updateFormDto) { + CommunityBuildingManagerEntity entity = ConvertUtils.sourceToTarget(updateFormDto, CommunityBuildingManagerEntity.class); + CustomerGridDTO gridDTO = SpringContextUtils.getBean(CustomerGridService.class).get(updateFormDto.getGridId()); + entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(gridDTO.getId(), gridDTO.getPids())); + updateById(entity); + } + + /** + * 批量删除楼长/单元长 + * todo: 同时清空楼栋表里的信息 + * + * @param ids + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(List ids) { + baseDao.deleteBatchIds(ids); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml new file mode 100644 index 0000000000..74b789763b --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 6349bdc821d42a926785efe12841e56fcafaaa32 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sat, 6 May 2023 14:59:05 +0800 Subject: [PATCH 204/340] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E5=B0=8F=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcNeighborHoodDTO.java | 16 ++++++++++++++++ .../dto/form/IcNeighborHoodAddFormDTO.java | 17 ++++++++++++++++- .../com/epmet/entity/IcNeighborHoodEntity.java | 17 +++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java index 8e39699670..66c41f6342 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java @@ -165,4 +165,20 @@ public class IcNeighborHoodDTO implements Serializable { */ private String buildingName; + /** + * 烟台需求：自然村/小区 + */ + private String viliageType; + /** + * 烟台需求：面积 + */ + private String area; + /** + * 烟台需求：开放类型 + */ + private String openType; + /** + * 烟台需求：建筑年代 + */ + private String buildYear; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java index 854462c6e1..f975c75048 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java @@ -113,6 +113,21 @@ public class IcNeighborHoodAddFormDTO extends PageFormDTO { * 实有楼栋数 */ private Integer realBuilding; - + /** + * 烟台需求：自然村/小区 + */ + private String viliageType; + /** + * 烟台需求：面积 + */ + private String area; + /** + * 烟台需求：开放类型 + */ + private String openType; + /** + * 烟台需求：建筑年代 + */ + private String buildYear; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java index 26e278fd16..2d67d4259b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java @@ -121,4 +121,21 @@ public class IcNeighborHoodEntity extends BaseEpmetEntity { * 二维码地址 */ private String qrcodeUrl; + + /** + * 烟台需求：自然村/小区 + */ + private String viliageType; + /** + * 烟台需求：面积 + */ + private String area; + /** + * 烟台需求：开放类型 + */ + private String openType; + /** + * 烟台需求：建筑年代 + */ + private String buildYear; } From 1d6f0a78549c9c02f05cdfd3e63bbeb19df314a5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 15:25:18 +0800 Subject: [PATCH 205/340] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BFfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java | 3 --- .../service/impl/CommunityBuildingManagerServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java index 1d2df38f08..ffb2fc69c8 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java @@ -78,9 +78,6 @@ public class CommunityBuildingManagerResultDTO implements Serializable { * 所属小区id */ private String viliageId; - /** - * 所属小区id - */ private String viliageName; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index 4693ce14b3..0d7593f50c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -65,7 +65,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl pageInfo = new PageInfo<>(resList); - return new PageData<>(resList, pageInfo.getTotal()); + return new PageData<>(resList, pageInfo.getTotal(),formDTO.getPageSize()); } /** From 6453e1c29626c844a9a89ee3e0ad4bfefafa47ef Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 15:43:52 +0800 Subject: [PATCH 206/340] =?UTF-8?q?=E5=8C=BA=E5=8E=BF=E3=80=81=E8=A1=97?= =?UTF-8?q?=E9=81=93=E3=80=81=E7=A4=BE=E5=8C=BA=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerAgencyController.java | 54 +++++++++++++++++++ .../impl/CustomerAgencyServiceImpl.java | 20 +++---- 2 files changed, 65 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 3d26395c0e..fad4233d80 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -19,6 +19,9 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.enums.OrgLevelEnum; +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.security.dto.TokenDto; @@ -41,6 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -564,4 +568,54 @@ public class CustomerAgencyController { return new Result>().ok(customerAgencyService.getCommunityList(dto)); } + /** + * 返回区县列表 + * @param tokenDto + * @return + */ + @PostMapping("districtList") + public Result> districtList(@LoginUser TokenDto tokenDto){ + Map params=new HashMap<>(); + params.put("CUSTOMER_ID",tokenDto.getCustomerId()); + params.put("LEVEL",OrgLevelEnum.DISTRICT.getCode()); + params.put("PID",null); + return new Result>().ok(customerAgencyService.list(params)); + } + + /** + * 返回街道列表，必传区县 + * @param tokenDto + * @param districtId + * @return + */ + @PostMapping("streetList/{districtId}") + public Result> streetList(@LoginUser TokenDto tokenDto,@PathVariable("districtId")String districtId){ + if(StringUtils.isBlank(districtId)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"districtId为空","请先选择区县"); + } + Map params=new HashMap<>(); + params.put("CUSTOMER_ID",tokenDto.getCustomerId()); + params.put("LEVEL",OrgLevelEnum.STREET.getCode()); + params.put("PID",districtId); + return new Result>().ok(customerAgencyService.list(params)); + } + + /** + * 返回社区列表，街道必传 + * @param tokenDto + * @param streetId + * @return + */ + @PostMapping("communityList/{streetId}") + public Result> communityList(@LoginUser TokenDto tokenDto,@PathVariable("streetId")String streetId){ + if(StringUtils.isBlank(streetId)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"streetId为空","请先选择街道"); + } + Map params=new HashMap<>(); + params.put("CUSTOMER_ID",tokenDto.getCustomerId()); + params.put("LEVEL",OrgLevelEnum.COMMUNITY.getCode()); + params.put("PID",streetId); + return new Result>().ok(customerAgencyService.list(params)); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 4585f7481d..87f0555690 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -18,7 +18,6 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -45,7 +44,6 @@ import com.epmet.constant.CustomerGridConstant; import com.epmet.dao.*; import com.epmet.dto.*; import com.epmet.dto.form.*; -import com.epmet.dto.region.LogOperationResultDTO; import com.epmet.dto.result.*; import com.epmet.entity.CustomerAgencyEntity; import com.epmet.entity.CustomerDepartmentEntity; @@ -136,12 +134,16 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl getWrapper(Map params) { - String id = (String) params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - + private LambdaQueryWrapper getWrapper(Map map) { + String id = map.containsKey(FieldConstant.ID_HUMP) ? (String) map.get(FieldConstant.ID_HUMP) : null; + String customerId = map.containsKey("CUSTOMER_ID") ? (String) map.get("CUSTOMER_ID") : null; + String level = map.containsKey("LEVEL") ? (String) map.get("LEVEL") : null; + String pid = map.containsKey("PID") ? (String) map.get("PID") : null; + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), CustomerAgencyEntity::getId, id) + .eq(StringUtils.isNotBlank(customerId), CustomerAgencyEntity::getCustomerId, customerId) + .eq(StringUtils.isNotBlank(level), CustomerAgencyEntity::getLevel, level) + .eq(StringUtils.isNotBlank(pid), CustomerAgencyEntity::getPid, pid); return wrapper; } @@ -1244,7 +1246,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyList, List gridList) { From 6f58e991382e0f2490b5e88c3a886bc12f4b206e Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sat, 6 May 2023 16:10:43 +0800 Subject: [PATCH 207/340] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/IcHouseAddFormDTO.java | 8 ++++++++ .../src/main/java/com/epmet/entity/IcHouseEntity.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java index aa4e6a999b..11d5ce0295 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java @@ -112,5 +112,13 @@ public class IcHouseAddFormDTO implements Serializable { * 房屋可编辑编码 */ private String coding; + /** + * 所在楼层 + */ + private String floor; + /** + * 面积 + */ + private String area; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java index 96e993c865..983b876709 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java @@ -136,4 +136,12 @@ public class IcHouseEntity extends BaseEpmetEntity { * 房屋可编辑编码 */ private String coding; + /** + * 所在楼层 + */ + private String floor; + /** + * 面积 + */ + private String area; } From d3009dfeaf3c9819ca4d92a60d4a60e2d019d97e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 18:01:52 +0800 Subject: [PATCH 208/340] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=B1=85=E6=B0=91=EF=BC=8C=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/processor/YanTaiTripReportSyncProcessor.java | 4 +--- .../com/epmet/service/impl/IcResiUserServiceImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java index 6b1d4a028d..1bb4afd991 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java @@ -6,17 +6,15 @@ import com.epmet.service.DataSyncConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; import static com.epmet.constant.EpidemicConstant.JOB_TYPE_TRIP_REPORT; -import static com.epmet.constant.EpidemicConstant.JOB_TYPE_VACCINE; /** * @Description 烟台行程上报数据同步处理器 * @Author zxc * @Date 2022/11/22 14:08 */ -@Component +// @Component @Slf4j public class YanTaiTripReportSyncProcessor extends AbstractDataSyncJobProcessor { 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 b10ab41c03..98c22b85ff 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 @@ -366,8 +366,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Sat, 6 May 2023 18:28:45 +0800 Subject: [PATCH 209/340] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/EditAgencyFormDTO.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java index 2d0da966d0..af4e9a36e2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java @@ -113,4 +113,30 @@ public class EditAgencyFormDTO implements Serializable { @Length(max = 500,message = "最多输入500字",groups =DefaultUserShowGroup.class ) private String remark; + + /** + * 村居/社区书记姓名 + */ + private String secretaryName; + /** + * 村居/社区书记电话 + */ + private String secretaryMobile; + /** + * 值班电话 + */ + private String dutyMobile; + /** + * 统一社会信用代码 + */ + private String unifiedSocialCreditCode; + /** + * 统一社会信用代码证书（图片附件） + */ + private String unifiedSocialCreditCodeCertificate; + + /** + * 详细地址 + */ + private String fullAddress; } \ No newline at end of file From 05f60d37787427a90f37dc378997f54eeba3409e Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sat, 6 May 2023 18:31:14 +0800 Subject: [PATCH 210/340] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/AgencysResultDTO.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java index f95c6349a4..7ca182856f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java @@ -137,4 +137,30 @@ public class AgencysResultDTO implements Serializable { private String remark; private String coordinates; + + /** + * 村居/社区书记姓名 + */ + private String secretaryName; + /** + * 村居/社区书记电话 + */ + private String secretaryMobile; + /** + * 值班电话 + */ + private String dutyMobile; + /** + * 统一社会信用代码 + */ + private String unifiedSocialCreditCode; + /** + * 统一社会信用代码证书（图片附件） + */ + private String unifiedSocialCreditCodeCertificate; + + /** + * 详细地址 + */ + private String fullAddress; } \ No newline at end of file From 1de597c2c244c6bf87ccd461bdc4a11d5ad50c3d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 18:48:06 +0800 Subject: [PATCH 211/340] dictOption/{dictType} --- .../controller/SysDictDataController.java | 13 ++++++++ .../com/epmet/service/SysDictDataService.java | 2 ++ .../service/impl/SysDictDataServiceImpl.java | 31 +++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java index ce18026bf8..1a51f32c0e 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java @@ -20,6 +20,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.SysDictDataDTO; import com.epmet.service.SysDictDataService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -118,6 +119,18 @@ public class SysDictDataController { return new Result>().ok(sysDictDataService.getNationOption()); } + /** + * 字典下拉框接口 + * @param dictType + * @return + */ + @PostMapping("dictOption/{dictType}") + public Result> getDictOption(@PathVariable("dictType")String dictType) { + if(StringUtils.isBlank(dictType)){ + return new Result<>(); + } + return new Result>().ok(sysDictDataService.getDictOption(dictType)); + } /** * @Description 人员关系 * @Param diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictDataService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictDataService.java index 6277ab6d2f..52de66b46d 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictDataService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictDataService.java @@ -92,4 +92,6 @@ public interface SysDictDataService extends BaseService { List dictListTree(String dictType); List getDictDataList(String dictType); + + List getDictOption(String dictType); } diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java index a7b6bff903..52c44b78f6 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java @@ -19,13 +19,17 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.TreeUtils; import com.epmet.dao.SysDictDataDao; +import com.epmet.dao.SysDictTypeDao; import com.epmet.dto.SysDictDataDTO; import com.epmet.entity.SysDictDataEntity; +import com.epmet.entity.SysDictTypeEntity; import com.epmet.service.SysDictDataService; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -38,6 +42,9 @@ import java.util.stream.Collectors; */ @Service public class SysDictDataServiceImpl extends BaseServiceImpl implements SysDictDataService { + @Autowired + private SysDictTypeDao sysDictTypeDao; + @Override public PageData page(Map params) { @@ -230,4 +237,28 @@ public class SysDictDataServiceImpl extends BaseServiceImpl getDictOption(String dictType) { + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(SysDictTypeEntity::getDictType,dictType); + SysDictTypeEntity sysDictTypeEntity=sysDictTypeDao.selectOne(queryWrapper); + if(null==sysDictTypeEntity){ + return new ArrayList<>(); + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysDictDataEntity::getDictTypeId,sysDictTypeEntity.getId() ); + wrapper.orderByAsc(SysDictDataEntity::getSort); + List list = baseDao.selectList(wrapper); + return list.stream().map(item -> { + OptionResultDTO dto = new OptionResultDTO(); + dto.setValue(item.getDictValue()); + dto.setLabel(item.getDictLabel()); + return dto; + }).collect(Collectors.toList()); + } } From 049c9b47af35b34ff4e996f7e286f5e621364a89 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sat, 6 May 2023 19:38:53 +0800 Subject: [PATCH 212/340] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerStaffServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 8f308d06ac..213f990d83 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -389,7 +389,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl Date: Sat, 6 May 2023 20:43:04 +0800 Subject: [PATCH 213/340] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E9=87=8D=E7=82=B9=E4=BA=BA?= =?UTF-8?q?=E7=BE=A4=E3=80=81=E5=9B=BD=E7=B1=8D=E3=80=81=E4=BA=BA=E5=8F=A3?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=81=E6=95=B4=E6=B2=BB=E9=9D=A2=E8=B2=8C?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcResiUserDTO.java | 25 +++++++++++++++++++ .../com/epmet/entity/IcResiUserEntity.java | 24 ++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index bf93b3b225..d16310d77c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -105,6 +105,11 @@ public class IcResiUserDTO implements Serializable { */ private String idCard; + /** + * 证件类型。烟台需求：来源于字典表dict_type=yt_id_card_type;1：身份证号；2：护照；3：港澳通行证；4：军人证；5：台胞证；6：其他 + */ + private String idCardType; + /** * 出生日期 */ @@ -125,6 +130,26 @@ public class IcResiUserDTO implements Serializable { */ private String contactsMobile; + /** + * 烟台需求：重点人群；名称对应字典表，dict_type:yt_key_point_user_type + */ + private String keyPointUserType; + + /** + * 烟台需求：国籍 + */ + private String nationality; + + /** + * 烟台需求：人口类型；名称对应字典表，dict_type:yt_population_type + */ + private String populationType; + + /** + * 烟台需求：政治面貌；名称对应字典表，dict_type:yt_politics_status + */ + private String politicsStatus; + /** * 九小场所url */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index a78fae885d..eda20ac933 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -102,7 +102,7 @@ public class IcResiUserEntity extends BaseEpmetEntity { private String idCard; /** - * 证件类型。1：身份证号；2：护照 + * 证件类型。烟台需求：来源于字典表dict_type=yt_id_card_type;1：身份证号；2：护照；3：港澳通行证；4：军人证；5：台胞证；6：其他 */ private String idCardType; @@ -126,7 +126,27 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String contactsMobile; - /** + /** + * 烟台需求：重点人群；名称对应字典表，dict_type:yt_key_point_user_type + */ + private String keyPointUserType; + + /** + * 烟台需求：国籍 + */ + private String nationality; + + /** + * 烟台需求：人口类型；名称对应字典表，dict_type:yt_population_type + */ + private String populationType; + + /** + * 烟台需求：政治面貌；名称对应字典表，dict_type:yt_politics_status + */ + private String politicsStatus; + + /** * 九小场所url */ private String ninePlace; From 6e771a6d2db0211d300adde4001173f8acd71f5c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 21:15:07 +0800 Subject: [PATCH 214/340] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E9=9C=80=E6=B1=82?= =?UTF-8?q?=EF=BC=9A=E4=B8=8E=E6=88=B7=E4=B8=BB=E5=85=B3=E7=B3=BB=EF=BC=88?= =?UTF-8?q?60=EF=BC=89=E5=AF=B9=E5=BA=94=E5=AD=97=E5=85=B8=E8=A1=A8dict=5F?= =?UTF-8?q?type:yt=5FHouseholder=5Frelationship=5Ftype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcResiUserDTO.java | 5 +++++ .../src/main/java/com/epmet/entity/IcResiUserEntity.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index d16310d77c..3098207e44 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -490,6 +490,11 @@ public class IcResiUserDTO implements Serializable { */ private String jtxxRemakes; + /** + * 烟台需求：与户主关系（60）对应字典表dict_type:yt_Householder_relationship_type + */ + private String yt_yhzgx; + /** * 用户状态【0:正常;1:迁出;2:注销】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index eda20ac933..33037d487c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -480,6 +480,11 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String jtxxRemakes; + /** + * 烟台需求：与户主关系（60）对应字典表dict_type:yt_Householder_relationship_type + */ + private String yt_yhzgx; + /** * 用户状态【0:正常;1:迁出;2:注销】 */ From 00de29ab2806b8e45ea4dac7385c5add38bb7267 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 09:17:26 +0800 Subject: [PATCH 215/340] =?UTF-8?q?=E6=88=B7=E7=B1=8D=E6=89=80=E5=9C=A8?= =?UTF-8?q?=E5=9C=B0=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A=EF=BC=8C?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=B5=AA=E6=BD=AE=E9=82=A3=E7=9A=84=E6=88=B7?= =?UTF-8?q?=E7=B1=8D=E8=AF=A6=E7=BB=86=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcResiUserDTO.java | 4 ++-- .../src/main/java/com/epmet/entity/IcResiUserEntity.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index 3098207e44..31a6740e6b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -426,9 +426,9 @@ public class IcResiUserDTO implements Serializable { private String jg; /** - * 户籍所在地 + * 户籍所在地;烟台需求：对应户籍详细地址 */ - private String hjszd; + private String hjszd; /** * 现居住地 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index 33037d487c..427d18a897 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -415,9 +415,9 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String jg; - /** - * 户籍所在地 - */ + /** + * 户籍所在地;烟台需求：对应户籍详细地址 + */ private String hjszd; /** From c4dd042be2033c924a1d6d8f67544863f2a395fa Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 09:19:52 +0800 Subject: [PATCH 216/340] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AFic?= =?UTF-8?q?=5Fresi=5Fuser=E5=A2=9E=E5=8A=A0=E6=88=B7=E7=B1=8D=E3=80=81?= =?UTF-8?q?=E5=B1=85=E4=BD=8F=E7=AD=8921=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcResiUserDTO.java | 105 ++++++++++++++++++ .../com/epmet/entity/IcResiUserEntity.java | 105 ++++++++++++++++++ 2 files changed, 210 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index 31a6740e6b..62541c7469 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -440,6 +440,111 @@ public class IcResiUserDTO implements Serializable { */ private String rhzk; + /** + * 烟台需求：是否现居住；0否；1是，对应字典表dict_type: + */ + private String isNowLive; + + /** + * 烟台需求：居住省 + */ + private String livingProvince; + + /** + * 烟台需求：居住市 + */ + private String livingCity; + + /** + * 烟台需求：居住区 + */ + private String livingArea; + + /** + * 烟台需求：居住街道 + */ + private String livingStreet; + + /** + * 烟台需求：居住社区 + */ + private String livingCommunity; + + /** + * 烟台需求：居住小区 + */ + private String livingViliageName; + + /** + * 烟台需求：居住楼号 + */ + private String livingBuildingNo; + + /** + * 烟台需求：居住单元号 + */ + private String livingUnitNo; + + /** + * 烟台需求：居住房间号 + */ + private String livingHouseNo; + + /** + * 烟台需求：户籍所在省 + */ + private String registerProvince; + + /** + * 烟台需求：户籍所在市 + */ + private String registerCity; + + /** + * 烟台需求：户籍所在区县 + */ + private String registerArea; + + /** + * 烟台需求：户籍所在街道 + */ + private String registerStreet; + + /** + * 烟台需求：户籍所在社区 + */ + private String registerCommunity; + + /** + * 烟台需求：户籍所在小区名称 + */ + private String registerViliageName; + + /** + * 烟台需求：户籍楼号 + */ + private String registerBuildingNo; + + /** + * 烟台需求：户籍单元号 + */ + private String registerUnitNo; + + /** + * 烟台需求：户籍房间号 + */ + private String registerHouseNo; + + /** + * 烟台需求：户别；对应字典表dict_type:yt_household_category + */ + private String householdCategory; + + /** + * 烟台需求：户号 + */ + private String houseHoldId; + /** * 居住信息备注 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index 427d18a897..961f69dfe9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -430,6 +430,111 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String rhzk; + /** + * 烟台需求：是否现居住；0否；1是，对应字典表dict_type: + */ + private String isNowLive; + + /** + * 烟台需求：居住省 + */ + private String livingProvince; + + /** + * 烟台需求：居住市 + */ + private String livingCity; + + /** + * 烟台需求：居住区 + */ + private String livingArea; + + /** + * 烟台需求：居住街道 + */ + private String livingStreet; + + /** + * 烟台需求：居住社区 + */ + private String livingCommunity; + + /** + * 烟台需求：居住小区 + */ + private String livingViliageName; + + /** + * 烟台需求：居住楼号 + */ + private String livingBuildingNo; + + /** + * 烟台需求：居住单元号 + */ + private String livingUnitNo; + + /** + * 烟台需求：居住房间号 + */ + private String livingHouseNo; + + /** + * 烟台需求：户籍所在省 + */ + private String registerProvince; + + /** + * 烟台需求：户籍所在市 + */ + private String registerCity; + + /** + * 烟台需求：户籍所在区县 + */ + private String registerArea; + + /** + * 烟台需求：户籍所在街道 + */ + private String registerStreet; + + /** + * 烟台需求：户籍所在社区 + */ + private String registerCommunity; + + /** + * 烟台需求：户籍所在小区名称 + */ + private String registerViliageName; + + /** + * 烟台需求：户籍楼号 + */ + private String registerBuildingNo; + + /** + * 烟台需求：户籍单元号 + */ + private String registerUnitNo; + + /** + * 烟台需求：户籍房间号 + */ + private String registerHouseNo; + + /** + * 烟台需求：户别；对应字典表dict_type:yt_household_category + */ + private String householdCategory; + + /** + * 烟台需求：户号 + */ + private String houseHoldId; + /** * 居住信息备注 */ From f9031d61c540a0d96b7338927a5ccef40bdc4e48 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 10:01:52 +0800 Subject: [PATCH 217/340] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E4=B8=8E=E6=88=B7=E4=B8=BB=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E3=80=81=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E9=87=8D=E7=82=B9=E4=BA=BA=E7=BE=A4=E3=80=81=E4=BA=BA=E5=8F=A3?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=81=E6=94=BF=E6=B2=BB=E9=9D=A2=E8=B2=8C?= =?UTF-8?q?=E3=80=81=E6=98=AF=E5=90=A6=E7=8E=B0=E5=B1=85=E4=BD=8F=E3=80=81?= =?UTF-8?q?=E6=88=B7=E5=88=AB,=E8=AF=95=E8=AF=95=E5=8F=AF=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserImportServiceImpl.java | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index e0b5c91837..71dd1ada0c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -6,7 +6,6 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.hutool.core.bean.BeanUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcelFactory; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.bean.ResiImportCategoryData; @@ -1457,11 +1456,38 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res optionTypeName = "所属支部"; options = this.listBranchOptions(); break; + case "/sys/dict/data/dictOption/yt_Householder_relationship_type": + optionTypeName = "与户主关系"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_id_card_type": + optionTypeName = "证件类型"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_key_point_user_type": + optionTypeName = "重点人群"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_population_type": + optionTypeName = "人口类型"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_politics_status": + optionTypeName = "政治面貌"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_is_now_live": + optionTypeName = "是否现居住"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_household_category": + optionTypeName = "户别"; + options = null; + break; default: log.warn("listRemoteOptions url is not supported"); } - if (options == null) { return null; } From 44a487f2059c918ea33ac732daf698629c932fe5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 10:06:28 +0800 Subject: [PATCH 218/340] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E4=B8=8E=E6=88=B7=E4=B8=BB=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E3=80=81=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E9=87=8D=E7=82=B9=E4=BA=BA=E7=BE=A4=E3=80=81=E4=BA=BA=E5=8F=A3?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=81=E6=94=BF=E6=B2=BB=E9=9D=A2=E8=B2=8C?= =?UTF-8?q?=E3=80=81=E6=98=AF=E5=90=A6=E7=8E=B0=E5=B1=85=E4=BD=8F=E3=80=81?= =?UTF-8?q?=E6=88=B7=E5=88=AB,=E8=AF=95=E8=AF=95=E5=8F=AF=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=AF=BC=E5=87=BA2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/EpmetAdminOpenFeignClient.java | 9 +++++++++ .../EpmetAdminOpenFeignClientFallback.java | 12 ++++++++++++ .../service/impl/IcResiUserImportServiceImpl.java | 14 +++++++------- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java index 59eb1e1e40..3999b45089 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java @@ -105,4 +105,13 @@ public interface EpmetAdminOpenFeignClient { @PostMapping("/sys/dict/data/dictDataList/{dictType}") Result> dictDataList(@PathVariable("dictType") String dictType); + + /** + * 字典下拉框 + * 根据dictType查询字典 + * @param dictType + * @return + */ + @PostMapping("/sys/dict/data/dictOption/{dictType}") + public Result> getDictOption(@PathVariable("dictType")String dictType); } diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java index 98e7e7f0f0..0184d2a100 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java @@ -65,4 +65,16 @@ public class EpmetAdminOpenFeignClientFallback implements EpmetAdminOpenFeignCli public Result> dictDataList(String dictType) { return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictDataList", dictType); } + + /** + * 字典下拉框 + * 根据dictType查询字典 + * + * @param dictType + * @return + */ + @Override + public Result> getDictOption(String dictType) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "getDictOption", dictType); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 71dd1ada0c..80d337f65d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -1458,31 +1458,31 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res break; case "/sys/dict/data/dictOption/yt_Householder_relationship_type": optionTypeName = "与户主关系"; - options = null; + options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_Householder_relationship_type"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/dictOption/yt_id_card_type": optionTypeName = "证件类型"; - options = null; + options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_id_card_type"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/dictOption/yt_key_point_user_type": optionTypeName = "重点人群"; - options = null; + options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_key_point_user_type"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/dictOption/yt_population_type": optionTypeName = "人口类型"; - options = null; + options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_population_type"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/dictOption/yt_politics_status": optionTypeName = "政治面貌"; - options = null; + options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_politics_status"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/dictOption/yt_is_now_live": optionTypeName = "是否现居住"; - options = null; + options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_is_now_live"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/dictOption/yt_household_category": optionTypeName = "户别"; - options = null; + options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_household_category"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; default: log.warn("listRemoteOptions url is not supported"); From eee252b0eb40ac46a23e7287b6722c23dab48ad4 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sun, 7 May 2023 14:25:46 +0800 Subject: [PATCH 219/340] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/AgencyServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index a972cd9797..b39c2e9d66 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -167,6 +167,12 @@ public class AgencyServiceImpl implements AgencyService { originalEntity.setContacts(formDTO.getContacts()); originalEntity.setMobile(formDTO.getMobile()); originalEntity.setRemark(formDTO.getRemark()); + originalEntity.setSecretaryName(formDTO.getSecretaryName()); + originalEntity.setSecretaryMobile(formDTO.getSecretaryMobile()); + originalEntity.setDutyMobile(formDTO.getDutyMobile()); + originalEntity.setUnifiedSocialCreditCode(formDTO.getUnifiedSocialCreditCode()); + originalEntity.setUnifiedSocialCreditCodeCertificate(formDTO.getUnifiedSocialCreditCodeCertificate()); + originalEntity.setFullAddress(formDTO.getFullAddress()); //利用mybatis 拦截器填充值 originalEntity.setUpdatedTime(null); originalEntity.setUpdatedBy(null); From 7a8cd6135ceca65541112a87c8c5e2b670eca681 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 14:39:47 +0800 Subject: [PATCH 220/340] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=EF=BC=8C=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E4=B8=BA=E6=B5=AA=E6=BD=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E5=BE=88=E5=A4=9A=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 75776 -> 77824 bytes .../excel/ic_resi_import_template_bak0507.xls | Bin 0 -> 75776 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_bak0507.xls diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index fc10d33a70cdcdd919c973abd4d2f66f973b99b0..1eb11e2f002f1b8c235f38ee57af2c189cbd5bea 100644 GIT binary patch delta 6580 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 Bq__Y8 delta 4637 zcmb7|3s98T701uLyRhu?elM_#sQ5$$frua?YN8!)Hd1-MiW!5lg39?`oG^U7s+HCd*DdQfS9FCQ&-G1l(#;$JfJI&?jP@D$5 z!2PDa&X}F^-Mo@ZJVDUizDx2e4JAe-h6k}`@pxPUTcwpPB5PEP_;%cA*WVLA zH}gBQMQ2W2M$2N%P6oEH*j942u%UcjS#|NUEt@Esc2r76TVj{Fv15wm64*QVinOEHnSuB#e0$ZVV73@@7Xmcp%a3)m-X(-!77MJfmFK z*1SR7r~}EZ*Nb!dp`tr~h@r)MCpxx?fP#;#oLF$(r`0-QC652CJ6_<`+sLcTc*zx6 zSjqGO1!Rw@c@F)UW>yAdfIHvM=TR`duf zBJ!tcnmZZy1_glJ{efu7VY(2ZL_y-DEj%&GBa4Pi+XhW1M(J44(rY>+QCh|N(xEkD zJv!qc^U`E~C=)^Q8t;)Nqb=umTaf~CTak*ELDLFA`5ef7P4vjq!9JQiOf;5;8na=q z8C(Q=Lzzw7DBT>`Od;rz<1ySTMeD+t)@BM&!ZNgbg)~|3W`w_3$iF01hOiM1I3E67e8q2n`j*R z64Vokw1&ngN`h>xqVb?Uy=2fhB})M%DoO<EAP!a&)I!a-9N zMS!MB3PW6S#90eX2X>JSWESt1B?w2Eo~;p$W#JwZd(F?*hL<_mM9+H$#F+loe|rY)Dj;b>*=#!BLi-4xB`%H*HSetGK1d?q+qW(FYz zWY`nJT?Q#39A%ghC2J8yh#eUPgx$}^DjD=5wYr$*qUM@R)=XqwC=?A9aYN0>N7)mF zOV-i2WF3P`))un3j#Uh1p~qN=c4%p15Iz}t{KflKF(SEUgbs(eI8v1qDyP#y<^@;D zI*=kfSnL|PX1&R@A77>kn}{}V#aG7z*L$zo zb*xOpZYg`_T`5Nkf(>lDkr^NbbtgzITt@m6wz-6tv7$^m<;9 zDB9Dm>y7`TyF0`$?KAn7H?SQ!OziyqQgP+h_5p9p-Hsa5on1r^_7K&*qj_Y>zH%L_ z5f!I~iP0Sy&+L`u%4F%4T1C<;*ndyNORv-`l3rP%NP49~k@SkazgHTSPkU*Nq=lioqSz-K$9-c(BQH*qx(tHO-hRg}Dy8 zI(+znBfTEKGeB>@EfSkdqWrOs>5s?p)%ORYMSs#f?l^IU*>CRfZU z7=&c;PzY#}>(c3>P}6@tMGpUssP=;9>V!)}bgWerTz9opiKN~J&(H#N6%vWA6{nzbo4=P`=WPqmWp5B9B4Wm@!~wdS`ni zyC;_S>=O5zQ{Q4^!sX8Z^4^IMc>{MF?l(UuW`|k3JxGjQwWsqhoULGNy>qgj$z%T6 zB71}LuAWUv->3r65AUeg6#0X2ihF`H0Q56OfuPNu4PNZOft>q^yWJ_y-Qg^fap%!+ zmd|;-XunqPtdC$nH}H7*HYdEd+wmO$ZvsmUWDt%N+Q{?Xb_ zYdrgn&e<@6;oGFsG?J}i&aH#lNT*{oGw&M0^v=Db*j{hidj>z=bY_iaP0WytKN L()m#Wo2mal^v>~G diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_bak0507.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_bak0507.xls new file mode 100644 index 0000000000000000000000000000000000000000..fc10d33a70cdcdd919c973abd4d2f66f973b99b0 GIT binary patch literal 75776 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�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 d3ik|sPWAd{=&~Z2KlAl7NlVXu{< Date: Mon, 8 May 2023 13:34:31 +0800 Subject: [PATCH 221/340] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA+=E4=B8=8B=E8=BD=BD=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/IcPropertyManagementDTO.java | 28 +++++ .../dto/form/IcPropertyManagementFormDTO.java | 13 +- .../PropertyManagementController.java | 114 +++++++++++++++++- .../epmet/dao/IcNeighborHoodPropertyDao.java | 10 +- .../service/PropertyManagementService.java | 17 ++- .../impl/PropertyManagementServiceImpl.java | 32 ++++- .../yantai/ic_property_management_temp.xlsx | Bin 0 -> 10172 bytes .../mapper/IcNeighborHoodPropertyDao.xml | 14 ++- 8 files changed, 205 insertions(+), 23 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/ic_property_management_temp.xlsx diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java index 171cbeb01c..6190e3d6d1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java @@ -17,6 +17,10 @@ package com.epmet.dto; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -37,58 +41,82 @@ public class IcPropertyManagementDTO implements Serializable { /** * 物业id */ + @ExcelIgnore private String id; /** * 物业名称 */ + @ExcelProperty(value = "物业名称") + @ColumnWidth(30) private String name; /** * 客户id */ + @ExcelIgnore private String customerId; /** * 烟台需求：物业联系人姓名 */ + @ExcelProperty(value = "物业联系人") + @ColumnWidth(30) private String contactName; /** * 烟台需求：物业联系人电话 */ + @ExcelProperty(value = "联系电话") + @ColumnWidth(30) private String contactMobile; + /** + * 导出时候用 + * 该物业关联的小区 + */ + @JsonIgnore + @ExcelProperty(value = "关联小区") + @ColumnWidth(60) + private String neighborHoodNames; + /** * 删除标识 0未删除、1已删除 */ + @ExcelIgnore private String delFlag; /** * 乐观锁 */ + @ExcelIgnore private Integer revision; /** * 创建人 */ + @ExcelIgnore private String createdBy; /** * 创建时间 */ + @ExcelIgnore private Date createdTime; /** * 更新人 */ + @ExcelIgnore private String updatedBy; /** * 更新时间 */ + @ExcelIgnore private Date updatedTime; /** * 关联的小区数量 */ + @ExcelIgnore private Integer totalNeighborHood; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java index 220a2b7488..938307b9b3 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java @@ -17,17 +17,17 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; @Data -public class IcPropertyManagementFormDTO implements Serializable { +public class IcPropertyManagementFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = 1L; @@ -40,8 +40,8 @@ public class IcPropertyManagementFormDTO implements Serializable { public interface UpdateShowGroup extends CustomerClientShowGroup { } - public interface PageGroup extends CustomerClientShowGroup { - } + // public interface PageGroup extends CustomerClientShowGroup { + // } @NotBlank(message = "物业id不能为空", groups = {DeleteGroup.class, UpdateShowGroup.class}) private String id; @@ -66,9 +66,4 @@ public class IcPropertyManagementFormDTO implements Serializable { private String customerId; - @NotNull(message = "pageNo不能为空", groups = PageGroup.class) - private Integer pageNo; - @NotNull(message = "pageSize不能为空", groups = PageGroup.class) - private Integer pageSize; - } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index d65ba66296..09c1266eec 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -17,21 +17,44 @@ package com.epmet.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.metadata.style.WriteCellStyle; +import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.IcPropertyManagementDTO; import com.epmet.dto.form.IcPropertyManagementFormDTO; import com.epmet.dto.result.IcPropertyManagementResultDTO; import com.epmet.service.PropertyManagementService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.io.IOUtils; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.ss.usermodel.VerticalAlignment; 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.http.HttpHeaders; +import org.springframework.web.bind.annotation.*; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.net.URLEncoder; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -43,6 +66,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-10-25 */ +@Slf4j @RestController @RequestMapping("propertymanagement") public class PropertyManagementController { @@ -55,9 +79,8 @@ public class PropertyManagementController { */ @PostMapping("page") public Result> page(@RequestBody IcPropertyManagementFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO,IcPropertyManagementFormDTO.PageGroup.class); return new Result>().ok(propertyManagementService.page(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getName(), - formDTO.getContactName(),formDTO.getContactMobile())); + formDTO.getContactName(),formDTO.getContactMobile(),"page-query")); } /** @@ -112,4 +135,83 @@ public class PropertyManagementController { return new Result(); } + /** + * 物业管理-下载导入模板 + * @param response + * @throws IOException + */ + @RequestMapping(value = "download-tem", method = {RequestMethod.GET, RequestMethod.POST}) + public void downloadTemplate(HttpServletResponse response) throws IOException { + response.setCharacterEncoding("UTF-8"); + response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); + //response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel"); + response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("物业管理导入模版", "UTF-8") + ".xlsx"); + + InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/ic_property_management_temp.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } + + + /** + * 物业管理-列表导出 + * + * @param tokenDto + * @param formDTO + * @param response + * @return + * @throws IOException + */ + @PostMapping("export") + public void exportEnterprise(@LoginUser TokenDto tokenDto, @RequestBody IcPropertyManagementFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + ExcelWriter excelWriter = null; + formDTO.setPageNo(NumConstant.ONE); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + try { + String fileName = "物业管理" + DateUtils.format(new Date()) + ".xlsx"; + WriteCellStyle headWriteCellStyle = new WriteCellStyle(); + headWriteCellStyle.setFillForegroundColor(IndexedColors.PALE_BLUE.getIndex()); + WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); + contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); + HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); + FreezeAndFilter writeHandler = new FreezeAndFilter(); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcPropertyManagementDTO.class) + .registerWriteHandler(horizontalCellStyleStrategy) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .registerWriteHandler(writeHandler).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + do { + data = propertyManagementService.page(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getName(), formDTO.getContactName(), formDTO.getContactMobile(),"export"); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(data.getList(), writeSheet); + } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("物业管理导出异常export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + + + + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java index 79a71a11b8..0d27ae9d56 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java @@ -18,9 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.entity.IcNeighborHoodPropertyEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 小区物业关系表 * @@ -29,5 +32,10 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcNeighborHoodPropertyDao extends BaseDao { - + /** + * 查询物业下的小区名称 + * @param propertyId 物业id + * @return + */ + List getNeighborHoodList(String propertyId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java index cae9715bd1..949269d16f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java @@ -39,5 +39,20 @@ public interface PropertyManagementService { void update(IcPropertyManagementFormDTO formDTO); void delete(IcPropertyManagementFormDTO formDTO); - PageData page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile); + /** + * 物业管理-列表查询 + * @param pageNo + * @param pageSize + * @param name 物业名称 + * @param contactName 物业联系人 + * @param contactMobile 联系电话 + * @param queryType 列表查询：page-query；导出：export + * @return + */ + PageData page(Integer pageNo, + Integer pageSize, + String name, + String contactName, + String contactMobile, + String queryType); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index e816556e07..a61155a910 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -2,6 +2,7 @@ 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.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; @@ -9,6 +10,7 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dao.IcNeighborHoodPropertyDao; import com.epmet.dao.IcPropertyManagementDao; +import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.IcPropertyManagementDTO; import com.epmet.dto.form.IcPropertyManagementFormDTO; import com.epmet.dto.result.IcPropertyManagementResultDTO; @@ -18,6 +20,8 @@ import com.epmet.service.PropertyManagementService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,6 +29,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @Slf4j @Service @@ -113,16 +118,33 @@ public class PropertyManagementServiceImpl implements PropertyManagementService /** * 物业管理-列表查询 + * * @param pageNo * @param pageSize - * @param name + * @param name 物业名称 + * @param contactName 物业联系人 + * @param contactMobile 联系电话 + * @param queryType 列表查询：page-query；导出：export * @return */ @Override - public PageData page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile) { - PageHelper.startPage(pageNo,pageSize); - List list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name,contactName,contactMobile); + public PageData page(Integer pageNo, Integer pageSize, String name, String contactName, String contactMobile, String queryType) { + PageHelper.startPage(pageNo, pageSize); + List list = icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(), name, contactName, contactMobile); PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal(),pageSize); + // 导出时需要导出关联的小区名称 + if ("export".equals(queryType)) { + pageInfo.getList().forEach(result -> { + List neighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(result.getId()); + List neighborHoodNames = neighborHoodList.stream() + .map(IcNeighborHoodDTO::getNeighborHoodName) + .distinct().collect(Collectors.toList()); + result.setNeighborHoodNames(CollectionUtils.isNotEmpty(neighborHoodList) ? StringUtils.join(neighborHoodNames, StrConstant.COMMA_ZH) : StrConstant.EPMETY_STR); + }); + } + return new PageData<>(list, pageInfo.getTotal(), pageSize); } + + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/ic_property_management_temp.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/ic_property_management_temp.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..f0611d26b02afacb2c68d0be54f50c135b9baf1c GIT binary patch literal 10172 zcmeHtbx>T}(k}#ehv2TkEf8D=8C-))g1bwA;O-jS-GjTk4v^sPZXto750ZONPIAw8 z>wSN|s<*0U?>#duYyEodUR~WSF9iV!5B4+yW!D9t?*ATej}HdcZ{_W*ZS0xkAIUHu ze}Mf#mQcy}od+BY%J`Ua5yDsjU^yTTdUh;*hb;N|i0u*YI5ewXn) zDZ`_Q;LDx<`k7`MIOEPp(Z zNQcL?%XTxP_Bm55lb)x~nqDcDQpAHfW}~A6NH~Yv>d=BQ<^pQ)5y;8$F;KkJa9!}> zE4*WCNU;#Z+D@8RJe=*g5{--O5rEW4=&bNei(|yF=qnr8`QzkhP0vd7EJtg3wnnhiMZT z#h2=>?}HogB2%+Qv_=?ynJg4Pej2QkB{#~O9q%SR(z69xIsd_;Fg}7!Y9zaor)=G6 z&gbQugY<)3js(NKcp<{>?aQ;R-OW;+&oTy%FOX@Fp$fFX*&0JWR9F+A$YqRQk{&CU zAmmG@MDu;40Jm)jYS%eVK#3&1FH_S>Yt#3!u^^hy)qR1}IdSF^v`(}K#W?3E=_&1G zQYi=5SPX4_@%nqRa2?)*=Q{Wi6yZ7^>P+Ly2hm%k-)&GQopVh0XalrI8({oq14nxY zYs)7q=OHHWxeJ>MK8t+yaNRpq_T#K{1=g_9_K~8fN{=IV0v) z0<9O8t7!AvtE*Z9;sYVR%JE2d8aFa;p;fpAklhTD^RZ&^S?G!gv!BaFKQCj0|E9}j zvo;!eTrn^oRGqeDDc3r~P$hRoYZ7OEK+tm5u*uuUl3P;a2Z;eaMUy6!swa)hFtca( z71`&WAfE&jfByMoD9xB~spUYo6hFj(J9t=KI@?c%I#mv%Z#pcRQi`S@ZD-uiXqP8F ztE5lBKf45Ux8ZxD9@+Krx>D{oGcOM;m2Af`L8%5859rEI(cuWf|)QX2e#M zSx;1l3V|3)8DB2I2eMf&B${cDRIH>3e_#R?i*2*605GE3VJ{2EH+!JJUwkO^Ks;xT z$X&j!#3czURfyWMtjV(1(_L40gbRVDNyB78s5gV;^k8e@W$5yCAm|whxgVo)3&7zE zFG>{@xv&wTgTs`XHRR-k^_NxNpjVW*X>uX!B36F;S6 ziu)`T#xRq}uO+8uOz-v`H|>SboEo^-<4?w}a4B1n>N=%0Vo^SgHMa~^q<=Nt#04R| z!CfPEI`;7*b*cOU&n!l%Ge3OpM2|g%DID5Vu zzNY-DDfjf02P>E}ejt)V_UPmCtFqBFV-EH=1-6D?nN;3tp1t6|ZkxNuD6|X}HA-&X z89A0OL2m0HVy9GgM@Nt>fs1b&DQs9z#XaLXB}S#LPNa_&4kQa+V==UoNKzaQj3Z0Y zX-kYl*;2GuINs`7NS~lnTqvVm%XNCWk8;OlVm1BZUG-j(>Y{q24ow(2UdJ>XWqIG(O4TjG z?+#+q{abF+qk}Mg+`|9E#$)}l@nVOq7MM{1mr&Ozke6s%`KJ4Vit@9}^8oM6y|*$_ z&003RgEli)2(D_h~!}kKL$lg!)MS6(TEGfrskuHgN zy2&v+7_jW0rZ$tpGGJ!Crh~h>PB1dL&`Z`Sb#|L;NS)I;Ktn=P&|jH8%j=$V=$ftA z+#(hq(3bBSIyowHEeZ?A|gTPaK z-Lvx8!+erTTZthpnO$A~K$T+-M3fe4ztii?KPTJVBD1hTLD3`VCM4W)>g6Sw0*Stn zk@eOD(e&Y&?t=3Nd;6>-Rc|kVioLPt?cLqowfW9^9uJzxji|)XM*eF)-80l+5B^+R z(1q1S^UgFc1y)30;#nelD{b_0UijrobI^>61euSX2mOrg6hb_3`a?o4O1E124qULl zRS&=qt0hFwl;#v16h1p?msizCScy%PpQD6)-viit6+V5LJ=2+_xHrwRMe$t4IUu2liJQ=G99& zj;GKDXC?Mm$Nqh0qrLd@117xbBIbck&9q+$Sl2C@G25U|Yk}|?StNMpyOZ={ysDvZ z7`o~kcb^GD;Ht8VnI%V|eIrd=;KG9q;ecq7wbAcG{%&U_@kMwNhh0JDq#IJ?&B$)+ z`)@}F#&Vzo<4BYfKE9UA?zOv{z{|G!npFPU~$=FcYAjtJ>9OadUGOm-+!ruY@gE(N|l=s*H09T|3`kc~nyp{$WnaK&e;La*?3 zp4E!})Bpe;&~M0I@n$S^fPvpCkPA3e$%hvRIE1l7Bn_Ehd~JA2cx)8(9!6l*C9Bz5 zalPT@O4!C1IzplvY=R9#VSRYmkLPS5r3#HIe@IZ$na)vkqn&OcOn9k|U^)IMzaB0{ zP5s=0n07kU=AjF{)t~x|(YrKpC3{(A*BNX6X8iRopwa!CqpNC27VsdT=i7Y#mk4am zW%404IT_qWI++s&eF!`!efbJDW4RdOo)}ajM=A&i7#vuOX_C&*;>!N5sMMhP*L*S* zQM7x4*?v-7Ov!7C^LQw&?NtS%P5gngL!=+)*F<<)vIDC(#AN#|L8-m1!!@9Xn>%ay-QCX}>XOApuBL9sj9zBcvU|kpcOI zrE41d(6cV}CW!zS2}NSl)*TOJ4%wkMhO%g7fk@CEPP~0)P*zAX-xwOwdL#i(wNQtw zC#~Ths$kPy;R*?5#IbQ=V|#Zq_c->49Z|k>nZ6_EqU(Me=QWdOMa6=!IzRZjE8yiL~xWD!Z0WxAPFeq)tej}@7aiK#P!wVApqSap{wNMh<93Ba|bYW`w6wQu;VG}q~ROCNLMOHnv23er22Zvu4g zV$#nKkZQ*-GwaB%?u0RXE4>T(jqy=(5poF$1UC#|ESXIer)x|Pa?27dr;Qi)w%sG2 zYf3qxduB||y4r77+1s7bho@=Geykx!$XK{DBp`#q=uCByB#dOY)-<-ov@ejal64z3o4_D_+_XD!Rf1qnjW$R6iP#ZClK z&bkfWhWfe5(Q?XMh_p{+q~OIZ!PVx2A8{6noP;F&b=0|(DL(mj?NLPV#Gm^x+K?1R zn4b)@n|{O6^?u-;Ws42NsMn^JC3ieJyUp-qdvL9)uSi4W+p5D5vs!hgn@`YCAZW+A z(0-^?`aUL8GG9)kU~%KIfZ$%B#O;_pRGY@+Y048K$G6iLz0m_-d72};MH3NOF>R)B zGJrcjp=xt@b!vd>C&Cl3a9W8?7#Oh>i8=u)*(;teMY5c!IJCIQ$>Inj&%+73ZBSyF zB=hI}ZbS@U8zS7`=*wSdC-ptqZtLK6d0~BAJ?QIY$?ei>PcHcN`r=KL^0RPFU|vGd z`uF{6cesg%HWyJw7Z&?Smm+%-AwN2%cI`=j|cM9q z6?xb)nB?=ta+<68VBN6|v;%2!V$zOw#fK~xAZ|@*gj+ihgejq)3&q(6TcZ#vzIDGZ z!5Jr7)ev`j4t@=*za(h*+^uFC^wk#?YdQ$=`~kc;UZR^F0F zcUPId1i4)mX!vW3LncxhJ?-2af8E9`oCgBYi;L^+J(jQz_vcsSpFW{(P0j~qc@*z8 zoD7JgLZvT=YY;enwXr;bXZc3($LlatuGd2x9Yc{=Lqy!WDIoo5@!qV~bwUs%c zv?T}LQGn5YfND*JlBR;e>$m2<`YyF~idvn#u{D||buYeh#II<4xTTnGf@=49D`Ti_ zovGVdRj4boJ@ffnxbpi6BgGF+DL1NXON!61%spqc6zai-T_mfuq^?57GQYHrCyz)k zwak|$*TpE`YaH%WjcXiQm*=xtlmSQHo)WFrjd4PLN(`x2wpb z5Cl^3C^kQW-jexQ6fv0e*gm=s@lvMSM_NF#j}EjlI+`E!BpLgw^mq`N(nRWSUnRz8 zOPC-GTVfY8Df;Fk4~X*hf3eDpJ6jS;jzGkC=FYk*`>G?EZXQZJkQPKqzcVQn^KM{t ztnR2W@E&xgZ@mQfwm#5l+s)=6>gXc26Hya_IFrPEA}_V#4KcA>0ro)us1= zTGh=#Fj47l8go#ZP8do_ro~Nhu^o{h3}a!w&7hl?$@S61X$KsGySqPar3T?d7E&>} z7As-r@T{jDA;M{jcVwi6XwV=_R=B)Mgjk|TwS-7KRJ0BQp3q0g@Jcs%GD0MG7qcm0 zWPa&IIE*9o##moUnuJ~0JXgmW)upoTPmGclDY0I9bNU$W!&%;67-+^pV58PT)Rg(R z&tfnNNN4iFFr-Bas|353;*oh#)l3zc>{HfT;1Tfg3s_ IC^CqL5o;)^2Cb=%kq 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 literal 0 HcmV?d00001 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml index 749861cc9a..db8211a0ce 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml @@ -15,5 +15,17 @@ - + \ No newline at end of file From 96a1c8e62806e143fb7a8b4dce0655c6ddadc6a4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 8 May 2023 14:10:55 +0800 Subject: [PATCH 222/340] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E7=AE=A1=E7=90=86=E5=B0=8F=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/IcPropertyManagementDTO.java | 4 + .../dto/form/IcPropertyManagementFormDTO.java | 7 ++ .../PropertyManagementController.java | 14 ++++ .../service/PropertyManagementService.java | 7 ++ .../impl/PropertyManagementServiceImpl.java | 78 +++++++++++++++---- .../mapper/IcNeighborHoodPropertyDao.xml | 2 +- 6 files changed, 97 insertions(+), 15 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java index 6190e3d6d1..5a34eab3cb 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java @@ -25,6 +25,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** @@ -79,6 +80,9 @@ public class IcPropertyManagementDTO implements Serializable { @ColumnWidth(60) private String neighborHoodNames; + @ExcelIgnore + List neighborHoodList; + /** * 删除标识 0未删除、1已删除 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java index 938307b9b3..0b3f3ea9b4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java @@ -24,6 +24,7 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import java.io.Serializable; +import java.util.List; @Data @@ -64,6 +65,12 @@ public class IcPropertyManagementFormDTO extends PageFormDTO implements Serializ @Length(max = 30, message = "联系电话不能超过30个字",groups = {AddShowGroup.class, UpdateShowGroup.class}) private String contactMobile; + /** + * 管理小区id + */ + private List neighborHoodIdList; + + private String customerId; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index 09c1266eec..e7175b3e82 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -42,6 +42,7 @@ import com.epmet.service.PropertyManagementService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.ss.usermodel.VerticalAlignment; import org.springframework.beans.factory.annotation.Autowired; @@ -211,6 +212,19 @@ public class PropertyManagementController { } } + /** + * 获取物业详情 + * + * @param id + * @return + */ + @PostMapping("detail/{id}") + public Result getDetail(@PathVariable("id") String id) { + if (StringUtils.isBlank(id)) { + return new Result<>(); + } + return new Result().ok(propertyManagementService.getDetail(id)); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java index 949269d16f..4e6e1a71e4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java @@ -55,4 +55,11 @@ public interface PropertyManagementService { String contactName, String contactMobile, String queryType); + + /** + * 查看物业详情 + * @param id + * @return + */ + IcPropertyManagementDTO getDetail(String id); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index a61155a910..324f9e3fff 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -35,6 +35,9 @@ import java.util.stream.Collectors; @Service public class PropertyManagementServiceImpl implements PropertyManagementService { + /** + * 物业表 + */ @Resource private IcPropertyManagementDao icPropertyManagementDao; @Resource @@ -62,43 +65,68 @@ public class PropertyManagementServiceImpl implements PropertyManagementService /** * 新增物业 * 名称客户下唯一 + * * @param formDTO * @return */ @Override @Transactional(rollbackFor = Exception.class) public String add(IcPropertyManagementFormDTO formDTO) { - //物业名字平台内唯一 - //如果输入的物业名字已经存在，直接返回物业id + // 物业名字平台内唯一 + // 如果输入的物业名字已经存在，直接返回物业id formDTO.setName(formDTO.getName().trim()); - IcPropertyManagementEntity entity = icPropertyManagementDao.selectByName(formDTO.getCustomerId(),formDTO.getName(),null); + IcPropertyManagementEntity entity = icPropertyManagementDao.selectByName(formDTO.getCustomerId(), formDTO.getName(), null); if (null != entity) { - return entity.getId(); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "物业名称已存在", "物业名称已存在"); } IcPropertyManagementEntity icPropertyManagementEntity = ConvertUtils.sourceToTarget(formDTO, IcPropertyManagementEntity.class); icPropertyManagementDao.insert(icPropertyManagementEntity); + if (CollectionUtils.isNotEmpty(formDTO.getNeighborHoodIdList())) { + formDTO.getNeighborHoodIdList().forEach(neighborHoodId -> { + // 插入小区物业关系表 + IcNeighborHoodPropertyEntity neighborHoodPropertyEntity = new IcNeighborHoodPropertyEntity(); + neighborHoodPropertyEntity.setPropertyId(icPropertyManagementEntity.getId()); + neighborHoodPropertyEntity.setNeighborHoodId(neighborHoodId); + icNeighborHoodPropertyDao.insert(neighborHoodPropertyEntity); + }); + } return icPropertyManagementEntity.getId(); } /** * 物业管理-修改 + * * @param formDTO */ @Override @Transactional(rollbackFor = Exception.class) public void update(IcPropertyManagementFormDTO formDTO) { - IcPropertyManagementEntity entity = icPropertyManagementDao.selectByName(EpmetRequestHolder.getLoginUserCustomerId(),formDTO.getName(),formDTO.getId()); + IcPropertyManagementEntity entity = icPropertyManagementDao.selectByName(EpmetRequestHolder.getLoginUserCustomerId(), formDTO.getName(), formDTO.getId()); if (null != entity) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"物业名称已存在","物业名称已存在"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "物业名称已存在", "物业名称已存在"); + } + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(IcPropertyManagementEntity::getId, formDTO.getId()) + .set(IcPropertyManagementEntity::getName, formDTO.getName()) + .set(IcPropertyManagementEntity::getContactName, formDTO.getContactName()) + .set(IcPropertyManagementEntity::getContactMobile, formDTO.getContactMobile()) + .set(IcPropertyManagementEntity::getUpdatedTime, new Date()) + .set(IcPropertyManagementEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); + icPropertyManagementDao.update(null, updateWrapper); + if (CollectionUtils.isNotEmpty(formDTO.getNeighborHoodIdList())) { + formDTO.getNeighborHoodIdList().forEach(neighborHoodId -> { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, formDTO.getId()) + .eq(IcNeighborHoodPropertyEntity::getNeighborHoodId, neighborHoodId); + if (icNeighborHoodPropertyDao.selectCount(queryWrapper) < 1) { + // 插入小区物业关系表 + IcNeighborHoodPropertyEntity neighborHoodPropertyEntity = new IcNeighborHoodPropertyEntity(); + neighborHoodPropertyEntity.setPropertyId(formDTO.getId()); + neighborHoodPropertyEntity.setNeighborHoodId(neighborHoodId); + icNeighborHoodPropertyDao.insert(neighborHoodPropertyEntity); + } + }); } - LambdaUpdateWrapper updateWrapper=new LambdaUpdateWrapper<>(); - updateWrapper.eq(IcPropertyManagementEntity::getId,formDTO.getId()) - .set(IcPropertyManagementEntity::getName,formDTO.getName()) - .set(IcPropertyManagementEntity::getContactName,formDTO.getContactName()) - .set(IcPropertyManagementEntity::getContactMobile,formDTO.getContactMobile()) - .set(IcPropertyManagementEntity::getUpdatedTime,new Date()) - .set(IcPropertyManagementEntity::getUpdatedBy,EpmetRequestHolder.getLoginUserId()); - icPropertyManagementDao.update(null,updateWrapper); } /** @@ -140,11 +168,33 @@ public class PropertyManagementServiceImpl implements PropertyManagementService .map(IcNeighborHoodDTO::getNeighborHoodName) .distinct().collect(Collectors.toList()); result.setNeighborHoodNames(CollectionUtils.isNotEmpty(neighborHoodList) ? StringUtils.join(neighborHoodNames, StrConstant.COMMA_ZH) : StrConstant.EPMETY_STR); + result.setNeighborHoodList(neighborHoodList); }); } return new PageData<>(list, pageInfo.getTotal(), pageSize); } + /** + * 查看物业详情 + * + * @param id + * @return + */ + @Override + public IcPropertyManagementDTO getDetail(String id) { + IcPropertyManagementEntity icPropertyManagementEntity = icPropertyManagementDao.selectById(id); + if (null == icPropertyManagementEntity) { + return null; + } + IcPropertyManagementDTO resultDto = ConvertUtils.sourceToTarget(icPropertyManagementEntity, IcPropertyManagementDTO.class); + List neighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(id); + List neighborHoodNames = neighborHoodList.stream() + .map(IcNeighborHoodDTO::getNeighborHoodName) + .distinct().collect(Collectors.toList()); + resultDto.setNeighborHoodNames(CollectionUtils.isNotEmpty(neighborHoodList) ? StringUtils.join(neighborHoodNames, StrConstant.COMMA_ZH) : StrConstant.EPMETY_STR); + resultDto.setNeighborHoodList(neighborHoodList); + return resultDto; + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml index db8211a0ce..12a20f286c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml @@ -21,7 +21,7 @@ h.NEIGHBOR_HOOD_NAME FROM ic_neighbor_hood_property p - INNER JOIN ic_neighbor_hood h ON ( p.NEIGHBOR_HOOD_ID = h.ID ) + INNER JOIN ic_neighbor_hood h ON ( p.NEIGHBOR_HOOD_ID = h.ID ) WHERE p.PROPERTY_ID = #{propertyId} AND p.DEL_FLAG = '0' From 546954b098392f84b51eb84d3173c274ca9562dc Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 8 May 2023 14:18:44 +0800 Subject: [PATCH 223/340] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/StaffController.java | 38 ++++++++++++++++++ .../excel/customer_staff_import_template.xlsx | Bin 0 -> 9722 bytes 2 files changed, 38 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/customer_staff_import_template.xlsx diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index bcc8e2f55e..d424f60202 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -8,16 +8,23 @@ import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.enums.RequirePermissionEnum; 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.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.service.StaffService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; +import java.net.URLEncoder; import java.util.List; /** @@ -25,6 +32,7 @@ import java.util.List; * @author zhaoqifeng * @date 2020/4/23 17:59 */ +@Slf4j @RestController @RequestMapping("staff") public class StaffController { @@ -251,4 +259,34 @@ public class StaffController { return new Result>().ok(staffService.staffOrgList(tokenDto)); } + /** + * 下载工作人员导入excel模板 + * + * @return + */ + @PostMapping("import/download-template") + public void downloadIcResiDownloadTemplate(HttpServletResponse response) { + InputStream is = null; + ServletOutputStream os = null; + try { + os = response.getOutputStream(); + + is = this.getClass().getClassLoader().getResourceAsStream("excel/customer_staff_import_template.xlsx"); + + response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); + response.setHeader("content-Type", "application/vnd.ms-excel"); + response.setHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("工作人员导入模板.xlsx", "UTF-8")); + + IOUtils.copy(is, os); + } catch (Exception e) { + String errorStackTrace = ExceptionUtils.getErrorStackTrace(e); + log.error("下载工作人员导入模板失败:{}", errorStackTrace); + + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "下载工作人员导入模板失败"); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/customer_staff_import_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/customer_staff_import_template.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..df7f4126472dc1f67d5a60445662f9fa0475343e GIT binary patch literal 9722 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 m&iwbjhBw|{R_p&a-oLsW Date: Mon, 8 May 2023 14:38:52 +0800 Subject: [PATCH 224/340] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constants/ImportTaskConstants.java | 5 + .../PropertyManagementController.java | 65 ++++++++- .../IcPropertyManagementImportListener.java | 120 +++++++++++++++++ .../IcPropertyManagementImportExcelData.java | 58 ++++++++ .../service/IcPropertyManagementService.java | 9 ++ .../service/PropertyManagementService.java | 8 ++ .../impl/IcPropertyManagementServiceImpl.java | 7 + .../impl/PropertyManagementServiceImpl.java | 126 +++++++++++++++++- 8 files changed, 390 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java index 204845c1fb..f7b664de4b 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java @@ -83,4 +83,9 @@ public interface ImportTaskConstants { * 未做核酸比对 */ String IC_NAT_COMPARE_RECORD="ic_nat_compare_record"; + + /** + * 物业表：ic_property_management + */ + String IC_PROPERTY_MANAGEMENT="ic_property_management"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index e7175b3e82..e342791fb2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -26,19 +26,26 @@ import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.ServiceConstant; 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.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcPropertyManagementDTO; import com.epmet.dto.form.IcPropertyManagementFormDTO; import com.epmet.dto.result.IcPropertyManagementResultDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.service.PropertyManagementService; +import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; @@ -48,17 +55,17 @@ import org.apache.poi.ss.usermodel.VerticalAlignment; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.net.URLEncoder; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.nio.file.Path; +import java.util.*; /** @@ -70,7 +77,7 @@ import java.util.Map; @Slf4j @RestController @RequestMapping("propertymanagement") -public class PropertyManagementController { +public class PropertyManagementController implements ResultDataResolver { @Autowired private PropertyManagementService propertyManagementService; @@ -226,6 +233,54 @@ public class PropertyManagementController { return new Result().ok(propertyManagementService.getDetail(id)); } + /** + * 导入excel + * + * @return + */ + @PostMapping("import") + public Result importExcel(MultipartFile file) { + // 1.暂存文件 + String originalFilename = file.getOriginalFilename(); + String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); + + Path fileSavePath; + try { + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir(ImportTaskConstants.IC_PROPERTY_MANAGEMENT, "import"); + fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName)); + } catch (IOException e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【物业管理导入】创建临时存储文件失败:{}", errorMsg); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "文件上传失败", "文件上传失败"); + } + + InputStream is = null; + FileOutputStream os = null; + + try { + is = file.getInputStream(); + os = new FileOutputStream(fileSavePath.toString()); + IOUtils.copy(is, os); + } catch (Exception e) { + log.error(ImportTaskConstants.IC_PROPERTY_MANAGEMENT + "表 importExcel exception", e); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } + + // 2.生成导入任务记录 + ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.IC_PROPERTY_MANAGEMENT), + ServiceConstant.EPMET_COMMON_SERVICE, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + "物业管理导入excel错误", + "物业管理导入excel错误"); + + // 3.执行导入 + propertyManagementService.execAsyncExcelImport(fileSavePath, rstData.getTaskId()); + return new Result(); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java new file mode 100644 index 0000000000..c591d54331 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java @@ -0,0 +1,120 @@ +package com.epmet.excel.handler; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.ValidateException; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.ObjectUtil; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.entity.IcPropertyManagementEntity; +import com.epmet.excel.yt.IcPropertyManagementImportExcelData; +import com.epmet.service.impl.IcPropertyManagementServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2023/5/8 14:23 + */ +@Slf4j +public class IcPropertyManagementImportListener implements ReadListener { + + // 最大条数阈值 + public static final int MAX_THRESHOLD = 200; + private String currentCustomerId; + private IcPropertyManagementServiceImpl propertyManagementService; + // 错误项列表 + private List errorRows = new ArrayList<>(); + // 要插入的数据 + private List insertDatas = new ArrayList<>(); + private List updateDatas = new ArrayList<>(); + + public IcPropertyManagementImportListener(String customerId, IcPropertyManagementServiceImpl propertyManagementService) { + this.currentCustomerId = customerId; + this.propertyManagementService = propertyManagementService; + } + + @Override + public void invoke(IcPropertyManagementImportExcelData data, AnalysisContext analysisContext) { + try { + // log.warn("有数据吗？"+JSON.toJSONString(data)); + // 不能为空先校验数据 + ValidatorUtils.validateEntity(data); + // 去除空格 + ObjectUtil.objectToTrim(data); + //物业名称唯一 + IcPropertyManagementEntity origin=propertyManagementService.getByName(currentCustomerId, data.getName()); + + IcPropertyManagementEntity propertyManagementEntity = ConvertUtils.sourceToTarget(data, IcPropertyManagementEntity.class); + propertyManagementEntity.setCustomerId(currentCustomerId); + if (null != origin) { + origin.setContactMobile(data.getContactMobile()); + origin.setContactName(data.getContactName()); + insertDatas.add(origin); + } else { + insertDatas.add(propertyManagementEntity); + } + + if (insertDatas.size() == MAX_THRESHOLD) { + execPersist(); + } + if (updateDatas.size() == MAX_THRESHOLD) { + execPersist(); + } + } catch (Exception e) { + String errorMsg = null; + if (e instanceof ValidateException) { + errorMsg = ((ValidateException) e).getMsg(); + } else if (e instanceof EpmetException) { + errorMsg = ((EpmetException) e).getInternalMsg(); + } else { + errorMsg = "未知错误"; + log.error("【物业管理表ic_property_management导入】出错:{}", ExceptionUtils.getErrorStackTrace(e)); + } + IcPropertyManagementImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(data, IcPropertyManagementImportExcelData.ErrorRow.class); + errorRow.setErrorInfo(errorMsg); + errorRows.add(errorRow); + } + + } + + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + // 最后几条达不到阈值，这里必须再调用一次 + execPersist(); + } + + /** + * 执行持久化 + */ + private void execPersist() { + try { + if (CollectionUtils.isNotEmpty(insertDatas)) { + propertyManagementService.insertBatch(insertDatas); + } + + if (CollectionUtils.isNotEmpty(updateDatas)) { + propertyManagementService.updateBatchById(updateDatas); + } + } finally { + insertDatas.clear(); + updateDatas.clear(); + } + } + + /** + * 获取错误行 + * + * @return + */ + public List getErrorRows() { + return errorRows; + } +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java new file mode 100644 index 0000000000..e172260c16 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java @@ -0,0 +1,58 @@ +package com.epmet.excel.yt; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/8 14:24 + */ +@Data +public class IcPropertyManagementImportExcelData { + /** + * 物业名称 + */ + @ExcelProperty(value = "物业名称") + private String name; + + /** + * 烟台需求：物业联系人姓名 + */ + @ExcelProperty(value = "物业联系人") + private String contactName; + + /** + * 烟台需求：物业联系人电话 + */ + @ExcelProperty(value = "联系电话") + private String contactMobile; + + @Data + public static class ErrorRow { + /** + * 物业名称 + */ + @ExcelProperty(value = "物业名称") + private String name; + + /** + * 烟台需求：物业联系人姓名 + */ + @ExcelProperty(value = "物业联系人") + private String contactName; + + /** + * 烟台需求：物业联系人电话 + */ + @ExcelProperty(value = "联系电话") + private String contactMobile; + + + @ColumnWidth(60) + @ExcelProperty("错误信息") + private String errorInfo; + } +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPropertyManagementService.java index bc808af034..83ea49e041 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPropertyManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPropertyManagementService.java @@ -92,4 +92,13 @@ public interface IcPropertyManagementService extends BaseService wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcPropertyManagementEntity::getCustomerId,customerId).eq(IcPropertyManagementEntity::getName,name); + return baseDao.selectOne(wrapper); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 324f9e3fff..557692cc65 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -1,34 +1,56 @@ package com.epmet.service.impl; +import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; 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.utils.ConvertUtils; -import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.commons.tools.utils.*; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcNeighborHoodPropertyDao; import com.epmet.dao.IcPropertyManagementDao; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.IcPropertyManagementDTO; import com.epmet.dto.form.IcPropertyManagementFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.IcPropertyManagementResultDTO; +import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcNeighborHoodPropertyEntity; import com.epmet.entity.IcPropertyManagementEntity; +import com.epmet.excel.handler.IcPropertyManagementImportListener; +import com.epmet.excel.yt.IcPropertyManagementImportExcelData; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.OssFeignClient; import com.epmet.service.PropertyManagementService; +import com.epmet.utils.ImportTaskUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; +import org.apache.http.entity.ContentType; +import org.apache.poi.util.IOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.annotation.Resource; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; import java.util.stream.Collectors; @Slf4j @@ -42,6 +64,10 @@ public class PropertyManagementServiceImpl implements PropertyManagementService private IcPropertyManagementDao icPropertyManagementDao; @Resource private IcNeighborHoodPropertyDao icNeighborHoodPropertyDao; + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + @Autowired + private OssFeignClient ossFeignClient; /** * 查询当前客户下的物业 @@ -118,7 +144,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, formDTO.getId()) .eq(IcNeighborHoodPropertyEntity::getNeighborHoodId, neighborHoodId); - if (icNeighborHoodPropertyDao.selectCount(queryWrapper) < 1) { + if (icNeighborHoodPropertyDao.selectCount(queryWrapper) < NumConstant.ONE) { // 插入小区物业关系表 IcNeighborHoodPropertyEntity neighborHoodPropertyEntity = new IcNeighborHoodPropertyEntity(); neighborHoodPropertyEntity.setPropertyId(formDTO.getId()); @@ -196,5 +222,99 @@ public class PropertyManagementServiceImpl implements PropertyManagementService return resultDto; } + /** + * 执行Excel导入 + * + * @param filePath + * @param importTaskId + */ + @Async + @Override + public void execAsyncExcelImport(Path filePath, String importTaskId) { + String userId = null; + try { + userId = EpmetRequestHolder.getLoginUserId(); + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + + IcPropertyManagementImportListener listener = new IcPropertyManagementImportListener(customerId, SpringContextUtils.getBean(IcPropertyManagementServiceImpl.class)); + + EasyExcel.read(filePath.toFile(), IcPropertyManagementImportExcelData.class, listener).headRowNumber(1).sheet(0).doRead(); + + String errorDesFileUrl = null; + + List errorRows = listener.getErrorRows(); + + boolean failed = errorRows.size() > 0; + + // 合并到一起写入 + // errorRows.addAll(otherRows); + + // 生成并上传描述文件 + OutputStream os = null; + FileItem fileItem = null; + if (errorRows.size() > 0) { + try { + // 文件生成 + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir(ImportTaskConstants.IC_PROPERTY_MANAGEMENT, "import", "error_des"); + String fileName = UUID.randomUUID().toString().concat(".xlsx"); + + fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile()) + .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName); + os = fileItem.getOutputStream(); + + EasyExcel.write(os, IcPropertyManagementImportExcelData.ErrorRow.class).sheet("信息列表").doWrite(errorRows); + // 文件上传oss + Result errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + if (errorDesFileUploadResult.success()) { + errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); + } + + } finally { + IOUtils.closeQuietly(os); + if (!fileItem.isInMemory()) { + try { + fileItem.delete(); + } catch (Exception e) { + log.error("【物业管理表ic_property_management】删除错误描述临时文件失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + } + } + + Result result = ImportTaskUtils.finishImportTask( + importTaskId, + failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS, + errorDesFileUrl, + ""); + + if (!result.success()) { + log.error("【物业管理表ic_property_management】finishImportTask失败"); + } + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【物业管理表ic_property_management】出错:{}", errorMsg); + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + importFinishTaskForm.setOperatorId(userId); + importFinishTaskForm.setResultDesc("城市管理图层导入失败:系统异常，请查看系统日志"); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【物业管理表ic_property_management】导入记录状态修改为'完成'失败"); + } + } finally { + // 删除临时文件 + if (Files.exists(filePath)) { + try { + Files.delete(filePath); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + } From 6cf3547b0134fe54b28a9823dbd963c956ff3424 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 8 May 2023 14:54:11 +0800 Subject: [PATCH 225/340] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcPropertyManagementDTO.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java index 5a34eab3cb..490cc35f90 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java @@ -20,7 +20,6 @@ package com.epmet.dto; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -75,7 +74,6 @@ public class IcPropertyManagementDTO implements Serializable { * 导出时候用 * 该物业关联的小区 */ - @JsonIgnore @ExcelProperty(value = "关联小区") @ColumnWidth(60) private String neighborHoodNames; From f5bbb9314fdd8775bf784262c63b49d7d210084b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 8 May 2023 14:56:13 +0800 Subject: [PATCH 226/340] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E7=AE=A1=E7=90=86=E5=B0=8F=E5=8C=BA=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcPropertyManagementDao.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml index 2035e53020..71046c4bb0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml @@ -72,7 +72,12 @@ SELECT p.NEIGHBOR_HOOD_ID, @@ -24,7 +25,7 @@ INNER JOIN ic_neighbor_hood h ON ( p.NEIGHBOR_HOOD_ID = h.ID ) WHERE p.PROPERTY_ID = #{propertyId} - AND (h.AGENCY_ID =#{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') ) + AND (h.AGENCY_ID = #{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') ) AND p.DEL_FLAG = '0' AND h.DEL_FLAG = '0' order by h.CREATED_TIME asc From 92cfd3d0c95964eea210fe9b0aaa92f750b16efa Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 8 May 2023 16:20:01 +0800 Subject: [PATCH 230/340] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/IcNeighborHoodResultDTO.java | 8 ++++++++ .../src/main/resources/mapper/IcNeighborHoodDao.xml | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java index d775552bbf..112ace5fbf 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java @@ -28,4 +28,12 @@ public class IcNeighborHoodResultDTO extends PageFormDTO { private String propertyId; private String agencyName; private String longitude; + + private String viliageTypeName; + + private String area; + + private String openTypeName; + + private String buildYear; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 326940bdd9..b61da5e7ab 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -130,7 +130,11 @@ d.PROPERTY_ID as propertyId , a.LOCATION as location, a.LONGITUDE as longitude, - a.LATITUDE as latitude + a.LATITUDE as latitude, + a.AREA as area, + a.BUILD_YEAR as buildYear, + if(a.VILIAGE_TYPE = 1,'住宅小区',if(a.VILIAGE_TYPE = 1,'自然村','')) as viliageTypeName, + if(a.OPEN_TYPE = 1,'封闭式',if(a.OPEN_TYPE = 1,'开放式','')) as openTypeName from ic_neighbor_hood a left join customer_agency b on a.AGENCY_ID = b.ID and b.DEL_FLAG='0' From ac12e2d18903fc100314a8851ff6c2f7846a22cb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 8 May 2023 16:39:15 +0800 Subject: [PATCH 231/340] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=B0=8F=E5=8C=BAid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcNeighborHoodController.java | 15 +++++++++++++ .../java/com/epmet/dao/IcNeighborHoodDao.java | 13 +++++++++++ .../epmet/service/IcNeighborHoodService.java | 7 ++++++ .../impl/IcNeighborHoodServiceImpl.java | 21 +++++++++++++----- .../resources/mapper/IcNeighborHoodDao.xml | 22 +++++++++++++++++++ .../mapper/IcNeighborHoodPropertyDao.xml | 2 +- 6 files changed, 74 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java index 1faa0d9221..2e39b1f211 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java @@ -174,6 +174,21 @@ public class IcNeighborHoodController { return new Result>().ok(list); } + /** + * 入参：gridId、agencyId + * 返回当前组织及下级下的所有小区 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("neighborhood-options-yantai") + public Result> queryNeighborHoodOptionsYanTai(@LoginUser TokenDto tokenDto, @RequestBody NeighborHoodOptionFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + List list=icNeighborHoodService.queryNeighborHoodOptionsYanTai(formDTO); + return new Result>().ok(list); + } + /** * 获取用户组织下小区列表 * diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java index 2fd4f25eee..b97fdf0f03 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java @@ -224,4 +224,17 @@ public interface IcNeighborHoodDao extends BaseDao { IcNeighborHoodEntity getNeighborHoodInfoByName(CheckHouseInfoFormDTO formDTO); List queryNeighborHoodOptions(NeighborHoodOptionFormDTO formDTO); + + /** + * label: xxx网格-xxx小区 + * @param customerId + * @param agencyId + * @param gridId + * @param neighborHoodName + * @return + */ + List queryNeighborHoodOptionsYanTai(@Param("customerId") String customerId, + @Param("agencyId") String agencyId, + @Param("gridId") String gridId, + @Param("neighborHoodName") String neighborHoodName); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java index e5766ce0d3..5313886414 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java @@ -203,4 +203,11 @@ public interface IcNeighborHoodService extends BaseService * @return */ List queryNeighborHoodOptions(NeighborHoodOptionFormDTO formDTO); + + /** + * 小区下拉框，小区名：xxx网格-xxx小区 + * @param formDTO + * @return + */ + List queryNeighborHoodOptionsYanTai(NeighborHoodOptionFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 3b6a79691c..d2f2dc4776 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -856,9 +856,20 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl queryNeighborHoodOptionsYanTai(NeighborHoodOptionFormDTO formDTO) { + if (StringUtils.isBlank(formDTO.getGridId()) && StringUtils.isBlank(formDTO.getAgencyId())) { + // 默认查询当前工作人员所属组织及下级的 + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + formDTO.setAgencyId(staffInfoCacheResult.getAgencyId()); + } + List list = baseDao.queryNeighborHoodOptionsYanTai(formDTO.getCustomerId(),formDTO.getAgencyId(),formDTO.getGridId(),formDTO.getNeighborHoodName()); + return list; + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 326940bdd9..0a4f7db95b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -695,4 +695,26 @@ ORDER BY h.NEIGHBOR_HOOD_NAME ASC + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml index 4ea353272f..9e5f9b0bf9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml @@ -18,7 +18,7 @@ SELECT m.*, + ( + case when m.type='0' then '楼长' + when m.type='1' then '单元长' + else '-' + end + )as typeName, d.ORGANIZATION_NAME AS districtName, s.ORGANIZATION_NAME AS streetName, c.ORGANIZATION_NAME AS communityName, From a01720c755d3eae1a24dfbcbbfc3550bfffe854c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 10:26:07 +0800 Subject: [PATCH 242/340] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=E8=BF=99=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=88=96=E8=80=85?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C=E4=B8=8D=E8=AE=BA=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=98=AF=E5=95=A5=EF=BC=8C=E5=8D=95=E5=85=83=E9=83=BD?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=B8=8D=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommunityBuildingManagerController.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 771bcb1006..2240faba43 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -25,7 +25,6 @@ import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.service.CommunityBuildingManagerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.ss.usermodel.VerticalAlignment; import org.springframework.beans.factory.annotation.Autowired; @@ -92,10 +91,10 @@ public class CommunityBuildingManagerController { public Result save(@LoginUser TokenDto tokenDto,@RequestBody CommunityBuildingManagerDTO dto){ dto.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(dto, CommunityBuildingManagerDTO.AddShowGroup.class); - //类型：0楼长；1单元长 + /* //类型：0楼长；1单元长 if("1".equals(dto.getType())&& StringUtils.isBlank(dto.getUnitId())){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"单元长必须选择所属单元","单元长必须选择所属单元"); - } + }*/ communityBuildingManagerService.save(dto); return new Result(); } @@ -110,10 +109,10 @@ public class CommunityBuildingManagerController { @PostMapping("update") public Result update(@RequestBody CommunityBuildingManagerDTO dto){ ValidatorUtils.validateEntity(dto, CommunityBuildingManagerDTO.UpdateShowGroup.class); - //类型：0楼长；1单元长 + /* //类型：0楼长；1单元长 if("1".equals(dto.getType())&& StringUtils.isBlank(dto.getUnitId())){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"单元长必须选择所属单元","单元长必须选择所属单元"); - } + }*/ communityBuildingManagerService.update(dto); return new Result(); } From a8025880e7dd941277528b5a6e12cb74bf1a0941 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 10:41:01 +0800 Subject: [PATCH 243/340] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=E8=BF=99=EF=BC=8C=E5=90=8C=E4=B8=80=E4=B8=AA=E6=A5=BC?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E5=85=81=E8=AE=B8=E6=9C=89=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=A5=BC=E9=95=BF=EF=BC=8C=E5=90=8C=E4=B8=80=E4=B8=AA=E5=8D=95?= =?UTF-8?q?=E5=85=83=EF=BC=8C=E5=8F=AA=E5=85=81=E8=AE=B8=E6=9C=89=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=8D=95=E5=85=83=E9=95=BF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunityBuildingManagerServiceImpl.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index 0d7593f50c..24fedd15ec 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -1,10 +1,12 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; @@ -21,6 +23,7 @@ import com.epmet.service.CommunityBuildingManagerService; import com.epmet.service.CustomerGridService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -105,13 +108,27 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl countQuery=new LambdaQueryWrapper<>(); + countQuery.eq(CommunityBuildingManagerEntity::getType,type) + .eq(CommunityBuildingManagerEntity::getBuildingId,buildingId) + .eq(StringUtils.isNotBlank(unitId),CommunityBuildingManagerEntity::getUnitId,unitId) + .ne(StringUtils.isNotBlank(id),CommunityBuildingManagerEntity::getId,id); + if(baseDao.selectCount(countQuery)>NumConstant.ZERO){ + throw new ValidateException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"所选楼栋(单元)已存在楼长(单元长)"); + } + } + /** * 编辑楼长/单元长 * todo: 同步到具体的楼栋 @@ -122,6 +139,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl Date: Tue, 9 May 2023 11:16:45 +0800 Subject: [PATCH 244/340] /gov/org/communityBuildingManager/export --- .../com/epmet/controller/CommunityBuildingManagerController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 2240faba43..4378e9bf8b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -167,6 +167,7 @@ public class CommunityBuildingManagerController { @PostMapping("export") public void exportCommunityBuildingManager(@LoginUser TokenDto tokenDto, @RequestBody CommunityBuildingManagerPageFormDTO formDTO, HttpServletResponse response) throws IOException { formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); ExcelWriter excelWriter = null; formDTO.setPageNo(NumConstant.ONE); formDTO.setPageSize(NumConstant.TEN_THOUSAND); From a6015e0aed5b927e5942a182f8457b7e55f291e7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 11:21:06 +0800 Subject: [PATCH 245/340] /gov/org/communityBuildingManager/export --- .../service/impl/CommunityBuildingManagerServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index 24fedd15ec..9f8e9bbf09 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -6,7 +6,6 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; -import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; @@ -125,7 +124,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImplNumConstant.ZERO){ - throw new ValidateException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"所选楼栋(单元)已存在楼长(单元长)"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"所选楼栋(单元)已存在楼长(单元长)","所选楼栋(单元)已存在楼长(单元长)"); } } From 2be44668f27270120b3a7feb213b27e3abe13156 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 11:23:29 +0800 Subject: [PATCH 246/340] /gov/org/propertymanagement/page --- .../com/epmet/service/impl/PropertyManagementServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 16fdde6f25..23ec2b19ff 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -210,6 +210,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService .distinct().collect(Collectors.toList()); result.setNeighborHoodNames(CollectionUtils.isNotEmpty(neighborHoodList) ? StringUtils.join(neighborHoodNames, StrConstant.COMMA_ZH) : StrConstant.EPMETY_STR); result.setNeighborHoodList(neighborHoodList); + result.setTotalNeighborHood(CollectionUtils.isNotEmpty(neighborHoodList)?neighborHoodList.size():NumConstant.ZERO); }); return new PageData<>(list, pageInfo.getTotal(), pageSize); } From 3d68e3a2a0684b1201c5dc483634c85440980f45 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 11:53:51 +0800 Subject: [PATCH 247/340] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E5=90=8D=E7=A7=B0=E4=B8=80=E8=87=B4=EF=BC=8C=E8=A6=86?= =?UTF-8?q?=E7=9B=96=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5excel=E5=A1=AB=E5=86=99=E7=9A=84=E4=B8=BA?= =?UTF-8?q?=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/handler/IcPropertyManagementImportListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java index c591d54331..096f586ee1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java @@ -56,7 +56,7 @@ public class IcPropertyManagementImportListener implements ReadListener Date: Tue, 9 May 2023 12:06:08 +0800 Subject: [PATCH 248/340] /gov/org/propertymanagement/update --- .../impl/PropertyManagementServiceImpl.java | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 23ec2b19ff..77f30363d4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -141,21 +141,24 @@ public class PropertyManagementServiceImpl implements PropertyManagementService .set(IcPropertyManagementEntity::getUpdatedTime, new Date()) .set(IcPropertyManagementEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); icPropertyManagementDao.update(null, updateWrapper); + CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId()); + + // 查询当前物业，在本组织及下级范围内，管理的小区 + List originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(formDTO.getId(), staffInfoCacheResult.getAgencyId()); + // 原来存在关联的小区，现在取消勾选了，需要删除物业小区关系表 + originNeighborHoodList.forEach(origin -> { + // 举例：原来管理A小区，现在取消勾选 + if (!formDTO.getNeighborHoodIdList().contains(origin.getId())) { + LambdaUpdateWrapper updateWrapper1 = new LambdaUpdateWrapper<>(); + updateWrapper1.eq(IcNeighborHoodPropertyEntity::getPropertyId, formDTO.getId()) + .eq(IcNeighborHoodPropertyEntity::getNeighborHoodId, origin.getId()) + .set(IcNeighborHoodPropertyEntity::getDelFlag, NumConstant.ONE_STR) + .set(IcNeighborHoodPropertyEntity::getUpdatedTime, new Date()) + .set(IcNeighborHoodPropertyEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); + icNeighborHoodPropertyDao.update(null, updateWrapper1); + } + }); if (CollectionUtils.isNotEmpty(formDTO.getNeighborHoodIdList())) { - CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId()); - List originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(formDTO.getId(),staffInfoCacheResult.getAgencyId()); - //原来关联的，现在清除的小区，删除物业小区关系表 - originNeighborHoodList.forEach(origin->{ - if(!formDTO.getNeighborHoodIdList().contains(origin.getId())){ - LambdaUpdateWrapper updateWrapper1=new LambdaUpdateWrapper<>(); - updateWrapper1.eq(IcNeighborHoodPropertyEntity::getPropertyId,formDTO.getId()) - .eq(IcNeighborHoodPropertyEntity::getNeighborHoodId,origin.getId()) - .set(IcNeighborHoodPropertyEntity::getDelFlag,NumConstant.ONE_STR) - .set(IcNeighborHoodPropertyEntity::getUpdatedTime, new Date()) - .set(IcNeighborHoodPropertyEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); - icNeighborHoodPropertyDao.update(null,updateWrapper1); - } - }); formDTO.getNeighborHoodIdList().forEach(neighborHoodId -> { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, formDTO.getId()) @@ -167,6 +170,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService neighborHoodPropertyEntity.setNeighborHoodId(neighborHoodId); icNeighborHoodPropertyDao.insert(neighborHoodPropertyEntity); } + //原本已经存在小区和物业的关系，不用再插入 }); } } From 90f0ddbff1c8d32b60b76cd0bccbf23aa287e12b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 12:18:11 +0800 Subject: [PATCH 249/340] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/yt/IcPropertyManagementImportExcelData.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java index 55196ffa18..cf9ad9d66b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * @Description * @Author yzm @@ -14,6 +16,7 @@ public class IcPropertyManagementImportExcelData { /** * 物业名称 */ + @NotBlank(message = "物业名称必填") @ExcelProperty(value = "*物业名称") private String name; From 73a98fe99edde529a4ee11a46f0d72f7a37cacf8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 12:23:29 +0800 Subject: [PATCH 250/340] /gov/org/communityBuildingManager/import --- .../epmet/constants/ImportTaskConstants.java | 5 ++ .../CommunityBuildingManagerController.java | 60 ++++++++++++++++++- .../CommunityBuildingManagerService.java | 3 + .../CommunityBuildingManagerServiceImpl.java | 39 ++++++++---- 4 files changed, 96 insertions(+), 11 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java index f7b664de4b..f25fd4269a 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java @@ -88,4 +88,9 @@ public interface ImportTaskConstants { * 物业表：ic_property_management */ String IC_PROPERTY_MANAGEMENT="ic_property_management"; + + /** + * 楼长单元长 + */ + String COMMUNITY_BUILDING_MANAGER="community_building_manager"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 4378e9bf8b..21f5cbfca9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -10,19 +10,26 @@ import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.ServiceConstant; 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.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; import com.epmet.dto.result.CommunityBuildingManagerDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.service.CommunityBuildingManagerService; +import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.apache.poi.ss.usermodel.IndexedColors; @@ -31,15 +38,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.net.URLEncoder; +import java.nio.file.Path; import java.util.Date; import java.util.List; +import java.util.UUID; /** @@ -51,7 +62,7 @@ import java.util.List; @Slf4j @RestController @RequestMapping("communityBuildingManager") -public class CommunityBuildingManagerController { +public class CommunityBuildingManagerController implements ResultDataResolver { @Autowired private CommunityBuildingManagerService communityBuildingManagerService; @@ -207,6 +218,53 @@ public class CommunityBuildingManagerController { } } + /** + * 导入excel + * + * @return + */ + @PostMapping("import") + public Result importExcel(MultipartFile file) { + // 1.暂存文件 + String originalFilename = file.getOriginalFilename(); + String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); + + Path fileSavePath; + try { + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir(ImportTaskConstants.COMMUNITY_BUILDING_MANAGER, "import"); + fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName)); + } catch (IOException e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【楼长单元长导入】创建临时存储文件失败:{}", errorMsg); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "文件上传失败", "文件上传失败"); + } + + InputStream is = null; + FileOutputStream os = null; + + try { + is = file.getInputStream(); + os = new FileOutputStream(fileSavePath.toString()); + IOUtils.copy(is, os); + } catch (Exception e) { + log.error(ImportTaskConstants.COMMUNITY_BUILDING_MANAGER + "表 importExcel exception", e); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } + + // 2.生成导入任务记录 + ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.COMMUNITY_BUILDING_MANAGER), + ServiceConstant.EPMET_COMMON_SERVICE, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + "楼长单元长导入excel错误", + "楼长单元长导入excel错误"); + + // 3.执行导入 + communityBuildingManagerService.execAsyncExcelImport(fileSavePath, rstData.getTaskId()); + return new Result(); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java index b67d4d0d35..eb32743443 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java @@ -7,6 +7,7 @@ import com.epmet.dto.result.CommunityBuildingManagerDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.entity.CommunityBuildingManagerEntity; +import java.nio.file.Path; import java.util.List; /** @@ -63,4 +64,6 @@ public interface CommunityBuildingManagerService extends BaseService ids); + + void execAsyncExcelImport(Path fileSavePath, String taskId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index 9f8e9bbf09..817d435c9b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -22,11 +22,14 @@ import com.epmet.service.CommunityBuildingManagerService; import com.epmet.service.CustomerGridService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.nio.file.Path; import java.util.List; /** @@ -35,6 +38,7 @@ import java.util.List; * @author generator generator@elink-cn.com * @since v1.0.0 2023-05-06 */ +@Slf4j @Service public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl implements CommunityBuildingManagerService { @@ -67,7 +71,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl pageInfo = new PageInfo<>(resList); - return new PageData<>(resList, pageInfo.getTotal(),formDTO.getPageSize()); + return new PageData<>(resList, pageInfo.getTotal(), formDTO.getPageSize()); } /** @@ -108,7 +112,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl countQuery=new LambdaQueryWrapper<>(); - countQuery.eq(CommunityBuildingManagerEntity::getType,type) - .eq(CommunityBuildingManagerEntity::getBuildingId,buildingId) - .eq(StringUtils.isNotBlank(unitId),CommunityBuildingManagerEntity::getUnitId,unitId) - .ne(StringUtils.isNotBlank(id),CommunityBuildingManagerEntity::getId,id); - if(baseDao.selectCount(countQuery)>NumConstant.ZERO){ - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"所选楼栋(单元)已存在楼长(单元长)","所选楼栋(单元)已存在楼长(单元长)"); + LambdaQueryWrapper countQuery = new LambdaQueryWrapper<>(); + countQuery.eq(CommunityBuildingManagerEntity::getType, type) + .eq(CommunityBuildingManagerEntity::getBuildingId, buildingId) + .eq(StringUtils.isNotBlank(unitId), CommunityBuildingManagerEntity::getUnitId, unitId) + .ne(StringUtils.isNotBlank(id), CommunityBuildingManagerEntity::getId, id); + if (baseDao.selectCount(countQuery) > NumConstant.ZERO) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所选楼栋(单元)已存在楼长(单元长)", "所选楼栋(单元)已存在楼长(单元长)"); } } @@ -138,7 +142,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl Date: Tue, 9 May 2023 12:27:11 +0800 Subject: [PATCH 251/340] =?UTF-8?q?/gov/org/communityBuildingManager/impor?= =?UTF-8?q?t,=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 --- .../CommunityBuildingManagerController.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 21f5cbfca9..01e62c31f4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -10,26 +10,20 @@ import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.constant.ServiceConstant; 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.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; import com.epmet.dto.result.CommunityBuildingManagerDTO; -import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.service.CommunityBuildingManagerService; -import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.apache.poi.ss.usermodel.IndexedColors; @@ -42,15 +36,12 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.net.URLEncoder; -import java.nio.file.Path; import java.util.Date; import java.util.List; -import java.util.UUID; /** @@ -225,7 +216,8 @@ public class CommunityBuildingManagerController implements ResultDataResolver { */ @PostMapping("import") public Result importExcel(MultipartFile file) { - // 1.暂存文件 + return new Result(); + /*// 1.暂存文件 String originalFilename = file.getOriginalFilename(); String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); @@ -263,7 +255,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver { // 3.执行导入 communityBuildingManagerService.execAsyncExcelImport(fileSavePath, rstData.getTaskId()); - return new Result(); + return new Result();*/ } From dd8eb84ecbe9484b9776c9b90802c31bd88891c9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 12:33:50 +0800 Subject: [PATCH 252/340] =?UTF-8?q?/gov/org/communityBuildingManager/impor?= =?UTF-8?q?t,=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 --- .../epmet/controller/CommunityBuildingManagerController.java | 2 +- .../java/com/epmet/controller/PropertyManagementController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 01e62c31f4..7c4f1fef3c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -215,7 +215,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver { * @return */ @PostMapping("import") - public Result importExcel(MultipartFile file) { + public Result importExcel(@RequestPart("file") MultipartFile file) { return new Result(); /*// 1.暂存文件 String originalFilename = file.getOriginalFilename(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index c3bff703b0..9adff02f7f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -239,7 +239,7 @@ public class PropertyManagementController implements ResultDataResolver { * @return */ @PostMapping("import") - public Result importExcel(MultipartFile file) { + public Result importExcel(@RequestPart("file") MultipartFile file) { // 1.暂存文件 String originalFilename = file.getOriginalFilename(); String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); From e46992190554c6a7797bad2d7d8a1faf20034240 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 12:58:07 +0800 Subject: [PATCH 253/340] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=89=A9=E4=B8=9A=EF=BC=9A/gov/org/propertymanagement/delete-b?= =?UTF-8?q?atch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PropertyManagementController.java | 15 +++++++- .../service/PropertyManagementService.java | 12 ++++++- .../impl/PropertyManagementServiceImpl.java | 34 ++++++++++++++++--- 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index 9adff02f7f..4c77e5472c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -139,7 +139,20 @@ public class PropertyManagementController implements ResultDataResolver { public Result delete(@RequestBody IcPropertyManagementFormDTO formDTO){ //效验数据 ValidatorUtils.validateEntity(formDTO, IcPropertyManagementFormDTO.DeleteGroup.class); - propertyManagementService.delete(formDTO); + propertyManagementService.delete(formDTO.getId()); + return new Result(); + } + + /** + * 物业批量删除 + * @param ids + * @return + */ + @PostMapping("delete-batch") + public Result deleteBatch( @RequestBody List ids) { + if (CollectionUtils.isNotEmpty(ids)) { + propertyManagementService.deleteBatch(ids); + } return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java index 301b730072..ccd2b27a38 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java @@ -38,7 +38,11 @@ public interface PropertyManagementService { String add(IcPropertyManagementFormDTO formDTO); void update(IcPropertyManagementFormDTO formDTO); - void delete(IcPropertyManagementFormDTO formDTO); + /** + * 物业管理批量删除 + * @param id + */ + void delete(String id); /** * 物业管理-列表查询 @@ -68,4 +72,10 @@ public interface PropertyManagementService { * @param taskId */ void execAsyncExcelImport(Path fileSavePath, String taskId); + + /** + * 物业管理批量删除 + * @param ids + */ + void deleteBatch(List ids); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 77f30363d4..3e34e3c845 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -177,19 +177,45 @@ public class PropertyManagementServiceImpl implements PropertyManagementService /** * 单个删除 - * @param formDTO + * @param id */ @Override @Transactional(rollbackFor = Exception.class) - public void delete(IcPropertyManagementFormDTO formDTO) { + public void delete(String id) { LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); - queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId,formDTO.getId()); + queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId,id); if (icNeighborHoodPropertyDao.selectCount(queryWrapper) > 0) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"物业存在与小区关联，无法删除","已与小区关联，无法删除"); } - icPropertyManagementDao.deleteById(formDTO.getId()); + icPropertyManagementDao.deleteById(id); } + /** + * 物业管理批量删除 + * @param ids + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteBatch(List ids) { + if (CollectionUtils.isEmpty(ids)) { + return; + } + int failedNum = NumConstant.ZERO; + for (String id : ids) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, id); + if (icNeighborHoodPropertyDao.selectCount(queryWrapper) > 0) { + failedNum += 1; + } else { + icPropertyManagementDao.deleteById(id); + } + } + if (failedNum > NumConstant.ZERO) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "物业存在与小区关联，无法删除", String.format("%s个物业已与小区关联，无法批量删除,请先解除与小区关联关系", failedNum)); + } + } + + /** * 物业管理-列表查询 * From de6311a50b1e8451f9d6eb8d3dd9854617a19c30 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 13:16:52 +0800 Subject: [PATCH 254/340] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=89=A9=E4=B8=9A=EF=BC=9A/gov/org/propertymanagement/delete-b?= =?UTF-8?q?atch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PropertyManagementController.java | 13 +++-- .../service/PropertyManagementService.java | 6 ++- .../impl/PropertyManagementServiceImpl.java | 49 +++++++++++++------ 3 files changed, 46 insertions(+), 22 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index 4c77e5472c..50767693ed 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -144,14 +144,19 @@ public class PropertyManagementController implements ResultDataResolver { } /** - * 物业批量删除 + * 物业管理-批量删除 + * * @param ids - * @return + * @return 返回失败的id列表 */ @PostMapping("delete-batch") - public Result deleteBatch( @RequestBody List ids) { + public Result> deleteBatch(@RequestBody List ids) { if (CollectionUtils.isNotEmpty(ids)) { - propertyManagementService.deleteBatch(ids); + List failedIdList = propertyManagementService.deleteBatch(ids); + Result result = new Result>().ok(failedIdList); + result.setMsg("部门物业删除失败"); + result.setCode(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode()); + return result; } return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java index ccd2b27a38..3f50a0658c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java @@ -42,7 +42,7 @@ public interface PropertyManagementService { * 物业管理批量删除 * @param id */ - void delete(String id); + Boolean delete(String id); /** * 物业管理-列表查询 @@ -75,7 +75,9 @@ public interface PropertyManagementService { /** * 物业管理批量删除 + * * @param ids + * @return 返回失败的id列表 */ - void deleteBatch(List ids); + List deleteBatch(List ids); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 3e34e3c845..d91fb52d38 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -177,42 +177,59 @@ public class PropertyManagementServiceImpl implements PropertyManagementService /** * 单个删除 + * * @param id */ @Override @Transactional(rollbackFor = Exception.class) - public void delete(String id) { - LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); - queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId,id); + public Boolean delete(String id) { + Boolean delResFlag=true; + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); + // 查询当前物业，在本组织及下级范围内，管理的小区 + List originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(id, staffInfoCacheResult.getAgencyId()); + // 如果存在记录，则解除物业与小区关联关系 + originNeighborHoodList.forEach(origin -> { + LambdaUpdateWrapper updateWrapper1 = new LambdaUpdateWrapper<>(); + updateWrapper1.eq(IcNeighborHoodPropertyEntity::getPropertyId, id) + .eq(IcNeighborHoodPropertyEntity::getNeighborHoodId, origin.getId()) + .set(IcNeighborHoodPropertyEntity::getDelFlag, NumConstant.ONE_STR) + .set(IcNeighborHoodPropertyEntity::getUpdatedTime, new Date()) + .set(IcNeighborHoodPropertyEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); + icNeighborHoodPropertyDao.update(null, updateWrapper1); + }); + // 再查询是否存在其他组织下的小区，与该物业有关联，存在则不允许删除 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, id); if (icNeighborHoodPropertyDao.selectCount(queryWrapper) > 0) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"物业存在与小区关联，无法删除","已与小区关联，无法删除"); + delResFlag=false; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前物业已与其他组织下的小区关联，无法删除", "当前物业已与其他组织下的小区关联，无法删除"); } + // 删除物业表 icPropertyManagementDao.deleteById(id); + return delResFlag; } + /** * 物业管理批量删除 + * * @param ids + * @return 返回失败的id列表 */ @Override @Transactional(rollbackFor = Exception.class) - public void deleteBatch(List ids) { + public List deleteBatch(List ids) { if (CollectionUtils.isEmpty(ids)) { - return; + return new ArrayList<>(); } - int failedNum = NumConstant.ZERO; + List failedIdList = new ArrayList<>(); for (String id : ids) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, id); - if (icNeighborHoodPropertyDao.selectCount(queryWrapper) > 0) { - failedNum += 1; - } else { - icPropertyManagementDao.deleteById(id); + Boolean res = delete(id); + if (!res) { + failedIdList.add(id); } } - if (failedNum > NumConstant.ZERO) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "物业存在与小区关联，无法删除", String.format("%s个物业已与小区关联，无法批量删除,请先解除与小区关联关系", failedNum)); - } + return failedIdList; } From 5a79a055643d898cc8da60fe36e2bbc1d2b4bfa5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 13:34:54 +0800 Subject: [PATCH 255/340] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=89=A9=E4=B8=9A=EF=BC=9A/gov/org/propertymanagement/delete-b?= =?UTF-8?q?atch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/PropertyManagementService.java | 2 +- .../service/impl/PropertyManagementServiceImpl.java | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java index 3f50a0658c..6966cf38a1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java @@ -42,7 +42,7 @@ public interface PropertyManagementService { * 物业管理批量删除 * @param id */ - Boolean delete(String id); + void delete(String id); /** * 物业管理-列表查询 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index d91fb52d38..8e4d6331b7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -182,8 +182,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean delete(String id) { - Boolean delResFlag=true; + public void delete(String id) { CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); // 查询当前物业，在本组织及下级范围内，管理的小区 List originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(id, staffInfoCacheResult.getAgencyId()); @@ -201,12 +200,10 @@ public class PropertyManagementServiceImpl implements PropertyManagementService LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, id); if (icNeighborHoodPropertyDao.selectCount(queryWrapper) > 0) { - delResFlag=false; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前物业已与其他组织下的小区关联，无法删除", "当前物业已与其他组织下的小区关联，无法删除"); } // 删除物业表 icPropertyManagementDao.deleteById(id); - return delResFlag; } @@ -224,7 +221,13 @@ public class PropertyManagementServiceImpl implements PropertyManagementService } List failedIdList = new ArrayList<>(); for (String id : ids) { - Boolean res = delete(id); + Boolean res =true; + try{ + //调用单挑删除方法 + delete(id); + }catch(EpmetException e){ + res=false; + } if (!res) { failedIdList.add(id); } From fcb374a34f600ab48856f632ae937a2396a2b2d5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 13:45:57 +0800 Subject: [PATCH 256/340] 111 --- .../com/epmet/excel/yt/IcPropertyManagementImportExcelData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java index cf9ad9d66b..7a318bbad7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java @@ -37,7 +37,7 @@ public class IcPropertyManagementImportExcelData { /** * 物业名称 */ - @ExcelProperty(value = "物业名称") + @ExcelProperty(value = "*物业名称") private String name; /** From 9b920e5256789e85b4b952bce9d963f6449190e8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 13:47:40 +0800 Subject: [PATCH 257/340] 111 --- .../com/epmet/controller/PropertyManagementController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index 50767693ed..c6bfacb04e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -153,6 +153,9 @@ public class PropertyManagementController implements ResultDataResolver { public Result> deleteBatch(@RequestBody List ids) { if (CollectionUtils.isNotEmpty(ids)) { List failedIdList = propertyManagementService.deleteBatch(ids); + if(CollectionUtils.isEmpty(failedIdList)){ + return new Result<>(); + } Result result = new Result>().ok(failedIdList); result.setMsg("部门物业删除失败"); result.setCode(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode()); From 9608a4fb868b0ba9ad058b7a1676e594ce95287c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 14:25:50 +0800 Subject: [PATCH 258/340] =?UTF-8?q?=E7=BB=8F=E4=B8=8E=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E7=A1=AE=E8=AE=A4=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=89=A9=E4=B8=9A=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A0=E9=9C=80=E5=88=A4=E6=96=AD=E4=B8=8B=E9=9D=A2=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=85=B3=E8=81=94=E5=B0=8F=E5=8C=BA=E3=80=82=20?= =?UTF-8?q?=E4=B8=94=E5=88=AB=E7=9A=84=E7=A4=BE=E5=8C=BA=E5=9C=A8=E7=94=A8?= =?UTF-8?q?=E6=AD=A4=E7=89=A9=E4=B8=9A=EF=BC=8C=E4=B9=9F=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=82=E6=B8=85=E9=99=A4=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=9A=84=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PropertyManagementServiceImpl.java | 34 ++++++++----------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 8e4d6331b7..6ead260319 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -183,27 +183,21 @@ public class PropertyManagementServiceImpl implements PropertyManagementService @Override @Transactional(rollbackFor = Exception.class) public void delete(String id) { - CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); - // 查询当前物业，在本组织及下级范围内，管理的小区 - List originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(id, staffInfoCacheResult.getAgencyId()); - // 如果存在记录，则解除物业与小区关联关系 - originNeighborHoodList.forEach(origin -> { - LambdaUpdateWrapper updateWrapper1 = new LambdaUpdateWrapper<>(); - updateWrapper1.eq(IcNeighborHoodPropertyEntity::getPropertyId, id) - .eq(IcNeighborHoodPropertyEntity::getNeighborHoodId, origin.getId()) - .set(IcNeighborHoodPropertyEntity::getDelFlag, NumConstant.ONE_STR) - .set(IcNeighborHoodPropertyEntity::getUpdatedTime, new Date()) - .set(IcNeighborHoodPropertyEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); - icNeighborHoodPropertyDao.update(null, updateWrapper1); - }); - // 再查询是否存在其他组织下的小区，与该物业有关联，存在则不允许删除 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, id); - if (icNeighborHoodPropertyDao.selectCount(queryWrapper) > 0) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前物业已与其他组织下的小区关联，无法删除", "当前物业已与其他组织下的小区关联，无法删除"); - } + Date now = new Date(); + // 删除物业与小区关联关系表 + LambdaUpdateWrapper updateWrapper1 = new LambdaUpdateWrapper<>(); + updateWrapper1.eq(IcNeighborHoodPropertyEntity::getPropertyId, id) + .set(IcNeighborHoodPropertyEntity::getDelFlag, NumConstant.ONE_STR) + .set(IcNeighborHoodPropertyEntity::getUpdatedTime, now) + .set(IcNeighborHoodPropertyEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); + icNeighborHoodPropertyDao.update(null, updateWrapper1); // 删除物业表 - icPropertyManagementDao.deleteById(id); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(IcPropertyManagementEntity::getId, id) + .set(IcPropertyManagementEntity::getDelFlag, NumConstant.ONE_STR) + .set(IcPropertyManagementEntity::getUpdatedTime, now) + .set(IcPropertyManagementEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); + icPropertyManagementDao.update(null, updateWrapper); } From 4d2ba136e8f0b1db96891b9e5f51aca972ca3e30 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 14:49:08 +0800 Subject: [PATCH 259/340] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A5=BC=E9=95=BF?= =?UTF-8?q?=EF=BC=8C=20=E5=90=8C=E6=97=B6=E6=B8=85=E7=A9=BAic=5Fbuilding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CommunityBuildingManagerServiceImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index 817d435c9b..c6cf2f0eb3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -1,6 +1,7 @@ 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.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -30,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.nio.file.Path; +import java.util.Date; import java.util.List; /** @@ -159,7 +161,16 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl ids) { - baseDao.deleteBatchIds(ids); + Date now=new Date(); + ids.forEach(id->{ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(CommunityBuildingManagerEntity::getId, id) + .set(CommunityBuildingManagerEntity::getDelFlag, NumConstant.ONE_STR) + .set(CommunityBuildingManagerEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()) + .set(CommunityBuildingManagerEntity::getUpdatedTime, now); + baseDao.update(null, updateWrapper); + // todo + }); } From 8db4108269878c4f1baa5ed6d9b1a71f27b973e0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 15:48:35 +0800 Subject: [PATCH 260/340] =?UTF-8?q?ic=5Fbuilding=E6=96=B0=E5=A2=9EBUILDING?= =?UTF-8?q?=5FLEADER=5FID=5FCARD=E3=80=81BUILDING=5FLEADER=5FTYPE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcBuildingDTO.java | 10 ++++++++++ .../main/java/com/epmet/entity/IcBuildingEntity.java | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java index 52567226eb..702294f7ea 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java @@ -96,6 +96,16 @@ public class IcBuildingDTO implements Serializable { */ private String buildingLeaderMobile; + /** + * 烟台需求：楼长身份证号 + */ + private String buildingLeaderIdCard; + + /** + * 烟台需求：类型：0楼长；1单元长 + */ + private String buildingLeaderType; + /** * 中心点位：经度 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java index 801267e2dd..117a7ea6e5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java @@ -92,6 +92,16 @@ public class IcBuildingEntity extends BaseEpmetEntity { */ private String buildingLeaderMobile; + /** + * 烟台需求：楼长身份证号 + */ + private String buildingLeaderIdCard; + + /** + * 烟台需求：类型：0楼长；1单元长 + */ + private String buildingLeaderType; + /** * 中心点位：经度 */ From 3e8fde72eafb875d77d9fafa51e36b94a3803da3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 16:03:04 +0800 Subject: [PATCH 261/340] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=3D=E3=80=8B=E6=A5=BC=E6=A0=8B=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunityBuildingManagerServiceImpl.java | 64 +++++++++++++++---- 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index c6cf2f0eb3..6461489107 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -4,6 +4,7 @@ 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.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -14,17 +15,20 @@ import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.PidUtils; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.dao.CommunityBuildingManagerDao; +import com.epmet.dao.IcBuildingDao; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; import com.epmet.dto.result.CommunityBuildingManagerDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.entity.CommunityBuildingManagerEntity; +import com.epmet.entity.IcBuildingEntity; import com.epmet.service.CommunityBuildingManagerService; import com.epmet.service.CustomerGridService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,6 +47,8 @@ import java.util.List; @Slf4j @Service public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl implements CommunityBuildingManagerService { + @Autowired + private IcBuildingDao icBuildingDao; /** * 列表分页查询 @@ -105,7 +111,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl buildingUpdate = new LambdaUpdateWrapper<>(); + buildingUpdate.eq(IcBuildingEntity::getId, entity.getBuildingId()) + .set(IcBuildingEntity::getBuildingLeaderName, entity.getName()) + .set(IcBuildingEntity::getBuildingLeaderMobile, entity.getPhone()) + .set(IcBuildingEntity::getBuildingLeaderIdCard, entity.getIdCard()) + .set(IcBuildingEntity::getBuildingLeaderType, entity.getType()) + .set(IcBuildingEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()) + .set(IcBuildingEntity::getUpdatedTime, new Date()); + icBuildingDao.update(null, buildingUpdate); } private void checkUnqiue(String type, String buildingId, String unitId, String id) { @@ -136,7 +152,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl buildingUpdate = new LambdaUpdateWrapper<>(); + buildingUpdate.eq(IcBuildingEntity::getId, updateFormDto.getBuildingId()) + .set(IcBuildingEntity::getBuildingLeaderName, updateFormDto.getName()) + .set(IcBuildingEntity::getBuildingLeaderMobile, updateFormDto.getPhone()) + .set(IcBuildingEntity::getBuildingLeaderIdCard, updateFormDto.getIdCard()) + .set(IcBuildingEntity::getBuildingLeaderType, updateFormDto.getType()) + .set(IcBuildingEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()) + .set(IcBuildingEntity::getUpdatedTime, new Date()); + icBuildingDao.update(null, buildingUpdate); } /** * 批量删除楼长/单元长 - * todo: 同时清空楼栋表里的信息 + * 同时清空楼栋表里的信息 * * @param ids * @return @@ -161,15 +187,29 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl ids) { - Date now=new Date(); - ids.forEach(id->{ - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(CommunityBuildingManagerEntity::getId, id) - .set(CommunityBuildingManagerEntity::getDelFlag, NumConstant.ONE_STR) - .set(CommunityBuildingManagerEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()) - .set(CommunityBuildingManagerEntity::getUpdatedTime, now); - baseDao.update(null, updateWrapper); - // todo + Date now = new Date(); + ids.forEach(id -> { + CommunityBuildingManagerEntity origin = baseDao.selectById(id); + if (null != origin) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(CommunityBuildingManagerEntity::getId, id) + .set(CommunityBuildingManagerEntity::getDelFlag, NumConstant.ONE_STR) + .set(CommunityBuildingManagerEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()) + .set(CommunityBuildingManagerEntity::getUpdatedTime, now); + baseDao.update(null, updateWrapper); + if (StringUtils.isNotBlank(origin.getBuildingId())) { + // 清空楼栋表的楼长4列信息 + LambdaUpdateWrapper buildingUpdate = new LambdaUpdateWrapper<>(); + buildingUpdate.eq(IcBuildingEntity::getId, origin.getBuildingId()) + .set(IcBuildingEntity::getBuildingLeaderName, StrConstant.EPMETY_STR) + .set(IcBuildingEntity::getBuildingLeaderMobile, StrConstant.EPMETY_STR) + .set(IcBuildingEntity::getBuildingLeaderIdCard, StrConstant.EPMETY_STR) + .set(IcBuildingEntity::getBuildingLeaderType, StrConstant.EPMETY_STR) + .set(IcBuildingEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()) + .set(IcBuildingEntity::getUpdatedTime, now); + icBuildingDao.update(null, buildingUpdate); + } + } }); } From 4d250a3ce903e5b7efdcd9a764e166164d8ff1a3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 18:02:40 +0800 Subject: [PATCH 262/340] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=E5=AF=BC=E5=85=A5=EF=BC=8C=E6=9C=AA=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/CommunityBuildingManagerDTO.java | 7 +- .../CommunityBuildingManagerController.java | 27 +- .../CommunityBuildingManagerEntity.java | 2 +- ...ommunityBuildingManagerImportListener.java | 117 +++++++++ ...mmunityBuildingManagerImportExcelData.java | 116 +++++++++ .../CommunityBuildingManagerService.java | 2 + .../com/epmet/service/IcBuildingService.java | 6 + .../CommunityBuildingManagerServiceImpl.java | 234 +++++++++++++++++- .../service/impl/IcBuildingServiceImpl.java | 20 ++ .../impl/PropertyManagementServiceImpl.java | 2 +- 10 files changed, 516 insertions(+), 17 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/CommunityBuildingManagerImportExcelData.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java index 062fe0b7b7..8022d3334c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java @@ -60,6 +60,7 @@ public class CommunityBuildingManagerDTO implements Serializable { */ @NotBlank(message ="类型不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) private String type; + private String typeName; /** * 所属区县id；取名字关联customer_agency @@ -84,6 +85,7 @@ public class CommunityBuildingManagerDTO implements Serializable { */ @NotBlank(message ="所属网格不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) private String gridId; + private String gridName; /** * 网格的全路径，包含网格id @@ -95,16 +97,19 @@ public class CommunityBuildingManagerDTO implements Serializable { */ @NotBlank(message ="所属小区不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) private String viliageId; + private String viliageName; /** * 所属楼栋id */ @NotBlank(message ="楼栋不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) private String buildingId; + private String buildingName; /** - * 所属单元id; 单元长时必填此列 + * 所属单元id */ private String unitId; + private String unitName; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 7c4f1fef3c..cf2cc27574 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -10,20 +10,28 @@ import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.OrgLevelEnum; 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.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constants.ImportTaskConstants; +import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; import com.epmet.dto.result.CommunityBuildingManagerDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.service.CommunityBuildingManagerService; +import com.epmet.service.CustomerAgencyService; +import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.apache.poi.ss.usermodel.IndexedColors; @@ -36,12 +44,15 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.net.URLEncoder; +import java.nio.file.Path; import java.util.Date; import java.util.List; +import java.util.UUID; /** @@ -215,9 +226,11 @@ public class CommunityBuildingManagerController implements ResultDataResolver { * @return */ @PostMapping("import") - public Result importExcel(@RequestPart("file") MultipartFile file) { - return new Result(); - /*// 1.暂存文件 + public Result importExcel(@LoginUser TokenDto tokenDto,@RequestPart("file") MultipartFile file) { + // 只有社区级账号可以导入 + communityBuildingManagerService.checkImportPermission(tokenDto.getCustomerId(),tokenDto.getUserId()); + + // 1.暂存文件 String originalFilename = file.getOriginalFilename(); String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); @@ -255,7 +268,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver { // 3.执行导入 communityBuildingManagerService.execAsyncExcelImport(fileSavePath, rstData.getTaskId()); - return new Result();*/ + return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java index c2ac9184b9..dc2e57bd94 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java @@ -79,7 +79,7 @@ public class CommunityBuildingManagerEntity extends BaseEpmetEntity { private String buildingId; /** - * 所属单元id; 单元长时必填此列 + * 所属单元id */ private String unitId; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java new file mode 100644 index 0000000000..8609096b6f --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java @@ -0,0 +1,117 @@ +package com.epmet.excel.handler; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.ValidateException; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.ObjectUtil; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.result.CommunityBuildingManagerDTO; +import com.epmet.excel.yt.CommunityBuildingManagerImportExcelData; +import com.epmet.service.impl.CommunityBuildingManagerServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2023/5/9 16:26 + */ +@Slf4j +public class CommunityBuildingManagerImportListener implements ReadListener { + + // 最大条数阈值 + public static final int MAX_THRESHOLD = 200; + private String customerId; + private String staffId; + private String agencyId; + private String districtId; + private String streetId; + private String rediPrex; + private CommunityBuildingManagerServiceImpl communityBuildingManagerService; + // 错误项列表 + private List errorRows = new ArrayList<>(); + // 要插入的数据 + private List excelDataList = new ArrayList<>(); + + public CommunityBuildingManagerImportListener(String customerId, String staffId, String agencyId,String districtId,String streetId,String rediPrex,CommunityBuildingManagerServiceImpl communityBuildingManagerService) { + this.customerId = customerId; + this.staffId = staffId; + this.agencyId=agencyId; + this.districtId=districtId; + this.streetId=streetId; + this.rediPrex=rediPrex; + this.communityBuildingManagerService = communityBuildingManagerService; + } + + + @Override + public void invoke(CommunityBuildingManagerImportExcelData data, AnalysisContext analysisContext) { + try { + // log.warn("有数据吗？"+JSON.toJSONString(data)); + // 不能为空先校验数据 + ValidatorUtils.validateEntity(data); + // 去除空格 + ObjectUtil.objectToTrim(data); + + CommunityBuildingManagerDTO communityBuildingManagerDTO = ConvertUtils.sourceToTarget(data, CommunityBuildingManagerDTO.class); + communityBuildingManagerDTO.setCustomerId(customerId); + communityBuildingManagerDTO.setCommunityId(agencyId); + communityBuildingManagerDTO.setType("单元长".equals(data.getTypeName()) ? NumConstant.ONE_STR : NumConstant.ZERO_STR); + excelDataList.add(communityBuildingManagerDTO); + if (excelDataList.size() == MAX_THRESHOLD) { + execPersist(); + } + } catch (Exception e) { + String errorMsg = null; + if (e instanceof ValidateException) { + errorMsg = ((ValidateException) e).getMsg(); + } else if (e instanceof EpmetException) { + errorMsg = ((EpmetException) e).getInternalMsg(); + } else { + errorMsg = "未知错误"; + log.error("【楼长单元长ic_property_management导入】出错:{}", ExceptionUtils.getErrorStackTrace(e)); + } + CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(data, CommunityBuildingManagerImportExcelData.ErrorRow.class); + errorRow.setErrorInfo(errorMsg); + errorRows.add(errorRow); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + // 最后几条达不到阈值，这里必须再调用一次 + execPersist(); + } + + /** + * 执行持久化 + */ + private void execPersist() { + try { + if (CollectionUtils.isNotEmpty(excelDataList)) { + communityBuildingManagerService.handleImportExcelData(customerId,staffId,agencyId, districtId, streetId,rediPrex,excelDataList,this); + } + } finally { + excelDataList.clear(); + } + } + + /** + * 获取错误行 + * + * @return + */ + public List getErrorRows() { + return errorRows; + } + + +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/CommunityBuildingManagerImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/CommunityBuildingManagerImportExcelData.java new file mode 100644 index 0000000000..469532c38f --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/CommunityBuildingManagerImportExcelData.java @@ -0,0 +1,116 @@ +package com.epmet.excel.yt; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; + +/** + * @Description + * @Author yzm + * @Date 2023/5/9 16:13 + */ +@Data +public class CommunityBuildingManagerImportExcelData { + + /** + * 姓名 + */ + @ExcelProperty(value = "*姓名") + @Length(max = 50, message = "姓名最多输入50字") + @NotBlank(message = "姓名不能为空") + private String name; + + /** + * 联系电话 + */ + @ExcelProperty(value = "*联系电话") + @Length(max = 50, message = "联系电话最多输入50字") + @NotBlank(message = "联系电话不能为空") + private String phone; + + /** + * 身份证号 + */ + @ExcelProperty(value = "*身份证号") + @Length(max = 50, message = "身份证号最多输入50字") + @NotBlank(message = "身份证号不能为空") + private String idCard; + + /** + * 类型：0楼长；1单元长 + */ + @ExcelProperty(value = "*类型") + @NotBlank(message = "类型不能为空") + private String typeName; + + @ExcelProperty(value = "*所属网格") + @NotBlank(message = "所属网格不能为空") + private String gridName; + + @ExcelProperty(value = "*所属小区") + @NotBlank(message = "所属小区不能为空") + private String viliageName; + + @ExcelProperty(value = "*楼栋") + @NotBlank(message = "楼栋不能为空") + private String buildingName; + + @ExcelProperty(value = "单元") + private String unitName; + + @Data + public static class ErrorRow { + /** + * 姓名 + */ + @ExcelProperty(value = "*姓名") + @ColumnWidth(20) + private String name; + + /** + * 联系电话 + */ + @ExcelProperty(value = "*联系电话") + @ColumnWidth(20) + private String phone; + + /** + * 身份证号 + */ + @ExcelProperty(value = "*身份证号") + @ColumnWidth(25) + private String idCard; + + /** + * 类型：0楼长；1单元长 + */ + @ExcelProperty(value = "*类型") + @ColumnWidth(15) + private String typeName; + + @ExcelProperty(value = "*所属网格") + @ColumnWidth(30) + private String gridName; + + @ExcelProperty(value = "*所属小区") + @ColumnWidth(30) + private String viliageName; + + @ExcelProperty(value = "*楼栋") + @ColumnWidth(20) + private String buildingName; + + @ExcelProperty(value = "单元") + @ColumnWidth(20) + private String unitName; + + @ColumnWidth(60) + @ExcelProperty("错误信息") + private String errorInfo; + } + +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java index eb32743443..fc48ab538f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java @@ -66,4 +66,6 @@ public interface CommunityBuildingManagerService extends BaseService ids); void execAsyncExcelImport(Path fileSavePath, String taskId); + + void checkImportPermission(String customerId, String userId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java index cde64d4da0..bac9041896 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java @@ -133,4 +133,10 @@ public interface IcBuildingService extends BaseService { * @return com.epmet.commons.tools.utils.Result */ Result getBuildingDetail(String buildingId); + + /** + * 更新ic_building的楼长信息那4列：building_leader_name、building_leader_mobile、building_leader_id_card、building_leader_type + * @param updateList + */ + void updateBuildingLeader(List updateList); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index 6461489107..63c0209d4f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -1,42 +1,66 @@ package com.epmet.service.impl; +import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; 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.OrgLevelEnum; +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; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; -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.SpringContextUtils; +import com.epmet.commons.tools.utils.*; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.CommunityBuildingManagerDao; import com.epmet.dao.IcBuildingDao; +import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; import com.epmet.dto.result.CommunityBuildingManagerDTO; +import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.entity.CommunityBuildingManagerEntity; import com.epmet.entity.IcBuildingEntity; +import com.epmet.excel.handler.CommunityBuildingManagerImportListener; +import com.epmet.excel.yt.CommunityBuildingManagerImportExcelData; +import com.epmet.excel.yt.IcPropertyManagementImportExcelData; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.OssFeignClient; import com.epmet.service.CommunityBuildingManagerService; +import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerGridService; +import com.epmet.utils.ImportTaskUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; +import org.apache.http.entity.ContentType; +import org.apache.poi.util.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.web.multipart.commons.CommonsMultipartFile; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; import java.nio.file.Path; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; /** * 楼长单元长信息表（烟台） @@ -49,7 +73,12 @@ import java.util.List; public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl implements CommunityBuildingManagerService { @Autowired private IcBuildingDao icBuildingDao; - + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + @Autowired + private OssFeignClient ossFeignClient; + + /** * 列表分页查询 * @@ -213,6 +242,14 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl errorRows = listener.getErrorRows(); + + boolean failed = errorRows.size() > 0; + + // 合并到一起写入 + // errorRows.addAll(otherRows); + + // 生成并上传描述文件 + OutputStream os = null; + FileItem fileItem = null; + if (errorRows.size() > 0) { + try { + // 文件生成 + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir(ImportTaskConstants.COMMUNITY_BUILDING_MANAGER, "import", "error_des"); + String fileName = UUID.randomUUID().toString().concat(".xlsx"); + + fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile()) + .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName); + os = fileItem.getOutputStream(); + + EasyExcel.write(os, IcPropertyManagementImportExcelData.ErrorRow.class).sheet("信息列表").doWrite(errorRows); + // 文件上传oss + Result errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + if (errorDesFileUploadResult.success()) { + errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); + } + + } finally { + IOUtils.closeQuietly(os); + if (!fileItem.isInMemory()) { + try { + fileItem.delete(); + } catch (Exception e) { + log.error("【楼长单元长表community_building_manager】删除错误描述临时文件失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + } + } + + Result result = ImportTaskUtils.finishImportTask( + importTaskId, + failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS, + errorDesFileUrl, + ""); + + if (!result.success()) { + log.error("【楼长单元长表community_building_manager】finishImportTask失败"); + } + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【楼长单元长表community_building_manager】出错:{}", errorMsg); + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + importFinishTaskForm.setOperatorId(staffId); + importFinishTaskForm.setResultDesc("物业管理表导入失败:系统异常，请查看系统日志"); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【楼长单元长表community_building_manager】导入记录状态修改为'完成'失败"); + } + } finally { + // 删除临时文件 + if (Files.exists(filePath)) { + try { + Files.delete(filePath); + } catch (IOException e) { + e.printStackTrace(); + } + } + // todo 删除 网格缓存、小区缓存、楼栋缓存、单元缓存 + + } + + + } + + /** + * @param customerId + * @param staffId + * @param agencyId + * @param rediPrex + * @param excelDataList + * @param listener + */ + public void handleImportExcelData(String customerId, + String staffId, + String agencyId, + String districtId, + String streetId, + String rediPrex, + List excelDataList, + CommunityBuildingManagerImportListener listener) { + List insertList = new ArrayList<>(); + List updateList = new ArrayList<>(); + for (CommunityBuildingManagerDTO dto : excelDataList) { + try { + CommunityBuildingManagerEntity entity = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerEntity.class); + entity.setDistrictId(districtId); + entity.setStreetId(streetId); + //查询当前社区下的网格列表 + // 所属网格 + String gridId = ""; + if (StringUtils.isBlank(gridId)) { + CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); + errorRow.setErrorInfo("网格不存在"); + listener.getErrorRows().add(errorRow); + continue; + } + // todo + entity.setOrgIdPath(CustomerOrgRedis.getOrgIdPath(gridId, OrgTypeEnum.GRID.getCode())); + + //查询当前网格下的小区 + // 所属小区 + String viliageId = ""; + if (StringUtils.isBlank(viliageId)) { + CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); + errorRow.setErrorInfo("小区不存在"); + listener.getErrorRows().add(errorRow); + continue; + } + entity.setViliageId(viliageId); + + //查询当前小区下的楼栋 + // 所属楼栋 + String buildingId = ""; + if (StringUtils.isBlank(buildingId)) { + CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); + errorRow.setErrorInfo("楼栋不存在"); + listener.getErrorRows().add(errorRow); + continue; + } + entity.setBuildingId(buildingId); + + // 所属单元 + String unitId = ""; + if (StringUtils.isNotBlank(dto.getUnitName())) { + // 查询楼栋下的单元列表 + if (StringUtils.isBlank(unitId)) { + CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); + errorRow.setErrorInfo("单元不存在"); + listener.getErrorRows().add(errorRow); + continue; + } + entity.setUnitId(unitId); + } + + LambdaQueryWrapper countQuery = new LambdaQueryWrapper<>(); + countQuery.eq(CommunityBuildingManagerEntity::getType, entity.getType()) + .eq(CommunityBuildingManagerEntity::getBuildingId, buildingId) + .eq(StringUtils.isNotBlank(unitId), CommunityBuildingManagerEntity::getUnitId, unitId) + .ne(CommunityBuildingManagerEntity::getId, null); + CommunityBuildingManagerEntity origin = baseDao.selectOne(countQuery); + if (null == origin) { + insertList.add(entity); + } else { + entity.setId(origin.getId()); + updateList.add(entity); + } + } catch (Exception e) { + CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); + errorRow.setErrorInfo("数据处理异常"); + listener.getErrorRows().add(errorRow); + } + } + // 同步到ic_building + this.insertBatch(insertList); + this.updateBatchById(updateList); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index 577e77c787..4e201a5336 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; @@ -173,4 +174,23 @@ public class IcBuildingServiceImpl extends BaseServiceImpl().ok(baseDao.getBuildingDetail(buildingId)); } + /** + * 更新ic_building的楼长信息那4列：building_leader_name、building_leader_mobile、building_leader_id_card、building_leader_type + * + * @param updateList + */ + @Override + public void updateBuildingLeader(List updateList) { + updateList.forEach(dto -> { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(IcBuildingEntity::getId, dto.getId()) + .set(IcBuildingEntity::getBuildingLeaderName, dto.getBuildingLeaderName()) + .set(IcBuildingEntity::getBuildingLeaderMobile, dto.getBuildingLeaderMobile()) + .set(IcBuildingEntity::getBuildingLeaderIdCard, dto.getBuildingLeaderIdCard()) + .set(IcBuildingEntity::getBuildingLeaderType, dto.getBuildingLeaderType()) + .set(IcBuildingEntity::getUpdatedBy, dto.getUpdatedBy()) + .set(IcBuildingEntity::getUpdatedTime, dto.getUpdatedTime()); + baseDao.update(null, updateWrapper); + }); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 6ead260319..558383ed73 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -359,7 +359,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService importFinishTaskForm.setTaskId(importTaskId); importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); importFinishTaskForm.setOperatorId(userId); - importFinishTaskForm.setResultDesc("城市管理图层导入失败:系统异常，请查看系统日志"); + importFinishTaskForm.setResultDesc("物业管理表导入失败:系统异常，请查看系统日志"); Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); if (!result.success()) { From 21760c66f77515e32f5070287f2917d8c3c893dc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 18:10:05 +0800 Subject: [PATCH 263/340] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=E5=AF=BC=E5=85=A5=EF=BC=8C=E6=9C=AA=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommunityBuildingManagerController.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index cf2cc27574..2597949a7d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -11,26 +11,24 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; -import com.epmet.commons.tools.enums.OrgLevelEnum; 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.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.*; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.FileUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; -import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; import com.epmet.dto.result.CommunityBuildingManagerDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.service.CommunityBuildingManagerService; -import com.epmet.service.CustomerAgencyService; import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; From b715cb4b5b38a4649e2f67891b2b59043953e4f4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 10 May 2023 09:26:40 +0800 Subject: [PATCH 264/340] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunityBuildingManagerController.java | 6 +++--- .../service/CommunityBuildingManagerService.java | 12 +++++++++--- .../impl/CommunityBuildingManagerServiceImpl.java | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 2597949a7d..379af23a48 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -93,7 +93,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver { /** * 新增楼长/单元长 - * todo: 同步到具体的楼栋 + * 同步到具体的楼栋 * @param dto * @return */ @@ -112,7 +112,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver { /** * 编辑楼长/单元长 - * todo: 同步到具体的楼栋 + * 同步到具体的楼栋 * @param dto * @return */ @@ -130,7 +130,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver { /** * 批量删除楼长/单元长 - * todo: 同时清空楼栋表里的信息 + * 同时清空楼栋表里的信息 * @param ids * @return */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java index fc48ab538f..1e90100266 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java @@ -40,7 +40,7 @@ public interface CommunityBuildingManagerService extends BaseService buildingUpdate = new LambdaUpdateWrapper<>(); buildingUpdate.eq(IcBuildingEntity::getId, entity.getBuildingId()) .set(IcBuildingEntity::getBuildingLeaderName, entity.getName()) @@ -194,7 +194,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl buildingUpdate = new LambdaUpdateWrapper<>(); buildingUpdate.eq(IcBuildingEntity::getId, updateFormDto.getBuildingId()) .set(IcBuildingEntity::getBuildingLeaderName, updateFormDto.getName()) From 6f25c600baf4eea7a9dd76c43a656c89eed5d40d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 10 May 2023 10:05:17 +0800 Subject: [PATCH 265/340] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=831?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ommunityBuildingManagerImportListener.java | 9 ++- .../CommunityBuildingManagerServiceImpl.java | 79 ++++++++++++------- 2 files changed, 56 insertions(+), 32 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java index 8609096b6f..d496c0b2cb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java @@ -17,6 +17,7 @@ import org.apache.commons.collections4.CollectionUtils; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * @Description @@ -28,6 +29,7 @@ public class CommunityBuildingManagerImportListener implements ReadListener gridMap; private String customerId; private String staffId; private String agencyId; @@ -40,7 +42,8 @@ public class CommunityBuildingManagerImportListener implements ReadListener excelDataList = new ArrayList<>(); - public CommunityBuildingManagerImportListener(String customerId, String staffId, String agencyId,String districtId,String streetId,String rediPrex,CommunityBuildingManagerServiceImpl communityBuildingManagerService) { + public CommunityBuildingManagerImportListener(Map gridMap,String customerId, String staffId, String agencyId, String districtId, String streetId, String rediPrex, CommunityBuildingManagerServiceImpl communityBuildingManagerService) { + this.gridMap=gridMap; this.customerId = customerId; this.staffId = staffId; this.agencyId=agencyId; @@ -73,7 +76,7 @@ public class CommunityBuildingManagerImportListener implements ReadListener gridList=customerGridService.getGridOption(staffInfoCacheResult.getAgencyId(), "addorupdate"); + Map gridMap = gridList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); + String uuid = IdWorker.getIdStr(); try { - staffId = EpmetRequestHolder.getLoginUserId(); - String customerId = EpmetRequestHolder.getLoginUserCustomerId(); - CustomerStaffInfoCacheResult staffInfoCacheResult=CustomerStaffRedis.getStaffInfo(customerId,staffId); - // todo - String districtId=""; - String streetId=""; - String uuid= IdWorker.getIdStr(); - CommunityBuildingManagerImportListener listener = new CommunityBuildingManagerImportListener(customerId,staffId,staffInfoCacheResult.getAgencyId(),districtId,streetId,uuid, + CommunityBuildingManagerImportListener listener = new CommunityBuildingManagerImportListener(gridMap,customerId,staffId,staffInfoCacheResult.getAgencyId(),districtId,streetId,uuid, SpringContextUtils.getBean(CommunityBuildingManagerServiceImpl.class)); EasyExcel.read(filePath.toFile(), CommunityBuildingManagerImportExcelData.class, listener).headRowNumber(1).sheet(0).doRead(); @@ -362,7 +370,8 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl gridMap, + String customerId, String staffId, String agencyId, String districtId, @@ -377,50 +386,62 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl viliageList = SpringContextUtils.getBean(IcNeighborHoodService.class).queryNeighborHoodOptions(neighborHoodOptionFormDTO); + Map viliageMap = viliageList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); + if (MapUtils.isEmpty(viliageMap) || !viliageMap.containsKey(dto.getViliageName()) || StringUtils.isBlank(viliageMap.get(dto.getViliageName()))) { CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); errorRow.setErrorInfo("小区不存在"); listener.getErrorRows().add(errorRow); continue; } + String viliageId = viliageMap.get(dto.getViliageName()); entity.setViliageId(viliageId); - //查询当前小区下的楼栋 + + // 查询当前小区下的楼栋 // 所属楼栋 - String buildingId = ""; - if (StringUtils.isBlank(buildingId)) { + List buildingList = SpringContextUtils.getBean(IcBuildingService.class).getBuildingOptions(viliageId); + Map buildingMap = buildingList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); + if (MapUtils.isEmpty(buildingMap) || !buildingMap.containsKey(dto.getBuildingName()) || StringUtils.isBlank(buildingMap.get(dto.getBuildingName()))) { CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); errorRow.setErrorInfo("楼栋不存在"); listener.getErrorRows().add(errorRow); continue; } + String buildingId = buildingMap.get(dto.getBuildingName()); entity.setBuildingId(buildingId); // 所属单元 String unitId = ""; if (StringUtils.isNotBlank(dto.getUnitName())) { // 查询楼栋下的单元列表 - if (StringUtils.isBlank(unitId)) { + List unitList = SpringContextUtils.getBean(IcBuildingUnitService.class).getUnitOptions(buildingId); + Map unitMap = unitList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); + if (MapUtils.isEmpty(unitMap) || !unitMap.containsKey(dto.getUnitName()) || StringUtils.isBlank(unitMap.get(dto.getUnitName()))) { CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); errorRow.setErrorInfo("单元不存在"); listener.getErrorRows().add(errorRow); continue; } + unitId = unitMap.get(dto.getUnitName()); entity.setUnitId(unitId); } From bb16b9ff7deb5019e8290d574038b828a8c7c700 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 10 May 2023 11:09:02 +0800 Subject: [PATCH 266/340] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=8312?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunityBuildingManagerServiceImpl.java | 81 ++++++++++++++++--- .../service/impl/IcBuildingServiceImpl.java | 2 +- 2 files changed, 69 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index 05a906abe5..538671377e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -15,6 +15,7 @@ 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.RedisUtils; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.*; @@ -23,6 +24,7 @@ import com.epmet.dao.CommunityBuildingManagerDao; import com.epmet.dao.IcBuildingDao; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.IcBuildingDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.NeighborHoodOptionFormDTO; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; @@ -78,7 +80,8 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl gridList=customerGridService.getGridOption(staffInfoCacheResult.getAgencyId(), "addorupdate"); Map gridMap = gridList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); String uuid = IdWorker.getIdStr(); + String redisKey = "community_building_manager_import".concat(StrConstant.COLON).concat(uuid); + try { - CommunityBuildingManagerImportListener listener = new CommunityBuildingManagerImportListener(gridMap,customerId,staffId,staffInfoCacheResult.getAgencyId(),districtId,streetId,uuid, + CommunityBuildingManagerImportListener listener = new CommunityBuildingManagerImportListener(gridMap,customerId,staffId,staffInfoCacheResult.getAgencyId(),districtId,streetId,redisKey, SpringContextUtils.getBean(CommunityBuildingManagerServiceImpl.class)); EasyExcel.read(filePath.toFile(), CommunityBuildingManagerImportExcelData.class, listener).headRowNumber(1).sheet(0).doRead(); @@ -355,8 +360,8 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl insertList = new ArrayList<>(); List updateList = new ArrayList<>(); + List buildingUpdateList=new ArrayList<>(); for (CommunityBuildingManagerDTO dto : excelDataList) { try { CommunityBuildingManagerEntity entity = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerEntity.class); @@ -399,12 +405,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl viliageList = SpringContextUtils.getBean(IcNeighborHoodService.class).queryNeighborHoodOptions(neighborHoodOptionFormDTO); + List viliageList =queryViliageList(customerId,staffId,agencyId,gridId,rediPrex); Map viliageMap = viliageList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); if (MapUtils.isEmpty(viliageMap) || !viliageMap.containsKey(dto.getViliageName()) || StringUtils.isBlank(viliageMap.get(dto.getViliageName()))) { CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); @@ -418,7 +419,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl buildingList = SpringContextUtils.getBean(IcBuildingService.class).getBuildingOptions(viliageId); + List buildingList=queryBuildingList(viliageId,rediPrex); Map buildingMap = buildingList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); if (MapUtils.isEmpty(buildingMap) || !buildingMap.containsKey(dto.getBuildingName()) || StringUtils.isBlank(buildingMap.get(dto.getBuildingName()))) { CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); @@ -433,7 +434,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl unitList = SpringContextUtils.getBean(IcBuildingUnitService.class).getUnitOptions(buildingId); + List unitList=queryUnitList(buildingId,rediPrex); Map unitMap = unitList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); if (MapUtils.isEmpty(unitMap) || !unitMap.containsKey(dto.getUnitName()) || StringUtils.isBlank(unitMap.get(dto.getUnitName()))) { CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); @@ -442,8 +443,8 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl countQuery = new LambdaQueryWrapper<>(); countQuery.eq(CommunityBuildingManagerEntity::getType, entity.getType()) @@ -457,6 +458,17 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl queryViliageList(String customerId, String staffId, String agencyId, String gridId, String rediPrex) { + String redisKey = rediPrex.concat(StrConstant.COLON).concat("viliage_list").concat(StrConstant.COLON).concat(gridId); + List viliageList = redisUtils.lrange(redisKey, NumConstant.ZERO, NumConstant.ONE_NEG, OptionResultDTO.class); + if (!CollectionUtils.isEmpty(viliageList)) { + return viliageList; + } + NeighborHoodOptionFormDTO neighborHoodOptionFormDTO = new NeighborHoodOptionFormDTO(); + neighborHoodOptionFormDTO.setCustomerId(customerId); + neighborHoodOptionFormDTO.setStaffId(staffId); + neighborHoodOptionFormDTO.setAgencyId(agencyId); + neighborHoodOptionFormDTO.setGridId(gridId); + List resultList = SpringContextUtils.getBean(IcNeighborHoodService.class).queryNeighborHoodOptions(neighborHoodOptionFormDTO); + // 有效时间1小时 + redisUtils.leftPush(redisKey, resultList, RedisUtils.HOUR_ONE_EXPIRE); + return resultList; + } + + private List queryBuildingList(String viliageId, String rediPrex) { + String redisKey = rediPrex.concat(StrConstant.COLON).concat("building_List").concat(StrConstant.COLON).concat(viliageId); + List buildingList = redisUtils.lrange(redisKey, NumConstant.ZERO, NumConstant.ONE_NEG, OptionResultDTO.class); + if (!CollectionUtils.isEmpty(buildingList)) { + return buildingList; + } + List resultList = SpringContextUtils.getBean(IcBuildingService.class).getBuildingOptions(viliageId); + // 有效时间1小时 + redisUtils.leftPush(redisKey, resultList, RedisUtils.HOUR_ONE_EXPIRE); + return resultList; + } + + private List queryUnitList(String buildingId, String rediPrex) { + String redisKey = rediPrex.concat(StrConstant.COLON).concat("unit_List").concat(StrConstant.COLON).concat(buildingId); + List unitList = redisUtils.lrange(redisKey, NumConstant.ZERO, NumConstant.ONE_NEG, OptionResultDTO.class); + if (!CollectionUtils.isEmpty(unitList)) { + return unitList; + } + List resultList = SpringContextUtils.getBean(IcBuildingUnitService.class).getUnitOptions(buildingId); + // 有效时间1小时 + redisUtils.leftPush(redisKey, resultList, RedisUtils.HOUR_ONE_EXPIRE); + return resultList; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index 4e201a5336..fa8737e051 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -189,7 +189,7 @@ public class IcBuildingServiceImpl extends BaseServiceImpl Date: Wed, 10 May 2023 13:28:37 +0800 Subject: [PATCH 267/340] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ImportGeneralDTO.java | 27 ++++++++++++++++++ .../epmet/model/NeighborHoodInfoModel.java | 12 ++++++++ .../impl/IcNeighborHoodServiceImpl.java | 21 ++++++++++++++ .../resources/excel/neighbor_template.xlsx | Bin 11674 -> 11413 bytes .../excel/neighbor_template_0510.xlsx | Bin 0 -> 11674 bytes .../resources/mapper/IcNeighborHoodDao.xml | 20 +++++++++++++ 6 files changed, 80 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template_0510.xlsx diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index df0f6b0530..dca6c1244b 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -183,4 +183,31 @@ public class ImportGeneralDTO implements Serializable { */ private Boolean buildingUpdateStatus = false; private Boolean neighborHoodUpdateStatus = false; + + /** + * 烟台需求：自然村/小区 + */ + private String viliageType; + + /** + * 烟台需求：自然村/小区 + */ + private String viliageTypeName; + /** + * 烟台需求：面积 + */ + private String area; + /** + * 烟台需求：开放类型 + */ + private String openType; + + /** + * 烟台需求：开放类型 + */ + private String openTypeName; + /** + * 烟台需求：建筑年代 + */ + private String buildYear; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java index 63260ee190..b1f33f409b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java @@ -21,6 +21,18 @@ public class NeighborHoodInfoModel { @ExcelProperty(value = "小区名称") private String neighborHoodName; + @ExcelProperty(value = "小区/自然村类型") + private String viliageTypeName; + + @ExcelProperty(value = "面积") + private String area; + + @ExcelProperty(value = "开放类型") + private String openTypeName; + + @ExcelProperty(value = "建筑年代") + private String buildYear; + @ExcelProperty(value = "关联物业") private String propertyName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index c253f154c5..55d7d172e5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -795,6 +795,27 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl needUpdateList) { + + needUpdateList.forEach( + needUpdate->{ + if (StringUtils.isNotBlank(needUpdate.getOpenTypeName())){ + if (needUpdate.getOpenTypeName().equals("自然村")){ + needUpdate.setOpenType("2"); + } + if (needUpdate.getOpenTypeName().equals("住宅小区")){ + needUpdate.setOpenType("1"); + } + } + if (StringUtils.isNotBlank(needUpdate.getViliageTypeName())){ + if (needUpdate.getViliageTypeName().equals("封闭式")){ + needUpdate.setViliageTypeName("1"); + } + if (needUpdate.getViliageTypeName().equals("开放式")){ + needUpdate.setViliageTypeName("2"); + } + } + }); + if (CollectionUtils.isNotEmpty(needUpdateList)){ baseDao.updateNeighborHood(needUpdateList); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx index 36297ea510f4e9d917b11d0da6106ac096d05a27..6cf2b7957e2ae12805b1ebea85d4c8c93c0b1585 100644 GIT binary patch literal 11413 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 JE9B4G{|{5RXjA|I literal 11674 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 + + + when id = #{l.neighborHoodId} then #{l.area} + + + + + when id = #{l.neighborHoodId} then #{l.buildYear} + + + + + when id = #{l.neighborHoodId} then #{l.viliageType} + + + + + when id = #{l.neighborHoodId} then #{l.openType} + + UPDATED_TIME = NOW() WHERE DEL_FLAG = '0' From eaee037d039b7f1392c1926bb435475309b1354f Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Wed, 10 May 2023 13:47:04 +0800 Subject: [PATCH 268/340] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/excel/IcNeighborHoodExcel.java | 13 +++++++++++++ .../main/resources/excel/neighbor_export.xlsx | Bin 12931 -> 11704 bytes .../resources/excel/neighbor_export_0510.xlsx | Bin 0 -> 12931 bytes .../resources/mapper/IcNeighborHoodDao.xml | 4 ++++ 4 files changed, 17 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export_0510.xlsx diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java index e9306fa5d7..227ed90e4a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java @@ -18,6 +18,7 @@ package com.epmet.excel; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.alibaba.excel.annotation.ExcelProperty; import com.epmet.util.ExcelVerifyInfo; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; @@ -108,6 +109,18 @@ public class IcNeighborHoodExcel extends ExcelVerifyInfo implements Serializable @Length(max=50,message = "不能超过50个字") private String neighborHoodName; + @Excel(name = "小区/自然村类型") + private String viliageTypeName; + + @Excel(name = "面积") + private String area; + + @Excel(name = "开放类型") + private String openTypeName; + + @Excel(name = "建筑年代") + private String buildYear; + @Excel(name = "关联物业") private String propertyName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export.xlsx index 2a1b3237d9de0b9f071d4c7ebfcc9fb0df6ef6cb..2d89d9255729ab7c6c41c736ad33386460df8c27 100644 GIT binary patch literal 11704 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 literal 12931 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

9`#A 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

9`#A z^g$5_AJ$!|Y>})zK+PMVe5R$TV`@E_*c8Dq{PeY)szpDzb}fnt zlJqQL^6E=U8+O;jl#!x~tWS#<3vkt(#!(Av>*S>eN|*tz)ooZYWXEGK8W!h;60q=s zb~8Bna6$|UOZ}Q(@J!^03CrZwJ(?AT%qPS5LQxli<0Luz?pv$gX`@EqyiH&f)$%BW z!q3a-TPwl9Pkr5t%evg5n|RLCdvjxU|KP>q5i>Lb&z*1B2ZYxOKvW%ce3E*6Fn?Tq zi#ywxkJqF?+&hVV(mi^;dA2cF8@5m?ZH?70SAiAzj&keW)4i*b=u)}#5(9;zxK4wNiTy z*TSRh>J!*VZSUHbbybZ+6BJD9T&@`Zl}!Qb;N)5$Z(;yq6e_5tXlP>~Z*ODkz-VA& zZ}c;!1E~bIU*)eJuS(Qes z1CzOKUPGzzP(KfY(68UwWTwKJarpSVBhOM>tfwl+4$2|3=%Rh$AQn_8?rvT0JiRX{ zzrsvA`;j+TA11a^3Fug}mbj`z8&%03+l-^PfVtE4wTtOL06aGJ9G%if<+0GY;LHeO zI4QUGEr(#;%$NCgZC+kN)kz&QGUtv=|_59kkUU;8w|7-}D`+eH8S0T*6vWt$J8 zq!j4*1OAngdbYOzWh97-e}2+prL5;cJ=!ZMdzcS*N!2ePKL|2YoeE%4>$gi@Dw!Li zW{ZDFgLNK_k->(t_bate#oA_;lnAE3s@kzOe*8Kb$(qNxJVjwP4s&4HlOG#LZW>Qp zt8KE+*T%I~8V}D^+$pQB;6Of1;j}VZQ*J0}ov{HtB=zeIxZ`p}{$Q5)kA$FQQ9rFQ#j+ohuEs zOu1$-iBsmYcCblV_8Fl(Z^Jxy43-b;O`cA+`)NvjdM_s?Efh54+J|aLbopa1!3AQ+ zPA%U{!H@(jdK!B^xLYZLtuXRT65XKWDy+}YQm73U_%VF1WQZBPKfk|wyu3f#3tdql zGWX)Ne$jg?GIAG)L-5KO8bS;M8O}ilx>LIeQqCJJBl3esAec+Lx=JwHi?ai953@@f zGvXJ^#hFSQcj4Qr^S!pq8;5AH%P{ZNFiPNgucZ6TYA=7x8$-t z2vIthqb4UMxa8JE`#Cxh@-Xh?2$t7+6;=mT4sW%nw^u>%Hx)_3_%=H2ti$YtW@<^Qq?wB_A!gZP#D> zv*B{8ahDOZ?YF-ir=lZQaJHLLr8+k8`KMl^f*4z#^YEf^;;^@V2nJ=7?}s;&pQj! zK9riPs%_rxw%@Id>yv`2=Isu~#9HtQunnAKf#iHWA6oQ$m_tnAEA-$Qk)LYe7+<+; z9`?FoV5y+T53(RDh+vVGQ-6%jgX2&L$BMf*hNy@f;s>qP9~=V%rw0Xt|2{eXdrANJ z_Ahhf@=|{X`1`!-UjYU|PWdm>tIrLePwo9SeFV+%J)7ZsZv6N0rr)Lj02-*;_J0pM zJ;!-I SELECT - d.id, - d.`NAME`, - d.ID_CARD, - d.DEATH_DATE, - d.AGE, - d.ADDRESS, - d.IC_RESI_USER_ID, - d.GRID_ID, - d.AGENCY_ID, - d.CREMATION_TIME, - d.ORGAN_NAME + d.* FROM data_sync_record_death d WHERE From 947072e7046e2273d0731cd70b8b6b2bc3d0828a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 11 May 2023 15:05:41 +0800 Subject: [PATCH 281/340] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DataSyncRecordDeathServiceImpl.java | 54 ++++++++++++++----- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java index 75403760af..d64ac4b252 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java @@ -14,16 +14,20 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; 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.SpringContextUtils; import com.epmet.dao.DataSyncRecordDeathDao; +import com.epmet.dao.IcResiUserDao; import com.epmet.dto.ChangeDeathDTO; import com.epmet.dto.DataSyncRecordDeathDTO; import com.epmet.dto.form.dataSync.DataSyncRecordDeathPageFormDTO; import com.epmet.entity.DataSyncRecordDeathEntity; +import com.epmet.entity.IcResiUserEntity; import com.epmet.service.DataSyncRecordDeathService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,6 +42,8 @@ import java.util.Map; */ @Service public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl implements DataSyncRecordDeathService { + @Autowired + private IcResiUserDao icResiUserDao; /** * 列表查询 @@ -124,27 +130,47 @@ public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcResiUserEntity::getIdCard, entity.getIdCard()) + .eq(IcResiUserEntity::getCustomerId, entity.getCustomerId()) + .eq(IcResiUserEntity::getDelFlag, NumConstant.ZERO_STR) + .select(IcResiUserEntity::getId); + IcResiUserEntity icResiUserEntity = icResiUserDao.selectOne(queryWrapper); + if (null == icResiUserEntity) { + existedFlag = false; + entity.setIcResiUserId(null); + entity.setDealResult("居民信息表不存在此居民"); + }else{ + entity.setIcResiUserId(icResiUserEntity.getId()); + } + if(existedFlag){ + ChangeDeathDTO changeDeathDTO = new ChangeDeathDTO(); + changeDeathDTO.setStaffId(userId); + changeDeathDTO.setUserId(entity.getIcResiUserId()); + changeDeathDTO.setGridId(entity.getGridId()); + changeDeathDTO.setName(entity.getName()); + changeDeathDTO.setIdCard(entity.getIdCard()); + // 手机号没有值 + changeDeathDTO.setMobile(StrConstant.EPMETY_STR); + changeDeathDTO.setDeathDate(DateUtils.stringToDate(entity.getDeathDate(), "yyyy-MM-dd")); + changeDeathDTO.setJoinReason("来源于数据比对-死亡人员数据"); + Result result=SpringContextUtils.getBean(ChangeDeathServiceImpl.class).save(changeDeathDTO); + if(!result.success()){ + entity.setDealStatus(NumConstant.TWO); + entity.setDealResult("同步死亡人员返回失败"); + } + } } catch (EpmetException epmetException) { - + //0:未处理；1:处理成功；2处理失败 entity.setDealStatus(NumConstant.TWO); entity.setDealResult("系统内部异常:" + epmetException.getMsg()); epmetException.printStackTrace(); } catch (Exception e) { - + //0:未处理；1:处理成功；2处理失败 entity.setDealStatus(NumConstant.TWO); entity.setDealResult("未知错误"); From d3f281a32184d97b78bf7b75b88ae85960ab3cb0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 11 May 2023 15:58:49 +0800 Subject: [PATCH 282/340] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4:?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java index d64ac4b252..012d9cf1f2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java @@ -141,6 +141,7 @@ public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl Date: Thu, 11 May 2023 16:01:11 +0800 Subject: [PATCH 283/340] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmetuser/impl/EpmetUserServiceImpl.java | 8 +++++ .../excel/CustomerStaffImportExcelData.java | 4 +-- .../epmet/service/impl/StaffServiceImpl.java | 2 +- .../impl/CustomerStaffServiceImpl.java | 35 ++++++++++--------- 4 files changed, 29 insertions(+), 20 deletions(-) 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 ea9980e7af..0a6f640a1f 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 @@ -723,6 +723,14 @@ public class EpmetUserServiceImpl implements EpmetUserService { formDTO.setPageNo(pageIndex); //1.分页查询排好序的工作人员Id列表【原本1/2步可以用一个sql，但涉及2需要按1的顺序排序，sql复杂且效率低，所以拆开】 LinkedList staffIds = customerStaffDao.selectOrderRole(formDTO); + if (staffIds!=null && formDTO.getStaffIds()!=null){ + formDTO.getStaffIds().forEach( + staffId->{ + if (!staffIds.contains(staffId)){ + staffIds.add(staffId); + } + }); + } //2.批量查询工作人员信息，按传入顺序排序 if(CollectionUtils.isEmpty(staffIds)){ return new ArrayList<>(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java index b5a1b08e1d..d724dc35b4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java @@ -29,10 +29,10 @@ public class CustomerStaffImportExcelData { private String idCard; @ExcelProperty("村居委员职务") - private Date viliagePosition; + private String viliagePosition; @ExcelProperty("党组织职务") - private Date partyPosition; + private String partyPosition; @NotBlank(message = "居住地址为必填项") @ExcelProperty("居住地址※") diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index 7a3e7db3fc..c45dc5d646 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -774,7 +774,7 @@ public class StaffServiceImpl implements StaffService { CustomerStaffImportListener listener = new CustomerStaffImportListener(userRemoteService.getLoginUserDetails().getUserId(), userRemoteService.getLoginUserDetails().getCustomerId(), orgType,orgId,this); - EasyExcel.read(filePath.toFile(), CustomerStaffImportExcelData.class, listener).headRowNumber(2).sheet(0).doRead(); + EasyExcel.read(filePath.toFile(), CustomerStaffImportExcelData.class, listener).headRowNumber(1).sheet(0).doRead(); String errorDesFileUrl = null; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 9238d9d20d..dbaf7171e1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -402,29 +402,30 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl { - StaffRoleEntity staffRoleEntity = new StaffRoleEntity(); - staffRoleEntity.setStaffId(userEntity.getId()); - staffRoleEntity.setRoleId(role); - staffRoleEntity.setOrgId(fromDTO.getAgencyId()); - staffRoleEntity.setCustomerId(fromDTO.getCustomerId()); - staffRoleService.insert(staffRoleEntity); - }); + if (fromDTO.getRoles()!=null){ + fromDTO.getRoles().forEach(role -> { + StaffRoleEntity staffRoleEntity = new StaffRoleEntity(); + staffRoleEntity.setStaffId(userEntity.getId()); + staffRoleEntity.setRoleId(role); + staffRoleEntity.setOrgId(fromDTO.getAgencyId()); + staffRoleEntity.setCustomerId(fromDTO.getCustomerId()); + staffRoleService.insert(staffRoleEntity); + }); + // 角色放缓存 + List roleKeyValue = govStaffRoleDao.selectRoleKeyName(fromDTO.getRoles()); + Map m = new HashMap(16); + roleKeyValue.forEach(r -> { + m.put(r.getRoleKey(), r.getRoleName()); + }); + dto.setRoles(m); + } - // 角色放缓存 - CustomerAgencyUserRoleDTO dto = new CustomerAgencyUserRoleDTO(); - List roleKeyValue = govStaffRoleDao.selectRoleKeyName(fromDTO.getRoles()); dto.setCustomerId(fromDTO.getCustomerId()); dto.setStaffId(userEntity.getId()); dto.setAgencyId(fromDTO.getAgencyId()); - Map m = new HashMap(16); - roleKeyValue.forEach(r -> { - m.put(r.getRoleKey(), r.getRoleName()); - }); - dto.setRoles(m); CustomerStaffRedis.delStaffInfoFormCache(dto.getCustomerId(), dto.getStaffId()); - return new Result().ok(ConvertUtils.sourceToTarget(staffEntity, CustomerStaffDTO.class)); } From 17b309f8cb2981a63fefded5c5eb89d82c063923 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 11 May 2023 16:30:24 +0800 Subject: [PATCH 284/340] =?UTF-8?q?=E6=A5=BC=E5=BC=A0=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ommunity_building_manager_import_temp.xlsx | Bin 9463 -> 10742 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/community_building_manager_import_temp.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/community_building_manager_import_temp.xlsx index 46c532d2b5df5eb27f9fd0230f5822602f697803..e8ceae9aa1ff6720df536d9991372ae86a1c18c6 100644 GIT binary patch delta 7654 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 iJdi^Vq|m?B{KWujt6@CEW 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 Date: Thu, 11 May 2023 16:43:26 +0800 Subject: [PATCH 285/340] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/StaffController.java | 2 +- .../excel/CustomerStaffImportExcelData.java | 7 +++++ .../handler/CustomerStaffImportListener.java | 28 +++++++++++++++++-- .../epmet/service/impl/StaffServiceImpl.java | 4 +-- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 23807cd908..1495e595a0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -259,7 +259,7 @@ public class StaffController implements ResultDataResolver { Path fileSavePath; try { - Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import"); + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("staff", "import"); fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName)); } catch (IOException e) { String errorMsg = ExceptionUtils.getErrorStackTrace(e); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java index d724dc35b4..c667472284 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java @@ -60,6 +60,13 @@ public class CustomerStaffImportExcelData { @Data public static class RowRemarkMessage { + @ColumnWidth(60) + @ExcelProperty("姓名") + private String name; + + @ColumnWidth(60) + @ExcelProperty("联系电话") + private String mobile; @ColumnWidth(60) @ExcelProperty("错误信息") diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CustomerStaffImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CustomerStaffImportListener.java index 28d91229af..7a8406eb8f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CustomerStaffImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CustomerStaffImportListener.java @@ -38,6 +38,8 @@ public class CustomerStaffImportListener implements ReadListener 0) { try { // 文件生成 - Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import", "error_des"); + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("staff", "import", "error_des"); String timeMillis = String.valueOf(System.currentTimeMillis()); - String fileName = "icnat_import_error_".concat(timeMillis).concat(".xlsx"); + String fileName = "staff_import_error_".concat(timeMillis).concat(".xlsx"); fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile()) .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName); From a9af7fa940f4607f8a03258b27a7e476562b8efc Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Thu, 11 May 2023 16:53:29 +0800 Subject: [PATCH 286/340] =?UTF-8?q?excel=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/customer_staff_import_template.xlsx | Bin 9594 -> 9646 bytes .../main/resources/excel/house_template.xlsx | Bin 9801 -> 9864 bytes .../resources/excel/neighbor_template.xlsx | Bin 11577 -> 11817 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/customer_staff_import_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/customer_staff_import_template.xlsx index 75678505187e1fc06269d98c4168f447e4c92451..4b9b2f1fce4c258bfe08fc043128233f56b86a07 100644 GIT binary patch delta 4520 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 G0002V^Lmp2 delta 4487 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 Z000000RSKX00766eI+XfT_FGf007X1f&c&j diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx index b325adef252fcb610cbddc046297653fd12c9052..5aca0af7a6fc4863b5895aea6d75ab11722d4d7b 100644 GIT binary patch delta 4958 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 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx index 31c08448700469717ae43da077772129b6e087b0..d98c075d9cc2bd770616a0d787958d8c5f098f22 100644 GIT binary patch delta 5363 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 delta 5127 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 TAn-p5n!iy1`imiW{>lCeF~FTv From f2786fcdb780e8f205ade4535f88f84cc7c50408 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 12 May 2023 11:09:03 +0800 Subject: [PATCH 287/340] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ImportGeneralDTO.java | 5 +++++ .../entity/IcPropertyManagementEntity.java | 3 +++ .../com/epmet/excel/IcNeighborHoodExcel.java | 6 ++++++ .../model/ImportNeighborHoodInfoListener.java | 7 +++++++ .../epmet/model/NeighborHoodInfoModel.java | 6 ++++++ .../main/resources/excel/neighbor_export.xlsx | Bin 11704 -> 11817 bytes .../resources/excel/neighbor_template.xlsx | Bin 11817 -> 11856 bytes .../resources/mapper/IcNeighborHoodDao.xml | 2 ++ 8 files changed, 29 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index 1c25e75f50..d617ad39dd 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -223,4 +223,9 @@ public class ImportGeneralDTO implements Serializable { private String buildingLeaderTypeNum; + + private String propertyUserName; + + private String propertyUserMobile; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java index c0ea9df16d..81a75f86ec 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java @@ -17,6 +17,8 @@ package com.epmet.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; @@ -39,6 +41,7 @@ public class IcPropertyManagementEntity extends BaseEpmetEntity { * 物业名称 */ private String name; + @TableField(fill = FieldFill.INSERT) private String customerId; /** * 烟台需求：物业联系人姓名 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java index 227ed90e4a..0406b33490 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java @@ -124,6 +124,12 @@ public class IcNeighborHoodExcel extends ExcelVerifyInfo implements Serializable @Excel(name = "关联物业") private String propertyName; + @Excel(name = "物业联系人") + private String propertyUserName; + + @Excel(name = "联系电话") + private String propertyUserMobile; + @Excel(name = "详细地址") @NotBlank(message = "不能为空") private String address; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java index 5bacafb1fe..f4fe33adb2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java @@ -185,6 +185,13 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener { IcPropertyManagementEntity e = new IcPropertyManagementEntity(); e.setName(name); + for (ImportGeneralDTO importGeneralDTO : notExistList) { + if (importGeneralDTO.getPropertyName().equals(name)){ + e.setContactMobile(importGeneralDTO.getPropertyUserMobile()); + e.setContactName(importGeneralDTO.getPropertyUserName()); + break; + } + } propertyManagementEntities.add(e); }); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java index b1f33f409b..374f367a2e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java @@ -36,6 +36,12 @@ public class NeighborHoodInfoModel { @ExcelProperty(value = "关联物业") private String propertyName; + @ExcelProperty(value = "物业联系人") + private String propertyUserName; + + @ExcelProperty(value = "联系电话") + private String propertyUserMobile; + @ExcelProperty(value = "详细地址") private String address; diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export.xlsx index 2d89d9255729ab7c6c41c736ad33386460df8c27..91a9637774b3ec0d1524f1b61864c5f699114f2a 100644 GIT binary patch delta 5473 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 Qz;a{=FAt6z=idSU0?&yr%K!iX delta 5340 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 delta 5700 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 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 7f51133503..574d29a6ae 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -197,6 +197,8 @@ a.ADDRESS as address, a.REMARK as remark, e.NAME as propertyName, + e.CONTACT_NAME as propertyUserName, + e.CONTACT_MOBILE as propertyUserMobile, b.ORGANIZATION_NAME as agencyName, c.GRID_NAME as gridName from ic_neighbor_hood a From 770d2d6e524c172a2e8345ad28190436c9f01f36 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 12 May 2023 15:38:03 +0800 Subject: [PATCH 288/340] =?UTF-8?q?=E6=A5=BC=E6=B4=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BuildingServiceImpl.java | 112 +++++++++++++++++- 1 file changed, 108 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 5f16fb2c62..8eb14781f5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -92,6 +92,8 @@ public class BuildingServiceImpl implements BuildingService { private IcOrganizationCodeInfoDao icOrganizationCodeInfoDao; @Autowired private IcOrganizationCodeInfoServiceImpl icOrganizationCodeInfoServiceImpl; + @Autowired + private CommunityBuildingManagerDao communityBuildingManagerDao; @Override @@ -103,8 +105,8 @@ public class BuildingServiceImpl implements BuildingService { if (null != count && count > 0) { throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); } - IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId()); - count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood.getNeighborHoodName(), formDTO.getBuildingName(), null); + IcNeighborHoodEntity neighborHood1 = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId()); + count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood1.getNeighborHoodName(), formDTO.getBuildingName(), null); if (null != count && count > 0) { throw new EpmetException(EpmetErrorCode.BUILDING_NAME_EXITED_IN_GRID.getCode()); } @@ -121,6 +123,57 @@ public class BuildingServiceImpl implements BuildingService { IcBuildingEntity entity = ConvertUtils.sourceToTarget(icBuildingDTO, IcBuildingEntity.class); icBuildingDao.insert(entity); + + LambdaQueryWrapper manager = new LambdaQueryWrapper().eq(CommunityBuildingManagerEntity::getBuildingId,entity.getId()); + CommunityBuildingManagerEntity communityBuildingManagerEntity = communityBuildingManagerDao.selectOne(manager); + + + if (StringUtils.isNotBlank(entity.getBuildingLeaderType())&& + StringUtils.isNotBlank(entity.getBuildingLeaderIdCard())&& + StringUtils.isNotBlank(entity.getBuildingLeaderMobile())&& + StringUtils.isNotBlank(entity.getBuildingLeaderName())){ + + if (communityBuildingManagerEntity!=null){ + communityBuildingManagerEntity.setIdCard(entity.getBuildingLeaderIdCard()); + communityBuildingManagerEntity.setPhone(entity.getBuildingLeaderMobile()); + communityBuildingManagerEntity.setType(entity.getBuildingLeaderType()); + communityBuildingManagerEntity.setName(entity.getBuildingLeaderName()); + communityBuildingManagerDao.updateById(communityBuildingManagerEntity); + }else{ + communityBuildingManagerEntity= new CommunityBuildingManagerEntity(); + communityBuildingManagerEntity.setIdCard(entity.getBuildingLeaderIdCard()); + communityBuildingManagerEntity.setPhone(entity.getBuildingLeaderMobile()); + communityBuildingManagerEntity.setType(entity.getBuildingLeaderType()); + communityBuildingManagerEntity.setName(entity.getBuildingLeaderName()); + communityBuildingManagerEntity.setBuildingId(entity.getId()); + communityBuildingManagerEntity.setViliageId(entity.getNeighborHoodId()); + IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(entity.getNeighborHoodId()); + communityBuildingManagerEntity.setGridId(neighborHood.getGridId()); + communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids()+":"+neighborHood.getAgencyId()+":"+neighborHood.getGridId()); + + List agencyIds = new ArrayList<>(Arrays.asList(neighborHood.getAgencyPids().split(":"))); + agencyIds.add(neighborHood.getAgencyId()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper().in(CustomerAgencyEntity::getId,agencyIds); + List customerAgencyEntities = customerAgencyDao.selectList(queryWrapper); + for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) { + if (customerAgencyEntity.getLevel().equals("community")){ + communityBuildingManagerEntity.setCommunityId(customerAgencyEntity.getId()); + } + if (customerAgencyEntity.getLevel().equals("street")){ + communityBuildingManagerEntity.setStreetId(customerAgencyEntity.getId()); + } + if (customerAgencyEntity.getLevel().equals("district")){ + communityBuildingManagerEntity.setDistrictId(customerAgencyEntity.getId()); + } + } + communityBuildingManagerDao.insert(communityBuildingManagerEntity); + } + }else{ + if (communityBuildingManagerEntity!=null){ + communityBuildingManagerDao.deleteById(communityBuildingManagerEntity); + } + } + //设置楼宇单元 Integer totalUnitNum = formDTO.getTotalUnitNum(); List unitList = new ArrayList<>(); @@ -657,8 +710,8 @@ public class BuildingServiceImpl implements BuildingService { if (null != count && count > 0) { throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); } - IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId()); - count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood.getNeighborHoodName(), formDTO.getBuildingName(), formDTO.getBuildingId()); + IcNeighborHoodEntity neighborHood1 = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId()); + count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood1.getNeighborHoodName(), formDTO.getBuildingName(), formDTO.getBuildingId()); if (null != count && count > 0) { throw new EpmetException(EpmetErrorCode.BUILDING_NAME_EXITED_IN_GRID.getCode()); } @@ -684,6 +737,57 @@ public class BuildingServiceImpl implements BuildingService { icBuildingDTO.setCustomerId(customerId); icBuildingService.update(icBuildingDTO); + + LambdaQueryWrapper manager = new LambdaQueryWrapper().eq(CommunityBuildingManagerEntity::getBuildingId,icBuildingDTO.getId()); + CommunityBuildingManagerEntity communityBuildingManagerEntity = communityBuildingManagerDao.selectOne(manager); + + + if (StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderType())&& + StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderIdCard())&& + StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderMobile())&& + StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderName())){ + + if (communityBuildingManagerEntity!=null){ + communityBuildingManagerEntity.setIdCard(icBuildingDTO.getBuildingLeaderIdCard()); + communityBuildingManagerEntity.setPhone(icBuildingDTO.getBuildingLeaderMobile()); + communityBuildingManagerEntity.setType(icBuildingDTO.getBuildingLeaderType()); + communityBuildingManagerEntity.setName(icBuildingDTO.getBuildingLeaderName()); + communityBuildingManagerDao.updateById(communityBuildingManagerEntity); + }else{ + communityBuildingManagerEntity= new CommunityBuildingManagerEntity(); + communityBuildingManagerEntity.setIdCard(icBuildingDTO.getBuildingLeaderIdCard()); + communityBuildingManagerEntity.setPhone(icBuildingDTO.getBuildingLeaderMobile()); + communityBuildingManagerEntity.setType(icBuildingDTO.getBuildingLeaderType()); + communityBuildingManagerEntity.setName(icBuildingDTO.getBuildingLeaderName()); + communityBuildingManagerEntity.setBuildingId(icBuildingDTO.getId()); + communityBuildingManagerEntity.setViliageId(icBuildingDTO.getNeighborHoodId()); + IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(icBuildingDTO.getNeighborHoodId()); + communityBuildingManagerEntity.setGridId(neighborHood.getGridId()); + communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids()+":"+neighborHood.getAgencyId()+":"+neighborHood.getGridId()); + + List agencyIds = new ArrayList<>(Arrays.asList(neighborHood.getAgencyPids().split(":"))); + agencyIds.add(neighborHood.getAgencyId()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper().in(CustomerAgencyEntity::getId,agencyIds); + List customerAgencyEntities = customerAgencyDao.selectList(queryWrapper); + for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) { + if (customerAgencyEntity.getLevel().equals("community")){ + communityBuildingManagerEntity.setCommunityId(customerAgencyEntity.getId()); + } + if (customerAgencyEntity.getLevel().equals("street")){ + communityBuildingManagerEntity.setStreetId(customerAgencyEntity.getId()); + } + if (customerAgencyEntity.getLevel().equals("district")){ + communityBuildingManagerEntity.setDistrictId(customerAgencyEntity.getId()); + } + } + communityBuildingManagerDao.insert(communityBuildingManagerEntity); + } + }else{ + if (communityBuildingManagerEntity!=null){ + communityBuildingManagerDao.deleteById(communityBuildingManagerEntity); + } + } + // 更新房屋名称 icHouseDao.houseUpdateHouseName(formDTO.getBuildingId()); //更新楼宇单元 From 3b6c6202e15ad270a6192ac2b00e38d48aeb6052 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 12 May 2023 15:38:57 +0800 Subject: [PATCH 289/340] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=AE=A1=E7=90=86=E5=B0=8F=E5=8C=BA=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E9=99=8D=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IcPropertyManagementDao.xml | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml index 88c1b8e2a0..64c35920e1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml @@ -71,19 +71,33 @@ \ No newline at end of file From aecd032441d9057603157fab8294e97eddcbdde6 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 12 May 2023 15:47:20 +0800 Subject: [PATCH 290/340] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A5=BC=E6=B4=9E?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcBuildingDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 34d1023fa6..853d3dc59d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -463,7 +463,7 @@ SELECT b.BUILDING_LEADER_ID_CARD as buildingLeaderIdCard, b.BUILDING_LEADER_TYPE as buildingLeaderType, - if(b.BUILDING_LEADER_TYPE = 0,'楼长',if(b.BUILDING_LEADER_TYPE = 1,'单元长','')) as buildingLeaderTypeName, + if(b.BUILDING_LEADER_TYPE = 0,'楼长',if(b.BUILDING_LEADER_TYPE = 1,'单元长',if(b.BUILDING_LEADER_TYPE = '0,1','楼长/单元长',if(b.BUILDING_LEADER_TYPE = '1,0','楼长/单元长','')))) as buildingLeaderTypeName, b.ID AS buildingId, b.BUILDING_NAME, b.NEIGHBOR_HOOD_ID, From cf2d8be960e019504aad05fdafdd2b32bb030f8d Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 12 May 2023 15:54:31 +0800 Subject: [PATCH 291/340] =?UTF-8?q?=E6=A5=BC=E6=B4=9E=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcBuildingDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 853d3dc59d..eb810ac14e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -463,7 +463,7 @@ SELECT b.BUILDING_LEADER_ID_CARD as buildingLeaderIdCard, b.BUILDING_LEADER_TYPE as buildingLeaderType, - if(b.BUILDING_LEADER_TYPE = 0,'楼长',if(b.BUILDING_LEADER_TYPE = 1,'单元长',if(b.BUILDING_LEADER_TYPE = '0,1','楼长/单元长',if(b.BUILDING_LEADER_TYPE = '1,0','楼长/单元长','')))) as buildingLeaderTypeName, + if(b.BUILDING_LEADER_TYPE = '0','楼长',if(b.BUILDING_LEADER_TYPE = '1','单元长',if(b.BUILDING_LEADER_TYPE = '0,1','楼长/单元长',if(b.BUILDING_LEADER_TYPE = '1,0','楼长/单元长','')))) as buildingLeaderTypeName, b.ID AS buildingId, b.BUILDING_NAME, b.NEIGHBOR_HOOD_ID, From 9f179cfe597ce0c2a18304927ea98b0d16fffb6f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 12 May 2023 16:15:58 +0800 Subject: [PATCH 292/340] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=A4=9A=E9=80=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CommunityBuildingManagerDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml index 1e826a9101..23b0f682e9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml @@ -33,6 +33,7 @@ ( case when m.type='0' then '楼长' when m.type='1' then '单元长' + when m.type='0,1' or m.type='1,0' then '楼长,单元长' else '-' end )as typeName, From c2205665d5eb1801f8ecc6ab5eff2384f62f2095 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 15 May 2023 13:29:26 +0800 Subject: [PATCH 293/340] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/model/BuildingInfoModel.java | 3 --- .../service/impl/BuildingServiceImpl.java | 2 ++ .../impl/IcNeighborHoodServiceImpl.java | 5 +++-- .../resources/excel/building_template.xlsx | Bin 11754 -> 11727 bytes 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java index 38df15fe5d..3a72a3f253 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java @@ -47,9 +47,6 @@ public class BuildingInfoModel { @ExcelProperty(value = "楼长身份证号") private String buildingLeaderIdCard; - @ExcelProperty(value = "楼长类型") - private String buildingLeaderType; - @ExcelProperty(value = "排序") private BigDecimal sort; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 8eb14781f5..c8a7d1fd13 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -121,6 +121,7 @@ public class BuildingServiceImpl implements BuildingService { IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class); icBuildingDTO.setCustomerId(customerId); IcBuildingEntity entity = ConvertUtils.sourceToTarget(icBuildingDTO, IcBuildingEntity.class); + entity.setBuildingLeaderType("0"); icBuildingDao.insert(entity); @@ -735,6 +736,7 @@ public class BuildingServiceImpl implements BuildingService { IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class); icBuildingDTO.setId(formDTO.getBuildingId()); icBuildingDTO.setCustomerId(customerId); + icBuildingDTO.setBuildingLeaderType("0"); icBuildingService.update(icBuildingDTO); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index f9c10cf973..bc6175f78a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -629,14 +629,15 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImplF!vNMtY@`1q7*|gmf({;F61=(%~X4A%diIBeg6k z-TnFh?icsmIcMg~nVEOy%scPQJkPUfHE30pi%XE6yL}Jw0T)cXn_4@YGUSIC#pMRP zN}1zQbPhsp*%wZE?SryGzj*jqUBA3-W>TWm%#Agtv|O*B^!86Fpg@H4AR`$v->7dx zg9KI{W0B!1X;_pl`AqeLV*WuZC{$Pf;Y2VA|ET0virF7muydE~IL=x^9vb&qUJ6LR zU9_FNgK%g-fXkALurlTRt+w`?#rpt_rV>-)x6EjunFvyH%fgo?>B^L)WOUD{zdEL5G0q0ve28 zflK<(NN2YJ7YD}(u|&WEr1t4EKctH~)eIr-yA(qV!Aw9ToN6VJ=5zr#k1#24xfAFg zMYKQ$8C3=yG+nJqk)vAkiy|CGEfV26Qn#)JVx;l=f=+Jr`2_^u^!NH_e^|fo|%VHIxIu|Nrk6acdcTExpIzN&QS}<`gwTsI`Fc6*m8C6ETeBAXL`z-vq+Yyo zvWX=H%m-OEEHpNKsrr&%8Qb=jYjH4T`^0W9DJKAPYzEiR>}%v<$n-?XwpUM=g62B_u_u z5ubdOWm3m0g<2U%M&#{kel;q9M^@Lq~6swt^RY3a;v? znWW*;mn3)NWrPico$?TzTCRyylec=%Lt!=g=~<%0C`&9s^rRV|^U3f5ap)Z##+h|V zfVr!z`U+R_{u8FxDyQ8Cg4B~)B&|tPZd{grKVH!eS8#i@imb1XQ8(%RP-pcnh+Utc zev}ns%UV6D>M=oGml+ev>fIE(CqhS`7azZIv1aO5?Oa+c6m;L7clROx-lPmIscHJN z4iDxnD*}Dv?DCjsE|*lA8oU8T`_H^AFyPlP8}c2vRoDV%PT6UV4bsYNXZ0e_N{e_d zT3_&WWJ}2l-=A=5Ddce5-&MpeSN?qUIJt5Nv#qaq&%ic2%Wmz)& z=Y`v~)5-<8+wJ31yKMPOzx_TR-EYB=pPpjs$xygAanARxMU%bi%Ops3p&vv_YBx`%K(3Q4=Hv!I1 z<9{lMga$x%p2DtmR&0loKczbG?ub62o$`pSh}l^?lHwcwh@W9YlMen&6&OWRzQYNSPBoPawyKH=EyzYWCdl z?<||$QmNnKp{edzkO6zdcOkxHI5@xbad0SbaBu=VM0|W-dpP?D2Y7mnTmMd;HKzwO zmVqkc_KrB@kEFw;9VcyG@pLoGA#EWV8dNVrT0EU4s4B;esKz+oiim-p)GxovGS>O2 z%4-z9U`%$=soKV-TyqqKfz z`}u>{1UPQ{_^JiN>I+_I^7N_^(7tbBy8sIr+=1x-se(CPZrRO}70^z$_(5mkc!JGU zCXW+76l{&VP07|oo7HcyPqPJ!??vR(w?BVrNRf;;yBQq=T{rt`S#H5bmkKZn}(G%V)v3y?B8ZucSATIX-Rp3x5Q%@HyA5 zv7uu%&9McKi*;Kz>+Dq&*UNi}Wh3ieFDQaVNWXkieg_PvZI|!y_S*CjUOksqo)`kH zVGiwDgKtP|wpcBdNX)tG#{GQDwPRe(i_Tsx9OLsyPwhf<$6j=mR(w@C`*C=oho&{X%*SDv@Sd0$vbw{qFnVv0oJ&0WG^0t{6odC9qeuoLnT4|WkO^3ODk5x{7k;kHR zxTutz2q{XvOrHy(GUqLcayOLNEE`+kuBik~3Gy9ElluH?Q1PF?K z*yoAM>}(rzetJFJ;vTUU125}u^MPE&P+mo3pUl9bUM(?9_?kXH zlv&@`ZzV+vNF6!=q$#NRnc*Q~3LKrVhX&OIY=;DWied(E$;fyQT{c43ukeCy7jBJ| zVf7>jdMVK0{Fj+-BPTSRyBo?4Xn0#NV;cq@>lt^YkMz$ryi;}9FwQKijl=52Ju`DR z3>ThMs}F%Q`L4f#7r8d=2uU~v18q^J&pDcbg%(l*lPd2CQJ^f=8#D{a&mzYb&> z-g{@+#ynWE?ezz`Y(YaeS5FQ)xw=<8e$5my???mUs6NMyAwcgC4>a_;OIFIv0hlJi zM;$sJz6kH(Z>jTR+EyX;K#KdDX_`(J7*EpU&xL{XL|L$Lt_E&z)5qo6( zC@crVN!;F86PJPWr!#6<1f2wXzBGz9`(?dkO?oMyUGiW= z@YTl@nU^6-&7JCe3tsoek>+X;pqJ58B0BbKWR6UBddle?IV5@)2%sW6W@2fOFCV%I zonB#)utq`PD3wESaa{Zss%ZIFBgh(B#_yW>GR=zb5sy!4(m|BG)^e9;aW59hb8_Jdu2q!A3t5{`dfUfrWzQbVmlwU+b-4Lqv9B3EuUZEzcb@i%-1;1FkoOR{>$CMp z*C(j>X>Cj`EZTd`M$~VFb*d=6NPGpxxDI|Yn8$d`vp*JY-cXez&k}PX&HVa;kGc1( zPvp~Wy~6qR#@PlY-atO{W>cI{#%5XCFvoGEEvV9^0s7n;6-*=CtrZIvElpqN8V(;W zSXo)`5hw@t&8Xb2jyenWBhcntC3B>Na$RuEvC$(UZ`BuL1rMw@1M)mvwixdnRi$E- zZK?CdZx#%?216P8)UK_R!%oY8#iiB9ld2v|aaLj;ak^~SUGI0EWwgG(x{fdhZMxHP zHTMOkgXo2+?8xqQlPBr0wuYx6DeAMnP}_gju>k@5iXWn5qyy+pXl@}siZbIW1hzJ0 za}X)=mVj8neIXCI6sY)<+r!espSoX2o=o|2al!*QjBHd{{}`u=*4LjNW(?+vA-VoM zn@Ue91O?H^QHM6t;bYKix@9qP=5$R7<}RZ1cnE1mGaMcd(5+m~+~o^FMiEb*2P*?J z7BxVUf`aR5d{HhhlF~gKP1$@;hLau~z^k@wcHsU1?e#Gb z&C;&tpsZ@Emdlg53_g#TNq*nO^{Nn8O9(jBm9iDmcj_?Fjvef}yZiU&rE**CjAs9_ zykFZGX{djC?mBu{Da@AFda?Iy17Ne33w(G!!05=qrJY&$!z4lZ2X$GHwy&NfvXdm7 zi_VQdYh$!E0k~|5fnSif6ryy6Vm)HQ;b9q-eduF5fbhLoU*`dVxK=E-c%9&NA@FIk z^I$CH3mjr*wt%9bf@CxbOXBI?6-By^rpUl3MWGXe6jdWM1KeqS^fm9>;o5ib2egT3 zkJ@qz!p8Mt2TeSkg;lJ!rKK9*QKSuUd>G`=^V$lZr&niFDv@Y1PIINFufa|${?Z9n z90{!0R9X8z`u#)*rMGG{G^4@L4A6(yNucN1-VE0fPjn}Gp+#iVR?cM4DDK8kf7@bR zt6;Zh$kB#fNdfbUHuF4 z{rzA0>lJ(&Z`@VxLa_%ng_dplD4a<728OX;L_pERA{S>7VWa3ZU}vBRVA{Xif{WP7 zzvE9hW?phtzGC_Ldk)ocb(5m!OG^(`Nhbx>x@*8t2cLlMFFGZ`iPm3M#0iz~W&f); zVE*QRTK~bUP)z97VU8)nWM<*OyJtrJz1Q$3uXsIx# zM=p;(JW?ogM!X}(K>A`grKuwAaG3WFRZucUk7y;Nz-$_gm z9WT}-hEgQDS_S5o^Y3H*cwOPmdf01JcK>F@{k6`b+dKh;F6HI%r>}zTfp?5tN z_(BzHdcN5}*Dma!@L&sfQxw~~R_Asx@~7nJnA-|6YQi{>A+y8g%yeyBlpEQC^Dmc@ z|F2J>4chJqBThCzzeAL&nS1~4#QgJ-!nekf#ecbIc*+}?)XAsn%_;bH%E74z4cu(= z?P!a70dlxvB3c{$!q?UU(e6uwufkmhami@^c{w_c_x|pjW<_~BdFW7wOl!0G*NN@c zvftudqVf@9k%5eAw(rcn6{;nf8tEoX<%ZT@!7Eu|8#+G#!wtSz%vRBIZ(CcH@9k2R zT0Vii`7i|fU2)m)Q1Kw7*zN9li6K*61b5fg#oMQam#DDkI~@fOTxTNw#M(}b17*MD zu}y)5&5Kd#Fg|v@78xd)I;*$k3Oh~kuf3YHpd^3*JeeDdhu;w3hWd=uvm)c(Q4 zq#Eo5-p6U$NL#Gcyg2&EUnSLFv=6rKC-~Q(uxQpU_uXbB@*Jffe`s1dW0Vz7&jY% z;uFVhLyYku{v|}Z^Z&$K=SE0?C2{W}+`vN2{~6tX0~`kzhvRQKiueNN<^4~__W%77 z^#8`+5Z-(o2o3?ke^cj71x#>p5yb*hxO|930TA;)XRh=24(a0I;N1OZn!o8^D?LDP z3d-SrMc4|;;wmFD1(k4p5p#l4%>Snhk>KFm|Cho4SS%rggw*gh$Pj{em=H-qV7y~; OM57Rxh>`D~VgCg@dt|c! delta 5510 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 g;gP{vIk`~@asCaR|3Wa{Uq}US;UvW1XZ Date: Mon, 15 May 2023 13:46:55 +0800 Subject: [PATCH 294/340] =?UTF-8?q?=E6=A5=BC=E6=B4=9E=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/IcBuildingExcel.java | 4 ++-- .../main/resources/excel/building_export.xlsx | Bin 11696 -> 11676 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java index 52e7a2a435..baf1cdb4a6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java @@ -134,6 +134,6 @@ public class IcBuildingExcel extends ExcelVerifyInfo implements Serializable { @Excel(name = "楼长身份证号") private String buildingLeaderIdCard; - @Excel(name = "楼长类型") - private String buildingLeaderType; +/* @Excel(name = "楼长类型") + private String buildingLeaderType;*/ } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export.xlsx index d1cad4c5560a387e821cd06056ab4b93983d127f..ba32c961d1359c4a0993a119cadd5a3106ca006a 100644 GIT binary patch delta 5360 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 From 3eb3ef92ca5790c8c9548eb93f89c83bdd20be4b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 17 May 2023 10:43:53 +0800 Subject: [PATCH 295/340] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/IcHouseService.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index 4324b1d2a5..d86c5646d7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -8,14 +8,10 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; -import com.epmet.dto.form.DetailByTypeFormDTO; import com.epmet.dto.form.HouseCountPictureFormDTO; import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO; -import com.epmet.dto.result.HouseAgencyInfoResultDTO; -import com.epmet.dto.result.HouseInfoDTO; -import com.epmet.dto.result.HouseListResultDTO; -import com.epmet.dto.result.HousesNameResultDTO; +import com.epmet.dto.result.*; import com.epmet.dto.result.lingshan.HouseTreeDTO; import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO; import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO; From cc18fc8dc88310b2bbbfc4238c53d130a38509a9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 17 May 2023 11:14:38 +0800 Subject: [PATCH 296/340] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=9C=A8dev=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IcHouseDao.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 4a31416e26..edce357e89 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -226,7 +226,9 @@ public interface IcHouseDao extends BaseDao { List selectListPartyCenterHouse(@Param("customerId") String customerId, @Param("agencyId") String agencyId, @Param("neighborHoodName") String neighborHoodName, - @Param("buildingName") String buildingName); + @Param("buildingName") String buildingName, + @Param("buildingId") String buildingId, + @Param("partyCenterHouseFlag") String partyCenterHouseFlag); /** * 群租房列表 @@ -241,7 +243,4 @@ public interface IcHouseDao extends BaseDao { List getHouseStatusCount(@Param("orgId") String orgId,@Param("orgType") String orgType, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); List getHousePictureList(@Param("orgId") String orgId,@Param("orgType") String orgType, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd,@Param("purpose") String purpose,@Param("rentFlag") Integer rentFlag); - @Param("buildingName") String buildingName, - @Param("buildingId") String buildingId, - @Param("partyCenterHouseFlag") String partyCenterHouseFlag); } From 511eaab4ee4643ba994f1436843785373ae05ab7 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Wed, 17 May 2023 14:17:29 +0800 Subject: [PATCH 297/340] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E6=8B=89=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/IcResiUserDeadTaskLogDTO.java | 69 ++++++++++ .../com/epmet/dto/form/DataSyncTaskParam.java | 4 + .../IcResiUserDeadTaskLogController.java | 72 ++++++++++ .../java/com/epmet/dao/DataSyncConfigDao.java | 4 + .../epmet/dao/IcResiUserDeadTaskLogDao.java | 16 +++ .../entity/IcResiUserDeadTaskLogEntity.java | 39 ++++++ .../excel/IcResiUserDeadTaskLogExcel.java | 48 +++++++ .../redis/IcResiUserDeadTaskLogRedis.java | 30 +++++ .../service/IcResiUserDeadTaskLogService.java | 78 +++++++++++ .../impl/DataSyncConfigServiceImpl.java | 126 ++++++++++++++---- .../IcResiUserDeadTaskLogServiceImpl.java | 83 ++++++++++++ .../resources/mapper/DataSyncConfigDao.xml | 77 +++++++++++ .../mapper/IcResiUserDeadTaskLogDao.xml | 20 +++ 13 files changed, 642 insertions(+), 24 deletions(-) create mode 100755 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDeadTaskLogDTO.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserDeadTaskLogController.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDeadTaskLogDao.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserDeadTaskLogEntity.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserDeadTaskLogExcel.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserDeadTaskLogRedis.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserDeadTaskLogService.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDeadTaskLogServiceImpl.java create mode 100755 epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDeadTaskLogDao.xml diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDeadTaskLogDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDeadTaskLogDTO.java new file mode 100755 index 0000000000..5fe9720ce7 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDeadTaskLogDTO.java @@ -0,0 +1,69 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 居民死亡任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-16 + */ +@Data +public class IcResiUserDeadTaskLogDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 0:正常数据 1:特殊数据 + */ + private Integer dataType; + + /** + * 数据数量 + */ + private Integer dataCount; + + /** + * 删除标识 0.未删除 1.已删除 + */ + private String 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-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java index 13a230c644..fff121cde4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java @@ -55,4 +55,8 @@ public class DataSyncTaskParam implements Serializable { * vaccine：疫苗接种 */ private String jobType; + + private int start; + + private int end; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserDeadTaskLogController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserDeadTaskLogController.java new file mode 100755 index 0000000000..ded5028e7e --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserDeadTaskLogController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IcResiUserDeadTaskLogDTO; +import com.epmet.service.IcResiUserDeadTaskLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 居民死亡任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-16 + */ +@RestController +@RequestMapping("icResiUserDeadTaskLog") +public class IcResiUserDeadTaskLogController { + + @Autowired + private IcResiUserDeadTaskLogService icResiUserDeadTaskLogService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icResiUserDeadTaskLogService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcResiUserDeadTaskLogDTO data = icResiUserDeadTaskLogService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcResiUserDeadTaskLogDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icResiUserDeadTaskLogService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcResiUserDeadTaskLogDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icResiUserDeadTaskLogService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icResiUserDeadTaskLogService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java index 35bbc6266d..303366c0f6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java @@ -60,6 +60,10 @@ public interface DataSyncConfigDao extends BaseDao { */ List getIdCardsByScope(DataSyncTaskParam formDTO); + List getIdCardsByScopeLimit(DataSyncTaskParam formDTO); + + List getIdCardsForSiWang(@Param("start")int start, @Param("end")int end); + DataSyncConfigDTO getConfigInfoByType(@Param("customerId") String customerId, @Param("switchStatus") String switchStatus,@Param("dataCode")String dataCode); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDeadTaskLogDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDeadTaskLogDao.java new file mode 100755 index 0000000000..b51a494890 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDeadTaskLogDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcResiUserDeadTaskLogEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 居民死亡任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-16 + */ +@Mapper +public interface IcResiUserDeadTaskLogDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserDeadTaskLogEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserDeadTaskLogEntity.java new file mode 100755 index 0000000000..79f9318880 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserDeadTaskLogEntity.java @@ -0,0 +1,39 @@ +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; + +/** + * 居民死亡任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_resi_user_dead_task_log") +public class IcResiUserDeadTaskLogEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 0:正常数据 1:特殊数据 + */ + private Integer dataType; + + /** + * 数据数量 + */ + private Integer dataCount; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserDeadTaskLogExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserDeadTaskLogExcel.java new file mode 100755 index 0000000000..b6deb4af29 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserDeadTaskLogExcel.java @@ -0,0 +1,48 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 居民死亡任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-16 + */ +@Data +public class IcResiUserDeadTaskLogExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "客户Id customer.id") + private String customerId; + + @Excel(name = "0:正常数据 1:特殊数据") + private Integer dataType; + + @Excel(name = "数据数量") + private Integer dataCount; + + @Excel(name = "删除标识 0.未删除 1.已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserDeadTaskLogRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserDeadTaskLogRedis.java new file mode 100755 index 0000000000..764447a7e9 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserDeadTaskLogRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 居民死亡任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-16 + */ +@Component +public class IcResiUserDeadTaskLogRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserDeadTaskLogService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserDeadTaskLogService.java new file mode 100755 index 0000000000..6f42f28fb1 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserDeadTaskLogService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcResiUserDeadTaskLogDTO; +import com.epmet.entity.IcResiUserDeadTaskLogEntity; + +import java.util.List; +import java.util.Map; + +/** + * 居民死亡任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-16 + */ +public interface IcResiUserDeadTaskLogService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2023-05-16 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2023-05-16 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcResiUserDeadTaskLogDTO + * @author generator + * @date 2023-05-16 + */ + IcResiUserDeadTaskLogDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2023-05-16 + */ + void save(IcResiUserDeadTaskLogDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2023-05-16 + */ + void update(IcResiUserDeadTaskLogDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2023-05-16 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 4473b71722..8d2c06dfa9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -106,6 +106,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl logEntityLambdaQueryWrapper = new LambdaQueryWrapper().orderByDesc(IcResiUserDeadTaskLogEntity::getCreatedTime).last("limit 1"); + IcResiUserDeadTaskLogEntity logEntity = icResiUserDeadTaskLogDao.selectOne(logEntityLambdaQueryWrapper); + + List userInfoResultDTOS = new ArrayList<>(); + boolean isNum = false; + int start = 0; + if (logEntity == null){ + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000); + if (userInfoResultDTOS.size() < 50000){ + isNum = true; + } + }else{ + if (logEntity.getDataType() == 1){ + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000); + isNum = true; + }else if (logEntity.getDataType() == 0){ + start = logEntity.getDataCount(); + } + + } + + IcResiUserDeadTaskLogEntity newLog = new IcResiUserDeadTaskLogEntity(); + newLog.setCreatedTime(new Date()); List dbResiList = null; - do { - for (DataSyncConfigDTO config : configData) { - // 设置查询数据范围 - formDTO.setOrgList(config.getScopeList()); - DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); - dbResiList = getNatUserInfoFromDb(formDTO, pageNo, pageSize); - if (CollectionUtils.isEmpty(dbResiList)) { - continue; - } - switch (anEnum) { - case SI_WANG: - try { - //查询正常状态的居民 - siWang(dbResiList); - log.info("======siWang信息拉取结束======"); - } catch (Exception e) { - log.error("death thread execute exception", e); - } - default: - log.warn("没有要处理的数据"); + + for (DataSyncConfigDTO config : configData) { + // 设置查询数据范围 + formDTO.setOrgList(config.getScopeList()); + DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); + if (isNum){ + formDTO.setStart(start); + formDTO.setEnd(50000-userInfoResultDTOS.size()); + dbResiList = getNatUserInfoFromDbLimit(formDTO); + dbResiList.addAll(userInfoResultDTOS); + newLog.setDataType(0); + newLog.setDataCount(50000-dbResiList.size()); + }else{ + formDTO.setStart(start); + formDTO.setEnd(start+50000); + dbResiList = getNatUserInfoFromDbLimit(formDTO); + if (dbResiList.size()<50000){ + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000-dbResiList.size()); + dbResiList.addAll(userInfoResultDTOS); + if (dbResiList.size() < 50000){ + formDTO.setStart(0); + formDTO.setEnd(50000-dbResiList.size()); + dbResiList.addAll(getNatUserInfoFromDbLimit(formDTO)); + newLog.setDataType(0); + newLog.setDataCount(50000-dbResiList.size()); + + }else{ + newLog.setDataType(1); + newLog.setDataCount(50000-dbResiList.size()); + } + }else{ + newLog.setDataType(0); + newLog.setDataCount(start+50000); } } - pageNo++; - } while (dbResiList != null && dbResiList.size() == pageSize); + icResiUserDeadTaskLogDao.insert(newLog); + + if (CollectionUtils.isEmpty(dbResiList)) { + continue; + } + switch (anEnum) { + case SI_WANG: + try { + //查询正常状态的居民 + siWang(dbResiList); + + log.info("======siWang信息拉取结束======"); + } catch (Exception e) { + log.error("death thread execute exception", e); + } + default: + log.warn("没有要处理的数据"); + } + } + } /** @@ -680,6 +736,28 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl getNatUserInfoFromDbLimit(DataSyncTaskParam formDTO) { + //根据 组织 分页获取 居民数据 + List list = baseDao.getIdCardsByScopeLimit(formDTO); + return list; + } + + /** + * desc：从数据库获取居民信息死亡 + * @return + */ + public List getNatUserInfoFromDbForSiWang(int start, int end) { + + List list = baseDao.getIdCardsForSiWang(start, end); + return list; + } + private void canJi(List resiList) { try { List list = new ArrayList<>(); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDeadTaskLogServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDeadTaskLogServiceImpl.java new file mode 100755 index 0000000000..29b5089654 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDeadTaskLogServiceImpl.java @@ -0,0 +1,83 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IcResiUserDeadTaskLogDao; +import com.epmet.dto.IcResiUserDeadTaskLogDTO; +import com.epmet.entity.IcResiUserDeadTaskLogEntity; +import com.epmet.service.IcResiUserDeadTaskLogService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 居民死亡任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-16 + */ +@Service +public class IcResiUserDeadTaskLogServiceImpl extends BaseServiceImpl implements IcResiUserDeadTaskLogService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcResiUserDeadTaskLogDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcResiUserDeadTaskLogDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcResiUserDeadTaskLogDTO get(String id) { + IcResiUserDeadTaskLogEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcResiUserDeadTaskLogDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcResiUserDeadTaskLogDTO dto) { + IcResiUserDeadTaskLogEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserDeadTaskLogEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcResiUserDeadTaskLogDTO dto) { + IcResiUserDeadTaskLogEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserDeadTaskLogEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml index ea80141610..f25185a68d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml @@ -108,6 +108,83 @@ ORDER BY CREATED_TIME + + + + + + + + \ No newline at end of file From 6c46f1c14d929921b5e2de57d46f3c769840f7ed Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 May 2023 15:20:12 +0800 Subject: [PATCH 302/340] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E4=B8=AD=E5=A4=AE=E5=8C=BA=E5=9F=9F:=E6=A5=BC=E6=A0=8B?= =?UTF-8?q?=E5=9D=90=E6=A0=87=E5=88=86=E5=B8=83/=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B1=95=E7=A4=BA=E6=88=BF=E5=B1=8B=E5=88=86?= =?UTF-8?q?=E5=B8=83=E7=82=B9=E4=BD=8D/=E8=8E=B7=E5=8F=96=E6=A5=BC?= =?UTF-8?q?=E6=A0=8B=E8=AF=A6=E6=83=85=EF=BC=8C=E6=9C=AA=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...enPartyCenterHouseDistributionFormDTO.java | 23 +++++++ .../result/lingshan/HouseDetailResultDTO.java | 18 +++++ ...eenPartyCenterHouseDistributionResDTO.java | 43 ++++++++++++ .../LingShanScreenGovOrgController.java | 66 +++++++++++++++++++ .../java/com/epmet/dao/IcBuildingDao.java | 11 ++++ .../main/java/com/epmet/dao/IcHouseDao.java | 13 ++++ .../com/epmet/service/IcBuildingService.java | 10 +++ .../com/epmet/service/IcHouseService.java | 23 +++++-- .../service/impl/IcBuildingServiceImpl.java | 13 ++++ .../service/impl/IcHouseServiceImpl.java | 36 ++++++++-- .../main/resources/mapper/IcBuildingDao.xml | 18 +++++ .../src/main/resources/mapper/IcHouseDao.xml | 22 +++++++ 12 files changed, 288 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java new file mode 100644 index 0000000000..0417a5540e --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form.lingshan; + +import com.epmet.commons.tools.validator.group.QueryGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Description 灵山大屏，根据网格id，查询党员中心户房屋坐标 + * @Author yzm + * @Date 2023/5/18 10:14 + */ +@Data +public class ScreenPartyCenterHouseDistributionFormDTO { + /** + * 网格必填 + */ + @NotBlank(message = "gridId不能为空",groups = QueryGroup.class) + private String gridId; + private String neighborHoodId; + private String buildingId; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java new file mode 100644 index 0000000000..cb48b95e46 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result.lingshan; + +import com.epmet.dto.IcHouseDTO; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/18 14:05 + */ +@Data +public class HouseDetailResultDTO extends IcHouseDTO { + /** + * 如果是党员中心户，关联的联户数 + */ + private Integer totalLianHu; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java new file mode 100644 index 0000000000..7e179fe4a0 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java @@ -0,0 +1,43 @@ +package com.epmet.dto.result.lingshan; + +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/18 10:56 + */ +@Data +public class ScreenPartyCenterHouseDistributionResDTO { + /** + * 小区id + */ + private String neighborHoodId; + private String neighborHoodName; + /** + * 所属楼栋id + */ + private String buildingId; + private String buildingName; + /** + * 所属单元id + */ + private String buildingUnitId; + private String unitName; + + /** + * 房屋名字后台插入时生成 + */ + private String houseName; + /** + * 房屋坐标 + */ + private String longitude; + private String latitude; + + /** + * 灵山项目：是否党员中心户：1是；0不是 + */ + private String partyCenterHouseFlag; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java new file mode 100644 index 0000000000..fe3123a482 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java @@ -0,0 +1,66 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IcBuildingDTO; +import com.epmet.dto.IcHouseDTO; +import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO; +import com.epmet.dto.result.lingshan.HouseDetailResultDTO; +import com.epmet.service.IcBuildingService; +import com.epmet.service.IcHouseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Description 灵山大屏-查询gov-org库的接口， 可以放在这.... + * @Author yzm + * @Date 2023/5/18 10:05 + */ +@RestController +@RequestMapping("houseScreen") +public class LingShanScreenGovOrgController { + @Autowired + private IcHouseService icHouseService; + @Autowired + private IcBuildingService icBuildingService; + + + /** + * 灵山大屏：查询楼栋坐标 + * + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("building-distribution") + public Result> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { + return new Result>().ok(icBuildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId())); + } + + + /** + * 灵山大屏：查询房屋坐标点位 + * 支持根据网格\小区\楼栋id查询 + */ + @PostMapping("house-distribution") + public Result> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { + return new Result>().ok(icHouseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId())); + } + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + @PostMapping("houseDetail/{houseId}") + public Result queryHouseDetail(@PathVariable("houseId")String houseId){ + return new Result().ok(icHouseService.queryHouseDetail(houseId)); + } + + + +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java index 2275021a67..ca6b57a3c5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java @@ -276,5 +276,16 @@ public interface IcBuildingDao extends BaseDao { * @return */ List selectHouseTree(@Param("unitId") String unitId); + + /** + * 查询楼栋列表：后续可以追加条件 + * @param customerId 必填！ + * @param gridId + * @param neighborHoodId + * @return + */ + List selectListByMap(@Param("customerId") String customerId, + @Param("gridId") String gridId, + @Param("neighborHoodId") String neighborHoodId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index f4212b5487..c2eedacf63 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -231,4 +231,17 @@ public interface IcHouseDao extends BaseDao { @Param("buildingName") String buildingName, @Param("buildingId") String buildingId, @Param("partyCenterHouseFlag") String partyCenterHouseFlag); + + /** + * 查询房屋列表：后续可以追加条件 + * @param customerId 必填！ + * @param gridId + * @param neighborHoodId + * @param buildingId + * @return + */ + List selectListByMap(@Param("customerId") String customerId, + @Param("gridId") String gridId, + @Param("neighborHoodId") String neighborHoodId, + @Param("buildingId") String buildingId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java index cde64d4da0..9d60ebcb56 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java @@ -133,4 +133,14 @@ public interface IcBuildingService extends BaseService { * @return com.epmet.commons.tools.utils.Result */ Result getBuildingDetail(String buildingId); + + /** + * 灵山大屏：查询楼栋坐标 + * + * @param customerId + * @param gridId + * @param neighborHoodId + * @return + */ + List buildingDistribution(String customerId, String gridId, String neighborHoodId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index cec8ca1349..47a8e7904a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -14,10 +14,7 @@ import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HousesNameResultDTO; -import com.epmet.dto.result.lingshan.HouseTreeDTO; -import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO; -import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO; -import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; +import com.epmet.dto.result.lingshan.*; import com.epmet.entity.IcHouseEntity; import java.util.List; @@ -183,4 +180,22 @@ public interface IcHouseService extends BaseService { * @param partyCenterHouseFlag */ void updatePartyCenterHouse(String houseId, String partyCenterHouseFlag); + + /** + * 灵山大屏：查询房屋坐标点位 + * + * @param gridId + * @param neighborHoodId + * @param buildingId + * @return + */ + List houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId); + + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + HouseDetailResultDTO queryHouseDetail(String houseId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index 577e77c787..db18a933f8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -173,4 +173,17 @@ public class IcBuildingServiceImpl extends BaseServiceImpl().ok(baseDao.getBuildingDetail(buildingId)); } + /** + * 灵山大屏：查询楼栋坐标 + * + * @param customerId + * @param gridId + * @param neighborHoodId + * @return + */ + @Override + public List buildingDistribution(String customerId, String gridId, String neighborHoodId) { + List list=baseDao.selectListByMap(customerId,gridId,neighborHoodId); + return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 8a782c376a..f76d723af1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -26,10 +26,7 @@ import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO; import com.epmet.dto.result.*; -import com.epmet.dto.result.lingshan.HouseTreeDTO; -import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO; -import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO; -import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; +import com.epmet.dto.result.lingshan.*; import com.epmet.entity.*; import com.epmet.enums.HousePurposeEnums; import com.epmet.enums.HouseRentFlagEnums; @@ -563,5 +560,36 @@ public class IcHouseServiceImpl extends BaseServiceImpl houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) { + List list=baseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId); + return ConvertUtils.sourceToTarget(list,IcHouseDTO.class); + } + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + @Override + public HouseDetailResultDTO queryHouseDetail(String houseId) { + IcHouseDTO data = get(houseId); + HouseDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(data, HouseDetailResultDTO.class); + if (null != resultDTO) { + LambdaQueryWrapper countQuery = new LambdaQueryWrapper<>(); + countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId); + resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery)); + } + return resultDTO; + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 2224b68099..2d632d7b2d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -602,4 +602,22 @@ and ih.BUILDING_UNIT_ID=#{unitId} order by ih.DOOR_NAME asc + + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 7ffaff80a2..aa4b825507 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -770,4 +770,26 @@ order by ca.CREATED_TIME asc,cg.CREATED_TIME asc,h.CREATED_TIME asc + + + From 20b7a726e2d4bce9e14c640905257686c40d3536 Mon Sep 17 00:00:00 2001 From: luyan Date: Thu, 18 May 2023 15:44:06 +0800 Subject: [PATCH 303/340] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=92=E6=A1=A3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=92=8C=E5=BD=92=E6=A1=A3=E7=8E=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/EventAnalysisResultDTO.java | 9 +++++++++ .../com/epmet/dto/result/EventRateResultDTO.java | 15 ++++++++++++--- .../epmet/service/impl/IcEventServiceImpl.java | 1 + .../src/main/resources/mapper/IcEventDao.xml | 12 ++++++++++-- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java index 906e984e35..e34285d2fd 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java @@ -26,6 +26,10 @@ public class EventAnalysisResultDTO implements Serializable { */ private Integer wangGeHua; + /** + * 归档数量 + */ + private Integer guiDang; /** * 红灯占比 */ @@ -41,4 +45,9 @@ public class EventAnalysisResultDTO implements Serializable { */ private Double yiJieAnRate; + /** + * 归档占比 + */ + + private Double guiDangRate; } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java index bea7f93e10..efd13ccbf6 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java @@ -37,20 +37,29 @@ public class EventRateResultDTO implements Serializable { private Integer lanDeng; /** - * 红灯占比 + * 归档数量 + */ + private Integer guiDang; + + /** + * 未响应占比 */ private Double hongDengRate; /** - * 黄灯占比 + * 处理中占比 */ private Double huangDengRate; /** - * 蓝灯占比 + * 已完成占比 */ private Double lanDengRate; + /** + * 归档占比 + */ + private Double guiDangRate; /** * 分类统计数量 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 0b2fbb6e0f..8364ff7231 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1962,6 +1962,7 @@ public class IcEventServiceImpl extends BaseServiceImpl and d.GRID_PIDS like concat(#{orgIdPath},'%') - ) ed + ) ed, + ( SELECT SUM( CASE WHEN d.DIFFICULT_POINT = 1 THEN 1 ELSE 0 END ) as dang + FROM ic_event d WHERE d.DEL_FLAG = 0 + + and d.GRID_PIDS like concat(#{orgIdPath},'%') + + ) ee @@ -492,10 +504,13 @@ SELECT ea.total AS jiSuJiBan, eb.total AS zhiTongLianBan, - ec.total AS wangGeHua + ec.total AS wangGeHua, + ed.total AS guiDang FROM ( - SELECT COUNT( e.id ) AS total FROM ic_event e + SELECT COUNT( e.id ) AS total + + FROM ic_event e WHERE e.DEL_FLAG = 0 AND e.SOURCE_TYPE = 0 AND ( e.OPERATION_TYPE = 0 OR e.OPERATION_TYPE IS NULL ) and e.GRID_PIDS like concat(#{orgIdPath},'%') @@ -514,7 +529,14 @@ and e.GRID_PIDS like concat(#{orgIdPath},'%') - ) ec + ) ec, + ( + SELECT COUNT( e.id ) AS total FROM ic_event e + WHERE e.DEL_FLAG = 0 AND e.DIFFICULT_POINT = 1 AND ( e.OPERATION_TYPE = 0 OR e.OPERATION_TYPE IS NULL ) + + and e.GRID_PIDS like concat(#{orgIdPath},'%') + + ) ed From af2936cfc1ba883099f3ece2fe4abcd78d26edc0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 May 2023 17:29:30 +0800 Subject: [PATCH 309/340] =?UTF-8?q?/epmetuser/icresiuser/ownerrelation?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=82=E9=85=8D=E7=81=B5=E5=B1=B1=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/PersonDataFormDTO.java | 6 ++ .../epmet/dto/result/IcResiUserBriefDTO.java | 8 +- .../dto/result/OwnerRelationResultDTO.java | 25 +++++++ .../controller/IcResiUserController.java | 2 +- .../com/epmet/service/IcResiUserService.java | 2 +- .../service/impl/IcResiUserServiceImpl.java | 73 +++++++++++++------ 6 files changed, 91 insertions(+), 25 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java index e2355d145a..8dbe98ac93 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java @@ -23,4 +23,10 @@ public class PersonDataFormDTO implements Serializable { @NotBlank(message = "tokenDto获取customerId不能为空",groups = PersonDataForm.class) private String customerId; + + /** + * 灵山项目需求，改造此接口，添加houseId，支持查询房屋里的所有人 + * /epmetuser/icresiuser/ownerrelation接口userId与houseId至少传一个值 + */ + private String houseId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java index 540b0207d9..ca832d0643 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java @@ -97,10 +97,14 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable { * 民族： */ private String mz; - /** * 因灵山项目添加此列： - * 与户主关系：存储字典纸 + * 民族姓名 + */ + private String mzName; + /** + * 因灵山项目添加此列： + * 与户主关系：存储字典：/sys/dict/data/relationship */ private String yhzgx; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java index 8ec9b45ef1..42c4e3e122 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java @@ -15,7 +15,18 @@ import java.util.List; public class OwnerRelationResultDTO implements Serializable { private static final long serialVersionUID = 2876258704168954941L; + /** + * 与户主关系是本人的居民 + */ private String ownerName; + /** + * 与户主关系是本人的居民id + */ + private String ownerUserId; + + /** + * 房屋里的所有人 + */ private List userList; @NoArgsConstructor @@ -24,11 +35,25 @@ public class OwnerRelationResultDTO implements Serializable { private String userId; private String userName; private String isSelf; + + /** + * 与户主关系key【字典表】 + */ + private String yhzgx; + + /** + * 与户主关系名称 + */ private String relation; + /** + * 人户情况 + */ + private String rhzk; /** * 2022.11.17：人户状况：人户一致、人在户不在、户在人不在、暂不清楚 */ private String renHuCondition; + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 440a440fd4..d52e63fb4e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -859,7 +859,7 @@ public class IcResiUserController implements ResultDataResolver { */ @PostMapping("ownerrelation") public Result getOwnerRelation(@RequestBody PersonDataFormDTO formDTO) { - return new Result().ok(icResiUserService.getOwnerRelation(formDTO.getUserId())); + return new Result().ok(icResiUserService.getOwnerRelation(formDTO.getUserId(),formDTO.getHouseId())); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 563365d414..2405fe6fa9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -134,7 +134,7 @@ public interface IcResiUserService extends BaseService { * @Author zhaoqifeng * @Date 2021/11/5 10:28 */ - OwnerRelationResultDTO getOwnerRelation(String userId); + OwnerRelationResultDTO getOwnerRelation(String userId,String houseId); /** * @Description 获取一栋楼每个房间人员分类的数量 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 a308fd7f55..97150ec2e7 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 @@ -1550,41 +1550,65 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId()); - wrapper.eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); - wrapper.orderByAsc(IcResiUserEntity::getYhzgx); - List resiUserList = baseDao.selectList(wrapper); - if (CollectionUtils.isNotEmpty(resiUserList)) { - List userList = resiUserList.stream().map(item -> { + if(StringUtils.isBlank(houseId)){ + //获取用户信息 + IcResiUserEntity user = baseDao.selectById(userId); + if (null != user) { + houseId=user.getHomeId(); + } + } + //获取用户所在家庭里所有人员信息 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getHomeId, houseId); + wrapper.eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); + wrapper.orderByAsc(IcResiUserEntity::getYhzgx); + List resiUserList = baseDao.selectList(wrapper); + if (CollectionUtils.isNotEmpty(resiUserList)) { + + //先找到户主：正常情况下只会有一个户主，所以找到之后，终止循环 + for(IcResiUserEntity resiUserEntity:resiUserList){ + //如果与房主的关系是本人，则这个人就是房主 + if (RelationshipEnum.SELF.getCode().equals(resiUserEntity.getYhzgx())) { + result.setOwnerName(resiUserEntity.getName()); + result.setOwnerUserId(resiUserEntity.getId()); + break; + } + } + List userList=new ArrayList<>(); + for(IcResiUserEntity item:resiUserList){ + //成员里排除户主 + if(!result.getOwnerUserId().equals(item.getId())){ OwnerRelationResultDTO.UserListBean bean = new OwnerRelationResultDTO.UserListBean(); bean.setUserId(item.getId()); bean.setUserName(item.getName()); + bean.setYhzgx(item.getYhzgx()); bean.setRelation(RelationshipEnum.getEnum(item.getYhzgx()).getName()); - if (userId.equals(item.getId())) { - bean.setIsSelf(NumConstant.ONE_STR); - } - //如果与房主的关系是本人，则这个人就是房主 - if (RelationshipEnum.SELF.getCode().equals(item.getYhzgx())) { - result.setOwnerName(item.getName()); + bean.setIsSelf(NumConstant.ZERO_STR); + + // 与入参里的居民id对比 + if (StringUtils.isNotBlank(userId)) { + if (userId.equals(item.getId())) { + bean.setIsSelf(NumConstant.ONE_STR); + } } + //2022.11.17 返参增加人户状况名称 + bean.setRhzk(item.getRhzk()); if (StringUtils.isBlank(item.getRhzk())){ bean.setRenHuCondition(RenHuConditionEnum.ZBQC.getName()); }else { bean.setRenHuCondition(RenHuConditionEnum.getNameByCode(item.getRhzk())); } - return bean; - }).collect(Collectors.toList()); - result.setUserList(userList); + userList.add(bean); + } } + result.setUserList(userList); } return result; } @@ -1673,6 +1697,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> mzRes=epmetAdminOpenFeignClient.getNationOption(); + if(mzRes.success()&&CollectionUtils.isNotEmpty(mzRes.getData())){ + Map mzMap = mzRes.getData().stream().collect(Collectors.toMap(OptionResultDTO::getValue, OptionResultDTO::getLabel)); + if(MapUtils.isNotEmpty(mzMap)&&mzMap.containsKey(r.getMz())){ + r.setMzName(mzMap.get(r.getMz())); + } + } r.setYhzgx(resiEntity.getYhzgx()); r.setYhzgxName(StrConstant.EPMETY_STR); Result> yhzgxRes=epmetAdminOpenFeignClient.getRelationshipOption(); From d4b7b40f9b967e0c27c3077fbeee5fb14a75336a Mon Sep 17 00:00:00 2001 From: luyan Date: Thu, 18 May 2023 17:28:43 +0800 Subject: [PATCH 310/340] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E6=9D=A5=E6=BA=90=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=8D=A0=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/EventAnalysisResultDTO.java | 26 +++-- .../epmet/controller/IcEventController.java | 98 ++++++++++++------- .../main/java/com/epmet/dao/IcEventDao.java | 6 +- .../com/epmet/service/IcEventService.java | 4 +- .../service/impl/IcEventServiceImpl.java | 14 ++- .../src/main/resources/mapper/IcEventDao.xml | 30 +++++- 6 files changed, 119 insertions(+), 59 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java index e34285d2fd..9d8643cf73 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java @@ -25,29 +25,41 @@ public class EventAnalysisResultDTO implements Serializable { * 网格化平台数量 */ private Integer wangGeHua; - /** - * 归档数量 + * 待处理 */ - private Integer guiDang; + private Integer daiChuLi; /** - * 红灯占比 + * 待处理占比 */ private Double daiChuLiRate; /** - * 黄灯占比 + * 处理中 + */ + private Integer chuLiZhong; + /** + * 处理中占比 */ private Double chuLiZhongRate; + + /** + * 已结案数量 + */ + private Integer yiJieAn; + /** - * 蓝灯占比 + * 已结案占比 */ private Double yiJieAnRate; + /** + * 归档数量 + */ + private Integer guiDang; /** * 归档占比 */ - private Double guiDangRate; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index dd31462f70..06ba55576b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -62,6 +62,7 @@ public class IcEventController { /** * 事件管理-列表 + * * @param tokenDto * @param formDTO * @return @@ -72,6 +73,7 @@ public class IcEventController { formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icEventService.list(formDTO)); } + /** * @Author sun * @Description 工作端小程序-事件管理-列表 @@ -84,28 +86,29 @@ public class IcEventController { return new Result>().ok(icEventService.list(formDTO)); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { IcEventDTO data = icEventService.get(id); return new Result().ok(data); } /** * 事件管理-新增 + * * @param tokenDto * @param formDTO * @return */ @NoRepeatSubmit @PostMapping("add") - public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcEventAddEditFormDTO formDTO){ + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcEventAddEditFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); formDTO.setApp(tokenDto.getApp()); formDTO.setClient(tokenDto.getClient()); - if("3".equals(formDTO.getOperationType())){ - ValidatorUtils.validateEntity(formDTO.getIssueInfo(),IcEventToIssueFormDTO.AddEventAndShiftIssue.class); + if ("3".equals(formDTO.getOperationType())) { + ValidatorUtils.validateEntity(formDTO.getIssueInfo(), IcEventToIssueFormDTO.AddEventAndShiftIssue.class); } icEventService.save(formDTO); return new Result(); @@ -113,7 +116,7 @@ public class IcEventController { @NoRepeatSubmit @PostMapping("update") - public Result update(@RequestBody IcEventDTO dto){ + public Result update(@RequestBody IcEventDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); icEventService.update(dto); @@ -121,7 +124,7 @@ public class IcEventController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); icEventService.delete(ids); @@ -130,6 +133,7 @@ public class IcEventController { /** * 事件处理分析-处理状态比例查询 + * * @param formDTO * @return */ @@ -148,6 +152,7 @@ public class IcEventController { /** * 事件处理分析-事件列表 + * * @param input * @return */ @@ -169,6 +174,7 @@ public class IcEventController { /** * 时间处理分析-阅读增量查询 + * * @param input * @return */ @@ -190,6 +196,7 @@ public class IcEventController { /** * 研判分析查询 + * * @param eventId * @return */ @@ -201,6 +208,7 @@ public class IcEventController { /** * 组织下，分类下的事件列表 + * * @param input * @return */ @@ -212,16 +220,17 @@ public class IcEventController { String orgType = input.getOrgType(); Integer pageNo = input.getPageNo(); Integer pageSize = input.getPageSize(); - PageData page = icEventService.getSameCategoryEvents(orgId, orgType, categroyPid, pageNo, pageSize); + PageData page = icEventService.getSameCategoryEvents(orgId, orgType, categroyPid, pageNo, pageSize); return new Result>().ok(page); } + /** * @Author sun * @Description 事件管理-回复 **/ @NoRepeatSubmit @PostMapping("reply") - public Result reply(@LoginUser TokenDto tokenDto, @RequestBody IcEventReplyFormDTO formDTO){ + public Result reply(@LoginUser TokenDto tokenDto, @RequestBody IcEventReplyFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); @@ -235,12 +244,12 @@ public class IcEventController { **/ @NoRepeatSubmit @PostMapping("icEventToProject") - public Result icEventToProject(@LoginUser TokenDto tokenDto, @RequestBody IcEventToProjectFormDTO formDTO){ + public Result icEventToProject(@LoginUser TokenDto tokenDto, @RequestBody IcEventToProjectFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); formDTO.setApp(tokenDto.getApp()); formDTO.setClient(tokenDto.getClient()); - ValidatorUtils.validateEntity(formDTO,IcEventToProjectFormDTO.ApprovalCategory.class,IcEventToProjectFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, IcEventToProjectFormDTO.ApprovalCategory.class, IcEventToProjectFormDTO.AddUserInternalGroup.class); icEventService.icEventToProject(formDTO); return new Result(); } @@ -250,7 +259,7 @@ public class IcEventController { * @Description 事件管理-转需求 **/ @PostMapping("icEventToDemand") - public Result icEventToDemand(@LoginUser TokenDto tokenDto, @RequestBody IcDemandFormDTO formDTO){ + public Result icEventToDemand(@LoginUser TokenDto tokenDto, @RequestBody IcDemandFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setDemandUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, IcDemandFormDTO.AddUserShowGroup.class, IcDemandFormDTO.AddUserInternalGroup.class); @@ -260,6 +269,7 @@ public class IcEventController { /** * 事件转议题 + * * @param tokenDto * @param formDTO * @return @@ -283,7 +293,7 @@ public class IcEventController { public Result> categoryAnalysisTotal(@LoginUser TokenDto tokenDto, @RequestBody IcEventCategoryAnalysisFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); - ValidatorUtils.validateEntity(formDTO,IcEventCategoryAnalysisFormDTO.TotalPie.class); + ValidatorUtils.validateEntity(formDTO, IcEventCategoryAnalysisFormDTO.TotalPie.class); List list = icEventService.categoryAnalysisTotal(formDTO); return new Result>().ok(list); } @@ -305,7 +315,7 @@ public class IcEventController { * @Author sun * @Description 事件管理-详情 **/ - @MaskResponse(fieldNames = { "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD }) + @MaskResponse(fieldNames = {"idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -313,6 +323,7 @@ public class IcEventController { ValidatorUtils.validateEntity(formDTO, IcEventListFormDTO.Detail.class); return new Result().ok(icEventService.detail(formDTO)); } + /** * @Author sun * @Description 工作端小程序-事件管理-详情 @@ -328,6 +339,7 @@ public class IcEventController { /** * 事件分类分析- 饼图2，直属下级 事件数量 + * * @param tokenDto * @param formDTO * @return @@ -353,19 +365,20 @@ public class IcEventController { /** * Desc: 定时任务自动评价 + * * @param formDTO * @author zxc * @date 2022/5/18 16:35 */ @PostMapping("auto-evaluation") - public Result autoEvaluation(@RequestBody AutoEvaluationFormDTO formDTO){ + public Result autoEvaluation(@RequestBody AutoEvaluationFormDTO formDTO) { icEventService.autoEvaluation(formDTO); return new Result(); } /** * @Author sun - * @Description 需求完成/项目结案时 修改事件数据 + * @Description 需求完成/项目结案时 修改事件数据 * 议题关闭时，如果议题来源于事件，也会调用此方法 **/ @PostMapping("closeprojectordemand") @@ -376,6 +389,7 @@ public class IcEventController { /** * Desc: 新增【随手拍、讲】 + * * @param tokenDto * @param formDTO * @author zxc @@ -383,7 +397,7 @@ public class IcEventController { */ @NoRepeatSubmit @PostMapping("add-event-resi") - public Result addEventFromResi(@LoginUser TokenDto tokenDto,@RequestBody AddEventFromResiFormDTO formDTO){ + public Result addEventFromResi(@LoginUser TokenDto tokenDto, @RequestBody AddEventFromResiFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, AddEventFromResiFormDTO.AddEventFromResiForm.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); @@ -394,6 +408,7 @@ public class IcEventController { /** * 居民端小程序我上报的事件-列表+详情 * yapi: http://yapi.elinkservice.cn/project/102/interface/api/7781 + * * @param tokenDto * @param formDTO * @return @@ -408,6 +423,7 @@ public class IcEventController { /** * 居民端我上报的事件， 消息列表跳转详情 + * * @param tokenDto * @param formDTO * @return @@ -423,20 +439,22 @@ public class IcEventController { /** * 居民端小程序我上报的事件详情页面-回复列表 * http://yapi.elinkservice.cn/project/102/interface/api/7783 + * * @param formDTO * @return */ @PostMapping("reply-list") - public Result> replyList(@LoginUser TokenDto tokenDto,@RequestBody MyReportIcEvFormDTO formDTO) { + public Result> replyList(@LoginUser TokenDto tokenDto, @RequestBody MyReportIcEvFormDTO formDTO) { formDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, MyReportIcEvFormDTO.ReplyListGroup.class); - return new Result>().ok(icEventReplyService.replyList(formDTO.getIcEventId(),formDTO.getUserId())); + return new Result>().ok(icEventReplyService.replyList(formDTO.getIcEventId(), formDTO.getUserId())); } /** * 居民端小程序我上报的事件-处理中 * 点击事件进入详情页时调用此接口，消除红点 * yapi：http://yapi.elinkservice.cn/project/102/interface/api/7790 + * * @param tokenDto * @param formDTO * @return @@ -452,23 +470,24 @@ public class IcEventController { /** * 居民端我上报的事件-回复 * http://yapi.elinkservice.cn/project/102/interface/api/7789 + * * @param tokenDto * @param formDTO * @return */ @NoRepeatSubmit @PostMapping("resi-reply") - public Result resiReply(@LoginUser TokenDto tokenDto, @RequestBody ResiReplyIcEventFormDTO formDTO){ + public Result resiReply(@LoginUser TokenDto tokenDto, @RequestBody ResiReplyIcEventFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - ValidatorUtils.validateEntity(formDTO, ResiReplyIcEventFormDTO.AddUserShowGroup.class,ResiReplyIcEventFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, ResiReplyIcEventFormDTO.AddUserShowGroup.class, ResiReplyIcEventFormDTO.AddUserInternalGroup.class); icEventService.resiReply(formDTO); return new Result(); } /** * @Author sun - * @Description 数字平台-事件导出 + * @Description 数字平台-事件导出 **/ @NoRepeatSubmit @PostMapping("export") @@ -487,8 +506,8 @@ public class IcEventController { List list = null; do { data = icEventService.list(formDTO); - data.getList().forEach(d->{ - if(!org.springframework.util.CollectionUtils.isEmpty(d.getImageList())){ + data.getList().forEach(d -> { + if (!org.springframework.util.CollectionUtils.isEmpty(d.getImageList())) { d.setImageUrl(d.getImageList().get(NumConstant.ZERO)); } }); @@ -501,7 +520,7 @@ public class IcEventController { response.setCharacterEncoding("UTF-8"); response.setHeader("content-type", "application/json; charset=UTF-8"); PrintWriter printWriter = response.getWriter(); - Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg()); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); printWriter.write(JSON.toJSONString(result)); printWriter.close(); } catch (Exception e) { @@ -515,7 +534,7 @@ public class IcEventController { /** * @Author sun - * @Description 工作端事件红点消除 + * @Description 工作端事件红点消除 **/ @PostMapping("govRedDot") public Result govRedDot(@RequestBody IcEventListFormDTO formDTO) { @@ -526,7 +545,7 @@ public class IcEventController { /** * @Author sun - * @Description 标记事件为难点堵点 + * @Description 标记事件为难点堵点 **/ @PostMapping("difficultpointevent") public Result difficultPointEvent(@RequestBody IcEventListFormDTO formDTO) { @@ -537,6 +556,7 @@ public class IcEventController { /** * 数据分析-个人档案-上报事件列表,根据epmetUserIdList查询 * 模仿gov/project/resieventreply/pageuserreported接口重新查询新表接口 + * * @author sun */ @PostMapping("icevent-pageuserreported") @@ -560,23 +580,25 @@ public class IcEventController { } /** - * @description 获取事件数量和分类数量 - * @param * @param null - * @return Result - * @throws - * @author yan Lu - * @date 2023/5/17 14:49 - */ + * @param * @param null + * @return Result + * @throws + * @description 获取事件数量和分类数量 + * @author yan Lu + * @date 2023/5/17 14:49 + */ @GetMapping("getEventRate") public Result getEventRate(@RequestParam("orgId") String orgId, - @RequestParam("orgType") String orgType){ - return new Result().ok(icEventService.getEventRate(orgId,orgType)); + @RequestParam("orgType") String orgType, + @RequestParam("eventType") String eventType) { + return new Result().ok(icEventService.getEventRate(orgId, orgType, eventType)); } @GetMapping("getEventAnalysis") public Result getEventAnalysis(@RequestParam("orgId") String orgId, - @RequestParam("orgType") String orgType){ - return new Result().ok(icEventService.getEventAnalysis(orgId,orgType)); + @RequestParam("orgType") String orgType, + @RequestParam("eventType") String eventType) { + return new Result().ok(icEventService.getEventAnalysis(orgId, orgType, eventType)); } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java index 9622cb94e0..3aed8c5932 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java @@ -148,12 +148,12 @@ public interface IcEventDao extends BaseDao { List selectUserReported(PageUserReportEventFormDTO formDTO); - EventRateResultDTO getEventRate(@Param("orgIdPath") String orgIdPath); + EventRateResultDTO getEventRate(@Param("orgIdPath") String orgIdPath, @Param("eventType") String eventType); - EventAnalysisResultDTO getEventAnalysis(@Param("orgIdPath") String orgPath); + EventAnalysisResultDTO getEventAnalysis(@Param("orgIdPath") String orgPath, @Param("eventType") String eventType); @MapKey("code") - List> getAnalysis(@Param("orgIdPath") String orgPath); + List> getAnalysis(@Param("orgIdPath") String orgPath); IcEventEntity selectByEventId(String icEventId); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java index 4e1e19e580..7b1a6bbbd9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java @@ -257,7 +257,7 @@ public interface IcEventService extends BaseService { * * @return */ - EventRateResultDTO getEventRate(String orgId, String orgType); + EventRateResultDTO getEventRate(String orgId, String orgType, String eventType); /** * 事件分析数据获取 @@ -266,5 +266,5 @@ public interface IcEventService extends BaseService { * @param orgType * @return */ - EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType); + EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType, String eventType); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 3e67c8d848..2c44fab7ff 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1924,8 +1924,8 @@ public class IcEventServiceImpl extends BaseServiceImpl> dataMap = baseDao.getAnalysis(getOrgPath(orgId, orgType));//按分类获取数量 Map temp = new HashMap<>(); if (null != dataMap && dataMap.size() > 0) { @@ -1956,10 +1956,14 @@ public class IcEventServiceImpl extends BaseServiceImpl and b.GRID_PIDS like concat(#{orgIdPath},'%') + + AND b.SOURCE_TYPE = #{eventType} + ) eb, ( SELECT SUM( CASE WHEN c.OPERATION_TYPE = 0 THEN 1 ELSE 0 END ) AS huang FROM ic_event c WHERE c.DEL_FLAG = 0 and c.STATUS = 'processing' and c.GRID_PIDS like concat(#{orgIdPath},'%') + + AND c.SOURCE_TYPE = #{eventType} + ) ec, ( SELECT SUM( CASE WHEN d.OPERATION_TYPE = 0 THEN 1 ELSE 0 END ) as lan FROM ic_event d WHERE d.DEL_FLAG = 0 and d.STATUS = 'closed_case' and d.GRID_PIDS like concat(#{orgIdPath},'%') + + AND d.SOURCE_TYPE = #{eventType} + ) ed, - ( SELECT SUM( CASE WHEN d.DIFFICULT_POINT = 1 and d.OPERATION_TYPE = 0 THEN 1 ELSE 0 END) as dang + ( SELECT SUM( CASE WHEN d.DIFFICULT_POINT = 1 THEN 1 ELSE 0 END) as dang FROM ic_event d WHERE d.DEL_FLAG = 0 and d.GRID_PIDS like concat(#{orgIdPath},'%') + + AND d.SOURCE_TYPE = #{eventType} + ) ee @@ -492,10 +504,13 @@ SELECT ea.total AS jiSuJiBan, eb.total AS zhiTongLianBan, - ec.total AS wangGeHua + ec.total AS wangGeHua, + ed.total AS guiDang FROM ( - SELECT COUNT( e.id ) AS total FROM ic_event e + SELECT COUNT( e.id ) AS total + + FROM ic_event e WHERE e.DEL_FLAG = 0 AND e.SOURCE_TYPE = 0 AND ( e.OPERATION_TYPE = 0 OR e.OPERATION_TYPE IS NULL ) and e.GRID_PIDS like concat(#{orgIdPath},'%') @@ -514,7 +529,14 @@ and e.GRID_PIDS like concat(#{orgIdPath},'%') - ) ec + ) ec, + ( + SELECT COUNT( e.id ) AS total FROM ic_event e + WHERE e.DEL_FLAG = 0 AND e.DIFFICULT_POINT = 1 AND ( e.OPERATION_TYPE = 0 OR e.OPERATION_TYPE IS NULL ) + + and e.GRID_PIDS like concat(#{orgIdPath},'%') + + ) ed From 249f976989d38006be4105b5ef8aa23ee0ae83ad Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 May 2023 17:29:30 +0800 Subject: [PATCH 311/340] =?UTF-8?q?/epmetuser/icresiuser/ownerrelation?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=82=E9=85=8D=E7=81=B5=E5=B1=B1=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/PersonDataFormDTO.java | 6 ++ .../epmet/dto/result/IcResiUserBriefDTO.java | 8 +- .../dto/result/OwnerRelationResultDTO.java | 25 +++++++ .../controller/IcResiUserController.java | 2 +- .../com/epmet/service/IcResiUserService.java | 2 +- .../service/impl/IcResiUserServiceImpl.java | 73 +++++++++++++------ 6 files changed, 91 insertions(+), 25 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java index e2355d145a..8dbe98ac93 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java @@ -23,4 +23,10 @@ public class PersonDataFormDTO implements Serializable { @NotBlank(message = "tokenDto获取customerId不能为空",groups = PersonDataForm.class) private String customerId; + + /** + * 灵山项目需求，改造此接口，添加houseId，支持查询房屋里的所有人 + * /epmetuser/icresiuser/ownerrelation接口userId与houseId至少传一个值 + */ + private String houseId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java index 540b0207d9..ca832d0643 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java @@ -97,10 +97,14 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable { * 民族： */ private String mz; - /** * 因灵山项目添加此列： - * 与户主关系：存储字典纸 + * 民族姓名 + */ + private String mzName; + /** + * 因灵山项目添加此列： + * 与户主关系：存储字典：/sys/dict/data/relationship */ private String yhzgx; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java index 8ec9b45ef1..42c4e3e122 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java @@ -15,7 +15,18 @@ import java.util.List; public class OwnerRelationResultDTO implements Serializable { private static final long serialVersionUID = 2876258704168954941L; + /** + * 与户主关系是本人的居民 + */ private String ownerName; + /** + * 与户主关系是本人的居民id + */ + private String ownerUserId; + + /** + * 房屋里的所有人 + */ private List userList; @NoArgsConstructor @@ -24,11 +35,25 @@ public class OwnerRelationResultDTO implements Serializable { private String userId; private String userName; private String isSelf; + + /** + * 与户主关系key【字典表】 + */ + private String yhzgx; + + /** + * 与户主关系名称 + */ private String relation; + /** + * 人户情况 + */ + private String rhzk; /** * 2022.11.17：人户状况：人户一致、人在户不在、户在人不在、暂不清楚 */ private String renHuCondition; + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 03284d5fe7..e48c26c81d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -860,7 +860,7 @@ public class IcResiUserController implements ResultDataResolver { */ @PostMapping("ownerrelation") public Result getOwnerRelation(@RequestBody PersonDataFormDTO formDTO) { - return new Result().ok(icResiUserService.getOwnerRelation(formDTO.getUserId())); + return new Result().ok(icResiUserService.getOwnerRelation(formDTO.getUserId(),formDTO.getHouseId())); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 090c56560f..a64a8e4e85 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -136,7 +136,7 @@ public interface IcResiUserService extends BaseService { * @Author zhaoqifeng * @Date 2021/11/5 10:28 */ - OwnerRelationResultDTO getOwnerRelation(String userId); + OwnerRelationResultDTO getOwnerRelation(String userId,String houseId); /** * @Description 获取一栋楼每个房间人员分类的数量 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 bcb36c5efb..9f68a6ac4f 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 @@ -1596,41 +1596,65 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId()); - wrapper.eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); - wrapper.orderByAsc(IcResiUserEntity::getYhzgx); - List resiUserList = baseDao.selectList(wrapper); - if (CollectionUtils.isNotEmpty(resiUserList)) { - List userList = resiUserList.stream().map(item -> { + if(StringUtils.isBlank(houseId)){ + //获取用户信息 + IcResiUserEntity user = baseDao.selectById(userId); + if (null != user) { + houseId=user.getHomeId(); + } + } + //获取用户所在家庭里所有人员信息 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getHomeId, houseId); + wrapper.eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); + wrapper.orderByAsc(IcResiUserEntity::getYhzgx); + List resiUserList = baseDao.selectList(wrapper); + if (CollectionUtils.isNotEmpty(resiUserList)) { + + //先找到户主：正常情况下只会有一个户主，所以找到之后，终止循环 + for(IcResiUserEntity resiUserEntity:resiUserList){ + //如果与房主的关系是本人，则这个人就是房主 + if (RelationshipEnum.SELF.getCode().equals(resiUserEntity.getYhzgx())) { + result.setOwnerName(resiUserEntity.getName()); + result.setOwnerUserId(resiUserEntity.getId()); + break; + } + } + List userList=new ArrayList<>(); + for(IcResiUserEntity item:resiUserList){ + //成员里排除户主 + if(!result.getOwnerUserId().equals(item.getId())){ OwnerRelationResultDTO.UserListBean bean = new OwnerRelationResultDTO.UserListBean(); bean.setUserId(item.getId()); bean.setUserName(item.getName()); + bean.setYhzgx(item.getYhzgx()); bean.setRelation(RelationshipEnum.getEnum(item.getYhzgx()).getName()); - if (userId.equals(item.getId())) { - bean.setIsSelf(NumConstant.ONE_STR); - } - //如果与房主的关系是本人，则这个人就是房主 - if (RelationshipEnum.SELF.getCode().equals(item.getYhzgx())) { - result.setOwnerName(item.getName()); + bean.setIsSelf(NumConstant.ZERO_STR); + + // 与入参里的居民id对比 + if (StringUtils.isNotBlank(userId)) { + if (userId.equals(item.getId())) { + bean.setIsSelf(NumConstant.ONE_STR); + } } + //2022.11.17 返参增加人户状况名称 + bean.setRhzk(item.getRhzk()); if (StringUtils.isBlank(item.getRhzk())){ bean.setRenHuCondition(RenHuConditionEnum.ZBQC.getName()); }else { bean.setRenHuCondition(RenHuConditionEnum.getNameByCode(item.getRhzk())); } - return bean; - }).collect(Collectors.toList()); - result.setUserList(userList); + userList.add(bean); + } } + result.setUserList(userList); } return result; } @@ -1719,6 +1743,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> mzRes=epmetAdminOpenFeignClient.getNationOption(); + if(mzRes.success()&&CollectionUtils.isNotEmpty(mzRes.getData())){ + Map mzMap = mzRes.getData().stream().collect(Collectors.toMap(OptionResultDTO::getValue, OptionResultDTO::getLabel)); + if(MapUtils.isNotEmpty(mzMap)&&mzMap.containsKey(r.getMz())){ + r.setMzName(mzMap.get(r.getMz())); + } + } r.setYhzgx(resiEntity.getYhzgx()); r.setYhzgxName(StrConstant.EPMETY_STR); Result> yhzgxRes=epmetAdminOpenFeignClient.getRelationshipOption(); From aa5a85b9b12c3fad69f74a64a64f4686a467f020 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 May 2023 18:07:10 +0800 Subject: [PATCH 312/340] =?UTF-8?q?houseDetail/{houseId}=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=88=BF=E5=B1=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/LingShanScreenGovOrgController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java index fe3123a482..51b0604767 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java @@ -1,6 +1,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcBuildingDTO; @@ -55,6 +56,7 @@ public class LingShanScreenGovOrgController { * @param houseId * @return */ + @MaskResponse(fieldNames = {"showOwnerIdCard", "showOwnerPhone"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_MOBILE}) @PostMapping("houseDetail/{houseId}") public Result queryHouseDetail(@PathVariable("houseId")String houseId){ return new Result().ok(icHouseService.queryHouseDetail(houseId)); From 9c3b219be83f91b41892369264b29cd9adca072f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 May 2023 18:25:52 +0800 Subject: [PATCH 313/340] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=94=A8=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...eenPartyCenterHouseDistributionResDTO.java | 43 ------------------- 1 file changed, 43 deletions(-) delete mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java deleted file mode 100644 index 7e179fe4a0..0000000000 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.epmet.dto.result.lingshan; - -import lombok.Data; - -/** - * @Description - * @Author yzm - * @Date 2023/5/18 10:56 - */ -@Data -public class ScreenPartyCenterHouseDistributionResDTO { - /** - * 小区id - */ - private String neighborHoodId; - private String neighborHoodName; - /** - * 所属楼栋id - */ - private String buildingId; - private String buildingName; - /** - * 所属单元id - */ - private String buildingUnitId; - private String unitName; - - /** - * 房屋名字后台插入时生成 - */ - private String houseName; - /** - * 房屋坐标 - */ - private String longitude; - private String latitude; - - /** - * 灵山项目：是否党员中心户：1是；0不是 - */ - private String partyCenterHouseFlag; -} - From c6deed961e456e6818231091010b044d1722f3e6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 May 2023 18:33:05 +0800 Subject: [PATCH 314/340] =?UTF-8?q?=E6=8F=90=E4=B8=8A=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/BuildingController.java | 14 +++++- .../com/epmet/controller/HouseController.java | 27 ++++++++++-- .../LingShanScreenGovOrgController.java | 44 ++----------------- .../com/epmet/service/BuildingService.java | 10 +++++ .../java/com/epmet/service/HouseService.java | 19 ++++++++ .../com/epmet/service/IcBuildingService.java | 10 +---- .../com/epmet/service/IcHouseService.java | 16 ------- .../service/impl/BuildingServiceImpl.java | 16 +++++++ .../epmet/service/impl/HouseServiceImpl.java | 36 ++++++++++++++- .../service/impl/IcBuildingServiceImpl.java | 14 +----- .../service/impl/IcHouseServiceImpl.java | 30 ------------- 11 files changed, 122 insertions(+), 114 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java index 971015a298..ac166eaec3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java @@ -31,7 +31,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcBuildingUnitDao; import com.epmet.dto.BuildingTreeLevelDTO; +import com.epmet.dto.IcBuildingDTO; import com.epmet.dto.form.*; +import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO; import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.BuildingResultPagedDTO; import com.epmet.dto.result.IcBuildingListResultDTO; @@ -283,5 +285,15 @@ public class BuildingController { } - + /** + * 灵山大屏：查询楼栋坐标 + * + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("building-distribution") + public Result> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { + return new Result>().ok(buildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId())); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 53738a3d4c..f57dc799be 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -48,10 +48,12 @@ import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcHouseDao; +import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.*; +import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO; import com.epmet.dto.result.*; +import com.epmet.dto.result.lingshan.HouseDetailResultDTO; import com.epmet.entity.CustomerOrgParameterEntity; -import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; @@ -100,9 +102,6 @@ public class HouseController implements ResultDataResolver { @Autowired private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient; - @Autowired - private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient; - @Autowired private IcHouseDao icHouseDao; @Autowired @@ -691,4 +690,24 @@ public class HouseController implements ResultDataResolver { return new Result>().ok(r); } + /** + * 灵山大屏：查询房屋坐标点位 + * 支持根据网格\小区\楼栋id查询 + */ + @PostMapping("house-distribution") + public Result> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { + return new Result>().ok(houseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId())); + } + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + @MaskResponse(fieldNames = {"showOwnerIdCard", "showOwnerPhone"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_MOBILE}) + @PostMapping("houseDetail/{houseId}") + public Result queryHouseDetail(@PathVariable("houseId")String houseId){ + return new Result().ok(houseService.queryHouseDetail(houseId)); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java index 51b0604767..760dfd6b9b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java @@ -1,19 +1,12 @@ package com.epmet.controller; -import com.epmet.commons.tools.annotation.LoginUser; -import com.epmet.commons.tools.annotation.MaskResponse; -import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.IcBuildingDTO; -import com.epmet.dto.IcHouseDTO; -import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO; -import com.epmet.dto.result.lingshan.HouseDetailResultDTO; import com.epmet.service.IcBuildingService; import com.epmet.service.IcHouseService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import java.util.List; +import javax.annotation.Resource; /** * @Description 灵山大屏-查询gov-org库的接口， 可以放在这.... @@ -23,44 +16,15 @@ import java.util.List; @RestController @RequestMapping("houseScreen") public class LingShanScreenGovOrgController { - @Autowired + @Resource private IcHouseService icHouseService; @Autowired private IcBuildingService icBuildingService; - /** - * 灵山大屏：查询楼栋坐标 - * - * @param tokenDto - * @param formDTO - * @return - */ - @PostMapping("building-distribution") - public Result> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { - return new Result>().ok(icBuildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId())); - } - /** - * 灵山大屏：查询房屋坐标点位 - * 支持根据网格\小区\楼栋id查询 - */ - @PostMapping("house-distribution") - public Result> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { - return new Result>().ok(icHouseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId())); - } - /** - * 灵山大屏：点击房屋，显示房屋详情 - * @param houseId - * @return - */ - @MaskResponse(fieldNames = {"showOwnerIdCard", "showOwnerPhone"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_MOBILE}) - @PostMapping("houseDetail/{houseId}") - public Result queryHouseDetail(@PathVariable("houseId")String houseId){ - return new Result().ok(icHouseService.queryHouseDetail(houseId)); - } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java index 27e1c4c1ee..d1da0c1ae8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java @@ -20,6 +20,7 @@ package com.epmet.service; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.BuildingTreeLevelDTO; +import com.epmet.dto.IcBuildingDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.BuildingResultPagedDTO; @@ -96,4 +97,13 @@ public interface BuildingService { */ Result buildingImportExcel(ImportInfoFormDTO formDTO, InputStream inputStream, Result importTask) throws IOException; + /** + * 灵山大屏：查询楼栋坐标 + * + * @param customerId + * @param gridId + * @param neighborHoodId + * @return + */ + List buildingDistribution(String customerId, String gridId, String neighborHoodId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 1161a1ee9f..35f659666f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -23,6 +23,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.lingshan.HouseDetailResultDTO; import com.google.common.cache.Cache; import javax.servlet.http.HttpServletResponse; @@ -204,4 +205,22 @@ public interface HouseService { PageData houseStatisListDetail(HouseChartFormDTO formDTO); PageData usingCommunityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize); + + /** + * 灵山大屏：查询房屋坐标点位 + * + * @param gridId + * @param neighborHoodId + * @param buildingId + * @return + */ + List houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId); + + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + HouseDetailResultDTO queryHouseDetail(String houseId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java index 9d60ebcb56..28efa71852 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java @@ -134,13 +134,5 @@ public interface IcBuildingService extends BaseService { */ Result getBuildingDetail(String buildingId); - /** - * 灵山大屏：查询楼栋坐标 - * - * @param customerId - * @param gridId - * @param neighborHoodId - * @return - */ - List buildingDistribution(String customerId, String gridId, String neighborHoodId); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index 47a8e7904a..b7a7de4fd4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -181,21 +181,5 @@ public interface IcHouseService extends BaseService { */ void updatePartyCenterHouse(String houseId, String partyCenterHouseFlag); - /** - * 灵山大屏：查询房屋坐标点位 - * - * @param gridId - * @param neighborHoodId - * @param buildingId - * @return - */ - List houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId); - - /** - * 灵山大屏：点击房屋，显示房屋详情 - * @param houseId - * @return - */ - HouseDetailResultDTO queryHouseDetail(String houseId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 5f16fb2c62..e3693d109d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -763,4 +763,20 @@ public class BuildingServiceImpl implements BuildingService { } + + /** + * 灵山大屏：查询楼栋坐标 + * + * @param customerId + * @param gridId + * @param neighborHoodId + * @return + */ + @Override + public List buildingDistribution(String customerId, String gridId, String neighborHoodId) { + List list=icBuildingDao.selectListByMap(customerId,gridId,neighborHoodId); + return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class); + } + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index a642150cf9..b5c7bbf08b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -36,6 +36,7 @@ import com.epmet.dao.*; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.lingshan.HouseDetailResultDTO; import com.epmet.entity.*; import com.epmet.enums.*; import com.epmet.feign.*; @@ -132,7 +133,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { @Autowired private DataReportOpenFeignClient dataReportOpenFeignClient; - + @Autowired + private LingshanPartyCenterHouseLianhuDao partyCenterHouseLianhuDao; /** * 房屋管理-新增房屋 * @@ -1525,4 +1527,36 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { agencyNamePathList.add(agencyInfo.getOrganizationName()); return String.join("-", agencyNamePathList); } + + + /** + * 灵山大屏：查询房屋坐标点位 + * + * @param gridId + * @param neighborHoodId + * @param buildingId + * @return + */ + @Override + public List houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) { + List list=icHouseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId); + return ConvertUtils.sourceToTarget(list,IcHouseDTO.class); + } + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + @Override + public HouseDetailResultDTO queryHouseDetail(String houseId) { + IcHouseDTO data = icHouseService.get(houseId); + HouseDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(data, HouseDetailResultDTO.class); + if (null != resultDTO) { + LambdaQueryWrapper countQuery = new LambdaQueryWrapper<>(); + countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId); + resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery)); + } + return resultDTO; + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index db18a933f8..694640be4f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -173,17 +173,5 @@ public class IcBuildingServiceImpl extends BaseServiceImpl().ok(baseDao.getBuildingDetail(buildingId)); } - /** - * 灵山大屏：查询楼栋坐标 - * - * @param customerId - * @param gridId - * @param neighborHoodId - * @return - */ - @Override - public List buildingDistribution(String customerId, String gridId, String neighborHoodId) { - List list=baseDao.selectListByMap(customerId,gridId,neighborHoodId); - return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class); - } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index f76d723af1..c6a7b21c4f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -560,36 +560,6 @@ public class IcHouseServiceImpl extends BaseServiceImpl houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) { - List list=baseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId); - return ConvertUtils.sourceToTarget(list,IcHouseDTO.class); - } - - /** - * 灵山大屏：点击房屋，显示房屋详情 - * @param houseId - * @return - */ - @Override - public HouseDetailResultDTO queryHouseDetail(String houseId) { - IcHouseDTO data = get(houseId); - HouseDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(data, HouseDetailResultDTO.class); - if (null != resultDTO) { - LambdaQueryWrapper countQuery = new LambdaQueryWrapper<>(); - countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId); - resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery)); - } - return resultDTO; - } } From 465e4bb7828430df1c2545025b910d0f73488954 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 May 2023 18:35:28 +0800 Subject: [PATCH 315/340] =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LingShanScreenGovOrgController.java | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java deleted file mode 100644 index 760dfd6b9b..0000000000 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.epmet.controller; - -import com.epmet.service.IcBuildingService; -import com.epmet.service.IcHouseService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -/** - * @Description 灵山大屏-查询gov-org库的接口， 可以放在这.... - * @Author yzm - * @Date 2023/5/18 10:05 - */ -@RestController -@RequestMapping("houseScreen") -public class LingShanScreenGovOrgController { - @Resource - private IcHouseService icHouseService; - @Autowired - private IcBuildingService icBuildingService; - - - - - - - - -} - From cd8f0f573d4a06dcfa4cbf002a914ccfb5871b58 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 May 2023 19:17:55 +0800 Subject: [PATCH 316/340] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=82=E7=82=B9=E5=87=BB=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=81=94=E6=88=B7=E5=9D=90=E6=A0=87=E7=82=B9?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LingshanPartyCenterHouseLianhuDTO.java | 3 ++- .../com/epmet/controller/HouseController.java | 14 ++++++++++ .../LingshanPartyCenterHouseLianhuDao.java | 15 +++++++++++ .../java/com/epmet/service/HouseService.java | 8 ++++++ .../epmet/service/impl/HouseServiceImpl.java | 26 +++++++++++++++++++ .../service/impl/IcHouseServiceImpl.java | 6 ++--- .../src/main/resources/mapper/IcHouseDao.xml | 3 +++ .../LingshanPartyCenterHouseLianhuDao.xml | 15 +++++++++++ 8 files changed, 85 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java index 0a7df6be25..c5db519f45 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java @@ -70,6 +70,7 @@ public class LingshanPartyCenterHouseLianhuDTO implements Serializable { * 联户：联户房屋id */ private String houseId; - + private String longitude; + private String latitude; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index f57dc799be..f31a58ad75 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -50,9 +50,11 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcHouseDao; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.*; +import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO; import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO; import com.epmet.dto.result.*; import com.epmet.dto.result.lingshan.HouseDetailResultDTO; +import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; import com.epmet.entity.CustomerOrgParameterEntity; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetMessageOpenFeignClient; @@ -710,4 +712,16 @@ public class HouseController implements ResultDataResolver { return new Result().ok(houseService.queryHouseDetail(houseId)); } + /** + * 灵山项目:根据楼栋id返回房屋列表，分页，且返回党员中心户标志, 联户群众数 + * + * @param formDTO + * @return + */ + @MaskResponse(fieldNames = {"showOwnerPhone", "showOwnerIdCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + @PostMapping("lingshanScreen/houseList") + public Result> queryHouseListForLingShanScreen(@RequestBody PartyCenterHousePageFormDTO formDTO) { + return new Result>().ok(houseService.queryHouseListForLingShanScreen(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getBuildingId())); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java index 7b712e100c..8788e1d6cb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java @@ -1,9 +1,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO; import com.epmet.entity.LingshanPartyCenterHouseLianhuEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 灵山_党员中心户联户 * @@ -15,5 +18,17 @@ public interface LingshanPartyCenterHouseLianhuDao extends BaseDao selectLianHuHouse(String partyCenterHouseId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 35f659666f..3594bd05c7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -24,6 +24,7 @@ import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.dto.result.lingshan.HouseDetailResultDTO; +import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; import com.google.common.cache.Cache; import javax.servlet.http.HttpServletResponse; @@ -223,4 +224,11 @@ public interface HouseService { * @return */ HouseDetailResultDTO queryHouseDetail(String houseId); + + /** + * 灵山项目:根据楼栋id返回房屋列表，分页，且返回党员中心户标志, 联户群众数 + * @param buildingId + * @return + */ + PageData queryHouseListForLingShanScreen(Integer pageNo, Integer pageSize, String buildingId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index b5c7bbf08b..fa053665de 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -37,6 +37,7 @@ import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.dto.result.lingshan.HouseDetailResultDTO; +import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; import com.epmet.entity.*; import com.epmet.enums.*; import com.epmet.feign.*; @@ -1559,4 +1560,29 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } return resultDTO; } + + /** + * 灵山项目:根据楼栋id返回房屋列表，分页，且返回党员中心户标志, 联户群众数 + * + * @param pageNo + * @param pageSize + * @param buildingId + * @return + */ + @Override + public PageData queryHouseListForLingShanScreen(Integer pageNo, Integer pageSize, String buildingId) { + PageHelper.startPage(pageNo, pageSize); + List list = icHouseDao.selectListPartyCenterHouse(null, + null, + null, + null, + buildingId, + null); + list.forEach(item -> { + item.setHouseTypeName(HouseTypeEnums.getTypeValue(item.getHouseType())); + item.setPurposeName(HousePurposeEnums.getTypeValue(item.getPurpose())); + }); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal(), pageSize); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index c6a7b21c4f..c0c50dac8b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -502,10 +502,8 @@ public class IcHouseServiceImpl extends BaseServiceImpl(); } - LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); - queryWrapper.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId,partyCenterHouseId); - List list=partyCenterHouseLianhuDao.selectList(queryWrapper); - return ConvertUtils.sourceToTarget(list,LingshanPartyCenterHouseLianhuDTO.class); + List resultList=partyCenterHouseLianhuDao.selectLianHuHouse(partyCenterHouseId); + return resultList; } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index aa4b825507..6e250fb9e6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -751,6 +751,9 @@ ih.DEL_FLAG = '0' AND b.DEL_FLAG = '0' AND h.DEL_FLAG = '0' + + and ih.customer_id=#{customerId} + AND ih.PARTY_CENTER_HOUSE_FLAG='1' diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml index 285b47922e..1c3072c4bc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml @@ -34,4 +34,19 @@ where DEL_FLAG='0' and HOUSE_ID = #{houseId} + + \ No newline at end of file From 8888215fd809ac89811a4d89e7ac164934dfaf47 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 May 2023 10:01:04 +0800 Subject: [PATCH 317/340] =?UTF-8?q?=E8=81=94=E6=88=B7=E7=BE=A4=E4=BC=97?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/LingShanLianHuResiUserFormDTO.java | 15 +++++++++ .../epmetuser/result/IcResiUserResultDTO.java | 16 +++++++++ .../LingShanLianHuResiUserResultDTO.java | 33 +++++++++++++++++++ .../controller/GovOrgController.java | 13 ++++++++ .../dataaggre/dao/govorg/IcHouseDao.java | 8 +++++ .../service/epmetuser/EpmetUserService.java | 8 ++++- .../epmetuser/impl/EpmetUserServiceImpl.java | 23 +++++++++++++ .../service/govorg/GovOrgService.java | 10 ++++++ .../govorg/impl/GovOrgServiceImpl.java | 31 ++++++++++++++--- .../resources/mapper/govorg/IcHouseDao.xml | 24 ++++++++++++++ 10 files changed, 176 insertions(+), 5 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/LingShanLianHuResiUserFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/LingShanLianHuResiUserFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/LingShanLianHuResiUserFormDTO.java new file mode 100644 index 0000000000..4ce99a8f04 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/LingShanLianHuResiUserFormDTO.java @@ -0,0 +1,15 @@ +package com.epmet.dataaggre.dto.epmetuser.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/19 9:23 + */ +@Data +public class LingShanLianHuResiUserFormDTO extends PageFormDTO { + private String partyCenterHouseId; +} + diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java new file mode 100644 index 0000000000..0c43cae2fa --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java @@ -0,0 +1,16 @@ +package com.epmet.dataaggre.dto.epmetuser.result; + +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/19 9:52 + */ +@Data +public class IcResiUserResultDTO { + private String icResiUserId; + private String name; + private String mobile; +} + diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java new file mode 100644 index 0000000000..e54f8e807e --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dataaggre.dto.epmetuser.result; + +import lombok.Data; + +import java.util.List; + +/** + * @Description 灵山大屏-党员中共新户联户群众列表 + * @Author yzm + * @Date 2023/5/19 9:10 + */ +@Data +public class LingShanLianHuResiUserResultDTO { + /** + * 与入参一致 + * 党员中心户房屋id, + */ + private String partyCenterHouseId; + // 关联的房屋信息 + private String neighborHoodId; + private String neighborHoodName; + private String buildingId; + private String buildingName; + private String buildingUnitId; + private String unitName; + private String doorName; + private String houseId; + // 每个房屋里住的居民 + private List resiList; + + +} + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 263a862971..d569a6be59 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -24,6 +24,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.beans.GridMemberDataAnalysisExcelExportBean; +import com.epmet.dataaggre.dto.epmetuser.form.LingShanLianHuResiUserFormDTO; +import com.epmet.dataaggre.dto.epmetuser.result.LingShanLianHuResiUserResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; @@ -567,4 +569,15 @@ public class GovOrgController { } } + + /** + * 灵山大屏：根据房屋id，查询联户里的居民信息列表 + * + * @param formDTO + * @return + */ + @PostMapping("lianHuResi") + public Result> lianHuResi(@RequestBody LingShanLianHuResiUserFormDTO formDTO) { + return new Result>().ok(govOrgService.lianHuResi(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getPartyCenterHouseId())); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java index 568e74e5cb..8350e4c753 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java @@ -2,6 +2,7 @@ package com.epmet.dataaggre.dao.govorg; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; +import com.epmet.dataaggre.dto.epmetuser.result.LingShanLianHuResiUserResultDTO; import com.epmet.dataaggre.entity.govorg.IcHouseEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -36,4 +37,11 @@ public interface IcHouseDao extends BaseDao { @Param("houseId") String houseId, @Param("houseRule") List houseRule, @Param("statRule") List statRule); + + /** + * 灵山项目：查询房屋关联的联户房屋 + * @param partyCenterHouseId + * @return + */ + List selectListLianHuHouse(@Param("partyCenterHouseId") String partyCenterHouseId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index ec87a71781..8ef6f1ad94 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -11,7 +11,6 @@ import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO; -import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; import com.epmet.dataaggre.dto.govorg.result.MemberProjectInfoResultDTO; @@ -269,4 +268,11 @@ public interface EpmetUserService { Integer pageNo, Integer pageSize); Integer staffQtyInGridsOfRole(String roleKeyAgent, Set staffIds); + + /** + * 根据房屋id,查询居民信息 + * @param houseId + * @return + */ + List listIcResiUserByHouseId(String houseId); } 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 9e04d840db..d4b56421ef 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 @@ -1187,4 +1187,27 @@ public class EpmetUserServiceImpl implements EpmetUserService, ResultDataResolve return customerStaffDao.countStaffQtyByStaffIdsAndRole(staffIds, role.getId()); } + + /** + * 根据房屋id,查询居民信息 + * + * @param houseId + * @return + */ + @Override + public List listIcResiUserByHouseId(String houseId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcResiUserEntity::getHomeId, houseId) + .eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); + List list = icResiUserDao.selectList(queryWrapper); + List resultList = new ArrayList<>(); + for (IcResiUserEntity entity : list) { + IcResiUserResultDTO resultDTO = new IcResiUserResultDTO(); + resultDTO.setIcResiUserId(entity.getId()); + resultDTO.setName(entity.getName()); + resultDTO.setMobile(entity.getMobile()); + resultList.add(resultDTO); + } + return resultList; + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index d8ffe1e59b..c9fbed85c9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dataaggre.beans.LingShanAgentServiceStaffAndGrid; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; +import com.epmet.dataaggre.dto.epmetuser.result.LingShanLianHuResiUserResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; @@ -309,4 +310,13 @@ public interface GovOrgService { Set getStaffIdsInGrid(String gridId); List listBelongGridsByStaffId(String staffId); + + /** + * 灵山大屏：根据房屋id，查询联户里的居民信息列表 + * @param pageNo + * @param pageSize + * @param partyCenterHouseId + * @return + */ + PageData lianHuResi(Integer pageNo, Integer pageSize, String partyCenterHouseId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 68a8b8dac3..9eb154dfe6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -37,10 +37,7 @@ import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.constant.OrgConstant; import com.epmet.dataaggre.dao.govorg.*; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; -import com.epmet.dataaggre.dto.epmetuser.result.CustomerStaffResultDTO; -import com.epmet.dataaggre.dto.epmetuser.result.ListStaffResultDTO; -import com.epmet.dataaggre.dto.epmetuser.result.StaffRoleListResultDTO; -import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; +import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; @@ -1572,4 +1569,30 @@ public class GovOrgServiceImpl implements GovOrgService { q2.in(CustomerGridEntity::getId, staffAndGrids.stream().map(CustomerStaffGridEntity::getGridId).collect(Collectors.toList())); return customerGridDao.selectList(q2); } + + + /** + * 灵山大屏：根据房屋id，查询联户里的居民信息列表 + * + * @param pageNo + * @param pageSize + * @param partyCenterHouseId + * @return + */ + public PageData lianHuResi(Integer pageNo, Integer pageSize, String partyCenterHouseId) { + // 先查询关联的房屋id + PageHelper.startPage(pageNo, pageSize); + List houseList = houseDao.selectListLianHuHouse(partyCenterHouseId); + if (CollectionUtils.isEmpty(houseList)) { + return new PageData<>(); + } + houseList.forEach(lianHuHouse -> { + List resiList = epmetUserService.listIcResiUserByHouseId(lianHuHouse.getHouseId()); + lianHuHouse.setResiList(resiList); + }); + PageInfo pageInfo = new PageInfo<>(houseList); + return new PageData<>(houseList, pageInfo.getTotal()); + } + + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml index c679f9a5ce..584add00d2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml @@ -38,4 +38,28 @@ + + From 31b3c386252d8d96123df35b10f370d28d01809d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 May 2023 10:23:00 +0800 Subject: [PATCH 318/340] pageSize --- .../epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 9eb154dfe6..0bd53003cb 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1591,7 +1591,7 @@ public class GovOrgServiceImpl implements GovOrgService { lianHuHouse.setResiList(resiList); }); PageInfo pageInfo = new PageInfo<>(houseList); - return new PageData<>(houseList, pageInfo.getTotal()); + return new PageData<>(houseList, pageInfo.getTotal(), pageSize); } From 095855db78fbd167f2efdf7ad648c65eae4f0253 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 May 2023 11:11:09 +0800 Subject: [PATCH 319/340] /icresiuser/resi-brief/+/data/aggregator/org/lianHuResi --- .../epmetuser/result/IcResiUserResultDTO.java | 1 + .../LingShanLianHuResiUserResultDTO.java | 13 +++++--- .../controller/GovOrgController.java | 2 ++ .../service/epmetuser/EpmetUserService.java | 4 +-- .../epmetuser/impl/EpmetUserServiceImpl.java | 15 ++++++--- .../govorg/impl/GovOrgServiceImpl.java | 33 +++++++++++++++---- .../resources/mapper/govorg/IcHouseDao.xml | 3 +- .../epmet/dto/result/IcResiUserBriefDTO.java | 2 ++ .../service/impl/IcResiUserServiceImpl.java | 2 ++ 9 files changed, 56 insertions(+), 19 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java index 0c43cae2fa..98f4d8889d 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java @@ -12,5 +12,6 @@ public class IcResiUserResultDTO { private String icResiUserId; private String name; private String mobile; + private String homeId; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java index e54f8e807e..90a516b53d 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java @@ -2,20 +2,22 @@ package com.epmet.dataaggre.dto.epmetuser.result; import lombok.Data; -import java.util.List; - /** * @Description 灵山大屏-党员中共新户联户群众列表 * @Author yzm * @Date 2023/5/19 9:10 */ @Data -public class LingShanLianHuResiUserResultDTO { +public class LingShanLianHuResiUserResultDTO extends IcResiUserResultDTO{ /** * 与入参一致 * 党员中心户房屋id, */ private String partyCenterHouseId; + /** + * 房主姓名 + */ + private String partyCenterHouseOwnerName; // 关联的房屋信息 private String neighborHoodId; private String neighborHoodName; @@ -25,8 +27,9 @@ public class LingShanLianHuResiUserResultDTO { private String unitName; private String doorName; private String houseId; - // 每个房屋里住的居民 - private List resiList; + + // // 每个房屋里住的居民 + // private List resiList; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index d569a6be59..5a1a3e3a7c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -5,6 +5,7 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.annotation.RequirePermission; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; @@ -576,6 +577,7 @@ public class GovOrgController { * @param formDTO * @return */ + @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) @PostMapping("lianHuResi") public Result> lianHuResi(@RequestBody LingShanLianHuResiUserFormDTO formDTO) { return new Result>().ok(govOrgService.lianHuResi(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getPartyCenterHouseId())); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 8ef6f1ad94..c178cf0da8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -271,8 +271,8 @@ public interface EpmetUserService { /** * 根据房屋id,查询居民信息 - * @param houseId + * @param houseIds * @return */ - List listIcResiUserByHouseId(String houseId); + PageData listIcResiUserByHouseId(Integer pageNo,Integer pageSize,List houseIds); } 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 d4b56421ef..3a6219508b 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 @@ -1191,23 +1191,30 @@ public class EpmetUserServiceImpl implements EpmetUserService, ResultDataResolve /** * 根据房屋id,查询居民信息 * - * @param houseId + * @param pageNo + * @param pageSize + * @param houseIds * @return */ @Override - public List listIcResiUserByHouseId(String houseId) { + public PageData listIcResiUserByHouseId(Integer pageNo,Integer pageSize,List houseIds) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(IcResiUserEntity::getHomeId, houseId) + queryWrapper.in(IcResiUserEntity::getHomeId, houseIds) .eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); + PageHelper.startPage(pageNo, pageSize); List list = icResiUserDao.selectList(queryWrapper); + PageInfo pageInfo = new PageInfo<>(list); + List resultList = new ArrayList<>(); for (IcResiUserEntity entity : list) { IcResiUserResultDTO resultDTO = new IcResiUserResultDTO(); resultDTO.setIcResiUserId(entity.getId()); resultDTO.setName(entity.getName()); resultDTO.setMobile(entity.getMobile()); + resultDTO.setHomeId(entity.getHomeId()); resultList.add(resultDTO); } - return resultList; + pageInfo.setList(resultList); + return new PageData<>(resultList, pageInfo.getTotal(),pageSize); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 0bd53003cb..d71e6e04ce 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -48,6 +48,7 @@ import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import com.epmet.dataaggre.entity.govorg.CustomerGridEntity; import com.epmet.dataaggre.entity.govorg.CustomerStaffGridEntity; +import com.epmet.dataaggre.entity.govorg.IcHouseEntity; import com.epmet.dataaggre.excel.GridLivelyDetailExcel; import com.epmet.dataaggre.excel.GridLivelyExcel; import com.epmet.dataaggre.service.commonservice.AreaCodeService; @@ -1580,18 +1581,36 @@ public class GovOrgServiceImpl implements GovOrgService { * @return */ public PageData lianHuResi(Integer pageNo, Integer pageSize, String partyCenterHouseId) { - // 先查询关联的房屋id - PageHelper.startPage(pageNo, pageSize); + IcHouseEntity partyHouseInfo=houseDao.selectById(partyCenterHouseId); List houseList = houseDao.selectListLianHuHouse(partyCenterHouseId); if (CollectionUtils.isEmpty(houseList)) { return new PageData<>(); } - houseList.forEach(lianHuHouse -> { - List resiList = epmetUserService.listIcResiUserByHouseId(lianHuHouse.getHouseId()); - lianHuHouse.setResiList(resiList); + List houseIds = houseList.stream().map(o -> o.getHouseId()).collect(Collectors.toList()); + // 先查询关联的房屋id + PageData resiPage = epmetUserService.listIcResiUserByHouseId(pageNo, pageSize, houseIds); + if (CollectionUtils.isEmpty(resiPage.getList())) { + return new PageData<>(); + } + Map lianHouseMap=houseList.stream().collect(Collectors.toMap(LingShanLianHuResiUserResultDTO :: getHouseId, v -> v, (v1, v2) -> v1)); + List resList=new ArrayList(); + resiPage.getList().forEach(dto->{ + LingShanLianHuResiUserResultDTO resultDTO=ConvertUtils.sourceToTarget(dto,LingShanLianHuResiUserResultDTO.class); + + LingShanLianHuResiUserResultDTO houseInfo = lianHouseMap.get(dto.getHomeId()); + resultDTO.setPartyCenterHouseId(houseInfo.getPartyCenterHouseId()); + resultDTO.setNeighborHoodId(houseInfo.getNeighborHoodId()); + resultDTO.setNeighborHoodName(houseInfo.getNeighborHoodName()); + resultDTO.setBuildingId(houseInfo.getBuildingId()); + resultDTO.setBuildingName(houseInfo.getBuildingName()); + resultDTO.setBuildingUnitId(houseInfo.getBuildingUnitId()); + resultDTO.setUnitName(houseInfo.getUnitName()); + resultDTO.setDoorName(houseInfo.getDoorName()); + resultDTO.setHouseId(houseInfo.getHouseId()); + resultDTO.setPartyCenterHouseId(partyHouseInfo.getOwnerName()); + resList.add(resultDTO); }); - PageInfo pageInfo = new PageInfo<>(houseList); - return new PageData<>(houseList, pageInfo.getTotal(), pageSize); + return new PageData<>(resList, resiPage.getTotal(),pageSize); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml index 584add00d2..fea9a017be 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml @@ -49,7 +49,8 @@ ib.BUILDING_NAME, l.BUILDING_UNIT_ID, u.UNIT_NAME, - ih.DOOR_NAME + ih.DOOR_NAME, + ih.OWNER_NAME as ownerName FROM lingshan_party_center_house_lianhu l INNER JOIN ic_house ih ON ( l.HOUSE_ID = ih.ID ) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java index ca832d0643..cb428b8aef 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java @@ -38,6 +38,7 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable { * 手机号 */ private String mobile; + private String realMobile; /** * 性别 @@ -48,6 +49,7 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable { * 身份证号 */ private String idCard; + private String realIdCard; /** * 出生日期 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 97150ec2e7..cb804c078e 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 @@ -1696,6 +1696,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> mzRes=epmetAdminOpenFeignClient.getNationOption(); if(mzRes.success()&&CollectionUtils.isNotEmpty(mzRes.getData())){ From a7eaf9a0278c9c22a63204b943eb4a3bba0b1aed Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 19 May 2023 14:00:28 +0800 Subject: [PATCH 320/340] =?UTF-8?q?=E5=A9=9A=E5=A7=BB=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/YtHsResUtils.java | 61 +++++ .../java/com/epmet/task/ResiDeadTask.java | 43 ++++ .../java/com/epmet/task/ResiMaritalTask.java | 43 ++++ .../epmet/dto/DataSyncRecordMaritalDTO.java | 109 ++++++++ .../com/epmet/dto/IcResiUserTaskLogDTO.java | 74 ++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 3 + .../EpmetUserOpenFeignClientFallback.java | 5 + .../com/epmet/constant/EpidemicConstant.java | 2 + .../controller/DataSyncConfigController.java | 13 + .../DataSyncRecordMaritalController.java | 72 ++++++ .../IcResiUserTaskLogController.java | 72 ++++++ .../epmet/dao/DataSyncRecordMaritalDao.java | 16 ++ .../com/epmet/dao/IcResiUserTaskLogDao.java | 16 ++ .../entity/DataSyncRecordMaritalEntity.java | 79 ++++++ .../epmet/entity/IcResiUserTaskLogEntity.java | 44 ++++ .../java/com/epmet/enums/DataSyncEnum.java | 1 + .../excel/DataSyncRecordMaritalExcel.java | 72 ++++++ .../epmet/excel/IcResiUserTaskLogExcel.java | 51 ++++ .../redis/DataSyncRecordMaritalRedis.java | 30 +++ .../epmet/redis/IcResiUserTaskLogRedis.java | 30 +++ .../epmet/service/DataSyncConfigService.java | 8 + .../service/DataSyncRecordMaritalService.java | 83 +++++++ .../service/IcResiUserTaskLogService.java | 78 ++++++ .../impl/DataSyncConfigServiceImpl.java | 233 +++++++++++++++++- .../DataSyncRecordMaritalServiceImpl.java | 92 +++++++ .../impl/IcResiUserTaskLogServiceImpl.java | 83 +++++++ .../mapper/DataSyncRecordMaritalDao.xml | 28 +++ .../resources/mapper/IcResiUserTaskLogDao.xml | 21 ++ 28 files changed, 1456 insertions(+), 6 deletions(-) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ResiDeadTask.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ResiMaritalTask.java create mode 100755 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordMaritalDTO.java create mode 100755 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserTaskLogDTO.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserTaskLogController.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserTaskLogDao.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordMaritalEntity.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserTaskLogEntity.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordMaritalExcel.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserTaskLogExcel.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/redis/DataSyncRecordMaritalRedis.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserTaskLogRedis.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserTaskLogService.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserTaskLogServiceImpl.java create mode 100755 epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml create mode 100755 epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserTaskLogDao.xml diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index 6e968d3af8..e33179fb84 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -172,6 +172,67 @@ public class YtHsResUtils { return new YtDataSyncResDTO(); } + /** + * desc:死亡数据同步 + * + * @return + */ + public static YtDataSyncResDTO hunYin(String cardNo, String userName) { + try { + tryAcquire("hunYin"); +// 1)appkey秘钥 +// 2)name姓名 必填 +// 3)idcard身份证号 必填 +// 4)start开始默认0 +// 5)limit每页记录数 + Map param = new HashMap<>(); + param.put(APP_KEY, "FH8dEJXl0WaZ8r2ZgHlNdEnoz"); + param.put("cert_num_man", cardNo); + param.put("name_man", userName); + param.put("start", 0); + param.put("limit", 1); + + log.info("hunYin api param:{}", param); + + Result result = HttpClientManager.getInstance().sendGet(SERVER_URL + "gjmzb_hydjxxhygr_sdsjzx1", param); +// String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":{\"code\":200,\"data\":{\"result\":{\"result\":\"IA:结婚\"},\"code\":\"0\",\"status\":\"success\"},\"message\":\"\"},\"total\":0}"; +// Result result = new Result().ok(mockData); + log.info("hunYin api result:{}", JSON.toJSONString(result)); + if (!result.success()) { + return new YtDataSyncResDTO(); + } + String data = result.getData(); + JSONObject jsonObject = JSON.parseObject(data); + //他们的结果是成功的 + if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) { + //第一层 + JSONObject firstData = JSON.parseObject(jsonObject.getString("data")); + + //第二层 data + if (firstData != null && StrConstant.HTTP_STATUS_OK.equals(firstData.getString(StrConstant.HTTP_RESP_CODE))) { + //第一层 + JSONObject secondData = JSON.parseObject(firstData.getString("data")); + if (secondData != null && secondData.getString("result") != null ) { + //第二层 data + JSONObject thirdData = JSON.parseObject(secondData.getString("result")); + Object fourthData = ""; + if (thirdData != null && thirdData.getString("result") != null){ + fourthData = thirdData.getString("result"); + } + return new YtDataSyncResDTO(200, "", fourthData.toString()); + } + } else { + log.warn("hunYin 调用蓝图接口成功但是蓝图的结果中 省平台失败"); + } + } else { + log.warn("hunYin 调用蓝图接口败"); + } + } catch (Exception e) { + log.error(String.format("烟台hunYin结果查询异常cardNo:%s", cardNo), e); + } + return new YtDataSyncResDTO(); + } + /** * desc:残疾数据同步 * diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ResiDeadTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ResiDeadTask.java new file mode 100644 index 0000000000..04a8ca81da --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ResiDeadTask.java @@ -0,0 +1,43 @@ +package com.epmet.task; + + +import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.DataSyncTaskParam; +import com.epmet.feign.EpmetUserOpenFeignClient; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @Description:死亡 + * @Return + * @Author: lichao + * @Date: 2023/5/19 13:47 + */ +@Slf4j +@Component("resiDeadTask") +public class ResiDeadTask implements ITask { + + @Autowired + private EpmetUserOpenFeignClient userOpenFeignClient; + + @Override + public void run(String params) { + DataSyncTaskParam formDTO = new DataSyncTaskParam(); + if (StringUtils.isNotBlank(params)) { + formDTO = JSON.parseObject(params, DataSyncTaskParam.class); + } + formDTO.setCustomerId(""); + + // 死亡 + Result maritalInfoScanTask = userOpenFeignClient.deathInfoScanTask(formDTO); + if (maritalInfoScanTask.success()) { + log.info("resiDeadTask定时任务执行成功"); + } else { + log.error("resiDeadTask定时任务执行失败:" + maritalInfoScanTask.getMsg()); + } + + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ResiMaritalTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ResiMaritalTask.java new file mode 100644 index 0000000000..e642cd7599 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ResiMaritalTask.java @@ -0,0 +1,43 @@ +package com.epmet.task; + + +import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.DataSyncTaskParam; +import com.epmet.feign.EpmetUserOpenFeignClient; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @Description:婚姻状况 + * @Return + * @Author: lichao + * @Date: 2023/5/19 13:47 + */ +@Slf4j +@Component("resiMaritalTask") +public class ResiMaritalTask implements ITask { + + @Autowired + private EpmetUserOpenFeignClient userOpenFeignClient; + + @Override + public void run(String params) { + DataSyncTaskParam formDTO = new DataSyncTaskParam(); + if (StringUtils.isNotBlank(params)) { + formDTO = JSON.parseObject(params, DataSyncTaskParam.class); + } + formDTO.setCustomerId(""); + + // 婚姻 + Result maritalInfoScanTask = userOpenFeignClient.maritalInfoScanTask(formDTO); + if (maritalInfoScanTask.success()) { + log.info("resiMaritalTask定时任务执行成功"); + } else { + log.error("resiMaritalTask定时任务执行失败:" + maritalInfoScanTask.getMsg()); + } + + } +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordMaritalDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordMaritalDTO.java new file mode 100755 index 0000000000..36326c4dbe --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordMaritalDTO.java @@ -0,0 +1,109 @@ +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-18 + */ +@Data +public class DataSyncRecordMaritalDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 组织的pids 含agencyId本身 + */ + private String pids; + + /** + * 网格ID + */ + private String gridId; + + /** + * 姓名 + */ + private String name; + + /** + * 身份证 + */ + private String idCard; + + /** + * 电话 + */ + private String mobile; + + /** + * 居民Id，ic_resi_user.id + */ + private String icResiUserId; + + /** + * 婚姻状况 + */ + private String maritalStatusName; + + /** + * 处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败 + */ + private Integer dealStatus; + + /** + * 处理结果 + */ + private String dealResult; + + /** + * 删除标识：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-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserTaskLogDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserTaskLogDTO.java new file mode 100755 index 0000000000..40bc4df4cb --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserTaskLogDTO.java @@ -0,0 +1,74 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Data +public class IcResiUserTaskLogDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 0:正常数据 1:特殊数据 + */ + private Integer dataType; + + /** + * 数据数量 + */ + private Integer dataCount; + + /** + * 婚姻：hunyin + */ + private String type; + + /** + * 删除标识 0.未删除 1.已删除 + */ + private String 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-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 ddc7a635e7..27d78c5329 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 @@ -1009,6 +1009,9 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/dataSyncConfig/deathInfoScanTask") Result deathInfoScanTask(@RequestBody DataSyncTaskParam formDTO); + @PostMapping("/epmetuser/dataSyncConfig/maritalInfoScanTask") + Result maritalInfoScanTask(@RequestBody DataSyncTaskParam formDTO); + @PostMapping("/epmetuser/dataSyncConfig/disabilityInfoScanTask") Result disabilityInfoScanTask(@RequestBody DataSyncTaskParam formDTO); 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 3bba7ced02..0b59de63c1 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 @@ -737,6 +737,11 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "deathInfoScanTask", formDTO); } + @Override + public Result maritalInfoScanTask(DataSyncTaskParam formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "maritalInfoScanTask", formDTO); + } + @Override public Result disabilityInfoScanTask(DataSyncTaskParam formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "disabilityInfoScanTask", formDTO); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java index 49da3ee0b9..3394910aaa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java @@ -8,11 +8,13 @@ public interface EpidemicConstant { * 残疾人 * 死亡 * 疫苗接种 + * 婚姻状况 */ String DATA_CODE_NAT = "hesuan"; String DATA_CODE_DISABILITY = "canji"; String DATA_CODE_DEATH = "siwang"; String DATA_CODE_VACCINE = "yimiaojiezhong"; + String DATA_CODE_MARITAL = "hunyin"; /** * ic_sync_job 任务类型 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java index 737bf81727..f2d6a0553f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java @@ -152,6 +152,19 @@ public class DataSyncConfigController { return new Result(); } + /** + * @Description: 婚姻信息定时拉取 + * @param formDTO: + * @Return com.epmet.commons.tools.utils.Result + * @Author: lichao + * @Date: 2023/5/18 14:39 + */ + @PostMapping("maritalInfoScanTask") + public Result maritalInfoScanTask(@RequestBody DataSyncTaskParam formDTO){ + dataSyncConfigService.maritalInfoScanTask(formDTO); + return new Result(); + } + /** * @Description 残疾信息定时拉取 * @param formDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java new file mode 100755 index 0000000000..c06aea31d3 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.DataSyncRecordMaritalDTO; +import com.epmet.service.DataSyncRecordMaritalService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@RestController +@RequestMapping("dataSyncRecordMarital") +public class DataSyncRecordMaritalController { + + @Autowired + private DataSyncRecordMaritalService dataSyncRecordMaritalService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = dataSyncRecordMaritalService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + DataSyncRecordMaritalDTO data = dataSyncRecordMaritalService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody DataSyncRecordMaritalDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dataSyncRecordMaritalService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody DataSyncRecordMaritalDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + dataSyncRecordMaritalService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + dataSyncRecordMaritalService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserTaskLogController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserTaskLogController.java new file mode 100755 index 0000000000..60ad0755ca --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserTaskLogController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IcResiUserTaskLogDTO; +import com.epmet.service.IcResiUserTaskLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@RestController +@RequestMapping("icResiUserTaskLog") +public class IcResiUserTaskLogController { + + @Autowired + private IcResiUserTaskLogService icResiUserTaskLogService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icResiUserTaskLogService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcResiUserTaskLogDTO data = icResiUserTaskLogService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcResiUserTaskLogDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icResiUserTaskLogService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcResiUserTaskLogDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icResiUserTaskLogService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icResiUserTaskLogService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java new file mode 100755 index 0000000000..772a5728db --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.DataSyncRecordMaritalEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Mapper +public interface DataSyncRecordMaritalDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserTaskLogDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserTaskLogDao.java new file mode 100755 index 0000000000..92800a8c31 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserTaskLogDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcResiUserTaskLogEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Mapper +public interface IcResiUserTaskLogDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordMaritalEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordMaritalEntity.java new file mode 100755 index 0000000000..b35c20530b --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordMaritalEntity.java @@ -0,0 +1,79 @@ +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-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("data_sync_record_marital") +public class DataSyncRecordMaritalEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 组织的pids 含agencyId本身 + */ + private String pids; + + /** + * 网格ID + */ + private String gridId; + + /** + * 姓名 + */ + private String name; + + /** + * 身份证 + */ + private String idCard; + + /** + * 电话 + */ + private String mobile; + + /** + * 居民Id，ic_resi_user.id + */ + private String icResiUserId; + + /** + * 婚姻状况 + */ + private String maritalStatusName; + + /** + * 处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败 + */ + private Integer dealStatus; + + /** + * 处理结果 + */ + private String dealResult; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserTaskLogEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserTaskLogEntity.java new file mode 100755 index 0000000000..19cf239e21 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserTaskLogEntity.java @@ -0,0 +1,44 @@ +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; + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_resi_user_task_log") +public class IcResiUserTaskLogEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 0:正常数据 1:特殊数据 + */ + private Integer dataType; + + /** + * 数据数量 + */ + private Integer dataCount; + + /** + * 婚姻：hunyin + */ + private String type; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java index 438453f134..0eb833f62a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java @@ -14,6 +14,7 @@ public enum DataSyncEnum { SI_WANG("siwang", "死亡数据"), VACCINE("yimiaojiezhong", "疫苗接种"), OTHER("qita","其他"), + HUN_YIN("hunyin", "婚姻状况数据"), ; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordMaritalExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordMaritalExcel.java new file mode 100755 index 0000000000..9a97b80380 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordMaritalExcel.java @@ -0,0 +1,72 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Data +public class DataSyncRecordMaritalExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "客户Id") + private String customerId; + + @Excel(name = "组织Id") + private String agencyId; + + @Excel(name = "组织的pids 含agencyId本身") + private String pids; + + @Excel(name = "网格ID") + private String gridId; + + @Excel(name = "姓名") + private String name; + + @Excel(name = "身份证") + private String idCard; + + @Excel(name = "电话") + private String mobile; + + @Excel(name = "居民Id，ic_resi_user.id") + private String icResiUserId; + + @Excel(name = "婚姻状况") + private String maritalStatusName; + + @Excel(name = "处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败") + private Integer dealStatus; + + @Excel(name = "处理结果") + private String dealResult; + + @Excel(name = "删除标识：0.未删除 1.已删除") + private Integer delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserTaskLogExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserTaskLogExcel.java new file mode 100755 index 0000000000..5c258cffd8 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserTaskLogExcel.java @@ -0,0 +1,51 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Data +public class IcResiUserTaskLogExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "客户Id customer.id") + private String customerId; + + @Excel(name = "0:正常数据 1:特殊数据") + private Integer dataType; + + @Excel(name = "数据数量") + private Integer dataCount; + + @Excel(name = "婚姻：hunyin") + private String type; + + @Excel(name = "删除标识 0.未删除 1.已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/DataSyncRecordMaritalRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/DataSyncRecordMaritalRedis.java new file mode 100755 index 0000000000..d81e5a8718 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/DataSyncRecordMaritalRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Component +public class DataSyncRecordMaritalRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserTaskLogRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserTaskLogRedis.java new file mode 100755 index 0000000000..9f411f156f --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserTaskLogRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Component +public class IcResiUserTaskLogRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java index 300128bc4d..3ec906dc5a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java @@ -142,4 +142,12 @@ public interface DataSyncConfigService extends BaseService */ void vaccineInfoScanTask(DataSyncTaskParam formDTO); + /** + * @Description: 婚姻信息定时拉取 + * @param formDTO: + * @Return void + * @Author: lichao + * @Date: 2023/5/18 14:39 + */ + void maritalInfoScanTask(DataSyncTaskParam formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java new file mode 100755 index 0000000000..078a98ca9f --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java @@ -0,0 +1,83 @@ +package com.epmet.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.DataSyncRecordDeathDTO; +import com.epmet.dto.DataSyncRecordMaritalDTO; +import com.epmet.entity.DataSyncRecordDeathEntity; +import com.epmet.entity.DataSyncRecordMaritalEntity; + +import java.util.List; +import java.util.Map; + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +public interface DataSyncRecordMaritalService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2023-05-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2023-05-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return DataSyncRecordMaritalDTO + * @author generator + * @date 2023-05-18 + */ + DataSyncRecordMaritalDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2023-05-18 + */ + void save(DataSyncRecordMaritalDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2023-05-18 + */ + void update(DataSyncRecordMaritalDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2023-05-18 + */ + void delete(String[] ids); + + DataSyncRecordMaritalDTO selectOne(LambdaQueryWrapper queryWrapper); +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserTaskLogService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserTaskLogService.java new file mode 100755 index 0000000000..471d321d64 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserTaskLogService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcResiUserTaskLogDTO; +import com.epmet.entity.IcResiUserTaskLogEntity; + +import java.util.List; +import java.util.Map; + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +public interface IcResiUserTaskLogService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2023-05-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2023-05-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcResiUserTaskLogDTO + * @author generator + * @date 2023-05-18 + */ + IcResiUserTaskLogDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2023-05-18 + */ + void save(IcResiUserTaskLogDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2023-05-18 + */ + void update(IcResiUserTaskLogDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2023-05-18 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 8d2c06dfa9..727fbbbb6a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -29,10 +29,7 @@ import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.YtHsResUtils; import com.epmet.constant.EpidemicConstant; import com.epmet.dao.*; -import com.epmet.dto.DataSyncConfigDTO; -import com.epmet.dto.DataSyncRecordDeathDTO; -import com.epmet.dto.DataSyncRecordDisabilityDTO; -import com.epmet.dto.YTVaccineListDTO; +import com.epmet.dto.*; import com.epmet.dto.form.ConfigSwitchFormDTO; import com.epmet.dto.form.DataSyncTaskParam; import com.epmet.dto.form.ScopeSaveFormDTO; @@ -87,6 +84,8 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl dbResiList) { + try { + List list = new ArrayList<>(); + for (NatUserInfoResultDTO dbResi : dbResiList) { + YtDataSyncResDTO thirdResult = YtHsResUtils.hunYin(dbResi.getIdCard(), dbResi.getName()); + if (200 != thirdResult.getCode()) { + log.warn("hunyin 调用蓝图接口失败了 继续处理下一个人"); + continue; + } + + String thirdResultData = thirdResult.getData(); + if(StringUtils.isBlank(thirdResultData)){ + continue; + } +// JSONObject thirdResultObject = JSON.parseObject(thirdResultData); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DataSyncRecordMaritalEntity::getIdCard, dbResi.getIdCard()); + //获取数据库里的记录 + DataSyncRecordMaritalDTO dbMaritaEntity = dataSyncRecordMaritalService.selectOne(queryWrapper); + + JudgeDealStatus judgeDealStatus = new JudgeDealStatus(thirdResultData, dbMaritaEntity).invokeMarital(); + if (judgeDealStatus.isStop()) { + continue; + } + + DataSyncRecordMaritalEntity entity = new DataSyncRecordMaritalEntity(); + if (dbMaritaEntity != null && StringUtils.isNotBlank(dbMaritaEntity.getId())) { + entity.setId(dbMaritaEntity.getId()); + } + entity.setCustomerId(dbResi.getCustomerId()); + entity.setAgencyId(dbResi.getAgencyId()); + entity.setPids(dbResi.getPids()); + entity.setGridId(dbResi.getGridId()); + entity.setName(dbResi.getName()); + entity.setIdCard(dbResi.getIdCard()); + entity.setIcResiUserId(dbResi.getUserId()); + //死亡未获取到数据 + if (thirdResultData != null) { + entity.setMaritalStatusName(thirdResultData); + } + + entity.setDealStatus(NumConstant.ZERO); + entity.setDealResult(StrConstant.EPMETY_STR); + if (judgeDealStatus.isNeedSetStatus) { + entity.setDealResult(judgeDealStatus.dealResult); + entity.setDealStatus(judgeDealStatus.dealStatus); + } + entity.setUpdatedTime(new Date()); + list.add(entity); + } + if (list.size() == NumConstant.ZERO) { + return; + } + dataSyncRecordMaritalService.saveOrUpdateBatch(list, NumConstant.TWO_HUNDRED); + } catch (Exception e) { + log.error("hunyin exception", e); + } + } + /** * desc：从数据库获取居民信息 * @@ -1003,6 +1064,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl configData = getConfigData(null, EpidemicConstant.DATA_CODE_MARITAL); + if (CollectionUtils.isEmpty(configData)){ + log.warn("maritalInfoScanTask not exists config data,customer is "+formDTO.getCustomerId()); + return; + } + // 取出 婚姻 拉取数据 范围 + long count = configData.stream().filter(o -> CollectionUtils.isNotEmpty(o.getScopeList())).count(); + if (count < 1) { + log.warn("maritalInfoScanTask scopeList is null"); + return; + } + + // 查询上一次定时任务 居民位置记录 + LambdaQueryWrapper logEntityLambdaQueryWrapper = new LambdaQueryWrapper().eq(IcResiUserTaskLogEntity::getType,"hunyin").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1"); + IcResiUserTaskLogEntity logEntity = resiUserTaskLogDao.selectOne(logEntityLambdaQueryWrapper); + // userInfoResultDTOS 待处理的数据存放 + List userInfoResultDTOS = new ArrayList<>(); + + boolean isNum = false; + int start = 0; + // 如果没有log数据 说明第一次进入循环 + if (logEntity == null){ + // 从0开始 优先获取规定的几个社区 + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000); + // 如果不满5000条数据 下面再从别的社区取 isNum = true + if (userInfoResultDTOS.size() < 50000){ + isNum = true; + } + }else{ + // 如果有log数据 判断一下上次停留在特殊数据还是普通数据 1是特殊数据（优先的几个社区） + if (logEntity.getDataType() == 1){ + // 从上次停止的数据开始获取 + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000); + // 下面再从别的社区取 isNum = true 凑够50000 + isNum = true; + }else if (logEntity.getDataType() == 0){ + // 如果是普通数据 直接从次停留在特殊数据获取 + start = logEntity.getDataCount(); + } + + } + // 建立一个最后插入log的标志 + IcResiUserTaskLogEntity newLog = new IcResiUserTaskLogEntity(); + newLog.setCreatedTime(new Date()); + newLog.setType("hunyin"); + List dbResiList = null; + + for (DataSyncConfigDTO config : configData) { + // 设置查询数据范围 + formDTO.setOrgList(config.getScopeList()); + DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); + // 如果true 说明之前获取过特殊数据了 把50000补完普通数据 + if (isNum){ + formDTO.setStart(start); + formDTO.setEnd(50000-userInfoResultDTOS.size()); + dbResiList = getNatUserInfoFromDbLimit(formDTO); + dbResiList.addAll(userInfoResultDTOS); + newLog.setDataType(0); + newLog.setDataCount(50000-dbResiList.size()); + }else{ + // false 说明之前没有获取过特殊数据了 + formDTO.setStart(start); + formDTO.setEnd(start+50000); + dbResiList = getNatUserInfoFromDbLimit(formDTO); + // 如果不够五万了 从头再来 + if (dbResiList.size()<50000){ + // 特殊数据 + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000-dbResiList.size()); + dbResiList.addAll(userInfoResultDTOS); + // 特殊数据不够 在获取普通数据 + if (dbResiList.size() < 50000){ + formDTO.setStart(0); + formDTO.setEnd(50000-dbResiList.size()); + dbResiList.addAll(getNatUserInfoFromDbLimit(formDTO)); + newLog.setDataType(0); + newLog.setDataCount(50000-dbResiList.size()); + + }else{ + newLog.setDataType(1); + newLog.setDataCount(50000-dbResiList.size()); + } + }else{ + newLog.setDataType(0); + newLog.setDataCount(start+50000); + } + } + + + if (CollectionUtils.isEmpty(dbResiList)) { + continue; + } + switch (anEnum) { + case HUN_YIN: + try { + //查询正常状态的居民 + hunYin(dbResiList); + resiUserTaskLogDao.insert(newLog); + log.info("======hunyin信息拉取结束======"); + } catch (Exception e) { + log.error("marry thread execute exception", e); + } + default: + log.warn("没有要处理的数据"); + } + } + + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java new file mode 100755 index 0000000000..417d6e6b18 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java @@ -0,0 +1,92 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.DataSyncRecordMaritalDao; +import com.epmet.dto.DataSyncRecordDeathDTO; +import com.epmet.dto.DataSyncRecordMaritalDTO; +import com.epmet.entity.DataSyncRecordDeathEntity; +import com.epmet.entity.DataSyncRecordMaritalEntity; +import com.epmet.service.DataSyncRecordMaritalService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Service +public class DataSyncRecordMaritalServiceImpl extends BaseServiceImpl implements DataSyncRecordMaritalService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, DataSyncRecordMaritalDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, DataSyncRecordMaritalDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public DataSyncRecordMaritalDTO get(String id) { + DataSyncRecordMaritalEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, DataSyncRecordMaritalDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(DataSyncRecordMaritalDTO dto) { + DataSyncRecordMaritalEntity entity = ConvertUtils.sourceToTarget(dto, DataSyncRecordMaritalEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(DataSyncRecordMaritalDTO dto) { + DataSyncRecordMaritalEntity entity = ConvertUtils.sourceToTarget(dto, DataSyncRecordMaritalEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public DataSyncRecordMaritalDTO selectOne(LambdaQueryWrapper queryWrapper) { + DataSyncRecordMaritalEntity entity = baseDao.selectOne(queryWrapper); + return ConvertUtils.sourceToTarget(entity, DataSyncRecordMaritalDTO.class); + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserTaskLogServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserTaskLogServiceImpl.java new file mode 100755 index 0000000000..3fd079eed6 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserTaskLogServiceImpl.java @@ -0,0 +1,83 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IcResiUserTaskLogDao; +import com.epmet.dto.IcResiUserTaskLogDTO; +import com.epmet.entity.IcResiUserTaskLogEntity; +import com.epmet.service.IcResiUserTaskLogService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Service +public class IcResiUserTaskLogServiceImpl extends BaseServiceImpl implements IcResiUserTaskLogService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcResiUserTaskLogDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcResiUserTaskLogDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcResiUserTaskLogDTO get(String id) { + IcResiUserTaskLogEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcResiUserTaskLogDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcResiUserTaskLogDTO dto) { + IcResiUserTaskLogEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserTaskLogEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcResiUserTaskLogDTO dto) { + IcResiUserTaskLogEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserTaskLogEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml new file mode 100755 index 0000000000..18a11ba5d5 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserTaskLogDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserTaskLogDao.xml new file mode 100755 index 0000000000..2700f6a9f2 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserTaskLogDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From b994c33cb902742d3c22a2910d25febb80dfa1c7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 May 2023 14:10:03 +0800 Subject: [PATCH 321/340] 1 --- .../epmet/dto/result/LingShanSpecialCrowdListResultDTO.java | 6 ++++++ .../src/main/resources/mapper/IcSpecialDao.xml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LingShanSpecialCrowdListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LingShanSpecialCrowdListResultDTO.java index efa7a61b47..3d9cd904b6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LingShanSpecialCrowdListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LingShanSpecialCrowdListResultDTO.java @@ -23,4 +23,10 @@ public class LingShanSpecialCrowdListResultDTO { @JsonFormat(pattern = "yyyy-MM-dd") private Date updatedTime; + private Integer gender; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date birthday; + + private Integer age; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml index 9535299885..d103b6da3c 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml @@ -16,6 +16,9 @@ , s.CREATED_TIME , s.UPDATED_TIME , s.SPECIAL_RQLB SPECIAL_TYPES_STR + , r.GENDER + , r.BIRTHDAY + , year(now()) - year(r.BIRTHDAY) as age from ic_resi_user r inner join ic_special s on (r.ID = s.IC_RESI_USER and s.DEL_FLAG = 0) where From f9b699e450ac9de563211b19d9dd6ca6907c35b6 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 19 May 2023 15:05:56 +0800 Subject: [PATCH 322/340] =?UTF-8?q?=E7=88=AC=E5=8F=96=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/entity/IcResiUserTaskLogEntity.java | 2 + .../impl/DataSyncConfigServiceImpl.java | 123 ++++++++++-------- .../resources/mapper/IcResiUserTaskLogDao.xml | 1 + 3 files changed, 71 insertions(+), 55 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserTaskLogEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserTaskLogEntity.java index 19cf239e21..ab9dec6ba5 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserTaskLogEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserTaskLogEntity.java @@ -41,4 +41,6 @@ public class IcResiUserTaskLogEntity extends BaseEpmetEntity { */ private String type; + private String dataScope; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 727fbbbb6a..75bce0d45a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -278,32 +278,39 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl logEntityLambdaQueryWrapper = new LambdaQueryWrapper().orderByDesc(IcResiUserDeadTaskLogEntity::getCreatedTime).last("limit 1"); - IcResiUserDeadTaskLogEntity logEntity = icResiUserDeadTaskLogDao.selectOne(logEntityLambdaQueryWrapper); - - List userInfoResultDTOS = new ArrayList<>(); - boolean isNum = false; - int start = 0; - if (logEntity == null){ - userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000); - if (userInfoResultDTOS.size() < 50000){ - isNum = true; - } - }else{ - if (logEntity.getDataType() == 1){ - userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000); - isNum = true; - }else if (logEntity.getDataType() == 0){ - start = logEntity.getDataCount(); - } - - } - IcResiUserDeadTaskLogEntity newLog = new IcResiUserDeadTaskLogEntity(); - newLog.setCreatedTime(new Date()); List dbResiList = null; for (DataSyncConfigDTO config : configData) { + String scope = config.getScopeList().stream().map(DataSyncScopeDTO::getId).collect(Collectors.joining(",")); + + // 查询上一次定时任务 居民位置记录 + LambdaQueryWrapper logEntityLambdaQueryWrapper = new LambdaQueryWrapper().eq(IcResiUserTaskLogEntity::getDataScope,scope).eq(IcResiUserTaskLogEntity::getType,"siwang").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1"); + IcResiUserTaskLogEntity logEntity = resiUserTaskLogDao.selectOne(logEntityLambdaQueryWrapper); + + List userInfoResultDTOS = new ArrayList<>(); + boolean isNum = false; + int start = 0; + if (logEntity == null){ + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000); + if (userInfoResultDTOS.size() < 50000){ + isNum = true; + } + }else{ + if (logEntity.getDataType() == 1){ + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000); + isNum = true; + }else if (logEntity.getDataType() == 0){ + start = logEntity.getDataCount(); + } + + } + + IcResiUserTaskLogEntity newLog = new IcResiUserTaskLogEntity(); + newLog.setCreatedTime(new Date()); + newLog.setDataScope(scope); + newLog.setType("siwang"); + // 设置查询数据范围 formDTO.setOrgList(config.getScopeList()); DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); @@ -347,7 +354,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl logEntityLambdaQueryWrapper = new LambdaQueryWrapper().eq(IcResiUserTaskLogEntity::getType,"hunyin").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1"); - IcResiUserTaskLogEntity logEntity = resiUserTaskLogDao.selectOne(logEntityLambdaQueryWrapper); - // userInfoResultDTOS 待处理的数据存放 - List userInfoResultDTOS = new ArrayList<>(); - - boolean isNum = false; - int start = 0; - // 如果没有log数据 说明第一次进入循环 - if (logEntity == null){ - // 从0开始 优先获取规定的几个社区 - userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000); - // 如果不满5000条数据 下面再从别的社区取 isNum = true - if (userInfoResultDTOS.size() < 50000){ - isNum = true; - } - }else{ - // 如果有log数据 判断一下上次停留在特殊数据还是普通数据 1是特殊数据（优先的几个社区） - if (logEntity.getDataType() == 1){ - // 从上次停止的数据开始获取 - userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000); - // 下面再从别的社区取 isNum = true 凑够50000 - isNum = true; - }else if (logEntity.getDataType() == 0){ - // 如果是普通数据 直接从次停留在特殊数据获取 - start = logEntity.getDataCount(); - } - } - // 建立一个最后插入log的标志 - IcResiUserTaskLogEntity newLog = new IcResiUserTaskLogEntity(); - newLog.setCreatedTime(new Date()); - newLog.setType("hunyin"); List dbResiList = null; for (DataSyncConfigDTO config : configData) { + + String scope = config.getScopeList().stream().map(DataSyncScopeDTO::getId).collect(Collectors.joining(",")); + + // 查询上一次定时任务 居民位置记录 + LambdaQueryWrapper logEntityLambdaQueryWrapper = new LambdaQueryWrapper().eq(IcResiUserTaskLogEntity::getDataScope,scope).eq(IcResiUserTaskLogEntity::getType,"hunyin").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1"); + IcResiUserTaskLogEntity logEntity = resiUserTaskLogDao.selectOne(logEntityLambdaQueryWrapper); + // userInfoResultDTOS 待处理的数据存放 + List userInfoResultDTOS = new ArrayList<>(); + + boolean isNum = false; + int start = 0; + // 如果没有log数据 说明第一次进入循环 + if (logEntity == null){ + // 从0开始 优先获取规定的几个社区 + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000); + // 如果不满5000条数据 下面再从别的社区取 isNum = true + if (userInfoResultDTOS.size() < 50000){ + isNum = true; + } + }else{ + // 如果有log数据 判断一下上次停留在特殊数据还是普通数据 1是特殊数据（优先的几个社区） + if (logEntity.getDataType() == 1){ + // 从上次停止的数据开始获取 + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000); + // 下面再从别的社区取 isNum = true 凑够50000 + isNum = true; + }else if (logEntity.getDataType() == 0){ + // 如果是普通数据 直接从次停留在特殊数据获取 + start = logEntity.getDataCount(); + } + + } + // 建立一个最后插入log的标志 + IcResiUserTaskLogEntity newLog = new IcResiUserTaskLogEntity(); + newLog.setCreatedTime(new Date()); + newLog.setType("hunyin"); + newLog.setDataScope(scope); + // 设置查询数据范围 formDTO.setOrgList(config.getScopeList()); DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserTaskLogDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserTaskLogDao.xml index 2700f6a9f2..c1385adc4a 100755 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserTaskLogDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserTaskLogDao.xml @@ -8,6 +8,7 @@ + From f668974585c656aef33d9d3620da322feff17c17 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 19 May 2023 16:17:16 +0800 Subject: [PATCH 323/340] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=80=E6=9D=A1=E4=B8=80=E6=9D=A1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/DataSyncConfigServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 75bce0d45a..44afdadf4d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -718,12 +718,13 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl Date: Fri, 19 May 2023 17:49:58 +0800 Subject: [PATCH 324/340] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=B0=8F=E5=8C=BA=E5=90=8D=E6=88=90=EF=BC=8C?= =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=82=B9=E4=BD=8D=E8=BF=94=E5=9B=9E=E5=B0=8F?= =?UTF-8?q?=E5=8C=BA=E5=90=8D=EF=BC=8C=E6=A5=BC=E6=A0=8B=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E5=8D=95=E5=85=83=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcBuildingDTO.java | 4 ++++ .../src/main/java/com/epmet/dao/IcBuildingDao.java | 7 ++++--- .../src/main/java/com/epmet/dao/IcHouseDao.java | 9 +++++---- .../com/epmet/service/impl/BuildingServiceImpl.java | 2 +- .../java/com/epmet/service/impl/HouseServiceImpl.java | 2 +- .../src/main/resources/mapper/IcBuildingDao.xml | 5 +++-- .../src/main/resources/mapper/IcHouseDao.xml | 11 +++++++++-- 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java index 52567226eb..cbd1178ec4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java @@ -49,6 +49,10 @@ public class IcBuildingDTO implements Serializable { * 小区id */ private String neighborHoodId; + /** + * 灵山项目添加 + */ + private String neighborHoodName; /** * 片区id，neighbor_hood_part.id,可为空。 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java index ca6b57a3c5..3ec90e6267 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcBuildingDTO; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; @@ -284,8 +285,8 @@ public interface IcBuildingDao extends BaseDao { * @param neighborHoodId * @return */ - List selectListByMap(@Param("customerId") String customerId, - @Param("gridId") String gridId, - @Param("neighborHoodId") String neighborHoodId); + List selectListByMap(@Param("customerId") String customerId, + @Param("gridId") String gridId, + @Param("neighborHoodId") String neighborHoodId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index c2eedacf63..787c644924 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -1,6 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcHouseDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.GetHouseInfoToCollectFormDTO; @@ -240,8 +241,8 @@ public interface IcHouseDao extends BaseDao { * @param buildingId * @return */ - List selectListByMap(@Param("customerId") String customerId, - @Param("gridId") String gridId, - @Param("neighborHoodId") String neighborHoodId, - @Param("buildingId") String buildingId); + List selectListByMap(@Param("customerId") String customerId, + @Param("gridId") String gridId, + @Param("neighborHoodId") String neighborHoodId, + @Param("buildingId") String buildingId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index e3693d109d..998dee8d45 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -774,7 +774,7 @@ public class BuildingServiceImpl implements BuildingService { */ @Override public List buildingDistribution(String customerId, String gridId, String neighborHoodId) { - List list=icBuildingDao.selectListByMap(customerId,gridId,neighborHoodId); + List list=icBuildingDao.selectListByMap(customerId,gridId,neighborHoodId); return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index fa053665de..68f4a47831 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -1540,7 +1540,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { */ @Override public List houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) { - List list=icHouseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId); + List list=icHouseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId); return ConvertUtils.sourceToTarget(list,IcHouseDTO.class); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 2d632d7b2d..6623f0a724 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -604,9 +604,10 @@ - SELECT - ib.* + ib.*, + h.NEIGHBOR_HOOD_NAME as neighborHoodName FROM ic_building ib LEFT JOIN ic_neighbor_hood h ON ( ib.NEIGHBOR_HOOD_ID = h.ID ) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 6e250fb9e6..470447f5c0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -775,11 +775,18 @@ - SELECT - ih.* + ih.*, + h.NEIGHBOR_HOOD_NAME as neighborHoodName, + ib.BUILDING_NAME as buildingName, + u.UNIT_NAME as unitName FROM ic_house ih + left join ic_building ib + on(ih.BUILDING_ID=ib.id) + left join ic_building_unit u + on(ih.BUILDING_UNIT_ID=u.id) LEFT JOIN ic_neighbor_hood h ON ( ih.NEIGHBOR_HOOD_ID = h.ID ) WHERE From 15a544e856acf89c90cba0f6082bf7f9f6f8d38a Mon Sep 17 00:00:00 2001 From: luyan Date: Fri, 19 May 2023 17:53:06 +0800 Subject: [PATCH 325/340] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/IcEventDTO.java | 88 +++++------ .../epmet/dto/form/IcEventAddEditFormDTO.java | 5 + .../dto/result/EventAnalysisResultDTO.java | 5 + .../epmet/dto/result/EventRateResultDTO.java | 24 --- .../dto/result/IcEventListResultDTO.java | 4 + .../epmet/controller/IcEventController.java | 23 ++- .../main/java/com/epmet/dao/IcEventDao.java | 54 +++++++ .../java/com/epmet/entity/IcEventEntity.java | 5 + .../com/epmet/service/IcEventService.java | 7 + .../service/impl/IcEventServiceImpl.java | 100 +++++++++++-- .../src/main/resources/mapper/IcEventDao.xml | 140 ++++++++++++------ 11 files changed, 332 insertions(+), 123 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java index 3be3954934..cb8e5a0a2e 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java @@ -20,107 +20,107 @@ public class IcEventDTO implements Serializable { /** * 主键，事件id */ - private String id; + private String id; /** * 客户ID */ - private String customerId; + private String customerId; /** * 事件所属的网格Id */ - private String gridId; + private String gridId; /** * 网格的所属组织 */ - private String agencyId; + private String agencyId; /** * 网格的所有组织Id */ - private String gridPids; + private String gridPids; /** * 报事的人【居民端/pc端居民Id】可为空 */ - private String reportUserId; + private String reportUserId; /** * 报事人姓名 */ - private String name; + private String name; /** * 手机号 */ - private String mobile; + private String mobile; /** * 身份证号 */ - private String idCard; + private String idCard; /** * 反映渠道【字典表】 */ - private String sourceType; + private String sourceType; /** * 发生时间 */ - private Date happenTime; + private Date happenTime; /** * 事件内容 */ - private String eventContent; + private String eventContent; /** * 纬度 */ - private String latitude; + private String latitude; /** * 经度 */ - private String longitude; + private String longitude; /** * 地址 */ - private String address; + private String address; /** * 处理中：processing；已办结：closed_case */ - private String status; + private String status; /** * 办结时间 */ - private Date closeCaseTime; + private Date closeCaseTime; /** * 0:已回复 1:已转项目 2:已转需求3:转议题 */ - private String operationType; + private String operationType; /** * 项目、需求ID、议题id */ - private String operationId; + private String operationId; /** * 事件是否被阅读过;1已读；针对报事人待处理列表 */ - private Integer readFlag; + private Integer readFlag; /** - * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/转需求/办结更新为1; + * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/转需求/办结更新为1; */ - private Integer redDot; + private Integer redDot; /** * 工作端的红点:展示1；不展示：0；【居民报事、回复更新为1】 @@ -130,81 +130,81 @@ public class IcEventDTO implements Serializable { /** * 最近一次操作时间（回复、立项、转需求、办结更新此列） */ - private Date latestOperatedTime; + private Date latestOperatedTime; /** * 是否解决：已解决 resolved，未解决 un_solved */ - private String resolveStatus; + private String resolveStatus; /** * 结案说明 */ - private String closeRemark; + private String closeRemark; /** * 评论人 */ - private String commentUserId; + private String commentUserId; /** * 评论内容 */ - private String satisfaction; + private String satisfaction; /** * 评论时间 */ - private Date commentTime; + private Date commentTime; /** - * 事件审核状态[涉及附件审核需要加的状态]（审核中：auditing； -auto_passed: 自动通过； -review：结果不确定，需要人工审核； -block: 结果违规； -rejected：人工审核驳回; -approved：人工审核通过） + * 事件审核状态[涉及附件审核需要加的状态]（审核中：auditing； + * auto_passed: 自动通过； + * review：结果不确定，需要人工审核； + * block: 结果违规； + * rejected：人工审核驳回; + * approved：人工审核通过） */ - private String auditStatus; + private String auditStatus; /** * 审核理由 */ - private String auditReason; + private String auditReason; /** * 是否标记难点堵点 0:否 1：是 */ - private String difficultPoint; + private String difficultPoint; /** * 删除标识:0.未删除 1.已删除 */ - private String delFlag; + private String delFlag; /** * 乐观锁 */ - private Integer revision; + private Integer revision; /** * 创建人 */ - private String createdBy; + private String createdBy; /** * 创建时间 */ - private Date createdTime; + private Date createdTime; /** * 更新人 */ - private String updatedBy; + private String updatedBy; /** * 更新时间 */ - private Date updatedTime; + private Date updatedTime; -} \ No newline at end of file +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventAddEditFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventAddEditFormDTO.java index c630f4940a..8d24ac8419 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventAddEditFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventAddEditFormDTO.java @@ -51,6 +51,11 @@ public class IcEventAddEditFormDTO implements Serializable { */ @NotBlank(message = "反映渠道不能为空", groups = {AddGroup.class}) private String sourceType; + + /** + * 事件类型：1、红灯事件 2、黄灯事件 3、蓝灯事件 + */ + private String eventType; /** * 发生时间 */ diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java index 9d8643cf73..5c2c4bff61 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java @@ -25,6 +25,11 @@ public class EventAnalysisResultDTO implements Serializable { * 网格化平台数量 */ private Integer wangGeHua; + + /** + * 0、上报 1、阅收 3、完结 4、审核 5、事件评价 6、结案归档 + */ + /** * 待处理 */ diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java index efd13ccbf6..1e2f9c24da 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java @@ -36,30 +36,6 @@ public class EventRateResultDTO implements Serializable { */ private Integer lanDeng; - /** - * 归档数量 - */ - private Integer guiDang; - - /** - * 未响应占比 - */ - private Double hongDengRate; - - /** - * 处理中占比 - */ - private Double huangDengRate; - - /** - * 已完成占比 - */ - private Double lanDengRate; - - /** - * 归档占比 - */ - private Double guiDangRate; /** * 分类统计数量 */ diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java index 349db1d45c..bb23c45258 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java @@ -77,6 +77,10 @@ public class IcEventListResultDTO implements Serializable { * 上报渠道[字典表] */ private String sourceType; + /** + * 事件类型： 1、红灯事件 2、黄灯事件 3、蓝灯事件 + */ + private String eventType; /** * 发生时间 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 06ba55576b..6d1afc7f3d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -583,7 +583,7 @@ public class IcEventController { * @param * @param null * @return Result * @throws - * @description 获取事件数量和分类数量 + * @description 获取事件数量和占比 * @author yan Lu * @date 2023/5/17 14:49 */ @@ -594,6 +594,14 @@ public class IcEventController { return new Result().ok(icEventService.getEventRate(orgId, orgType, eventType)); } + /** + * @param + * @return Result + * @throws + * @description 按事件分类统计 + * @author yan Lu + * @date 2023/5/18 17:53 + */ @GetMapping("getEventAnalysis") public Result getEventAnalysis(@RequestParam("orgId") String orgId, @RequestParam("orgType") String orgType, @@ -601,4 +609,17 @@ public class IcEventController { return new Result().ok(icEventService.getEventAnalysis(orgId, orgType, eventType)); } + /** + * @param * @param null null + * @return null + * @throws + * @description 根据组织ID获取事件办理统计情况 + * @author yan Lu + * @date 2023/5/19 09:28 + */ + @GetMapping("getEventRateByAgencyId") + public Result> getEventRateByAgencyId(@RequestParam("agencyId") String agencyId) { + return new Result>().ok(icEventService.getEventRateByAgencyId(agencyId)); + } + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java index 3aed8c5932..b3aa4b5b3b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java @@ -148,12 +148,66 @@ public interface IcEventDao extends BaseDao { List selectUserReported(PageUserReportEventFormDTO formDTO); + /** + * 按响应级别统计数量 + * + * @param orgIdPath + * @return + */ + EventRateResultDTO getEventCount(@Param("orgIdPath") String orgIdPath); + + /** + * 获取事件处理进度占比 + * + * @param orgIdPath + * @param eventType + * @return + */ EventRateResultDTO getEventRate(@Param("orgIdPath") String orgIdPath, @Param("eventType") String eventType); + /** + * 分类统计事件来源数量 + * + * @param orgPath + * @param eventType + * @return + */ EventAnalysisResultDTO getEventAnalysis(@Param("orgIdPath") String orgPath, @Param("eventType") String eventType); + /** + * 根据事件类型，统计各类型的数量 + * + * @param orgPath + * @return + */ @MapKey("code") List> getAnalysis(@Param("orgIdPath") String orgPath); + /** + * 根据ID查询事件 + * + * @param icEventId + * @return + */ IcEventEntity selectByEventId(String icEventId); + + /** + * 根据事件来源获取数量 + * + * @param orgPath 1、即诉即办 2、直通联办 3、网格化平台 + * @return + */ + EventAnalysisResultDTO getEventBySourceTypeCount(@Param("orgIdPath") String orgPath); + + /** + * 根据 事件来源获取 完成进度占比 + * 待响应 没有任何回复数据或者只有上报数据 + * 处理中 只要包含一条阅收数据即为处理中 + * 已结案 只要包含一条完结数据即为已结案 + * 已归档 只要包含一条归档数据即为已归档 + * manageType: 0、上报 1、阅收 3、完结 4、审核 5、事件评价 6、结案归档 + */ + Integer getEventByReplyTypeCount(@Param("orgIdPath") String orgPath, + @Param("sourceType") String sourceType, + @Param("manageType") String manageType); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java index c20ab1ec25..3cb9cd00b9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java @@ -71,6 +71,11 @@ public class IcEventEntity extends BaseEpmetEntity { */ private String sourceType; + /** + * 事件类型：1、红灯事件 2、黄灯事件 3、蓝灯事件 + */ + private String eventType; + /** * 发生时间 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java index 7b1a6bbbd9..bc7baf4b78 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java @@ -267,4 +267,11 @@ public interface IcEventService extends BaseService { * @return */ EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType, String eventType); + + /** + * 根据组织ID获取下一级组织事件不完结率和完结数量 + * @return + */ + + List getEventRateByAgencyId(String agencyId); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 2c44fab7ff..cc7397f80a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -322,6 +322,7 @@ public class IcEventServiceImpl extends BaseServiceImpl> dataMap = baseDao.getAnalysis(getOrgPath(orgId, orgType));//按分类获取数量 Map temp = new HashMap<>(); if (null != dataMap && dataMap.size() > 0) { @@ -1958,19 +1959,71 @@ public class IcEventServiceImpl extends BaseServiceImpl getEventRateByAgencyId(String agencyId) { + if (StringUtils.isNotEmpty(agencyId)) { + List orgs = getSubOrgs(agencyId); + if (null != orgs && orgs.size() > 0) { + + } + } + return null; + } + + /** + * @param orgId + * @param orgType + * @return + * @deprecationg 获取orgPath + */ private String getOrgPath(String orgId, String orgType) { if (OrgInfoConstant.AGENCY.equals(orgType)) { // 行政组织 AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); @@ -1981,4 +2034,27 @@ public class IcEventServiceImpl extends BaseServiceImpl getSubOrgs(String agencyId) { + List orgList = new ArrayList<>(); + Result> orgs = govOrgOpenFeignClient.subOrgList(agencyId); + if (!orgs.success() || CollectionUtils.isEmpty(orgs.getData())) { + return orgList; + } + for (SubOrgResDTO org : orgs.getData()) { + IcEventAnalysisOrgResDTO resultDto = ConvertUtils.sourceToTarget(org, IcEventAnalysisOrgResDTO.class); + if ("agency".equals(org.getOrgType())) { + resultDto.setOrgName(org.getOrgName()); + resultDto.setOrgType(org.getOrgType()); + resultDto.setOrgId(org.getOrgId()); + orgList.add(resultDto); + } + } + return orgList; + } + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index 9d98c5370f..2cc91c2851 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -440,63 +440,61 @@ ORDER BY re.created_time desc + + @@ -540,6 +538,64 @@ + + + + - + CONCAT( n.NEIGHBOR_HOOD_NAME, b.BUILDING_NAME ) AS label, b.id AS buildingId, b.BUILDING_NAME AS buildingName, n.id AS neighborhoodId, From 1a355559493b1311a8767e3d6a9ba37bf6ecd70d Mon Sep 17 00:00:00 2001 From: luyan Date: Fri, 19 May 2023 18:15:40 +0800 Subject: [PATCH 327/340] =?UTF-8?q?=E5=BE=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GridOrVillageEventRateResultDTO.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java new file mode 100644 index 0000000000..669b0b4dea --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author yan Lu + * @description 各新村或网格事件处理数量和办结率 + * @create 2023/5/19 09:16 + */ + +@Data +public class GridOrVillageEventRateResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 网格名称或者社区(新村)名称 + */ + private String agencyName; + + /** + * 完结事件数量 + */ + private String total; + + /** + * 事件完结率 + */ + private String rate; +} From 476d45fec42ce146ee06ba01914d493c690709ba Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 May 2023 18:21:07 +0800 Subject: [PATCH 328/340] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/BuildingServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 998dee8d45..285677741d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -774,6 +774,7 @@ public class BuildingServiceImpl implements BuildingService { */ @Override public List buildingDistribution(String customerId, String gridId, String neighborHoodId) { + //随便加点注释 List list=icBuildingDao.selectListByMap(customerId,gridId,neighborHoodId); return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class); } From ce4bde4fafe7c17f74d0821e6ad79e6ba2e7c94f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 May 2023 18:26:36 +0800 Subject: [PATCH 329/340] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcBuildingServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index b7ce4ca07d..8106d144e3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -203,7 +203,7 @@ public class IcBuildingServiceImpl extends BaseServiceImpl buildingDistribution(String customerId, String gridId, String neighborHoodId) { - List list=baseDao.selectListByMap(customerId,gridId,neighborHoodId); + List list=baseDao.selectListByMap(customerId,gridId,neighborHoodId); return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class); } From d0f4801e058e0efd8f10ba56dd97b653bb83f99a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 May 2023 18:43:38 +0800 Subject: [PATCH 330/340] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IcBuildingDao.java | 5 ++++- .../src/main/resources/mapper/IcBuildingDao.xml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java index e64c19ebb2..4d026bf754 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java @@ -246,7 +246,10 @@ public interface IcBuildingDao extends BaseDao { * @author zhy * @date 2022/8/19 17:32 */ - List listBuildingInfo(String customerId,String agencyId,String gridId,String buildingName); + List listBuildingInfo(@Param("customerId") String customerId, + @Param("agencyId") String agencyId, + @Param("gridId") String gridId, + @Param("buildingName") String buildingName); /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index d3efa153c4..777ee3e9dd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -516,9 +516,9 @@ - SELECT select e.* from ic_event e where e.id = #{icEventId} + + e.ID AS eventId, + e.GRID_ID AS gridId, + e.SOURCE_TYPE AS sourceType, + e.EVENT_TYPE AS eventType, + e.LATITUDE, + e.LONGITUDE, + e.EVENT_CONTENT AS eventContent, + r.MANAGE_STATUS AS manageStatus, + c.CATEGORY_CODE AS categoryCode + + + + + + + From 472b6b10d33b0c82c85f9422ae772853d2acd4e6 Mon Sep 17 00:00:00 2001 From: luyan Date: Sat, 20 May 2023 14:30:20 +0800 Subject: [PATCH 336/340] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E6=9D=91?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=8A=9E=E7=90=86=E6=83=85=E5=86=B5=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GridOrVillageEventRateResultDTO.java | 2 ++ .../main/java/com/epmet/dao/IcEventDao.java | 2 +- .../service/impl/IcEventServiceImpl.java | 11 +++++--- .../src/main/resources/mapper/IcEventDao.xml | 26 ++++++++++++++----- 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java index 3d069b9d3d..8197f035bf 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java @@ -20,6 +20,8 @@ public class GridOrVillageEventRateResultDTO implements Serializable { */ private String agencyName; + private String gridId; + /** * 完结事件数量 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java index dcb065bd5a..40e6b3c65a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java @@ -215,5 +215,5 @@ public interface IcEventDao extends BaseDao { List getListBySourceTypeOrEventType(@Param("orgIdPath") String orgPath, @Param("sourceType") String sourceType, @Param("eventType") String eventType); - GridOrVillageEventRateResultDTO getEventRateByGridIds(@Param("orgId") String orgId); + List getEventRateByGridIds(@Param("orgIds") List orgIds); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index ed8c018018..691098277d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -2013,14 +2013,19 @@ public class IcEventServiceImpl extends BaseServiceImpl orgs = getSubOrgs(agencyId); if (null != orgs && orgs.size() > 0) { + Map namesMap = new HashMap<>(); for (IcEventAnalysisOrgResDTO org : orgs) { - GridOrVillageEventRateResultDTO dto = baseDao.getEventRateByGridIds(org.getOrgId()); + namesMap.put(org.getOrgId(), org.getOrgName()); + } + List ids = orgs.stream().map(IcEventAnalysisOrgResDTO::getOrgId).collect(Collectors.toList()); + List resultList = baseDao.getEventRateByGridIds(ids); + for (GridOrVillageEventRateResultDTO dto : resultList) { if (null != dto) { - dto.setAgencyName(org.getOrgName()); + dto.setAgencyName(namesMap.get(dto.getGridId())); dto.setRate(dto.getRate() == null ? 0 : dto.getRate()); dtoList.add(dto); } else { - dto.setAgencyName(org.getOrgName()); + dto.setAgencyName(namesMap.get(dto.getGridId())); dto.setRate(0.00); dto.setTotal(0); dtoList.add(dto); diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index 8562041da5..6ea141687b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -675,28 +675,40 @@ From df86e8524aacccea63f3a112f1beefe42da9f666 Mon Sep 17 00:00:00 2001 From: luyan Date: Sat, 20 May 2023 14:48:45 +0800 Subject: [PATCH 337/340] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E6=9D=91?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=8A=9E=E7=90=86=E6=83=85=E5=86=B5=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GridOrVillageEventRateResultDTO.java | 2 +- .../service/impl/IcEventServiceImpl.java | 28 +++++++++++++------ .../src/main/resources/mapper/IcEventDao.xml | 3 +- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java index 8197f035bf..755af9fff5 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java @@ -20,7 +20,7 @@ public class GridOrVillageEventRateResultDTO implements Serializable { */ private String agencyName; - private String gridId; + private String orgId; /** * 完结事件数量 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 691098277d..ea9d011ae0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -2019,18 +2019,30 @@ public class IcEventServiceImpl extends BaseServiceImpl ids = orgs.stream().map(IcEventAnalysisOrgResDTO::getOrgId).collect(Collectors.toList()); List resultList = baseDao.getEventRateByGridIds(ids); - for (GridOrVillageEventRateResultDTO dto : resultList) { - if (null != dto) { - dto.setAgencyName(namesMap.get(dto.getGridId())); - dto.setRate(dto.getRate() == null ? 0 : dto.getRate()); - dtoList.add(dto); - } else { - dto.setAgencyName(namesMap.get(dto.getGridId())); + if(null != resultList && resultList.size()> 0){ + for (GridOrVillageEventRateResultDTO dto : resultList) { + if (null != dto) { + dto.setAgencyName(namesMap.get(dto.getOrgId())); + dto.setRate(dto.getRate() == null ? 0 : dto.getRate()); + dtoList.add(dto); + } else { + dto.setAgencyName(namesMap.get(dto.getOrgId())); + dto.setRate(0.00); + dto.setTotal(0); + dtoList.add(dto); + } + } + }else { + namesMap.keySet().forEach(key->{ + GridOrVillageEventRateResultDTO dto = new GridOrVillageEventRateResultDTO(); + dto.setOrgId(key); + dto.setAgencyName(namesMap.get(key)); dto.setRate(0.00); dto.setTotal(0); dtoList.add(dto); - } + }); } + } } return dtoList; diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index 6ea141687b..ab3f0b13df 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -675,7 +675,7 @@ From efd45b2db856ca88ecaed4bcd781ad585ba2f429 Mon Sep 17 00:00:00 2001 From: wxz Date: Sat, 20 May 2023 20:53:12 +0800 Subject: [PATCH 338/340] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E5=8A=9E?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=9A=84=E6=9D=83=E9=99=90=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/enums/RequirePermissionEnum.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java index d03143dd81..8d0a5cccc8 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java @@ -200,7 +200,9 @@ public enum RequirePermissionEnum { * 事件管理-工作端小程序列表、详情接口权限 */ IC_EVENT_LIST("ic_event_list","基层治理:事件管理:列表","基层治理-事件管理-列表"), - IC_EVENT_DETAIL("ic_event_detail","基层治理:事件管理:详情","基层治理-事件管理-详情"); + IC_EVENT_DETAIL("ic_event_detail","基层治理:事件管理:详情","基层治理-事件管理-详情"), + + WORK_LINGSHAN_AGENT_SERVICE("work_lingshan_agent_service", "代办服务", "代办服务"); private String key; private String name; From f8e1ae045d278fe9c93f03d73ed2e6b5680ea198 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 May 2023 10:26:39 +0800 Subject: [PATCH 339/340] /epmetuser/icresiuser/ownerrelation --- .../com/epmet/service/impl/IcResiUserServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 31a9f5ed70..2b27825dc3 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 @@ -1628,8 +1628,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl userList=new ArrayList<>(); for(IcResiUserEntity item:resiUserList){ - //成员里排除户主 - if(!result.getOwnerUserId().equals(item.getId())){ + // 成员里排除户主 + if (null == result.getOwnerUserId() || !result.getOwnerUserId().equals(item.getId())) { OwnerRelationResultDTO.UserListBean bean = new OwnerRelationResultDTO.UserListBean(); bean.setUserId(item.getId()); bean.setUserName(item.getName()); @@ -1644,11 +1644,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Mon, 22 May 2023 13:43:32 +0800 Subject: [PATCH 340/340] =?UTF-8?q?fix:=E3=80=90=E7=81=B5=E5=B1=B1-?= =?UTF-8?q?=E7=BA=A2=E8=89=B2=E4=BB=A3=E5=8A=9E=E3=80=91=E5=AF=BC=E5=85=A5?= =?UTF-8?q?+=E6=96=B0=E5=A2=9E=EF=BC=9AorgIdPath=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tractLingShanSpecialCrowdExcelImportListener.java | 12 ++++++++++-- .../impl/LingShanSpecialCrowdServiceImpl.java | 12 +++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java index 23dd2802ad..6361f0da7d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java @@ -9,7 +9,9 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ValidateException; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +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; @@ -244,7 +246,7 @@ public abstract class AbstractLingShanSpecialCrowdExcelImportListener it = getOriginDatas().iterator(); @@ -256,9 +258,15 @@ public abstract class AbstractLingShanSpecialCrowdExcelImportListener