From cea7446924374e6262fede35a59039eab2dd3a8a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 17 Aug 2022 16:24:58 +0800 Subject: [PATCH 001/397] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E4=B8=8B=E6=94=BE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/RedisKeys.java | 16 + .../main/java/com/epmet/dto/DhTokenDTO.java | 39 + .../com/epmet/dto/form/DhAuthFormDTO.java | 27 + .../com/epmet/dto/form/DhCardPageFormDTO.java | 29 + .../com/epmet/dto/form/DhChannelFormDTO.java | 23 + .../epmet/dto/form/DhChannelPageFormDTO.java | 25 + .../com/epmet/dto/form/DhDeptFormDTO.java | 25 + .../com/epmet/dto/form/DhIdentityFormDTO.java | 29 + .../epmet/dto/form/DhLoginPassFormDTO.java | 23 + .../com/epmet/dto/form/DhNodeFormDTO.java | 23 + .../epmet/dto/form/DhPersonCardFormDTO.java | 39 + .../dto/form/DhPersonCardListFormDTO.java | 22 + .../epmet/dto/form/DhPersonDelFormDTO.java | 22 + .../com/epmet/dto/form/DhPersonFormDTO.java | 39 + .../epmet/dto/form/DhPersonImgFormDTO.java | 23 + .../epmet/dto/form/DhPersonPageFormDTO.java | 25 + .../com/epmet/dto/form/DhPlanFormDTO.java | 27 + .../com/epmet/dto/form/DhPlanPageFormDTO.java | 25 + .../epmet/dto/form/DhPublicKeyFormDTO.java | 21 + .../epmet/dto/form/VisitVisitorFormDTO.java | 51 + .../epmet/dto/result/DhChannelResultDTO.java | 23 + .../impl/IcResiCollectServiceImpl.java | 16 + .../impl/IcResiCollectVisitorServiceImpl.java | 14 + .../java/com/epmet/util/dh/Base64Util.java | 768 +++++++++++++++ .../java/com/epmet/util/dh/BaseNCodec.java | 521 ++++++++++ .../main/java/com/epmet/util/dh/Cities.java | 7 + .../com/epmet/util/dh/DhCloudProperties.java | 60 ++ .../java/com/epmet/util/dh/DhDeviceUtil.java | 902 ++++++++++++++++++ .../main/java/com/epmet/util/dh/DhResult.java | 141 +++ .../main/java/com/epmet/util/dh/IDUtils.java | 85 ++ .../main/java/com/epmet/util/dh/RSAUtils.java | 316 ++++++ 31 files changed, 3406 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DhTokenDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhAuthFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhCardPageFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhChannelFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhChannelPageFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhDeptFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhIdentityFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhLoginPassFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhNodeFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonCardFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonCardListFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonDelFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonImgFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonPageFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPlanFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPlanPageFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPublicKeyFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitVisitorFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DhChannelResultDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/Base64Util.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/BaseNCodec.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/Cities.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhCloudProperties.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhResult.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/IDUtils.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/RSAUtils.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index b39bb7fa47..4c18a3ea55 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -856,4 +856,20 @@ public class RedisKeys { } return rootPrefix.concat("staffbaseinfo:")+userId; } + + + /** + * 大华publicKey + */ + public static String getDhPublicKey() { + return rootPrefix.concat("dh:public"); + } + + /** + * 大华token + */ + public static String getDhToken() { + return rootPrefix.concat("dh:token"); + } + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DhTokenDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DhTokenDTO.java new file mode 100644 index 0000000000..eee5c3fc13 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DhTokenDTO.java @@ -0,0 +1,39 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 大华设备鉴权信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-04-22 + */ +@Data +public class DhTokenDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * loginName + */ + private String loginName; + + /** + * token + */ + private String token; + + /** + * publicKey + */ + private String publicKey; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhAuthFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhAuthFormDTO.java new file mode 100644 index 0000000000..9652e1c0d6 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhAuthFormDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.form; + +import com.epmet.dto.result.DhChannelResultDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhAuthFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String cardNumber; + + private String timeQuantumId; + + private List cardPrivilegeDetails; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhCardPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhCardPageFormDTO.java new file mode 100644 index 0000000000..d5066cbaa8 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhCardPageFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhCardPageFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer pageNum; + + private Integer pageSize; + + private String personCode; + + private String cardNumber; + + private String cardStatus; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhChannelFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhChannelFormDTO.java new file mode 100644 index 0000000000..a3b1675b57 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhChannelFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhChannelFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String interfaceId; + + private String jsonParam; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhChannelPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhChannelPageFormDTO.java new file mode 100644 index 0000000000..5af8d5c6ab --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhChannelPageFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhChannelPageFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer pageNum; + + private Integer pageSize; + + private String deviceGenre; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhDeptFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhDeptFormDTO.java new file mode 100644 index 0000000000..a5071854e9 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhDeptFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhDeptFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String name; + + private String description; + + private Long parentId; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhIdentityFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhIdentityFormDTO.java new file mode 100644 index 0000000000..0f73e060f6 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhIdentityFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhIdentityFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String name; + + private Double subsidyAmount; + + private Integer isCashRecharge; + + private Integer isMachineRecharge; + + private String description; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhLoginPassFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhLoginPassFormDTO.java new file mode 100644 index 0000000000..1e7d8e3216 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhLoginPassFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhLoginPassFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String loginName; + + private String loginPass; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhNodeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhNodeFormDTO.java new file mode 100644 index 0000000000..482aa4e64e --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhNodeFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhNodeFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String typeCode; + + private String nodeId; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonCardFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonCardFormDTO.java new file mode 100644 index 0000000000..deaec222f5 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonCardFormDTO.java @@ -0,0 +1,39 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhPersonCardFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long personId; + + private String personName; + + private String cardNumber; + + private String cardType; + + private String category; + + private String cardStatus; + + private String startDate; + + private String endDate; + + private String cardPassword; + + private String subSystems; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonCardListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonCardListFormDTO.java new file mode 100644 index 0000000000..9e9d889412 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonCardListFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhPersonCardListFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private List objectList; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonDelFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonDelFormDTO.java new file mode 100644 index 0000000000..defc1509ce --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonDelFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhPersonDelFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private List personIds; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonFormDTO.java new file mode 100644 index 0000000000..e3720e9c39 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonFormDTO.java @@ -0,0 +1,39 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhPersonFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String paperType; + + private String paperNumber; + + private String name; + + private String code; + + private Long deptId; + + private String sex; + + private String birthday; + + private String phone; + + private String status; + + private String personIdentityId; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonImgFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonImgFormDTO.java new file mode 100644 index 0000000000..d5ba9f49cf --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonImgFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhPersonImgFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String personCode; + + private String base64file; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonPageFormDTO.java new file mode 100644 index 0000000000..7597af3680 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPersonPageFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhPersonPageFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer pageNum; + + private Integer pageSize; + + private String code; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPlanFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPlanFormDTO.java new file mode 100644 index 0000000000..007e44ad18 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPlanFormDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhPlanFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String detail; + + private String memo; + + private String name; + + private Integer type; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPlanPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPlanPageFormDTO.java new file mode 100644 index 0000000000..559d50d6af --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPlanPageFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhPlanPageFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer pageNum; + + private Integer pageSize; + + private String singleCondition; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPublicKeyFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPublicKeyFormDTO.java new file mode 100644 index 0000000000..1be6abcc35 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DhPublicKeyFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhPublicKeyFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String loginName; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitVisitorFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitVisitorFormDTO.java new file mode 100644 index 0000000000..e1f9db62e0 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitVisitorFormDTO.java @@ -0,0 +1,51 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +/** + * 租客表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-07-26 + */ +@Data +public class VisitVisitorFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 姓名 + */ + @NotBlank(message = "姓名不能为空",groups = {AddGroup.class, DefaultGroup.class}) + private String name; + + /** + * 身份证 + */ + @NotBlank(message = "身份证号不能为空",groups = {AddGroup.class, DefaultGroup.class}) + private String idCard; + + /** + * 手机号 + */ + @NotBlank(message = "联系方式不能为空",groups = {AddGroup.class, DefaultGroup.class}) + private String mobile; + + /** + * 头像 + */ + private String faceImg; + + /** + * 节点 + */ + private String node; + + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DhChannelResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DhChannelResultDTO.java new file mode 100644 index 0000000000..0871cdd7ff --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DhChannelResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 海康社区人员信息下放 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-20 + */ +@Data +public class DhChannelResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String privilegeType; + + private String resouceCode; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index 93c25d9ec5..b2a3406576 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -31,6 +31,7 @@ import com.epmet.feign.GovOrgFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.IcResiCollectService; import com.epmet.service.IcUserChangeRecordService; +import com.epmet.util.dh.DhDeviceUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; @@ -71,6 +72,8 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl memMap = queryOriginMem(collectInfo.getId()); saveOrUpdateMem(newMemberList, memMap,collectInfo); } + + // 如果是顺德居小区的人还要下放门禁 + if (formDTO.getVillageName().contains("顺德居")) { + formDTO.getMemberList().forEach(item->{ + VisitVisitorFormDTO visitor = new VisitVisitorFormDTO(); + visitor.setIdCard(item.getIdNum()); + visitor.setMobile(item.getMobile()); + visitor.setName(item.getName()); + visitor.setFaceImg(item.getFaceImg()); + dhDeviceUtil.sendAuth(visitor); + }); + } + return new Result().ok("提交成功"); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java index ccb7451952..1be91e180b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java @@ -17,10 +17,12 @@ import com.epmet.dto.SaveCollectVisitorFormDTO; import com.epmet.dto.form.CollectDetailFormDTO; import com.epmet.dto.form.CollectListFormDTO; import com.epmet.dto.form.VisitListFormDTO; +import com.epmet.dto.form.VisitVisitorFormDTO; import com.epmet.dto.result.CollectListResultDTO; import com.epmet.entity.IcResiCollectVisitorEntity; import com.epmet.redis.IcResiCollectVisitorRedis; import com.epmet.service.IcResiCollectVisitorService; +import com.epmet.util.dh.DhDeviceUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; @@ -48,6 +50,9 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -146,6 +151,15 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImplRFC 2045. + * + *

+ * This class implements section 6.8. Base64 Content-Transfer-Encoding from RFC 2045 Multipurpose + * Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies by Freed and Borenstein. + *

+ *

+ * The class can be parameterized in the following manner with various constructors: + *

+ *
    + *
  • URL-safe mode: Default off.
    • + *
  • Line length: Default 76. Line length that aren't multiples of 4 will still essentially end up being multiples of + * 4 in the encoded data. + *
  • Line separator: Default is CRLF ("\r\n")
    • + *
+ *

+ * The URL-safe parameter is only applied to encode operations. Decoding seamlessly handles both modes. + *

+ *

+ * Since this class operates directly on byte streams, and not character streams, it is hard-coded to only + * encode/decode character encodings which are compatible with the lower 127 ASCII chart (ISO-8859-1, Windows-1252, + * UTF-8, etc). + *

+ *

+ * This class is thread-safe. + *

+ * + * @see RFC 2045 + * @since 1.0 + * @version $Id: Base64.java 1635986 2014-11-01 16:27:52Z tn $ + */ +public class Base64Util extends BaseNCodec { + + /** + * BASE32 characters are 6 bits in length. + * They are formed by taking a block of 3 octets to form a 24-bit string, + * which is converted into 4 BASE64 characters. + */ + private static final int BITS_PER_ENCODED_BYTE = 6; + private static final int BYTES_PER_UNENCODED_BLOCK = 3; + private static final int BYTES_PER_ENCODED_BLOCK = 4; + + /** + * Chunk separator per RFC 2045 section 2.1. + * + *

+ * N.B. The next major release may break compatibility and make this field private. + *

+ * + * @see RFC 2045 section 2.1 + */ + static final byte[] CHUNK_SEPARATOR = {'\r', '\n'}; + + /** + * This array is a lookup table that translates 6-bit positive integer index values into their "Base64 Alphabet" + * equivalents as specified in Table 1 of RFC 2045. + * + * Thanks to "commons" project in ws.apache.org for this code. + * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/ + */ + private static final byte[] STANDARD_ENCODE_TABLE = { + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', + 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', + 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/' + }; + + /** + * This is a copy of the STANDARD_ENCODE_TABLE above, but with + and / + * changed to - and _ to make the encoded Base64 results more URL-SAFE. + * This table is only used when the Base64's mode is set to URL-SAFE. + */ + private static final byte[] URL_SAFE_ENCODE_TABLE = { + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', + 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', + 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_' + }; + + /** + * This array is a lookup table that translates Unicode characters drawn from the "Base64 Alphabet" (as specified + * in Table 1 of RFC 2045) into their 6-bit positive integer equivalents. Characters that are not in the Base64 + * alphabet but fall within the bounds of the array are translated to -1. + * + * Note: '+' and '-' both decode to 62. '/' and '_' both decode to 63. This means decoder seamlessly handles both + * URL_SAFE and STANDARD base64. (The encoder, on the other hand, needs to know ahead of time what to emit). + * + * Thanks to "commons" project in ws.apache.org for this code. + * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/ + */ + private static final byte[] DECODE_TABLE = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, 62, -1, 63, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, -1, -1, -1, -1, 63, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51 + }; + + /** + * Base64 uses 6-bit fields. + */ + /** Mask used to extract 6 bits, used when encoding */ + private static final int MASK_6BITS = 0x3f; + + // The static final fields above are used for the original static byte[] methods on Base64. + // The private member fields below are used with the new streaming approach, which requires + // some state be preserved between calls of encode() and decode(). + + /** + * Encode table to use: either STANDARD or URL_SAFE. Note: the DECODE_TABLE above remains static because it is able + * to decode both STANDARD and URL_SAFE streams, but the encodeTable must be a member variable so we can switch + * between the two modes. + */ + private final byte[] encodeTable; + + // Only one decode table currently; keep for consistency with Base32 code + private final byte[] decodeTable = DECODE_TABLE; + + /** + * Line separator for encoding. Not used when decoding. Only used if lineLength > 0. + */ + private final byte[] lineSeparator; + + /** + * Convenience variable to help us determine when our buffer is going to run out of room and needs resizing. + * decodeSize = 3 + lineSeparator.length; + */ + private final int decodeSize; + + /** + * Convenience variable to help us determine when our buffer is going to run out of room and needs resizing. + * encodeSize = 4 + lineSeparator.length; + */ + private final int encodeSize; + + /** + * Creates a Base64 codec used for decoding (all modes) and encoding in URL-unsafe mode. + *

+ * When encoding the line length is 0 (no chunking), and the encoding table is STANDARD_ENCODE_TABLE. + *

+ * + *

+ * When decoding all variants are supported. + *

+ */ + public Base64Util() { + this(0); + } + + /** + * Creates a Base64 codec used for decoding (all modes) and encoding in the given URL-safe mode. + *

+ * When encoding the line length is 76, the line separator is CRLF, and the encoding table is STANDARD_ENCODE_TABLE. + *

+ * + *

+ * When decoding all variants are supported. + *

+ * + * @param urlSafe + * if true, URL-safe encoding is used. In most cases this should be set to + * false. + * @since 1.4 + */ + public Base64Util(final boolean urlSafe) { + this(MIME_CHUNK_SIZE, CHUNK_SEPARATOR, urlSafe); + } + + /** + * Creates a Base64 codec used for decoding (all modes) and encoding in URL-unsafe mode. + *

+ * When encoding the line length is given in the constructor, the line separator is CRLF, and the encoding table is + * STANDARD_ENCODE_TABLE. + *

+ *

+ * Line lengths that aren't multiples of 4 will still essentially end up being multiples of 4 in the encoded data. + *

+ *

+ * When decoding all variants are supported. + *

+ * + * @param lineLength + * Each line of encoded data will be at most of the given length (rounded down to nearest multiple of + * 4). If lineLength <= 0, then the output will not be divided into lines (chunks). Ignored when + * decoding. + * @since 1.4 + */ + public Base64Util(final int lineLength) { + this(lineLength, CHUNK_SEPARATOR); + } + + /** + * Creates a Base64 codec used for decoding (all modes) and encoding in URL-unsafe mode. + *

+ * When encoding the line length and line separator are given in the constructor, and the encoding table is + * STANDARD_ENCODE_TABLE. + *

+ *

+ * Line lengths that aren't multiples of 4 will still essentially end up being multiples of 4 in the encoded data. + *

+ *

+ * When decoding all variants are supported. + *

+ * + * @param lineLength + * Each line of encoded data will be at most of the given length (rounded down to nearest multiple of + * 4). If lineLength <= 0, then the output will not be divided into lines (chunks). Ignored when + * decoding. + * @param lineSeparator + * Each line of encoded data will end with this sequence of bytes. + * @throws IllegalArgumentException + * Thrown when the provided lineSeparator included some base64 characters. + * @since 1.4 + */ + public Base64Util(final int lineLength, final byte[] lineSeparator) { + this(lineLength, lineSeparator, false); + } + + /** + * Creates a Base64 codec used for decoding (all modes) and encoding in URL-unsafe mode. + *

+ * When encoding the line length and line separator are given in the constructor, and the encoding table is + * STANDARD_ENCODE_TABLE. + *

+ *

+ * Line lengths that aren't multiples of 4 will still essentially end up being multiples of 4 in the encoded data. + *

+ *

+ * When decoding all variants are supported. + *

+ * + * @param lineLength + * Each line of encoded data will be at most of the given length (rounded down to nearest multiple of + * 4). If lineLength <= 0, then the output will not be divided into lines (chunks). Ignored when + * decoding. + * @param lineSeparator + * Each line of encoded data will end with this sequence of bytes. + * @param urlSafe + * Instead of emitting '+' and '/' we emit '-' and '_' respectively. urlSafe is only applied to encode + * operations. Decoding seamlessly handles both modes. + * Note: no padding is added when using the URL-safe alphabet. + * @throws IllegalArgumentException + * The provided lineSeparator included some base64 characters. That's not going to work! + * @since 1.4 + */ + public Base64Util(final int lineLength, final byte[] lineSeparator, final boolean urlSafe) { + super(BYTES_PER_UNENCODED_BLOCK, BYTES_PER_ENCODED_BLOCK, + lineLength, + lineSeparator == null ? 0 : lineSeparator.length); + // TODO could be simplified if there is no requirement to reject invalid line sep when length <=0 + // @see test case Base64Test.testConstructors() + if (lineSeparator != null) { + if (containsAlphabetOrPad(lineSeparator)) { + final String sep = newStringUtf8(lineSeparator); + throw new IllegalArgumentException("lineSeparator must not contain base64 characters: [" + sep + "]"); + } + if (lineLength > 0){ // null line-sep forces no chunking rather than throwing IAE + this.encodeSize = BYTES_PER_ENCODED_BLOCK + lineSeparator.length; + this.lineSeparator = new byte[lineSeparator.length]; + System.arraycopy(lineSeparator, 0, this.lineSeparator, 0, lineSeparator.length); + } else { + this.encodeSize = BYTES_PER_ENCODED_BLOCK; + this.lineSeparator = null; + } + } else { + this.encodeSize = BYTES_PER_ENCODED_BLOCK; + this.lineSeparator = null; + } + this.decodeSize = this.encodeSize - 1; + this.encodeTable = urlSafe ? URL_SAFE_ENCODE_TABLE : STANDARD_ENCODE_TABLE; + } + + /** + * Returns our current encode mode. True if we're URL-SAFE, false otherwise. + * + * @return true if we're in URL-SAFE mode, false otherwise. + * @since 1.4 + */ + public boolean isUrlSafe() { + return this.encodeTable == URL_SAFE_ENCODE_TABLE; + } + + /** + *

+ * Encodes all of the provided data, starting at inPos, for inAvail bytes. Must be called at least twice: once with + * the data to encode, and once with inAvail set to "-1" to alert encoder that EOF has been reached, to flush last + * remaining bytes (if not multiple of 3). + *

+ *

Note: no padding is added when encoding using the URL-safe alphabet.

+ *

+ * Thanks to "commons" project in ws.apache.org for the bitwise operations, and general approach. + * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/ + *

+ * + * @param in + * byte[] array of binary data to base64 encode. + * @param inPos + * Position to start reading data from. + * @param inAvail + * Amount of bytes available from input for encoding. + * @param context + * the context to be used + */ + @Override + void encode(final byte[] in, int inPos, final int inAvail, final Context context) { + if (context.eof) { + return; + } + // inAvail < 0 is how we're informed of EOF in the underlying data we're + // encoding. + if (inAvail < 0) { + context.eof = true; + if (0 == context.modulus && lineLength == 0) { + return; // no leftovers to process and not using chunking + } + final byte[] buffer = ensureBufferSize(encodeSize, context); + final int savedPos = context.pos; + switch (context.modulus) { // 0-2 + case 0 : // nothing to do here + break; + case 1 : // 8 bits = 6 + 2 + // top 6 bits: + buffer[context.pos++] = encodeTable[(context.ibitWorkArea >> 2) & MASK_6BITS]; + // remaining 2: + buffer[context.pos++] = encodeTable[(context.ibitWorkArea << 4) & MASK_6BITS]; + // URL-SAFE skips the padding to further reduce size. + if (encodeTable == STANDARD_ENCODE_TABLE) { + buffer[context.pos++] = pad; + buffer[context.pos++] = pad; + } + break; + + case 2 : // 16 bits = 6 + 6 + 4 + buffer[context.pos++] = encodeTable[(context.ibitWorkArea >> 10) & MASK_6BITS]; + buffer[context.pos++] = encodeTable[(context.ibitWorkArea >> 4) & MASK_6BITS]; + buffer[context.pos++] = encodeTable[(context.ibitWorkArea << 2) & MASK_6BITS]; + // URL-SAFE skips the padding to further reduce size. + if (encodeTable == STANDARD_ENCODE_TABLE) { + buffer[context.pos++] = pad; + } + break; + default: + throw new IllegalStateException("Impossible modulus "+context.modulus); + } + context.currentLinePos += context.pos - savedPos; // keep track of current line position + // if currentPos == 0 we are at the start of a line, so don't add CRLF + if (lineLength > 0 && context.currentLinePos > 0) { + System.arraycopy(lineSeparator, 0, buffer, context.pos, lineSeparator.length); + context.pos += lineSeparator.length; + } + } else { + for (int i = 0; i < inAvail; i++) { + final byte[] buffer = ensureBufferSize(encodeSize, context); + context.modulus = (context.modulus+1) % BYTES_PER_UNENCODED_BLOCK; + int b = in[inPos++]; + if (b < 0) { + b += 256; + } + context.ibitWorkArea = (context.ibitWorkArea << 8) + b; // BITS_PER_BYTE + if (0 == context.modulus) { // 3 bytes = 24 bits = 4 * 6 bits to extract + buffer[context.pos++] = encodeTable[(context.ibitWorkArea >> 18) & MASK_6BITS]; + buffer[context.pos++] = encodeTable[(context.ibitWorkArea >> 12) & MASK_6BITS]; + buffer[context.pos++] = encodeTable[(context.ibitWorkArea >> 6) & MASK_6BITS]; + buffer[context.pos++] = encodeTable[context.ibitWorkArea & MASK_6BITS]; + context.currentLinePos += BYTES_PER_ENCODED_BLOCK; + if (lineLength > 0 && lineLength <= context.currentLinePos) { + System.arraycopy(lineSeparator, 0, buffer, context.pos, lineSeparator.length); + context.pos += lineSeparator.length; + context.currentLinePos = 0; + } + } + } + } + } + + /** + *

+ * Decodes all of the provided data, starting at inPos, for inAvail bytes. Should be called at least twice: once + * with the data to decode, and once with inAvail set to "-1" to alert decoder that EOF has been reached. The "-1" + * call is not necessary when decoding, but it doesn't hurt, either. + *

+ *

+ * Ignores all non-base64 characters. This is how chunked (e.g. 76 character) data is handled, since CR and LF are + * silently ignored, but has implications for other bytes, too. This method subscribes to the garbage-in, + * garbage-out philosophy: it will not check the provided data for validity. + *

+ *

+ * Thanks to "commons" project in ws.apache.org for the bitwise operations, and general approach. + * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/ + *

+ * + * @param in + * byte[] array of ascii data to base64 decode. + * @param inPos + * Position to start reading data from. + * @param inAvail + * Amount of bytes available from input for encoding. + * @param context + * the context to be used + */ + @Override + void decode(final byte[] in, int inPos, final int inAvail, final Context context) { + if (context.eof) { + return; + } + if (inAvail < 0) { + context.eof = true; + } + for (int i = 0; i < inAvail; i++) { + final byte[] buffer = ensureBufferSize(decodeSize, context); + final byte b = in[inPos++]; + if (b == pad) { + // We're done. + context.eof = true; + break; + } else { + if (b >= 0 && b < DECODE_TABLE.length) { + final int result = DECODE_TABLE[b]; + if (result >= 0) { + context.modulus = (context.modulus+1) % BYTES_PER_ENCODED_BLOCK; + context.ibitWorkArea = (context.ibitWorkArea << BITS_PER_ENCODED_BYTE) + result; + if (context.modulus == 0) { + buffer[context.pos++] = (byte) ((context.ibitWorkArea >> 16) & MASK_8BITS); + buffer[context.pos++] = (byte) ((context.ibitWorkArea >> 8) & MASK_8BITS); + buffer[context.pos++] = (byte) (context.ibitWorkArea & MASK_8BITS); + } + } + } + } + } + + // Two forms of EOF as far as base64 decoder is concerned: actual + // EOF (-1) and first time '=' character is encountered in stream. + // This approach makes the '=' padding characters completely optional. + if (context.eof && context.modulus != 0) { + final byte[] buffer = ensureBufferSize(decodeSize, context); + + // We have some spare bits remaining + // Output all whole multiples of 8 bits and ignore the rest + switch (context.modulus) { +// case 0 : // impossible, as excluded above + case 1 : // 6 bits - ignore entirely + // TODO not currently tested; perhaps it is impossible? + break; + case 2 : // 12 bits = 8 + 4 + context.ibitWorkArea = context.ibitWorkArea >> 4; // dump the extra 4 bits + buffer[context.pos++] = (byte) ((context.ibitWorkArea) & MASK_8BITS); + break; + case 3 : // 18 bits = 8 + 8 + 2 + context.ibitWorkArea = context.ibitWorkArea >> 2; // dump 2 bits + buffer[context.pos++] = (byte) ((context.ibitWorkArea >> 8) & MASK_8BITS); + buffer[context.pos++] = (byte) ((context.ibitWorkArea) & MASK_8BITS); + break; + default: + throw new IllegalStateException("Impossible modulus "+context.modulus); + } + } + } + + /** + * Tests a given byte array to see if it contains only valid characters within the Base64 alphabet. Currently the + * method treats whitespace as valid. + * + * @param arrayOctet + * byte array to test + * @return true if all bytes are valid characters in the Base64 alphabet or if the byte array is empty; + * false, otherwise + * @deprecated 1.5 Use {@link #isBase64(byte[])}, will be removed in 2.0. + */ + @Deprecated + public static boolean isArrayByteBase64(final byte[] arrayOctet) { + return isBase64(arrayOctet); + } + + /** + * Returns whether or not the octet is in the base 64 alphabet. + * + * @param octet + * The value to test + * @return true if the value is defined in the the base 64 alphabet, false otherwise. + * @since 1.4 + */ + public static boolean isBase64(final byte octet) { + return octet == PAD_DEFAULT || (octet >= 0 && octet < DECODE_TABLE.length && DECODE_TABLE[octet] != -1); + } + + /** + * Tests a given String to see if it contains only valid characters within the Base64 alphabet. Currently the + * method treats whitespace as valid. + * + * @param base64 + * String to test + * @return true if all characters in the String are valid characters in the Base64 alphabet or if + * the String is empty; false, otherwise + * @since 1.5 + */ + public static boolean isBase64(final String base64) { + return isBase64(getBytesUtf8(base64)); + } + + /** + * Tests a given byte array to see if it contains only valid characters within the Base64 alphabet. Currently the + * method treats whitespace as valid. + * + * @param arrayOctet + * byte array to test + * @return true if all bytes are valid characters in the Base64 alphabet or if the byte array is empty; + * false, otherwise + * @since 1.5 + */ + public static boolean isBase64(final byte[] arrayOctet) { + for (int i = 0; i < arrayOctet.length; i++) { + if (!isBase64(arrayOctet[i]) && !isWhiteSpace(arrayOctet[i])) { + return false; + } + } + return true; + } + + /** + * Encodes binary data using the base64 algorithm but does not chunk the output. + * + * @param binaryData + * binary data to encode + * @return byte[] containing Base64 characters in their UTF-8 representation. + */ + public static byte[] encodeBase64(final byte[] binaryData) { + return encodeBase64(binaryData, false); + } + + /** + * Encodes binary data using the base64 algorithm but does not chunk the output. + * + * NOTE: We changed the behaviour of this method from multi-line chunking (commons-codec-1.4) to + * single-line non-chunking (commons-codec-1.5). + * + * @param binaryData + * binary data to encode + * @return String containing Base64 characters. + * @since 1.4 (NOTE: 1.4 chunked the output, whereas 1.5 does not). + */ + public static String encodeBase64String(final byte[] binaryData) { + return newStringUtf8(encodeBase64(binaryData, false)); + } + + /** + * Encodes binary data using a URL-safe variation of the base64 algorithm but does not chunk the output. The + * url-safe variation emits - and _ instead of + and / characters. + * Note: no padding is added. + * @param binaryData + * binary data to encode + * @return byte[] containing Base64 characters in their UTF-8 representation. + * @since 1.4 + */ + public static byte[] encodeBase64URLSafe(final byte[] binaryData) { + return encodeBase64(binaryData, false, true); + } + + /** + * Encodes binary data using a URL-safe variation of the base64 algorithm but does not chunk the output. The + * url-safe variation emits - and _ instead of + and / characters. + * Note: no padding is added. + * @param binaryData + * binary data to encode + * @return String containing Base64 characters + * @since 1.4 + */ + public static String encodeBase64URLSafeString(final byte[] binaryData) { + return newStringUtf8(encodeBase64(binaryData, false, true)); + } + + /** + * Encodes binary data using the base64 algorithm and chunks the encoded output into 76 character blocks + * + * @param binaryData + * binary data to encode + * @return Base64 characters chunked in 76 character blocks + */ + public static byte[] encodeBase64Chunked(final byte[] binaryData) { + return encodeBase64(binaryData, true); + } + + /** + * Encodes binary data using the base64 algorithm, optionally chunking the output into 76 character blocks. + * + * @param binaryData + * Array containing binary data to encode. + * @param isChunked + * if true this encoder will chunk the base64 output into 76 character blocks + * @return Base64-encoded data. + * @throws IllegalArgumentException + * Thrown when the input array needs an output array bigger than {@link Integer#MAX_VALUE} + */ + public static byte[] encodeBase64(final byte[] binaryData, final boolean isChunked) { + return encodeBase64(binaryData, isChunked, false); + } + + /** + * Encodes binary data using the base64 algorithm, optionally chunking the output into 76 character blocks. + * + * @param binaryData + * Array containing binary data to encode. + * @param isChunked + * if true this encoder will chunk the base64 output into 76 character blocks + * @param urlSafe + * if true this encoder will emit - and _ instead of the usual + and / characters. + * Note: no padding is added when encoding using the URL-safe alphabet. + * @return Base64-encoded data. + * @throws IllegalArgumentException + * Thrown when the input array needs an output array bigger than {@link Integer#MAX_VALUE} + * @since 1.4 + */ + public static byte[] encodeBase64(final byte[] binaryData, final boolean isChunked, final boolean urlSafe) { + return encodeBase64(binaryData, isChunked, urlSafe, Integer.MAX_VALUE); + } + + /** + * Encodes binary data using the base64 algorithm, optionally chunking the output into 76 character blocks. + * + * @param binaryData + * Array containing binary data to encode. + * @param isChunked + * if true this encoder will chunk the base64 output into 76 character blocks + * @param urlSafe + * if true this encoder will emit - and _ instead of the usual + and / characters. + * Note: no padding is added when encoding using the URL-safe alphabet. + * @param maxResultSize + * The maximum result size to accept. + * @return Base64-encoded data. + * @throws IllegalArgumentException + * Thrown when the input array needs an output array bigger than maxResultSize + * @since 1.4 + */ + public static byte[] encodeBase64(final byte[] binaryData, final boolean isChunked, + final boolean urlSafe, final int maxResultSize) { + if (binaryData == null || binaryData.length == 0) { + return binaryData; + } + + // Create this so can use the super-class method + // Also ensures that the same roundings are performed by the ctor and the code + final Base64Util b64 = isChunked ? new Base64Util(urlSafe) : new Base64Util(0, CHUNK_SEPARATOR, urlSafe); + final long len = b64.getEncodedLength(binaryData); + if (len > maxResultSize) { + throw new IllegalArgumentException("Input array too big, the output array would be bigger (" + + len + + ") than the specified maximum size of " + + maxResultSize); + } + + return b64.encode(binaryData); + } + + /** + * Decodes a Base64 String into octets. + *

+ * Note: this method seamlessly handles data encoded in URL-safe or normal mode. + *

+ * + * @param base64String + * String containing Base64 data + * @return Array containing decoded data. + * @since 1.4 + */ + public static byte[] decodeBase64(final String base64String) { + return new Base64Util().decode(base64String); + } + + /** + * Decodes Base64 data into octets. + *

+ * Note: this method seamlessly handles data encoded in URL-safe or normal mode. + *

+ * + * @param base64Data + * Byte array containing Base64 data + * @return Array containing decoded data. + */ + public static byte[] decodeBase64(final byte[] base64Data) { + return new Base64Util().decode(base64Data); + } + + // Implementation of the Encoder Interface + + // Implementation of integer encoding used for crypto + /** + * Decodes a byte64-encoded integer according to crypto standards such as W3C's XML-Signature. + * + * @param pArray + * a byte array containing base64 character data + * @return A BigInteger + * @since 1.4 + */ + public static BigInteger decodeInteger(final byte[] pArray) { + return new BigInteger(1, decodeBase64(pArray)); + } + + /** + * Encodes to a byte64-encoded integer according to crypto standards such as W3C's XML-Signature. + * + * @param bigInt + * a BigInteger + * @return A byte array containing base64 character data + * @throws NullPointerException + * if null is passed in + * @since 1.4 + */ + public static byte[] encodeInteger(final BigInteger bigInt) { + if (bigInt == null) { + throw new NullPointerException("encodeInteger called with null parameter"); + } + return encodeBase64(toIntegerBytes(bigInt), false); + } + + /** + * Returns a byte-array representation of a BigInteger without sign bit. + * + * @param bigInt + * BigInteger to be converted + * @return a byte array representation of the BigInteger parameter + */ + static byte[] toIntegerBytes(final BigInteger bigInt) { + int bitlen = bigInt.bitLength(); + // round bitlen + bitlen = ((bitlen + 7) >> 3) << 3; + final byte[] bigBytes = bigInt.toByteArray(); + + if (((bigInt.bitLength() % 8) != 0) && (((bigInt.bitLength() / 8) + 1) == (bitlen / 8))) { + return bigBytes; + } + // set up params for copying everything but sign bit + int startSrc = 0; + int len = bigBytes.length; + + // if bigInt is exactly byte-aligned, just skip signbit in copy + if ((bigInt.bitLength() % 8) == 0) { + startSrc = 1; + len--; + } + final int startDst = bitlen / 8 - len; // to pad w/ nulls as per spec + final byte[] resizedBytes = new byte[bitlen / 8]; + System.arraycopy(bigBytes, startSrc, resizedBytes, startDst, len); + return resizedBytes; + } + + /** + * Returns whether or not the octet is in the Base64 alphabet. + * + * @param octet + * The value to test + * @return true if the value is defined in the the Base64 alphabet false otherwise. + */ + @Override + protected boolean isInAlphabet(final byte octet) { + return octet >= 0 && octet < decodeTable.length && decodeTable[octet] != -1; + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/BaseNCodec.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/BaseNCodec.java new file mode 100644 index 0000000000..08bfa92378 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/BaseNCodec.java @@ -0,0 +1,521 @@ +package com.epmet.util.dh; + + +import java.nio.charset.Charset; +import java.util.Arrays; + +/** + * Abstract superclass for Base-N encoders and decoders. + * + *

+ * This class is thread-safe. + *

+ * + * @version $Id: BaseNCodec.java 1634404 2014-10-26 23:06:10Z ggregory $ + */ +public abstract class BaseNCodec { + + /** + * Holds thread context so classes can be thread-safe. + * + * This class is not itself thread-safe; each thread must allocate its own copy. + * + * @since 1.7 + */ + static class Context { + + /** + * Place holder for the bytes we're dealing with for our based logic. + * Bitwise operations store and extract the encoding or decoding from this variable. + */ + int ibitWorkArea; + + /** + * Place holder for the bytes we're dealing with for our based logic. + * Bitwise operations store and extract the encoding or decoding from this variable. + */ + long lbitWorkArea; + + /** + * Buffer for streaming. + */ + byte[] buffer; + + /** + * Position where next character should be written in the buffer. + */ + int pos; + + /** + * Position where next character should be read from the buffer. + */ + int readPos; + + /** + * Boolean flag to indicate the EOF has been reached. Once EOF has been reached, this object becomes useless, + * and must be thrown away. + */ + boolean eof; + + /** + * Variable tracks how many characters have been written to the current line. Only used when encoding. We use + * it to make sure each encoded line never goes beyond lineLength (if lineLength > 0). + */ + int currentLinePos; + + /** + * Writes to the buffer only occur after every 3/5 reads when encoding, and every 4/8 reads when decoding. This + * variable helps track that. + */ + int modulus; + + Context() { + } + + /** + * Returns a String useful for debugging (especially within a debugger.) + * + * @return a String useful for debugging. + */ + @SuppressWarnings("boxing") // OK to ignore boxing here + public String toString() { + return String.format("%s[buffer=%s, currentLinePos=%s, eof=%s, ibitWorkArea=%s, lbitWorkArea=%s, " + + "modulus=%s, pos=%s, readPos=%s]", this.getClass().getSimpleName(), Arrays.toString(buffer), + currentLinePos, eof, ibitWorkArea, lbitWorkArea, modulus, pos, readPos); + } + } + + /** + * EOF + * + * @since 1.7 + */ + static final int EOF = -1; + + /** + * MIME chunk size per RFC 2045 section 6.8. + * + *

+ * The {@value} character limit does not count the trailing CRLF, but counts all other characters, including any + * equal signs. + *

+ * + * @see RFC 2045 section 6.8 + */ + public static final int MIME_CHUNK_SIZE = 76; + + /** + * PEM chunk size per RFC 1421 section 4.3.2.4. + * + *

+ * The {@value} character limit does not count the trailing CRLF, but counts all other characters, including any + * equal signs. + *

+ * + * @see RFC 1421 section 4.3.2.4 + */ + public static final int PEM_CHUNK_SIZE = 64; + + private static final int DEFAULT_BUFFER_RESIZE_FACTOR = 2; + + /** + * Defines the default buffer size - currently {@value} + * - must be large enough for at least one encoded block+separator + */ + private static final int DEFAULT_BUFFER_SIZE = 8192; + + /** Mask used to extract 8 bits, used in decoding bytes */ + protected static final int MASK_8BITS = 0xff; + + /** + * Byte used to pad output. + */ + protected static final byte PAD_DEFAULT = '='; // Allow static access to default + + /** + * @deprecated Use {@link #pad}. Will be removed in 2.0. + */ + @Deprecated + protected final byte PAD = PAD_DEFAULT; // instance variable just in case it needs to vary later + + protected final byte pad; // instance variable just in case it needs to vary later + + /** Number of bytes in each full block of unencoded data, e.g. 4 for Base64 and 5 for Base32 */ + private final int unencodedBlockSize; + + /** Number of bytes in each full block of encoded data, e.g. 3 for Base64 and 8 for Base32 */ + private final int encodedBlockSize; + + /** + * Chunksize for encoding. Not used when decoding. + * A value of zero or less implies no chunking of the encoded data. + * Rounded down to nearest multiple of encodedBlockSize. + */ + protected final int lineLength; + + /** + * Size of chunk separator. Not used unless {@link #lineLength} > 0. + */ + private final int chunkSeparatorLength; + + /** + * Note lineLength is rounded down to the nearest multiple of {@link #encodedBlockSize} + * If chunkSeparatorLength is zero, then chunking is disabled. + * @param unencodedBlockSize the size of an unencoded block (e.g. Base64 = 3) + * @param encodedBlockSize the size of an encoded block (e.g. Base64 = 4) + * @param lineLength if > 0, use chunking with a length lineLength + * @param chunkSeparatorLength the chunk separator length, if relevant + */ + protected BaseNCodec(final int unencodedBlockSize, final int encodedBlockSize, + final int lineLength, final int chunkSeparatorLength) { + this(unencodedBlockSize, encodedBlockSize, lineLength, chunkSeparatorLength, PAD_DEFAULT); + } + + /** + * Note lineLength is rounded down to the nearest multiple of {@link #encodedBlockSize} + * If chunkSeparatorLength is zero, then chunking is disabled. + * @param unencodedBlockSize the size of an unencoded block (e.g. Base64 = 3) + * @param encodedBlockSize the size of an encoded block (e.g. Base64 = 4) + * @param lineLength if > 0, use chunking with a length lineLength + * @param chunkSeparatorLength the chunk separator length, if relevant + * @param pad byte used as padding byte. + */ + protected BaseNCodec(final int unencodedBlockSize, final int encodedBlockSize, + final int lineLength, final int chunkSeparatorLength, final byte pad) { + this.unencodedBlockSize = unencodedBlockSize; + this.encodedBlockSize = encodedBlockSize; + final boolean useChunking = lineLength > 0 && chunkSeparatorLength > 0; + this.lineLength = useChunking ? (lineLength / encodedBlockSize) * encodedBlockSize : 0; + this.chunkSeparatorLength = chunkSeparatorLength; + + this.pad = pad; + } + + /** + * Returns true if this object has buffered data for reading. + * + * @param context the context to be used + * @return true if there is data still available for reading. + */ + boolean hasData(final Context context) { // package protected for access from I/O streams + return context.buffer != null; + } + + /** + * Returns the amount of buffered data available for reading. + * + * @param context the context to be used + * @return The amount of buffered data available for reading. + */ + int available(final Context context) { // package protected for access from I/O streams + return context.buffer != null ? context.pos - context.readPos : 0; + } + + /** + * Get the default buffer size. Can be overridden. + * + * @return {@link #DEFAULT_BUFFER_SIZE} + */ + protected int getDefaultBufferSize() { + return DEFAULT_BUFFER_SIZE; + } + + /** + * Increases our buffer by the {@link #DEFAULT_BUFFER_RESIZE_FACTOR}. + * @param context the context to be used + */ + private byte[] resizeBuffer(final Context context) { + if (context.buffer == null) { + context.buffer = new byte[getDefaultBufferSize()]; + context.pos = 0; + context.readPos = 0; + } else { + final byte[] b = new byte[context.buffer.length * DEFAULT_BUFFER_RESIZE_FACTOR]; + System.arraycopy(context.buffer, 0, b, 0, context.buffer.length); + context.buffer = b; + } + return context.buffer; + } + + /** + * Ensure that the buffer has room for size bytes + * + * @param size minimum spare space required + * @param context the context to be used + * @return the buffer + */ + protected byte[] ensureBufferSize(final int size, final Context context){ + if ((context.buffer == null) || (context.buffer.length < context.pos + size)){ + return resizeBuffer(context); + } + return context.buffer; + } + + /** + * Extracts buffered data into the provided byte[] array, starting at position bPos, up to a maximum of bAvail + * bytes. Returns how many bytes were actually extracted. + *

+ * Package protected for access from I/O streams. + * + * @param b + * byte[] array to extract the buffered data into. + * @param bPos + * position in byte[] array to start extraction at. + * @param bAvail + * amount of bytes we're allowed to extract. We may extract fewer (if fewer are available). + * @param context + * the context to be used + * @return The number of bytes successfully extracted into the provided byte[] array. + */ + int readResults(final byte[] b, final int bPos, final int bAvail, final Context context) { + if (context.buffer != null) { + final int len = Math.min(available(context), bAvail); + System.arraycopy(context.buffer, context.readPos, b, bPos, len); + context.readPos += len; + if (context.readPos >= context.pos) { + context.buffer = null; // so hasData() will return false, and this method can return -1 + } + return len; + } + return context.eof ? EOF : 0; + } + + /** + * Checks if a byte value is whitespace or not. + * Whitespace is taken to mean: space, tab, CR, LF + * @param byteToCheck + * the byte to check + * @return true if byte is whitespace, false otherwise + */ + protected static boolean isWhiteSpace(final byte byteToCheck) { + switch (byteToCheck) { + case ' ' : + case '\n' : + case '\r' : + case '\t' : + return true; + default : + return false; + } + } + + /** + * Encodes an Object using the Base-N algorithm. This method is provided in order to satisfy the requirements of + * the Encoder interface, and will throw an EncoderException if the supplied object is not of type byte[]. + * + * @param obj + * Object to encode + * @return An object (of type byte[]) containing the Base-N encoded data which corresponds to the byte[] supplied. + * @throws Exception + * if the parameter supplied is not of type byte[] + */ + public Object encode(final Object obj) throws Exception { + if (!(obj instanceof byte[])) { + throw new Exception("Parameter supplied to Base-N encode is not a byte[]"); + } + return encode((byte[]) obj); + } + + /** + * Encodes a byte[] containing binary data, into a String containing characters in the Base-N alphabet. + * Uses UTF8 encoding. + * + * @param pArray + * a byte array containing binary data + * @return A String containing only Base-N character data + */ + public String encodeToString(final byte[] pArray) { + return newStringUtf8(encode(pArray)); + } + + /** + * Encodes a byte[] containing binary data, into a String containing characters in the appropriate alphabet. + * Uses UTF8 encoding. + * + * @param pArray a byte array containing binary data + * @return String containing only character data in the appropriate alphabet. + */ + public String encodeAsString(final byte[] pArray){ + return newStringUtf8(encode(pArray)); + } + + /** + * Decodes an Object using the Base-N algorithm. This method is provided in order to satisfy the requirements of + * the Decoder interface, and will throw a DecoderException if the supplied object is not of type byte[] or String. + * + * @param obj + * Object to decode + * @return An object (of type byte[]) containing the binary data which corresponds to the byte[] or String + * supplied. + * @throws Exception + * if the parameter supplied is not of type byte[] + */ + public Object decode(final Object obj) throws Exception { + if (obj instanceof byte[]) { + return decode((byte[]) obj); + } else if (obj instanceof String) { + return decode((String) obj); + } else { + throw new Exception("Parameter supplied to Base-N decode is not a byte[] or a String"); + } + } + + /** + * Decodes a String containing characters in the Base-N alphabet. + * + * @param pArray + * A String containing Base-N character data + * @return a byte array containing binary data + */ + public byte[] decode(final String pArray) { + return decode(getBytesUtf8(pArray)); + } + + /** + * Decodes a byte[] containing characters in the Base-N alphabet. + * + * @param pArray + * A byte array containing Base-N character data + * @return a byte array containing binary data + */ + public byte[] decode(final byte[] pArray) { + if (pArray == null || pArray.length == 0) { + return pArray; + } + final Context context = new Context(); + decode(pArray, 0, pArray.length, context); + decode(pArray, 0, EOF, context); // Notify decoder of EOF. + final byte[] result = new byte[context.pos]; + readResults(result, 0, result.length, context); + return result; + } + + /** + * Encodes a byte[] containing binary data, into a byte[] containing characters in the alphabet. + * + * @param pArray + * a byte array containing binary data + * @return A byte array containing only the basen alphabetic character data + */ + public byte[] encode(final byte[] pArray) { + if (pArray == null || pArray.length == 0) { + return pArray; + } + final Context context = new Context(); + encode(pArray, 0, pArray.length, context); + encode(pArray, 0, EOF, context); // Notify encoder of EOF. + final byte[] buf = new byte[context.pos - context.readPos]; + readResults(buf, 0, buf.length, context); + return buf; + } + + // package protected for access from I/O streams + abstract void encode(byte[] pArray, int i, int length, Context context); + + // package protected for access from I/O streams + abstract void decode(byte[] pArray, int i, int length, Context context); + + /** + * Returns whether or not the octet is in the current alphabet. + * Does not allow whitespace or pad. + * + * @param value The value to test + * + * @return true if the value is defined in the current alphabet, false otherwise. + */ + protected abstract boolean isInAlphabet(byte value); + + /** + * Tests a given byte array to see if it contains only valid characters within the alphabet. + * The method optionally treats whitespace and pad as valid. + * + * @param arrayOctet byte array to test + * @param allowWSPad if true, then whitespace and PAD are also allowed + * + * @return true if all bytes are valid characters in the alphabet or if the byte array is empty; + * false, otherwise + */ + public boolean isInAlphabet(final byte[] arrayOctet, final boolean allowWSPad) { + for (int i = 0; i < arrayOctet.length; i++) { + if (!isInAlphabet(arrayOctet[i]) && + (!allowWSPad || (arrayOctet[i] != pad) && !isWhiteSpace(arrayOctet[i]))) { + return false; + } + } + return true; + } + + /** + * Tests a given String to see if it contains only valid characters within the alphabet. + * The method treats whitespace and PAD as valid. + * + * @param basen String to test + * @return true if all characters in the String are valid characters in the alphabet or if + * the String is empty; false, otherwise + * @see #isInAlphabet(byte[], boolean) + */ + public boolean isInAlphabet(final String basen) { + return isInAlphabet(getBytesUtf8(basen), true); + } + + /** + * Tests a given byte array to see if it contains any characters within the alphabet or PAD. + * + * Intended for use in checking line-ending arrays + * + * @param arrayOctet + * byte array to test + * @return true if any byte is a valid character in the alphabet or PAD; false otherwise + */ + protected boolean containsAlphabetOrPad(final byte[] arrayOctet) { + if (arrayOctet == null) { + return false; + } + for (final byte element : arrayOctet) { + if (pad == element || isInAlphabet(element)) { + return true; + } + } + return false; + } + + /** + * Calculates the amount of space needed to encode the supplied array. + * + * @param pArray byte[] array which will later be encoded + * + * @return amount of space needed to encoded the supplied array. + * Returns a long since a max-len array will require > Integer.MAX_VALUE + */ + public long getEncodedLength(final byte[] pArray) { + // Calculate non-chunked size - rounded up to allow for padding + // cast to long is needed to avoid possibility of overflow + long len = ((pArray.length + unencodedBlockSize-1) / unencodedBlockSize) * (long) encodedBlockSize; + if (lineLength > 0) { // We're using chunking + // Round up to nearest multiple + len += ((len + lineLength-1) / lineLength) * chunkSeparatorLength; + } + return len; + } + + public static Charset UTF8 = Charset.forName("UTF-8"); + + public static String newStringUtf8(byte[] bytes) { + return newString(bytes, UTF8); + } + + private static String newString(final byte[] bytes, final Charset charset) { + return bytes == null ? null : new String(bytes, charset); + } + + public static byte[] getBytesUtf8(final String string) { + return getBytes(string, UTF8); + } + + private static byte[] getBytes(final String string, final Charset charset) { + if (string == null) { + return null; + } + return string.getBytes(charset); + } +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/Cities.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/Cities.java new file mode 100644 index 0000000000..52f63fd167 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/Cities.java @@ -0,0 +1,7 @@ +package com.epmet.util.dh; + +class Cities { + static final int cities [] = { + 350602, 370782, 513431, 532624, 530426, 370203, 350128, 421002, 350624, 430225, 360300, 350203, 220211, 420822, 530625, 653126, 420203, 220182, 230603, 533323, 430121, 621225, 652827, 511500, 450205, 652824, 411402, 440781, 469022, 370214, 542521, 433101, 460100, 530381, 411722, 533400, 110229, 640300, 210700, 450127, 440105, 530828, 120000, 420000, 211402, 341823, 220402, 330500, 371324, 150500, 150927, 321284, 230231, 150926, 630123, 341700, 441400, 542330, 370684, 370828, 654326, 610831, 140300, 350581, 421182, 421200, 341124, 371423, 445302, 513225, 532522, 469026, 450102, 433130, 222406, 511325, 410328, 210422, 430405, 341100, 140212, 445222, 350403, 430521, 520111, 652924, 522201, 542327, 110103, 530826, 630122, 610527, 330481, 522424, 820000, 231081, 410103, 431223, 230524, 441284, 500226, 152524, 211382, 530300, 411102, 410727, 152223, 451200, 610203, 230805, 500116, 341222, 420324, 610500, 141128, 371202, 140426, 510181, 341021, 340421, 130623, 152529, 130626, 530902, 220102, 532801, 220183, 632122, 371622, 140721, 340121, 420503, 632524, 610327, 130500, 152923, 150422, 420528, 140221, 430502, 610921, 422822, 130627, 430105, 410926, 340603, 510321, 211202, 522729, 653100, 421123, 310104, 341282, 410602, 510304, 230712, 320481, 532627, 610800, 610522, 360829, 410105, 410106, 431126, 330127, 131126, 350428, 130930, 430621, 130724, 450681, 411381, 130208, 411200, 522327, 640105, 321282, 632323, 371481, 420800, 621124, 341825, 340300, 450923, 530500, 411423, 150302, 530821, 140802, 310115, 410203, 420116, 371724, 430922, 130800, 150502, 210711, 230207, 511529, 530325, 320402, 542300, 140723, 542221, 511800, 150430, 440700, 220421, 350181, 520329, 350784, 440115, 330304, 411221, 510107, 360803, 520221, 350603, 421003, 411522, 150205, 220503, 620421, 370303, 451031, 150525, 360700, 340711, 620403, 610924, 500117, 542626, 511922, 620800, 450123, 533123, 320900, 410423, 330902, 451002, 623027, 620923, 220204, 420923, 210922, 150429, 150929, 420684, 610427, 150624, 340702, 360313, 320300, 320600, 431228, 621000, 370323, 530421, 640104, 370503, 533421, 420102, 371428, 220105, 350981, 370113, 230503, 130925, 231025, 620300, 341524, 130127, 231200, 130224, 420606, 652922, 371426, 130402, 140826, 511304, 610724, 511823, 542100, 510303, 440113, 500114, 542337, 451381, 513336, 441427, 450311, 630105, 361122, 610829, 360425, 130128, 350105, 511525, 220202, 632724, 350205, 310112, 640303, 623023, 140726, 513229, 330103, 420204, 140725, 350500, 511826, 211322, 630102, 230822, 653022, 130426, 371121, 632200, 640521, 621100, 511524, 130803, 130982, 451202, 350600, 450324, 130424, 510800, 640324, 131028, 450305, 340828, 140423, 654028, 110114, 340503, 653128, 610823, 510184, 310105, 542622, 610821, 511602, 522730, 331000, 360100, 410421, 450107, 150826, 610525, 140922, 140107, 632522, 130283, 130121, 130431, 632523, 430223, 530112, 361023, 361181, 411421, 340302, 654325, 360733, 370322, 450126, 632721, 320924, 430321, 532625, 652927, 440523, 230302, 511702, 361025, 150725, 360731, 321183, 451024, 440404, 320205, 321302, 370306, 371322, 510311, 360102, 431124, 410883, 500238, 230110, 522422, 331123, 411403, 522229, 520424, 510682, 320000, 231102, 652101, 371000, 130107, 420527, 542121, 500112, 150425, 140225, 341623, 331100, 430522, 540123, 500000, 652923, 130726, 150223, 420529, 440783, 530921, 211003, 320281, 513223, 530700, 450400, 331004, 410303, 511681, 640205, 640424, 620821, 441424, 530522, 630000, 370634, 360726, 230604, 150523, 371302, 340323, 141023, 220581, 610431, 610524, 220724, 150922, 410600, 211103, 440800, 632222, 230505, 330211, 360721, 130406, 522627, 422826, 220122, 210882, 230826, 530102, 130921, 469002, 360424, 340123, 220502, 120112, 450422, 370830, 152201, 320107, 361028, 510104, 440923, 654000, 330621, 141034, 450803, 510727, 621222, 530000, 610825, 610302, 510400, 450109, 441202, 429021, 654201, 211300, 140624, 360302, 511528, 130108, 532527, 652826, 520303, 530825, 330322, 511600, 430281, 340406, 230624, 522223, 500235, 220281, 411503, 610322, 411330, 533100, 210122, 411726, 341102, 220181, 530626, 130826, 411622, 232722, 340825, 230102, 441500, 360826, 420111, 141082, 141182, 231281, 620200, 441581, 431129, 440183, 130604, 220800, 532329, 620321, 610526, 510000, 411224, 621022, 130428, 340521, 130205, 421087, 532621, 130628, 310118, 440902, 510502, 321000, 420583, 130804, 542522, 360103, 410800, 420113, 530829, 532524, 421125, 542301, 513424, 460107, 320830, 421000, 513230, 331024, 360222, 220303, 530602, 511522, 130823, 441802, 420881, 330200, 330727, 361124, 530113, 330803, 440114, 210211, 430726, 152526, 533321, 460000, 510600, 411282, 420281, 500118, 522625, 350426, 150522, 330382, 530424, 611023, 130532, 231084, 469031, 150300, 210600, 341302, 130185, 320400, 450330, 445102, 150404, 420506, 410311, 411623, 522401, 440803, 421022, 320114, 451226, 211421, 611024, 360200, 410700, 150222, 371203, 360123, 320703, 210282, 320322, 211221, 433100, 623025, 350505, 330108, 230803, 360732, 510124, 510302, 420106, 430211, 330183, 420205, 640323, 140224, 653226, 321102, 420984, 330424, 441882, 210800, 340500, 140932, 510703, 522631, 230127, 420582, 211302, 330503, 500242, 652302, 371626, 433123, 520321, 210900, 652900, 410184, 654221, 330881, 371081, 410104, 370829, 150104, 450521, 441223, 420600, 460106, 433125, 130630, 370211, 520114, 451423, 230381, 231085, 360321, 340223, 430412, 410811, 130303, 542127, 632621, 220103, 610830, 211121, 650106, 451324, 654322, 430224, 610626, 341821, 150981, 421023, 430203, 441827, 653201, 411000, 211081, 632127, 610624, 370321, 130638, 532530, 210204, 451321, 510525, 140924, 330326, 230203, 520328, 321081, 330782, 350583, 510623, 621025, 622926, 450222, 610404, 431322, 350123, 611021, 371400, 360900, 131023, 360111, 370902, 440281, 131081, 150421, 330329, 340104, 140200, 520200, 610822, 370700, 411600, 341721, 210811, 230705, 341502, 522623, 220622, 130184, 152200, 542424, 130200, 130730, 130400, 430721, 431026, 230902, 140729, 152502, 130522, 652925, 450303, 632626, 350504, 230100, 211011, 530428, 451030, 610422, 450405, 532327, 310108, 371327, 210100, 500113, 371102, 410221, 511821, 542122, 360122, 610828, 350721, 450502, 445321, 511825, 140108, 320504, 513432, 371325, 610623, 431202, 330825, 511725, 150621, 511129, 350623, 430682, 511133, 150103, 110116, 152202, 350481, 451425, 420504, 440300, 522425, 360823, 510403, 620103, 320382, 632722, 421024, 410326, 450421, 220882, 350724, 542329, 370900, 610304, 230500, 341800, 341000, 230882, 610622, 522626, 653124, 230700, 431123, 450122, 620402, 370523, 532628, 451227, 620422, 320721, 210681, 451302, 230707, 130525, 210727, 341421, 420922, 110109, 410402, 350925, 640400, 371122, 450100, 513430, 231224, 433122, 230208, 610727, 610303, 140226, 140429, 330102, 653225, 632726, 522230, 542125, 230703, 341723, 130207, 532502, 620724, 530321, 469028, 131128, 320115, 610402, 320723, 610328, 231002, 140702, 330683, 371312, 230421, 411121, 211303, 410922, 441624, 220700, 370405, 420300, 220282, 370784, 632625, 430529, 510524, 141123, 650200, 140430, 361123, 110000, 370283, 430124, 141181, 420105, 330122, 150100, 511521, 431122, 440308, 222424, 330903, 130625, 210102, 610423, 632624, 513200, 513231, 610521, 440229, 130727, 230230, 210202, 511621, 130404, 520422, 430681, 510521, 532532, 410204, 532323, 130126, 411625, 511100, 320623, 530822, 420381, 350423, 654202, 512022, 220702, 361030, 230711, 210111, 530128, 431302, 341321, 532328, 542334, 140121, 542523, 320507, 620902, 450221, 370612, 410724, 520122, 131182, 431002, 321300, 610502, 522222, 621121, 210403, 370284, 522300, 210423, 420302, 450602, 530326, 350902, 530722, 350781, 330109, 310230, 522723, 610326, 320111, 620822, 350525, 510823, 450981, 630100, 500240, 320305, 361128, 361024, 232700, 341023, 350782, 650202, 532926, 610103, 610923, 350200, 141028, 450512, 513332, 411721, 441481, 431381, 511000, 440205, 430703, 522325, 361129, 130132, 350924, 610632, 131121, 350211, 140421, 421100, 410803, 510626, 321181, 150428, 530624, 361027, 450902, 331082, 360921, 222403, 340881, 231182, 431025, 610926, 511400, 420625, 140322, 370786, 710000, 522328, 370304, 620121, 371523, 420683, 450702, 540124, 360428, 420505, 140105, 411323, 430921, 450921, 320206, 140223, 320506, 620623, 370212, 441200, 360983, 310120, 410400, 430423, 371723, 530422, 320724, 513325, 441324, 530600, 370400, 230722, 610728, 513335, 620982, 110107, 350429, 623021, 230708, 371328, 131082, 441825, 370783, 610400, 140781, 421122, 430300, 513429, 522634, 350825, 500115, 210504, 130722, 430923, 370686, 422827, 141030, 420802, 140603, 422828, 140923, 131026, 542200, 220623, 141027, 360203, 222402, 350824, 513331, 632801, 430603, 140823, 440513, 110102, 120225, 610429, 610826, 350430, 542231, 532531, 420100, 441881, 450200, 532525, 621002, 440606, 511822, 370681, 500101, 371326, 430100, 410900, 532822, 130824, 441226, 410482, 370831, 210321, 513427, 340404, 420104, 610621, 371700, 530622, 511421, 140500, 140829, 371103, 650100, 460108, 360600, 370881, 361021, 371082, 522732, 542226, 150800, 210323, 532301, 430722, 441625, 622901, 371425, 513333, 411321, 440811, 130721, 533325, 530111, 410782, 430624, 210702, 130130, 421222, 411327, 130624, 230108, 231222, 610582, 430981, 410224, 610700, 360830, 130705, 530802, 361125, 220106, 542427, 320411, 652926, 210903, 120223, 330682, 140600, 430700, 411602, 430702, 371726, 440282, 440982, 540122, 360827, 653121, 230715, 530323, 620721, 141031, 610112, 140902, 130183, 622923, 371625, 210603, 532325, 532500, 321100, 320113, 411023, 652122, 513434, 320321, 510105, 430304, 330104, 361127, 440608, 230123, 520112, 542129, 350122, 632128, 654300, 130635, 410381, 650105, 370205, 410181, 511181, 211321, 130733, 542128, 445323, 450821, 621221, 361000, 450329, 360622, 340207, 522428, 530827, 141130, 610631, 620111, 410000, 210522, 220104, 130631, 610102, 140825, 230710, 341702, 650103, 150727, 320802, 542126, 445122, 532528, 522722, 130433, 140921, 522725, 320684, 522200, 440605, 370685, 510903, 652825, 441521, 310103, 320103, 220221, 410711, 623026, 370124, 532600, 130421, 230111, 445100, 320505, 350104, 542422, 230621, 520421, 220323, 130302, 520302, 320405, 331021, 411624, 130203, 469027, 152523, 130133, 542338, 441323, 620500, 420981, 150221, 360782, 150802, 411082, 141100, 610323, 130923, 430611, 360423, 620722, 330206, 640381, 620700, 150921, 370406, 654002, 540127, 410222, 330411, 130629, 510802, 511025, 130322, 450000, 451402, 420321, 150124, 610723, 120110, 371100, 370000, 522601, 150823, 230206, 361026, 610000, 310114, 130223, 530924, 141021, 360802, 420902, 542623, 430725, 451300, 130125, 450332, 632700, 469033, 411329, 530721, 430406, 130637, 331023, 420114, 622921, 150822, 530630, 632725, 421221, 610104, 320705, 370481, 440400, 621126, 530328, 513437, 220723, 450105, 140728, 510812, 230605, 350722, 441623, 520121, 410325, 500236, 140727, 131181, 610116, 370403, 210000, 410411, 469023, 130100, 410122, 410523, 411681, 140122, 360730, 330324, 510421, 320700, 350527, 371500, 440402, 640302, 411024, 500107, 320124, 370921, 370682, 230225, 530900, 530124, 532523, 810000, 371422, 511527, 620823, 411081, 411724, 430822, 340403, 330802, 421083, 421281, 130928, 430811, 210802, 522624, 445281, 520102, 140927, 150625, 511523, 420325, 513330, 140623, 410324, 440825, 431221, 654003, 445300, 341004, 130521, 340208, 410802, 440000, 410183, 422823, 542222, 522426, 621200, 150928, 210803, 650203, 654301, 320903, 341422, 430202, 632121, 650204, 430524, 130481, 542430, 130981, 320324, 210400, 330381, 230183, 431128, 653130, 130929, 321088, 431127, 320921, 330824, 420322, 640181, 530126, 120111, 320804, 371321, 140621, 530628, 150304, 230300, 510114, 542331, 370826, 230704, 610426, 430511, 341622, 430602, 350821, 445202, 371323, 451229, 652829, 533423, 210283, 450600, 230321, 130523, 620100, 530400, 321322, 610824, 451027, 321011, 654223, 410725, 441300, 620522, 411729, 370882, 370785, 520113, 360430, 440233, 542524, 610329, 520325, 110112, 520203, 640122, 659001, 331126, 632822, 361126, 610222, 371524, 231004, 140181, 370305, 350926, 330282, 469006, 610114, 150303, 420624, 340321, 350400, 430421, 430781, 610204, 130534, 451400, 450500, 440785, 340405, 450300, 231000, 410200, 511111, 131003, 620922, 659004, 611000, 610100, 321111, 410825, 542333, 340811, 410225, 532324, 420804, 650205, 640100, 411324, 230804, 140425, 150627, 341802, 130530, 469007, 321023, 652300, 360426, 370213, 411525, 370704, 371424, 542124, 542133, 150200, 542527, 130634, 110104, 230184, 150423, 370102, 421121, 511028, 652328, 130123, 440604, 130535, 210726, 130432, 130706, 232723, 130229, 621228, 320323, 632622, 640121, 230304, 430424, 621224, 610702, 450223, 513224, 330783, 320800, 231202, 510723, 530621, 211422, 530129, 451026, 341221, 152531, 330600, 441900, 340803, 451102, 210213, 622922, 150700, 152221, 320482, 141033, 230900, 230124, 530103, 440222, 451025, 320582, 511902, 210604, 230422, 341822, 410108, 431027, 451225, 130723, 370200, 442000, 652123, 410526, 152530, 520402, 140424, 430381, 500225, 610902, 410302, 440983, 500232, 130225, 440512, 440232, 621026, 410182, 330900, 230221, 361022, 513401, 130300, 411727, 360429, 440802, 610929, 650121, 532927, 230523, 421102, 530925, 360727, 513300, 610722, 654023, 210505, 411122, 321324, 441423, 140123, 469000, 141122, 152900, 371525, 140830, 500233, 211102, 220881, 140722, 150821, 130527, 150207, 620981, 441203, 360728, 653224, 532331, 450503, 330212, 532823, 611002, 620702, 542332, 130429, 130430, 350723, 632600, 542624, 542526, 450226, 130632, 510725, 650107, 230903, 350402, 411100, 360403, 512081, 542132, 152921, 340400, 420500, 450721, 450722, 370112, 530823, 340602, 650104, 340700, 370125, 542232, 530423, 430103, 420700, 540121, 610481, 350305, 330602, 469029, 440882, 220822, 341225, 371721, 130822, 610802, 522726, 511722, 210300, 533124, 653123, 150924, 341003, 532322, 420525, 340800, 370285, 640200, 513433, 350923, 410702, 620621, 130529, 371600, 510724, 610625, 310116, 510122, 410306, 130984, 230904, 130321, 420117, 430426, 542225, 310109, 152522, 411104, 500231, 632802, 340122, 150902, 513328, 410425, 632221, 520330, 532526, 542425, 652100, 532932, 431300, 230702, 420682, 152222, 441426, 320502, 350503, 370687, 510106, 440600, 120115, 652800, 130304, 152525, 451222, 330182, 610126, 340304, 659003, 320200, 430382, 340504, 350425, 640422, 130000, 130423, 522633, 150923, 410928, 320811, 330681, 350900, 130204, 330784, 441602, 360322, 360502, 430581, 440305, 632300, 510704, 610428, 652928, 230128, 220721, 430723, 652929, 210411, 411723, 330110, 140106, 350783, 220722, 410422, 340823, 220300, 632800, 320105, 330522, 230223, 510683, 542123, 360781, 110106, 513322, 360923, 640106, 441823, 542400, 411502, 370602, 610122, 451023, 451481, 320923, 654200, 371502, 532922, 130202, 150526, 542336, 411425, 131002, 371623, 530502, 220582, 370703, 210112, 530922, 653122, 654021, 654022, 500109, 330303, 320585, 450403, 150723, 411728, 341125, 441700, 420581, 420626, 532623, 411500, 620924, 210224, 623022, 421224, 513221, 321323, 632123, 430821, 340621, 371522, 511102, 440306, 500111, 450881, 140900, 611025, 632525, 440511, 622924, 140400, 411103, 141081, 421181, 510811, 441303, 230306, 371402, 230303, 440224, 320826, 410923, 431081, 360724, 411002, 410102, 630104, 522622, 211282, 152528, 654024, 510108, 532326, 429006, 150125, 530181, 211481, 510182, 610528, 650109, 210781, 330300, 370404, 230716, 340822, 220100, 211005, 421126, 350100, 411481, 350524, 542627, 469021, 152224, 320621, 330502, 410527, 420112, 430481, 513323, 652200, 130636, 230407, 130582, 140321, 620600, 360800, 420921, 140100, 411422, 340802, 220284, 350921, 341024, 469003, 410726, 110117, 230307, 510921, 341522, 510132, 440903, 420526, 150900, 130633, 230281, 654025, 231024, 522224, 620400, 510411, 542335, 320211, 410500, 610730, 510300, 510681, 410223, 620104, 150400, 530402, 340000, 141125, 341402, 542421, 350700, 150782, 654321, 420222, 420821, 500241, 410505, 513329, 222400, 522632, 360725, 371200, 310117, 140800, 320503, 371728, 320381, 331122, 230600, 321182, 450302, 360926, 621021, 231005, 141002, 513428, 422801, 220521, 341503, 130903, 621024, 210113, 320202, 640202, 110113, 654027, 650000, 421124, 320304, 340102, 350303, 360602, 140929, 340311, 520327, 421202, 533122, 621102, 620000, 623001, 420107, 610726, 440106, 440100, 451000, 431028, 430400, 610430, 653125, 530723, 653200, 141121, 230200, 532925, 542233, 131100, 410581, 530322, 130926, 320682, 141102, 130181, 130621, 320611, 130983, 131025, 230781, 371482, 533324, 512000, 210503, 430221, 650201, 520181, 441781, 230400, 410404, 371526, 321202, 152527, 371521, 341181, 330921, 340604, 370923, 410704, 510522, 620824, 120105, 510900, 140622, 621023, 130227, 513334, 340200, 370302, 230125, 130182, 540125, 422825, 431230, 441302, 410822, 220681, 130324, 620826, 210181, 511781, 522728, 650102, 522600, 321112, 411281, 150602, 210203, 320829, 330726, 411725, 411523, 130703, 530425, 430122, 411527, 652722, 410728, 440804, 500106, 440900, 513233, 211404, 540000, 370725, 130425, 231121, 500103, 510781, 350111, 130683, 341400, 431022, 441702, 420103, 510504, 211122, 321084, 522727, 610324, 431003, 150206, 450922, 431102, 450224, 360922, 469005, 341521, 429004, 510700, 150783, 410211, 231100, 130524, 130528, 522225, 350213, 230713, 640221, 512002, 511402, 150724, 451224, 141022, 522226, 361100, 370521, 450423, 530324, 360824, 360500, 420702, 130732, 140928, 131022, 451228, 330402, 341203, 350625, 341002, 654225, 410403, 510821, 130827, 522629, 630103, 411325, 370832, 360734, 340111, 542600, 320584, 542328, 500102, 430407, 371727, 410506, 520323, 430302, 450481, 653127, 230714, 140222, 610725, 433126, 150600, 330100, 222404, 141026, 110101, 469030, 350103, 360681, 522322, 510129, 341200, 220322, 441225, 522630, 610827, 640423, 542223, 211004, 131127, 210281, 140428, 341722, 341103, 632821, 500243, 469001, 231123, 360481, 430500, 640522, 440184, 110111, 361002, 653131, 340703, 360729, 370983, 431121, 511123, 320100, 211223, 141025, 522423, 130434, 441422, 532928, 210402, 410781, 513400, 150825, 610331, 441821, 441502, 360825, 440500, 331003, 371624, 370126, 130922, 140211, 350702, 542228, 652901, 410304, 652723, 440104, 150121, 360521, 430104, 450321, 610424, 522702, 320412, 411303, 450124, 510322, 654226, 440103, 451323, 520123, 340303, 520322, 140881, 429005, 411700, 140581, 451021, 620523, 530926, 140981, 451028, 360202, 370300, 411025, 140602, 140524, 150781, 230706, 500237, 610900, 130581, 653101, 320925, 331102, 360881, 542429, 610928, 330203, 450700, 652700, 450802, 210602, 211381, 220602, 451424, 330483, 430528, 441402, 511622, 430111, 420602, 220400, 231221, 360281, 441800, 510402, 130700, 430800, 530627, 652327, 621227, 210421, 330723, 610425, 431224, 120103, 522636, 450804, 230202, 511126, 220422, 150626, 220802, 230305, 441224, 430408, 231083, 371427, 350822, 610628, 500200, 350212, 350000, 210304, 130825, 430626, 231003, 371311, 140110, 230227, 410927, 450621, 230229, 430802, 411626, 440307, 361029, 210804, 621122, 320203, 410603, 130900, 130681, 320583, 411426, 140822, 220605, 320982, 370100, 321003, 441322, 211281, 652223, 371621, 341600, 511300, 610630, 371083, 350124, 230204, 320102, 350521, 542525, 654224, 360735, 450103, 511425, 210911, 513426, 510100, 211403, 150424, 120114, 510121, 532800, 450326, 140522, 210624, 150721, 431100, 330800, 510115, 150123, 450703, 445224, 330105, 330328, 141029, 230406, 350725, 320922, 150403, 360925, 230623, 513326, 513338, 340824, 513232, 430600, 341423, 341424, 150521, 370282, 441283, 320282, 370827, 341324, 420900, 361102, 511424, 330000, 350626, 370281, 511721, 530121, 340203, 321200, 210124, 360121, 532622, 411322, 653024, 140521, 341202, 441600, 522326, 530125, 330226, 511422, 520425, 140427, 210404, 420303, 632521, 150581, 500108, 533300, 230205, 140824, 640402, 511302, 211224, 450924, 451123, 610922, 620524, 530824, 430482, 542426, 422800, 141126, 350622, 320404, 433124, 210104, 430527, 230521, 371300, 231124, 350182, 120221, 431321, 321203, 330283, 440112, 430204, 410202, 430724, 331181, 130927, 542621, 232721, 130924, 130129, 152500, 520100, 341323, 131000, 330523, 331125, 542625, 511024, 513327, 610925, 410300, 220600, 450203, 441721, 431200, 530523, 350982, 411702, 441622, 653000, 370781, 421300, 610581, 522700, 440304, 341122, 410503, 110228, 230800, 640502, 220524, 150785, 511323, 511423, 371581, 320116, 320681, 222405, 341525, 542428, 440116, 430503, 510922, 632100, 130725, 360981, 320104, 450108, 310106, 130728, 330624, 420323, 511923, 522635, 520326, 330400, 340502, 532300, 433127, 421381, 511303, 130702, 500222, 610927, 231223, 130403, 141024, 640000, 431225, 430422, 141129, 630121, 350628, 513436, 620122, 341824, 511124, 460105, 431281, 511322, 530927, 530427, 431024, 653223, 131124, 231283, 640425, 451223, 110108, 140000, 513222, 632321, 340827, 140926, 130435, 320125, 611026, 621123, 220621, 231225, 130427, 230828, 150524, 610111, 610403, 500234, 140525, 520103, 410882, 110115, 540100, 530800, 511526, 230104, 210682, 360821, 410185, 370982, 330482, 361121, 451221, 350424, 340402, 610202, 131122, 211100, 321281, 510503, 370522, 623024, 421081, 210782, 431103, 653023, 130821, 532930, 652823, 510722, 620725, 632224, 410323, 141127, 222426, 469032, 440981, 120113, 513226, 511011, 230709, 320902, 370500, 360124, 532900, 350322, 340202, 532501, 231282, 640500, 341204, 350526, 140930, 411400, 420607, 440784, 520381, 530629, 220500, 542325, 659000, 211400, 440203, 542322, 321002, 411627, 230502, 350800, 620302, 130828, 451121, 411628, 652325, 431226, 520400, 510112, 610721, 150925, 210521, 450603, 140109, 331002, 450800, 522400, 621223, 220000, 340322, 370105, 130729, 210114, 350206, 533422, 371722, 511381, 511724, 542423, 341621, 542229, 230403, 330204, 620825, 350302, 211002, 152501, 320303, 230109, 370800, 340721, 431000, 150702, 211324, 522323, 130682, 419001, 360000, 450331, 140724, 530524, 130684, 360828, 532626, 130533, 140481, 220200, 230833, 522731, 530127, 360402, 441826, 411521, 222401, 140827, 540126, 330521, 532929, 500119, 610602, 340221, 330185, 360421, 610729, 211021, 130531, 411202, 150000, 445121, 410327, 230382, 610330, 510904, 341523, 611022, 620105, 130731, 411528, 150426, 513337, 445221, 350427, 230000, 310101, 410305, 511132, 420703, 360723, 513324, 210502, 360105, 451122, 341226, 500223, 430525, 130230, 330822, 620503, 451281, 220203, 320803, 370502, 610627, 510603, 511502, 610124, 654026, 621226, 321283, 632623, 652222, 131125, 411621, 410322, 440507, 430623, 652301, 513435, 652201, 450900, 420502, 370181, 370705, 371329, 360104, 140931, 410100, 341602, 330702, 410502, 150105, 150623, 451322, 230129, 445200, 510500, 441523, 410821, 211000, 532931, 140821, 450328, 331022, 542323, 140227, 532901, 610113, 512021, 420704, 220821, 140431, 440883, 130526, 610115, 340103, 532923, 410329, 410522, 350823, 430102, 120104, 652801, 620423, 522228, 130600, 654323, 210881, 310000, 620521, 331124, 210200, 130131, 330703, 511112, 622925, 431382, 513321, 632324, 220382, 360400, 320706, 632322, 341022, 610600, 150722, 620622, 360924, 532529, 510726, 431227, 500110, 510113, 320831, 511900, 510923, 371421, 530923, 140828, 430902, 652828, 451421, 450225, 210381, 210905, 620123, 420200, 360427, 431222, 500229, 511321, 520324, 131123, 360902, 440204, 542224, 230405, 141124, 410611, 430903, 210921, 653001, 622900, 440607, 511827, 341322, 350681, 410721, 510824, 530521, 150622, 620900, 370683, 652323, 230606, 450325, 421127, 659002, 530623, 370811, 411424, 410823, 220302, 430523, 511802, 511921, 430200, 231226, 620802, 350582, 445381, 511700, 511623, 230103, 513422, 141000, 411526, 610523, 370613, 210904, 450322, 210703, 632723, 331127, 150726, 350629, 620525, 371725, 530100, 230602, 520382, 510822, 511824, 130281, 430900, 341500, 150784, 310110, 210123, 371602, 542227, 411300, 440515, 220381, 361130, 410902, 520201, 451422, 130603, 500105, 500230, 440703, 230182, 440303, 330421, 450304, 522324, 441723, 653221, 350802, 431229, 220112, 370600, 230921, 210500, 450327, 469025, 341300, 411302, 632823, 513227, 440823, 511723, 653129, 410621, 430000, 620602, 350922, 513423, 131102, 632126, 140925, 410703, 440705, 411328, 130622, 621125, 341182, 410804, 120106, 500104, 520423, 653222, 430181, 445322, 450204, 350502, 230224, 620921, 370202, 370883, 330700, 410205, 320981, 350300, 370724, 320311, 450404, 130124, 150203, 140700, 331121, 530724, 622927, 542324, 230126, 511113, 620502, 653227, 140303, 230622, 360323, 610125, 230881, 610629, 350627, 510183, 150122, 210103, 341881, 371702, 340222, 360702, 230522, 520222, 330225, 520000, 320581, 530122, 140882, 511324, 371002, 370611, 440514, 513425, 620723, 533103, 441621, 411326, 522227, 500224, 141032, 331081, 320722, 360982, 220283, 130323, 231181, 421223, 522628, 450125, 350421, 370911, 350125, 440403, 652324, 469024, 411222, 533102, 422802, 210212, 510422, 150402, 152922, 431023, 522427, 610300, 340826, 360722, 370104, 530302, 654324, 330281, 421303, 623000, 632500, 210311, 460200, 441421, 500227, 150824, 510131, 410481, 310113, 321311, 150202, 131024, 340600, 652701, 420982, 431125, 652822, 370702, 330302, 330327, 431021, 330922, 522301, 532924, 211200, 350881, 542326, 360822, 620102, 542500, 621202, 621027, 450323, 440200, 420202, 500228, 520300, 340100, 220523, 440704, 320500, 320204, 210105, 330781, 451022, 451029, 632223, 513228, 411524, 341126, 451100, 530702, 440881, 410622, 350121, 420115, 610200, 350304, 320602, 522701 + }; +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhCloudProperties.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhCloudProperties.java new file mode 100644 index 0000000000..f482ee1b8b --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhCloudProperties.java @@ -0,0 +1,60 @@ +package com.epmet.util.dh; + +import org.springframework.stereotype.Component; + +/** + * 海康设备参数 + * + * @author zhy + * @date 2022/5/20 14:59 + */ +@Component +public class DhCloudProperties { + + /** + * URL + */ + private String url; + + /** + * 账号 + */ + private String loginName; + + + /** + * 账号密码 + */ + private String loginPass; + + public DhCloudProperties() { + url = "http://112.6.213.175:8314"; + loginName = "shundeju"; + loginPass = "hg123456"; + } + + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getLoginName() { + return loginName; + } + + public void setLoginName(String loginName) { + this.loginName = loginName; + } + + public String getLoginPass() { + return loginPass; + } + + public void setLoginPass(String loginPass) { + this.loginPass = loginPass; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java new file mode 100644 index 0000000000..8443275404 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java @@ -0,0 +1,902 @@ +package com.epmet.util.dh; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +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.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.dto.DhTokenDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.DhChannelResultDTO; +import net.coobird.thumbnailator.Thumbnails; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.imageio.ImageIO; +import javax.xml.bind.DatatypeConverter; +import java.awt.image.BufferedImage; +import java.io.*; +import java.math.BigDecimal; +import java.net.URL; +import java.time.LocalDate; +import java.util.*; + +/** + * 海康设备下放命令 + * + * @author zhy + * @date 2022/5/20 9:36 + */ +@Component +public class DhDeviceUtil { + private static Logger logger = LoggerFactory.getLogger(DhDeviceUtil.class); + + @Autowired + private DhCloudProperties dhCloudProperties; + + @Autowired + private RedisUtils redisUtils; + + private final String GET_PUBLIC_KEY = "/WPMS/getPublicKey"; + private final String GET_LOGIN_PASS = "/WPMS/login"; + private final String GET_DEPARTMENT = "/CardSolution/card/department"; + private final String GET_NODE = "/CardSolution/resource/tree/nodeList"; + private final String GET_CHANNEL = "/admin/rest/api"; + private final String GET_PERSON_IDENTITY = "/CardSolution/card/person/personidentity"; + private final String GET_DOOR_PLAN = "/CardSolution/card/accessControl/timeQuantum/1/page"; + private final String GET_DOOR_CHANNEL = "/CardSolution/card/accessControl/channel/bycondition/combined"; + private final String ADD_PERSON = "/CardSolution/card/person"; + private final String LIST_PERSON = "/CardSolution/card/person/bycondition/combined"; + private final String DEL_PERSON = "/CardSolution/card/person/delete"; + private final String ADD_PERSON_IMG = "/CardSolution/common/saveMobileBase64ImageToByte"; + private final String ADD_AUTH = "/CardSolution/card/accessControl/doorAuthority/update"; + private final String LIST_CARD = "/CardSolution/card/card/bycondition/combined"; + private final String DEL_CARD = "/CardSolution/card/card/returnByNumber/"; + private final String OPEN_CARD = "/CardSolution/card/card/open/batch"; + + + /** + * 主方法，准备下发开门权限 + * + * @param dto + * @return void + * @author zhy + * @date 2022/8/17 15:24 + */ + public void sendAuth(VisitVisitorFormDTO dto) { + if (StringUtils.isBlank(dto.getIdCard())) { + dto.setIdCard(IDUtils.getIdNo(true)); + } + + DhPersonFormDTO formDTO = new DhPersonFormDTO(); + formDTO.setPaperType("身份证"); + formDTO.setPaperNumber(dto.getIdCard()); + formDTO.setName(dto.getName()); + formDTO.setCode(dto.getIdCard().substring(dto.getIdCard().length() - 10)); + formDTO.setSex(IDUtils.getSex(dto.getIdCard())); + formDTO.setBirthday(dto.getIdCard().substring(6, 10) + "-" + dto.getIdCard().substring(10, 12) + "-" + dto.getIdCard().substring(12, 14)); + formDTO.setPhone(dto.getMobile()); + formDTO.setStatus("在职"); + addPersonAuth(formDTO, dto.getFaceImg(), dto.getNode()); + } + + /** + * 获取publicKey + * + * @param + * @return void + * @author zhy + * @date 2022/5/20 16:40 + */ + private String getPublicKey() { + String key = RedisKeys.getDhPublicKey(); + Object obj = redisUtils.get(key); + if (null != obj) { + return (String) obj; + } + + String url = dhCloudProperties.getUrl().concat(GET_PUBLIC_KEY); + Map paramsMap = new HashMap<>(4); + + DhPublicKeyFormDTO dto = new DhPublicKeyFormDTO(); + dto.setLoginName(dhCloudProperties.getLoginName()); + + String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData(); + + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "publicKey获取失败"); + } + + JSONObject toResult = JSON.parseObject(data); + if (!toResult.containsKey("publicKey")) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "publicKey获取失败"); + } + String publicKey = toResult.get("publicKey").toString(); + + redisUtils.set(key, publicKey, RedisUtils.MINUTE_THIRTY_EXPIRE); + return publicKey; + } + + /** + * 获取loginPass + * + * @param + * @return void + * @author zhy + * @date 2022/5/20 16:40 + */ + private DhTokenDTO getLoginPass(String publicKey) { + String key = RedisKeys.getDhToken(); + Object obj = redisUtils.get(key); + if (null != obj) { + return (DhTokenDTO) obj; + } + + String url = dhCloudProperties.getUrl().concat(GET_LOGIN_PASS); + Map paramsMap = new HashMap<>(4); + + DhLoginPassFormDTO dto = new DhLoginPassFormDTO(); + dto.setLoginName(dhCloudProperties.getLoginName()); + String pwd; + try { + pwd = RSAUtils.getPwdByRsa(publicKey, dhCloudProperties.getLoginPass()); + } catch (Exception e) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "loginPass加密失败"); + } + dto.setLoginPass(pwd); + + String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData(); + + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "loginPass获取失败"); + } + + JSONObject toResult = JSON.parseObject(data); + if (!toResult.containsKey("token")) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "loginPass获取失败"); + } + DhTokenDTO token = new DhTokenDTO(); + token.setId(toResult.get("id").toString()); + token.setLoginName(toResult.get("loginName").toString()); + token.setPublicKey(toResult.get("publicKey").toString()); + token.setToken(toResult.get("token").toString()); + redisUtils.set(key, token, RedisUtils.MINUTE_THIRTY_EXPIRE); + return token; + } + + /** + * 新增部门 + * + * @param + * @return java.lang.String + * @author zhy + * @date 2022/5/23 10:08 + */ + private Long getDept() { + String url = dhCloudProperties.getUrl().concat(GET_DEPARTMENT); + String urlParam = getDhUrlParams(); + url = url + urlParam; + + Map paramsMap = new HashMap<>(4); +// DhDeptFormDTO dto = new DhDeptFormDTO(); +// dto.setName("访客部门"); +// dto.setParentId(1L); + + String data = HttpClientManager.getInstance().sendGet(url, paramsMap).getData(); + + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询部门列表失败"); + } + JSONObject toResult = JSON.parseObject(data); + DhResult result = ConvertUtils.mapToEntity(toResult, DhResult.class); + if (null != toResult.get("success")) { + result.setCode(200); + } + if (!result.getSuccess()) { + logger.info(result.getErrMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询部门列表失败!" + result.getErrMsg()); + } + Object registerResult = result.getData(); + + JSONArray jsonArray = JSON.parseArray(registerResult.toString()); + for (int i = 0; i < jsonArray.size(); i++) { + if ("临时人员".equals(jsonArray.getJSONObject(i).get("name").toString())) { + return Long.parseLong(jsonArray.getJSONObject(i).get("id").toString()); + } + } + + return null; + } + + /** + * 查询节点 + * + * @param + * @return java.lang.String + * @author zhy + * @date 2022/5/23 10:08 + */ + private String getNode(String nodeName) { + String url = dhCloudProperties.getUrl().concat(GET_NODE); + String urlParam = getDhUrlParams(); + url = url + urlParam; + + Map paramsMap = new HashMap<>(4); + DhNodeFormDTO dto = new DhNodeFormDTO(); + dto.setNodeId("ORG_001"); + dto.setTypeCode("01;0;8;7"); + + String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData(); + + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询节点列表失败"); + } + JSONObject toResult = JSON.parseObject(data); + DhResult result = ConvertUtils.mapToEntity(toResult, DhResult.class); + if (null != toResult.get("success")) { + result.setCode(200); + } + if (!result.getSuccess()) { + logger.info(result.getErrMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询节点列表失败!" + result.getErrMsg()); + } + Object registerResult = result.getData(); + + JSONArray jsonArray = JSON.parseArray(registerResult.toString()); + for (int i = 0; i < jsonArray.size(); i++) { + if (nodeName.equals(jsonArray.getJSONObject(i).get("name").toString())) { + return jsonArray.getJSONObject(i).get("id").toString(); + } + } + + return null; + } + + /** + * 人员预处理 + * + * @param + * @return java.lang.String + * @author zhy + * @date 2022/5/23 10:08 + */ + private void personHandle(String code) { + String url = dhCloudProperties.getUrl().concat(LIST_PERSON); + String urlParam = getDhUrlParams(); + url = url + urlParam; + + Map paramsMap = new HashMap<>(4); + DhPersonPageFormDTO dto = new DhPersonPageFormDTO(); + dto.setPageNum(1); + dto.setPageSize(100); + dto.setCode(code); + + String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData(); + + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询人员列表失败"); + } + JSONObject toResult = JSON.parseObject(data); + DhResult result = ConvertUtils.mapToEntity(toResult, DhResult.class); + if (null != toResult.get("success")) { + result.setCode(200); + } + if (!result.getSuccess()) { + logger.info(result.getErrMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询人员列表失败!" + result.getErrMsg()); + } + Object registerResult = result.getData(); + + JSONObject jsonObject = JSON.parseObject(registerResult.toString()); + + List ids = new ArrayList<>(); + JSONArray jsonArray = JSON.parseArray(jsonObject.get("pageData").toString()); + for (int i = 0; i < jsonArray.size(); i++) { + ids.add(Integer.parseInt(jsonArray.getJSONObject(i).get("id").toString())); + } + if (!ids.isEmpty()) { + DhPersonDelFormDTO del = new DhPersonDelFormDTO(); + del.setPersonIds(ids); + delPerson(del); + } + + } + + /** + * 卡片预处理 + * + * @param + * @return java.lang.String + * @author zhy + * @date 2022/5/23 10:08 + */ + private void cardHandle(String code) { + String url = dhCloudProperties.getUrl().concat(LIST_CARD); + String urlParam = getDhUrlParams(); + url = url + urlParam; + + Map paramsMap = new HashMap<>(4); + DhCardPageFormDTO dto = new DhCardPageFormDTO(); + dto.setPageNum(1); + dto.setPageSize(100); + dto.setPersonCode(code); + + String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData(); + + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询卡片列表失败"); + } + JSONObject toResult = JSON.parseObject(data); + DhResult result = ConvertUtils.mapToEntity(toResult, DhResult.class); + if (null != toResult.get("success")) { + result.setCode(200); + } + if (!result.getSuccess()) { + logger.info(result.getErrMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询卡片列表失败!" + result.getErrMsg()); + } + Object registerResult = result.getData(); + + JSONObject jsonObject = JSON.parseObject(registerResult.toString()); + + JSONArray jsonArray = JSON.parseArray(jsonObject.get("pageData").toString()); + for (int i = 0; i < jsonArray.size(); i++) { + delCard(jsonArray.getJSONObject(i).get("cardNumber").toString()); + } + } + + /** + * 删除人员 + * + * @param + * @return java.lang.String + * @author zhy + * @date 2022/5/23 10:08 + */ + private void delPerson(DhPersonDelFormDTO dto) { + String url = dhCloudProperties.getUrl().concat(DEL_PERSON); + String urlParam = getDhUrlParams(); + url = url + urlParam; + + Map paramsMap = new HashMap<>(4); + + String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData(); + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "删除人员失败"); + } + } + + /** + * 退卡 + * + * @param + * @return java.lang.String + * @author zhy + * @date 2022/5/23 10:08 + */ + private void delCard(String cardNum) { + String url = dhCloudProperties.getUrl().concat(DEL_CARD); + url = url + cardNum; + String urlParam = getDhUrlParams(); + url = url + urlParam; + + Map paramsMap = new HashMap<>(4); + + String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, StringUtils.EMPTY, paramsMap).getData(); + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "删除卡片失败"); + } + } + + /** + * 获取身份 + * + * @param + * @return java.lang.String + * @author zhy + * @date 2022/5/23 11:04 + */ + private String getIdentity() { + String url = dhCloudProperties.getUrl().concat(GET_PERSON_IDENTITY); + String urlParam = getDhUrlParams(); + url = url + urlParam; + + Map paramsMap = new HashMap<>(4); +// DhIdentityFormDTO dto = new DhIdentityFormDTO(); +// dto.setName("访客"); +// dto.setSubsidyAmount(0D); +// dto.setIsCashRecharge(1); +// dto.setIsMachineRecharge(1); + + String data = HttpClientManager.getInstance().sendGet(url, paramsMap).getData(); + + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取身份列表失败"); + } + JSONObject toResult = JSON.parseObject(data); + DhResult result = ConvertUtils.mapToEntity(toResult, DhResult.class); + if (null != toResult.get("success")) { + result.setCode(200); + } + if (!result.getSuccess()) { + logger.info(result.getErrMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取身份列表失败!" + result.getErrMsg()); + } + Object registerResult = result.getData(); + JSONArray jsonArray = JSON.parseArray(registerResult.toString()); + for (int i = 0; i < jsonArray.size(); i++) { + if ("默认身份".equals(jsonArray.getJSONObject(i).get("name").toString())) { + return jsonArray.getJSONObject(i).get("id").toString(); + } + } + + return ""; + } + + /** + * 获取开门计划 + * + * @param + * @return java.lang.String + * @author zhy + * @date 2022/5/23 11:04 + */ + private Long getPlan() { + String url = dhCloudProperties.getUrl().concat(GET_DOOR_PLAN); + String urlParam = getDhUrlParams(); + url = url + urlParam; + + Map paramsMap = new HashMap<>(4); + DhPlanPageFormDTO dto = new DhPlanPageFormDTO(); + dto.setPageNum(1); + dto.setPageSize(100); + dto.setSingleCondition("默认"); + + String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData(); + + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询开门计划失败"); + } + JSONObject toResult = JSON.parseObject(data); + DhResult result = ConvertUtils.mapToEntity(toResult, DhResult.class); + if (null != toResult.get("success")) { + result.setCode(200); + } + if (!result.getSuccess()) { + logger.info(result.getErrMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询开门计划失败!" + result.getErrMsg()); + } + Object registerResult = result.getData(); + + JSONObject jsonObject = JSON.parseObject(registerResult.toString()); + + JSONArray jsonArray = JSON.parseArray(jsonObject.get("pageData").toString()); + + if (jsonArray.size() > 0) { + return Long.parseLong(jsonArray.getJSONObject(0).get("id").toString()); + } + + return null; + } + + /** + * 查询通道 + * + * @param + * @return java.lang.String + * @author zhy + * @date 2022/5/23 11:04 + */ + private List getChannel() { + String url = dhCloudProperties.getUrl().concat(GET_DOOR_CHANNEL); + String urlParam = getDhUrlParams(); + url = url + urlParam; + + Map paramsMap = new HashMap<>(4); + DhChannelPageFormDTO dto = new DhChannelPageFormDTO(); + dto.setPageSize(100); + dto.setPageNum(1); + dto.setDeviceGenre("0"); + + String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData(); + + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询通道列表失败"); + } + JSONObject toResult = JSON.parseObject(data); + DhResult result = ConvertUtils.mapToEntity(toResult, DhResult.class); + if (null != toResult.get("success")) { + result.setCode(200); + } + if (!result.getSuccess()) { + logger.info(result.getErrMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询通道列表失败!" + result.getErrMsg()); + } + Object registerResult = result.getData(); + + JSONObject jsonObject = JSON.parseObject(registerResult.toString()); + + JSONArray jsonArray = JSON.parseArray(jsonObject.get("pageData").toString()); + + List list = new ArrayList<>(); + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject jsonItem = jsonArray.getJSONObject(i); + DhChannelResultDTO channel = new DhChannelResultDTO(); + channel.setPrivilegeType("1"); + channel.setResouceCode(jsonItem.get("channelCode").toString()); + list.add(channel); + } + + return list; + } + + /** + * 查询通道-从全部设备中获取 + * + * @param + * @return java.lang.String + * @author zhy + * @date 2022/5/23 11:04 + */ + private List getAllChannel(String nodeName) { + String nodeId = getNode(nodeName); + if (StringUtils.isBlank(nodeId)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询节点失败"); + } + nodeId = nodeId.replaceAll("ORG_", ""); + String url = dhCloudProperties.getUrl().concat(GET_CHANNEL); + String urlParam = getDhUrlParams(); + url = url + urlParam; + + Map paramsMap = new HashMap<>(4); + DhChannelFormDTO dto = new DhChannelFormDTO(); + dto.setInterfaceId("admin_001_006"); + dto.setJsonParam("{\"param\":{\"unitType\":7,\"orgCode\":\"" + nodeId + "\"}}"); + + String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData(); + + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询通道列表失败"); + } + JSONObject toResult = JSON.parseObject(data); + DhResult result = ConvertUtils.mapToEntity(toResult, DhResult.class); + if (null != toResult.get("success")) { + result.setCode(200); + } + if (!result.getSuccess()) { + logger.info(result.getErrMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询通道列表失败!" + result.getErrMsg()); + } + Object registerResult = result.getData(); + + JSONArray jsonArray = JSON.parseArray(registerResult.toString()); + + List list = new ArrayList<>(); + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject jsonItem = jsonArray.getJSONObject(i); + DhChannelResultDTO channel = new DhChannelResultDTO(); + channel.setPrivilegeType("1"); + channel.setResouceCode(jsonItem.get("channelId").toString()); + list.add(channel); + } + + return list; + } + + /** + * 新增人员 + * + * @param dto + * @return java.lang.String + * @author zhy + * @date 2022/5/23 11:04 + */ + private Long addPerson(DhPersonFormDTO dto) { + // 数据预处理 + dataHandle(dto.getCode()); + + String url = dhCloudProperties.getUrl().concat(ADD_PERSON); + String urlParam = getDhUrlParams(); + url = url + urlParam; + + Long deptId = getDept(); + if (null == deptId) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询临时人员部门失败"); + } + String identity = getIdentity(); + if (StringUtils.isBlank(identity)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取身份失败"); + } + dto.setDeptId(deptId); + dto.setPersonIdentityId(identity); + + Map paramsMap = new HashMap<>(4); + + String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData(); + + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "新增人员失败"); + } + JSONObject toResult = JSON.parseObject(data); + DhResult result = ConvertUtils.mapToEntity(toResult, DhResult.class); + if (null != toResult.get("success")) { + result.setCode(200); + } + if (!result.getSuccess()) { + logger.info(result.getErrMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "新增人员失败!" + result.getErrMsg()); + } + Object registerResult = result.getData(); + if (null != registerResult) { + return Long.parseLong(registerResult.toString()); + } + return null; + } + + /** + * 下发人员头像 + * + * @param dto + * @return java.lang.String + * @author zhy + * @date 2022/5/23 11:04 + */ + private String addPersonImg(DhPersonFormDTO dto, String imgUrl) { + DhPersonImgFormDTO imgFormDTO = new DhPersonImgFormDTO(); + String url = dhCloudProperties.getUrl().concat(ADD_PERSON_IMG); + String urlParam = getDhUrlParams(); + url = url + urlParam; + + imgFormDTO.setPersonCode(dto.getCode()); + imgFormDTO.setBase64file(getBase64ByUrl(imgUrl)); + + Map paramsMap = new HashMap<>(4); + + String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(imgFormDTO), paramsMap).getData(); + + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "下发人员头像失败"); + } + JSONObject toResult = JSON.parseObject(data); + DhResult result = ConvertUtils.mapToEntity(toResult, DhResult.class); + if (null != toResult.get("success")) { + result.setCode(200); + } + if (!result.getSuccess()) { + logger.info(result.getErrMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "下发人员头像失败!" + result.getErrMsg()); + } else { + return "success"; + } + } + + /** + * 人员开卡 + * + * @param dto + * @return java.lang.String + * @author zhy + * @date 2022/5/23 11:04 + */ + private String addPersonCard(DhPersonFormDTO dto) { + Long personId = addPerson(dto); + if (personId == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "添加人员信息失败"); + } + DhPersonCardListFormDTO cardListFormDTO = new DhPersonCardListFormDTO(); + List cardList = new ArrayList<>(); + DhPersonCardFormDTO cardFormDTO = new DhPersonCardFormDTO(); + String url = dhCloudProperties.getUrl().concat(OPEN_CARD); + String urlParam = getDhUrlParams(); + url = url + urlParam; + + cardFormDTO.setPersonId(personId); + cardFormDTO.setPersonName(dto.getName()); + cardFormDTO.setCardNumber(generateNiceString(8)); + cardFormDTO.setCardType("0"); + cardFormDTO.setCategory("0"); + cardFormDTO.setCardStatus("ACTIVE"); + cardFormDTO.setStartDate(LocalDate.now().toString()); + cardFormDTO.setEndDate(LocalDate.now().toString()); + String pwd; + try { + pwd = RSAUtils.getPwdByRsa(getPublicKey(), "123456"); + } catch (Exception e) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "密码加密失败"); + } + cardFormDTO.setCardPassword(pwd); + cardFormDTO.setSubSystems("1"); + cardList.add(cardFormDTO); + cardListFormDTO.setObjectList(cardList); + + Map paramsMap = new HashMap<>(4); + + String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(cardListFormDTO), paramsMap).getData(); + + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "人员开卡失败"); + } + JSONObject toResult = JSON.parseObject(data); + DhResult result = ConvertUtils.mapToEntity(toResult, DhResult.class); + if (null != toResult.get("success")) { + result.setCode(200); + } + if (!result.getSuccess()) { + logger.info(result.getErrMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "人员开卡失败!" + result.getErrMsg()); + } else { + return cardFormDTO.getCardNumber(); + } + } + + /** + * 下发人员权限 + * + * @param dto + * @return java.lang.String + * @author zhy + * @date 2022/5/23 11:04 + */ + private String addPersonAuth(DhPersonFormDTO dto, String imgUrl, String node) { + String personCard = addPersonCard(dto); + if (StringUtils.isBlank(personCard)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "开卡失败"); + } else if (StringUtils.isNotBlank(imgUrl)) { + addPersonImg(dto, imgUrl); + } + +// List channel = getAllChannel(node); + List channel = getChannel(); + if (channel.isEmpty()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取通道失败"); + } + + Long plan = getPlan(); + if (plan == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取开门计划失败"); + } + + DhAuthFormDTO authFormDTO = new DhAuthFormDTO(); + String url = dhCloudProperties.getUrl().concat(ADD_AUTH); + String urlParam = getDhUrlParams(); + url = url + urlParam; + + authFormDTO.setCardNumber(personCard); + authFormDTO.setTimeQuantumId(plan.toString()); + authFormDTO.setCardPrivilegeDetails(channel); + + Map paramsMap = new HashMap<>(4); + + String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(authFormDTO), paramsMap).getData(); + + if (null == data) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "下发人员权限失败"); + } + JSONObject toResult = JSON.parseObject(data); + DhResult result = ConvertUtils.mapToEntity(toResult, DhResult.class); + if (null != toResult.get("success")) { + result.setCode(200); + } + if (!result.getSuccess()) { + logger.info(result.getErrMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "下发人员权限失败!" + result.getErrMsg()); + } else { + return "success"; + } + } + + /** + * 拼接url固定参数 + * + * @param + * @return java.lang.String + * @author zhy + * @date 2022/7/28 16:09 + */ + private String getDhUrlParams() { + DhTokenDTO token = getLoginPass(getPublicKey()); + return "?userId=" + token.getId() + "&username=" + token.getLoginName() + "&token=" + token.getToken(); + } + + private String getBase64ByUrl(String imgUrl) { + String ossDomain; + byte[] fileBytes; + try { + URL url = new URL(imgUrl); + DataInputStream dataInputStream = new DataInputStream(url.openStream()); + byte[] originBytes = toByteArray(dataInputStream); + + fileBytes = compressPicCycle(originBytes, 100L, 0.1); + } catch (IOException e) { + logger.error("图片上传异常", e); + throw new RenException("图片上传异常"); + } + return DatatypeConverter.printBase64Binary(fileBytes); + } + + /** + * @param bytes 原图片字节数组 + * @param desFileSize 指定图片大小,单位 kb + * @param accuracy 精度,递归压缩的比率,建议小于0.9 + * @return + */ + private byte[] compressPicCycle(byte[] bytes, long desFileSize, double accuracy) throws IOException { + // 获取目标图片 + long fileSize = bytes.length; + System.out.println("=====fileSize======== " + fileSize); + // 判断图片大小是否小于指定图片大小 + if (fileSize <= desFileSize * 1024) { + return bytes; + } + //计算宽高 + BufferedImage bim = ImageIO.read(new ByteArrayInputStream(bytes)); + int imgWidth = bim.getWidth(); + System.out.println(imgWidth + "====imgWidth====="); + int imgHeight = bim.getHeight(); + int desWidth = new BigDecimal(imgWidth).multiply(new BigDecimal(accuracy)).intValue(); + System.out.println(desWidth + "====desWidth====="); + int desHeight = new BigDecimal(imgHeight).multiply(new BigDecimal(accuracy)).intValue(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); //字节输出流（写入到内存） + Thumbnails.of(new ByteArrayInputStream(bytes)).size(desWidth, desHeight).outputQuality(accuracy).toOutputStream(baos); + //如果不满足要求,递归直至满足要求 + return compressPicCycle(baos.toByteArray(), desFileSize, accuracy); + } + + /** + * inputstream输入流转换成byte[]字节数组 + * + * @param input + * @return byte[] + * @author yinzuomei + * @date 2020/2/27 16:09 + */ + private byte[] toByteArray(InputStream input) throws IOException { + ByteArrayOutputStream output = new ByteArrayOutputStream(); + byte[] buffer = new byte[1024 * 4]; + int n = 0; + while (-1 != (n = input.read(buffer))) { + output.write(buffer, 0, n); + } + return output.toByteArray(); + } + + /** + * 随机生成16进制字符串 + * + * @param len + * @return java.lang.String + * @author zhy + * @date 2022/7/29 9:47 + */ + private String generateNiceString(int len) { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < len; i++) { + sb.append(Integer.toHexString(new Random().nextInt(16))); + } + return sb.toString().toUpperCase(); + } + + /** + * 退卡，然后删除人员 + * + * @param code + * @return void + * @author zhy + * @date 2022/8/3 10:48 + */ + private void dataHandle(String code) { + // 先退卡 + cardHandle(code); + // 再删人员 + personHandle(code); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhResult.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhResult.java new file mode 100644 index 0000000000..99149c1814 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhResult.java @@ -0,0 +1,141 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.util.dh; + +import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.ErrorCode; +import com.epmet.commons.tools.utils.MessageUtils; +import org.apache.commons.lang3.StringUtils; + +import java.io.Serializable; + +/** + * 响应数据 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +public class DhResult implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 编码：0表示成功，其他值表示失败 + */ + private Integer code = 0; + /** + * 消息内容 + */ + private String errMsg = "success"; + + /** + * 内部信息 + */ + private Boolean success = true; + + /** + * 响应数据 + */ + private T data; + + public DhResult ok(T data) { + this.setData(data); + return this; + } + + public boolean success(){ + return code == 0; + } + + /** + * 返回 + * "code": 8000, + * "msg": "服务器开小差了...", + */ + public DhResult error() { + this.code = EpmetErrorCode.SERVER_ERROR.getCode(); + this.errMsg = EpmetErrorCode.getMsg(code); + if (StringUtils.isBlank(this.errMsg)) { + this.errMsg = MessageUtils.getMessage(this.code); + } + return this; + } + + /** + * 根据错误编码查询msg返回 + */ + public DhResult error(int code) { + this.code = code; + this.errMsg = EpmetErrorCode.getMsg(code); + if (StringUtils.isBlank(this.errMsg)) { + this.errMsg = MessageUtils.getMessage(this.code); + } + return this; + } + + /** + * 传入错误编码+msg返回 + */ + public DhResult error(int code, String msg) { + this.code = code; + this.errMsg = msg; + return this; + } + + /** + * + * @param msg + * @return 此方法废弃，统一使用 + * logger.error(XXXX); + * throw new RenException(XXXX); + * XXXX定义常量里 + */ + @Deprecated + public DhResult error(String msg) { + this.code = ErrorCode.INTERNAL_SERVER_ERROR; + this.errMsg = msg; + return this; + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getErrMsg() { + return errMsg; + } + + public void setErrMsg(String errMsg) { + this.errMsg = errMsg; + } + + public T getData() { + return data; + } + + public void setData(T data) { + this.data = data; + } + + public Boolean getSuccess() { + return success; + } + + public void setSuccess(Boolean success) { + this.success = success; + } + + @Override + public String toString() { + return JSON.toJSONString(this); + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/IDUtils.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/IDUtils.java new file mode 100644 index 0000000000..706be9231e --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/IDUtils.java @@ -0,0 +1,85 @@ +package com.epmet.util.dh; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Random; + +public class IDUtils { + public static String getIdNo(boolean male) { + //随机生成生日 1~99岁 + long begin = System.currentTimeMillis() - 3153600000000L;//100年内 + long end = System.currentTimeMillis() - 31536000000L; //1年内 + long rtn = begin + (long) (Math.random() * (end - begin)); + Date date = new Date(rtn); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd"); + String birth = simpleDateFormat.format(date); + return getIdNo(birth, male); + } + + public static String getIdNo(String birth, boolean male) { + StringBuilder sb = new StringBuilder(); + Random random = new Random(); + int value = random.nextInt(Cities.cities.length); + sb.append(Cities.cities[value]); + sb.append(birth); + value = random.nextInt(999) + 1; + if (male && value % 2 == 0) { + value++; + } + if (!male && value % 2 == 1) { + value++; + } + if (value >= 100) { + sb.append(value); + } else if (value >= 10) { + sb.append('0').append(value); + } else { + sb.append("00").append(value); + } + sb.append(calcTrailingNumber(sb)); + return sb.toString(); + } + + private static final int[] calcC = {7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2}; + private static final char[] calcR = {'1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2'}; + + private static char calcTrailingNumber(StringBuilder sb) { + int[] n = new int[17]; + int result = 0; + for (int i = 0; i < n.length; i++) { + n[i] = Integer.parseInt(String.valueOf(sb.charAt(i))); + } + for (int i = 0; i < n.length; i++) { + result += calcC[i] * n[i]; + } + return calcR[result % 11]; + } + + /** + * 根据身份证号判断用户性别 + * + * @param cardNo + * @return + */ + public static String getSex(String cardNo) { + String sexStr = "0"; + if (cardNo.length() == 15) { + sexStr = cardNo.substring(14, 15); + } else if (cardNo.length() == 18) { + sexStr = cardNo.substring(16, 17); + } + int sexNo = Integer.parseInt(sexStr); + return sexNo % 2 == 0 ? "女" : "男"; + } + +// public static void main(String[] args) { +// long a = System.currentTimeMillis(); +// System.out.println(getIdNo("19790306", true)); +// System.out.println(getIdNo("20100112", false)); +// System.out.println(getIdNo(true)); +// System.out.println(getIdNo(false)); +// a = System.currentTimeMillis() - a; +// System.out.println(a); +// } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/RSAUtils.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/RSAUtils.java new file mode 100644 index 0000000000..88a2752e03 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/RSAUtils.java @@ -0,0 +1,316 @@ +package com.epmet.util.dh; + +import cn.hutool.core.codec.Base64; +import org.bouncycastle.jce.provider.BouncyCastleProvider; + +import javax.crypto.Cipher; +import java.security.*; +import java.security.interfaces.RSAPrivateKey; +import java.security.interfaces.RSAPublicKey; +import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; +import java.util.HashMap; +import java.util.Map; + +/** + * + *

Title:RSAUtils

+ *

Description:RSA工具类

+ *

Company:浙江大华技术股份有限公司

+ * @author 32174 + * @date 2018年12月18日 + */ +public class RSAUtils{ + public static final String KEY_ALGORITHM = "RSA"; + public static final String SIGNATURE_ALGORITHM = "MD5withRSA"; + public static final String PADDING="RSA/None/PKCS1Padding"; + + private static final String PUBLIC_KEY = "RSAPublicKey"; + private static final String PRIVATE_KEY = "RSAPrivateKey"; + + private static final int KEY_SIZE = 1024; // 秘钥长度1024，最长加密117字节明文 + + static{ + Security.addProvider(new BouncyCastleProvider()); + } + /** + * 用私钥对信息生成数字签名 + * + * @param data + * 加密数据 + * @param privateKey + * 私钥 + * + * @return + * @throws Exception + */ + public static String sign(byte[] data, String privateKey) throws Exception { + // 解密由base64编码的私钥 + byte[] keyBytes = decryptBASE64(privateKey); + + // 构造PKCS8EncodedKeySpec对象 + PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(keyBytes); + + // KEY_ALGORITHM 指定的加密算法 + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + + // 取私钥匙对象 + PrivateKey priKey = keyFactory.generatePrivate(pkcs8KeySpec); + + // 用私钥对信息生成数字签名 + Signature signature = Signature.getInstance(SIGNATURE_ALGORITHM); + signature.initSign(priKey); + signature.update(data); + + return encryptBASE64(signature.sign()); + } + + /** + * BASE64加密 + * + * @param key + * @return + * @throws Exception + */ + public static String encryptBASE64(byte[] key) throws Exception { + return Base64Util.encodeBase64String(key); + } + + /** + * BASE64解密 + * + * @param key + * @return + * @throws Exception + */ + public static byte[] decryptBASE64(String key) throws Exception { + return Base64Util.decodeBase64(key.getBytes()); + } + + /** + * 校验数字签名 + * + * @param data + * 加密数据 + * @param publicKey + * 公钥 + * @param sign + * 数字签名 + * + * @return 校验成功返回true 失败返回false + * @throws Exception + * + */ + public static boolean verify(byte[] data, String publicKey, String sign) + throws Exception { + + // 解密由base64编码的公钥 + byte[] keyBytes = decryptBASE64(publicKey); + + // 构造X509EncodedKeySpec对象 + X509EncodedKeySpec keySpec = new X509EncodedKeySpec(keyBytes); + + // KEY_ALGORITHM 指定的加密算法 + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + + // 取公钥匙对象 + PublicKey pubKey = keyFactory.generatePublic(keySpec); + + Signature signature = Signature.getInstance(SIGNATURE_ALGORITHM); + signature.initVerify(pubKey); + signature.update(data); + + // 验证签名是否正常 + return signature.verify(decryptBASE64(sign)); + } + + /** + * 解密
+ * 用私钥解密 + * + * @param data + * @param key + * @return + * @throws Exception + */ + public static byte[] decryptByPrivateKey(byte[] data, String key) + throws Exception { + // 对密钥解密 + byte[] keyBytes = decryptBASE64(key); + + // 取得私钥 + PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(keyBytes); + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + Key privateKey = keyFactory.generatePrivate(pkcs8KeySpec); + + // 对数据解密 + Cipher cipher = Cipher.getInstance(PADDING , BouncyCastleProvider.PROVIDER_NAME); + cipher.init(Cipher.DECRYPT_MODE, privateKey); + + return cipher.doFinal(data); + } + + /** + * 解密
+ * 用公钥解密 + * + * @param data + * @param key + * @return + * @throws Exception + */ + public static byte[] decryptByPublicKey(byte[] data, String key) + throws Exception { + // 对密钥解密 + byte[] keyBytes = decryptBASE64(key); + + // 取得公钥 + X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(keyBytes); + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + Key publicKey = keyFactory.generatePublic(x509KeySpec); + + // 对数据解密 + Cipher cipher = Cipher.getInstance(PADDING , BouncyCastleProvider.PROVIDER_NAME); + cipher.init(Cipher.DECRYPT_MODE, publicKey); + + return cipher.doFinal(data); + } + + /** + * 加密
+ * 用公钥加密 + * + * @param data + * @param key + * @return + * @throws Exception + */ + public static byte[] encryptByPublicKey(byte[] data, String key) + throws Exception { + // 对公钥解密 + byte[] keyBytes = decryptBASE64(key); + + // 取得公钥 + X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(keyBytes); + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + Key publicKey = keyFactory.generatePublic(x509KeySpec); + + // 对数据加密 + Cipher cipher = Cipher.getInstance(PADDING , BouncyCastleProvider.PROVIDER_NAME); + cipher.init(Cipher.ENCRYPT_MODE, publicKey); + + return cipher.doFinal(data); + } + + /** + * 加密
+ * 用私钥加密 + * + * @param data + * @param key + * @return + * @throws Exception + */ + public static byte[] encryptByPrivateKey(byte[] data, String key) + throws Exception { + // 对密钥解密 + byte[] keyBytes = decryptBASE64(key); + + // 取得私钥 + PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(keyBytes); + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + Key privateKey = keyFactory.generatePrivate(pkcs8KeySpec); + + // 对数据加密 + Cipher cipher = Cipher.getInstance(PADDING , BouncyCastleProvider.PROVIDER_NAME); + cipher.init(Cipher.ENCRYPT_MODE, privateKey); + + return cipher.doFinal(data); + } + + /** + * 取得私钥(BASE64编码) + * + * @param keyMap + * @return + * @throws Exception + */ + public static String getPrivateKey(Map keyMap) + throws Exception { + Key key = (Key) keyMap.get(PRIVATE_KEY); + + return encryptBASE64(key.getEncoded()); + } + + /** + * 取得公钥(BASE64编码) + * + * @param keyMap + * @return + * @throws Exception + */ + public static String getPublicKey(Map keyMap) + throws Exception { + Key key = (Key) keyMap.get(PUBLIC_KEY); + + return encryptBASE64(key.getEncoded()); + } + + /** + * 判断字符串是否被公钥加密 + * @param text + * @param privateKey + * @return + */ + public static boolean isTextEncryptByPublicKey(String text , String privateKey){ + boolean bol = true; + try{ + byte[] encryBytes = RSAUtils.decryptBASE64(text); + RSAUtils.decryptByPrivateKey(encryBytes, privateKey); + }catch(Exception e){ + bol = false; + } + return bol; + } + + /** + * 初始化密钥 + * + * @return + * @throws Exception + */ + public static Map initKey() throws Exception { + KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance(KEY_ALGORITHM , BouncyCastleProvider.PROVIDER_NAME); + keyPairGen.initialize(KEY_SIZE , new SecureRandom()); + + KeyPair keyPair = keyPairGen.generateKeyPair(); + + // 公钥 + RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic(); + + // 私钥 + RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate(); + + Map keyMap = new HashMap(2); + + keyMap.put(PUBLIC_KEY, publicKey); + keyMap.put(PRIVATE_KEY, privateKey); + return keyMap; + } + + /** + * 密码加密 + * + * @param + * @return java.lang.String + * @author zhy + * @date 2022/7/29 10:46 + */ + public static String getPwdByRsa(String publicKey, String str) throws Exception { + byte[] decoded = Base64.decode(publicKey); + RSAPublicKey pubKey =(RSAPublicKey)KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(decoded));// RSA加密 + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.ENCRYPT_MODE, pubKey); + return Base64.encode(cipher.doFinal(str.getBytes("UTF-8"))); + } +} From 2dd241af518989222170e9fc3b1d71d171f4f87a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 18 Aug 2022 10:11:26 +0800 Subject: [PATCH 002/397] =?UTF-8?q?=E5=8D=A1=E7=89=87=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=8D=8A=E5=B9=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/util/dh/DhDeviceUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java index 8443275404..c46df703f3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java @@ -705,7 +705,7 @@ public class DhDeviceUtil { cardFormDTO.setCategory("0"); cardFormDTO.setCardStatus("ACTIVE"); cardFormDTO.setStartDate(LocalDate.now().toString()); - cardFormDTO.setEndDate(LocalDate.now().toString()); + cardFormDTO.setEndDate(LocalDate.now().plusDays(180L).toString()); String pwd; try { pwd = RSAUtils.getPwdByRsa(getPublicKey(), "123456"); From 47568e5f5dde220acd6ca4eb4eb6c1bbcd5ddf1b Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 18 Aug 2022 11:31:37 +0800 Subject: [PATCH 003/397] =?UTF-8?q?=E3=80=90=E6=8A=A5=E8=A1=A8=E3=80=91pc?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8D=95=E6=8A=A5=E8=A1=A8=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD-=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dtos/result/JiMuReportBriefResultDTO.java | 17 ++++ .../feigns/JiMuReportOpenFeignClient.java | 8 ++ .../JiMuReportOpenFeignClientFallback.java | 7 ++ .../impl/IcCustomerReportServiceImpl.java | 77 +++++++++++++------ 4 files changed, 87 insertions(+), 22 deletions(-) create mode 100644 epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/result/JiMuReportBriefResultDTO.java diff --git a/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/result/JiMuReportBriefResultDTO.java b/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/result/JiMuReportBriefResultDTO.java new file mode 100644 index 0000000000..be5f3df667 --- /dev/null +++ b/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/result/JiMuReportBriefResultDTO.java @@ -0,0 +1,17 @@ +package com.epmet.commons.feignclient.dtos.result; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 报表简要信息result dto + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class JiMuReportBriefResultDTO { + private String id; + private String code; + private String name; +} diff --git a/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/feigns/JiMuReportOpenFeignClient.java b/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/feigns/JiMuReportOpenFeignClient.java index 08b07c0dab..009c68c2c8 100644 --- a/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/feigns/JiMuReportOpenFeignClient.java +++ b/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/feigns/JiMuReportOpenFeignClient.java @@ -3,6 +3,7 @@ package com.epmet.commons.feignclient.feigns; import com.epmet.commons.feignclient.dtos.JiMuPage; import com.epmet.commons.feignclient.dtos.JiMuResult; import com.epmet.commons.feignclient.dtos.form.JimuReportExportRequestDTO; +import com.epmet.commons.feignclient.dtos.result.JiMuReportBriefResultDTO; import com.epmet.commons.feignclient.dtos.result.JiMuReportDetailResultDTO; import com.epmet.commons.feignclient.dtos.result.JimuReportDbDataResultDTO; import com.epmet.commons.feignclient.dtos.result.JimuReportFieldTreeResultDTO; @@ -44,4 +45,11 @@ public interface JiMuReportOpenFeignClient { @PostMapping("jmreport/exportAllExcelStream") Response exportAllExcelStream(JimuReportExportRequestDTO param); + + /** + * 报表简要信息 + * @return + */ + @GetMapping("jmreport/get/{report-id}") + JiMuResult getReportBrief(@PathVariable("report-id") String reportId); } diff --git a/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/feigns/fallback/JiMuReportOpenFeignClientFallback.java b/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/feigns/fallback/JiMuReportOpenFeignClientFallback.java index b1c793d560..9158a6858c 100644 --- a/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/feigns/fallback/JiMuReportOpenFeignClientFallback.java +++ b/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/feigns/fallback/JiMuReportOpenFeignClientFallback.java @@ -3,6 +3,7 @@ package com.epmet.commons.feignclient.feigns.fallback; import com.epmet.commons.feignclient.dtos.JiMuPage; import com.epmet.commons.feignclient.dtos.JiMuResult; import com.epmet.commons.feignclient.dtos.form.JimuReportExportRequestDTO; +import com.epmet.commons.feignclient.dtos.result.JiMuReportBriefResultDTO; import com.epmet.commons.feignclient.dtos.result.JiMuReportDetailResultDTO; import com.epmet.commons.feignclient.dtos.result.JimuReportDbDataResultDTO; import com.epmet.commons.feignclient.dtos.result.JimuReportFieldTreeResultDTO; @@ -48,4 +49,10 @@ public class JiMuReportOpenFeignClientFallback implements JiMuReportOpenFeignCli JiMuResult rst = new JiMuResult<>(false, "请求失败", 200, null,null); return rst; } + + @Override + public JiMuResult getReportBrief(String reportID) { + JiMuResult rst = new JiMuResult<>(false, "请求失败", 200, null,null); + return rst; + } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java index f88fd01ee9..27450721d8 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java @@ -9,10 +9,7 @@ import com.epmet.commons.feignclient.dtos.JiMuPage; import com.epmet.commons.feignclient.dtos.JiMuResult; import com.epmet.commons.feignclient.dtos.form.JiMuReportFormDTO; import com.epmet.commons.feignclient.dtos.form.JimuReportExportRequestDTO; -import com.epmet.commons.feignclient.dtos.result.JiMuReportDetailResultDTO; -import com.epmet.commons.feignclient.dtos.result.JiMuReportResultDTO; -import com.epmet.commons.feignclient.dtos.result.JimuReportDbDataResultDTO; -import com.epmet.commons.feignclient.dtos.result.JimuReportFieldTreeResultDTO; +import com.epmet.commons.feignclient.dtos.result.*; import com.epmet.commons.feignclient.feigns.JiMuReportOpenFeignClient; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.*; @@ -280,14 +277,18 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl>> fResult = jiMuReportOpenFeignClient.fieldTree(reportId); String datasourceId = fResult.getResult().get(0).get(0).getDbId(); - // 根据数据源ID查询数据源信息 + // 报表数据源信息 JiMuResult dbData = jiMuReportOpenFeignClient.loadDbData(datasourceId); JimuReportDbDataResultDTO.ReportDB reportDb = dbData.getResult().getReportDb(); + // 报表简要信息 + JiMuResult reportBriefResult = jiMuReportOpenFeignClient.getReportBrief(reportId); + JiMuReportBriefResultDTO reportBrief = reportBriefResult.getResult(); + // api的url String apiUrl = reportDb.getApiUrl(); // api方法 @@ -296,29 +297,34 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl ids = listIds(bizId, paramKey, apiUrl, isHttps, idFieldName); + HashMap idAndNames = listBizObjectIdAndName(bizId, paramKey, apiUrl, isHttps, idFieldName, nameFieldName); // 3. 然后以这一列作为查询条件，循环，继续调用该接口，得到单条数据，每一条数据都下载一个excel，最后将其打包为一个压缩包下载 Path storePath = makeTemporaryDownloadDir(reportId); // 4.生成压缩文件 - Path zipFile = downloadAndComppress(storePath, reportId, reportDb.getDbChName(), paramKey, ids); + Path zipFile = downloadAndComppress(storePath, reportId, reportBrief.getName(), paramKey, idAndNames); // 5.下载 try (FileInputStream fis = new FileInputStream(zipFile.toFile())) { @@ -342,10 +348,9 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl ids) { + private Path downloadAndComppress(Path storePath, String reportId, String reportName, String paramKey, HashMap idAndNames) { // 请求头 Map headers = new HashMap<>(); headers.put(Constant.AUTHORIZATION_HEADER, EpmetRequestHolder.getHeader(Constant.AUTHORIZATION_HEADER)); @@ -360,7 +365,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl files = new ArrayList<>(); + HashMap files = new HashMap<>(); String currentTimeStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss")); @@ -373,13 +378,15 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl> idParts = ListUtils.partition(ids, 100); + ArrayList idList = new ArrayList<>(); + idList.addAll(idAndNames.keySet()); + List> idParts = ListUtils.partition(idList, 100); // 1. 循环下载所有id对应的excel CountDownLatch cdl = new CountDownLatch(idParts.size()); for (List idPart : idParts) { CompletableFuture.runAsync(() -> { - downloadXlsByBatchByBizId(reportId, idPart, param, xlsxStorePath, files, cdl); + downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files, cdl); }, executorService); } @@ -397,9 +404,17 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl bizObjNameAndCount = new HashMap<>(32); + for (Map.Entry entry : files.entrySet()) { + String bizObjectId = entry.getKey(); + File file = entry.getValue(); + + String bizObjName = idAndNames.get(bizObjectId); + + bizObjName = getBizObjName(bizObjNameAndCount, bizObjName); + try (final FileInputStream fis = new FileInputStream(file.getAbsolutePath())) { - zos.putNextEntry(new ZipEntry(reportName + "_" + currentTimeStr + "/" + file.getName())); + zos.putNextEntry(new ZipEntry(String.format("%s_%s/%s_%s.xlsx", reportName, currentTimeStr, reportName, bizObjName))); final byte[] buffer = new byte[10240]; for (int len; (len = fis.read(buffer)) > 0; ) { zos.write(buffer, 0, len); @@ -421,6 +436,22 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl bizObjNameAndCount, String bizObjName) { + Integer nameCount = bizObjNameAndCount.get(bizObjName); + if (nameCount == null) { + nameCount = 1; + bizObjNameAndCount.put(bizObjName, nameCount); + } else { + bizObjNameAndCount.put(bizObjName, ++nameCount); + } + + if (nameCount > 1) { + bizObjName = String.format("%s(%d)", bizObjName, nameCount); + } + + return bizObjName; + } + /** * 批量下载xlsx * @param reportId @@ -429,7 +460,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl bizIds, JimuReportExportRequestDTO param, Path xlsxStorePath, ArrayList files, + public void downloadXlsByBatchByBizId(String reportId, List bizIds, Map idAndNames, JimuReportExportRequestDTO param, Path xlsxStorePath, Map files, CountDownLatch cdl) { for (String id : bizIds) { @@ -456,7 +487,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl listIds(String id, String paramKey, String apiUrl, boolean isHttps, String idFieldName) { + public HashMap listBizObjectIdAndName(String id, String paramKey, String apiUrl, boolean isHttps, String idFieldName, String nameFieldName) { apiUrl = apiUrl.replace("'${id}'", id == null ? "" : id); apiUrl = apiUrl.replace("'${paramKey}'", paramKey); @@ -526,7 +557,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl ids = new ArrayList<>(); + HashMap idAndNames = new HashMap<>(); if (data instanceof JSONObject) { // 这种可能是pageData的 @@ -539,8 +570,10 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl it = array.listIterator(); it.hasNext(); ) { JSONObject e = (JSONObject) it.next(); - ids.add(e.getString(idFieldName)); + String idValue = e.getString(idFieldName); + String nameValue = e.getString(nameFieldName); + idAndNames.put(idValue, nameValue); } - return ids; + return idAndNames; } } \ No newline at end of file From c47157141f9a24f838df8da3dd611fd4ff502c0c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 18 Aug 2022 12:55:04 +0800 Subject: [PATCH 004/397] =?UTF-8?q?=E3=80=90=E6=8A=A5=E8=A1=A8=E3=80=91pc?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8D=95=E6=8A=A5=E8=A1=A8=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD-=E7=94=B1=E4=BA=8E=E7=A7=AF=E6=9C=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8F=96=E6=B6=88=E5=A4=9A=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcCustomerReportServiceImpl.java | 76 ++++++++++++------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java index 27450721d8..4f6277d886 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java @@ -55,8 +55,6 @@ import java.nio.file.Path; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -279,20 +277,29 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl>> fResult = jiMuReportOpenFeignClient.fieldTree(reportId); + if (fResult == null || !fResult.isSuccess()) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "根据报表id未找到字段列表,报表ID：" + reportId, "根据报表id未找到字段列表,报表ID：" + reportId); + } String datasourceId = fResult.getResult().get(0).get(0).getDbId(); // 报表数据源信息 JiMuResult dbData = jiMuReportOpenFeignClient.loadDbData(datasourceId); + if (fResult == null || !fResult.isSuccess()) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "根据报表id未找到数据源,报表ID：" + reportId, "根据报表id未找到数据源,报表ID：" + reportId); + } JimuReportDbDataResultDTO.ReportDB reportDb = dbData.getResult().getReportDb(); // 报表简要信息 JiMuResult reportBriefResult = jiMuReportOpenFeignClient.getReportBrief(reportId); + if (fResult == null || !fResult.isSuccess()) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "根据报表id未找到报表信息,报表ID：" + reportId, "根据报表id未找到报表信息,报表ID：" + reportId); + } JiMuReportBriefResultDTO reportBrief = reportBriefResult.getResult(); // api的url String apiUrl = reportDb.getApiUrl(); // api方法 - //String apiMethod = reportDb.getApiMethod(); + String apiMethod = reportDb.getApiMethod(); // 是否是集合 //String isList = reportDb.getIsList(); // 返回的列表中，哪个字段是ID @@ -318,13 +325,13 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl idAndNames = listBizObjectIdAndName(bizId, paramKey, apiUrl, isHttps, idFieldName, nameFieldName); + HashMap idAndNames = listBizObjectIdAndName(bizId, paramKey, apiUrl, isHttps, idFieldName, nameFieldName, apiMethod); // 3. 然后以这一列作为查询条件，循环，继续调用该接口，得到单条数据，每一条数据都下载一个excel，最后将其打包为一个压缩包下载 Path storePath = makeTemporaryDownloadDir(reportId); // 4.生成压缩文件 - Path zipFile = downloadAndComppress(storePath, reportId, reportBrief.getName(), paramKey, idAndNames); + Path zipFile = downloadAndCompress(storePath, reportId, reportBrief.getName(), paramKey, idAndNames); // 5.下载 try (FileInputStream fis = new FileInputStream(zipFile.toFile())) { @@ -350,7 +357,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl idAndNames) { + private Path downloadAndCompress(Path storePath, String reportId, String reportName, String paramKey, HashMap idAndNames) { // 请求头 Map headers = new HashMap<>(); headers.put(Constant.AUTHORIZATION_HEADER, EpmetRequestHolder.getHeader(Constant.AUTHORIZATION_HEADER)); @@ -382,21 +389,22 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl> idParts = ListUtils.partition(idList, 100); - // 1. 循环下载所有id对应的excel - CountDownLatch cdl = new CountDownLatch(idParts.size()); + // 1. 循环下载所有id对应的excel（积木报表的导出接口有并发问题，多线程会导出空表，暂时不用多线程了） + //CountDownLatch cdl = new CountDownLatch(idParts.size()); for (List idPart : idParts) { - CompletableFuture.runAsync(() -> { - downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files, cdl); - }, executorService); + downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files); + //CompletableFuture.runAsync(() -> { + // downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files, cdl); + //}, executorService); } // 等待多线程执行完成，再执行打包 - try { - cdl.await(); - } catch (InterruptedException e) { - log.error(ExceptionUtils.getErrorStackTrace(e)); - throw new EpmetException("【报表批量导出】CountDownLatch等待被中断"); - } + //try { + // cdl.await(); + //} catch (InterruptedException e) { + // log.error(ExceptionUtils.getErrorStackTrace(e)); + // throw new EpmetException("【报表批量导出】CountDownLatch等待被中断"); + //} // 2,打包 Path zipFile = storePath.resolve(reportName + "_" + currentTimeStr + ".zip"); @@ -409,11 +417,9 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl 0; ) { @@ -436,7 +442,13 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl bizObjNameAndCount, String bizObjName) { + /** + * 为业务对象名称编号，解决重名对象问题 + * @param bizObjNameAndCount 业务对象名称/出现次数map + * @param bizObjName 原始业务对象名 + * @return + */ + public String getNumberedObjName(HashMap bizObjNameAndCount, String bizObjName) { Integer nameCount = bizObjNameAndCount.get(bizObjName); if (nameCount == null) { nameCount = 1; @@ -460,8 +472,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl bizIds, Map idAndNames, JimuReportExportRequestDTO param, Path xlsxStorePath, Map files, - CountDownLatch cdl) { + public void downloadXlsByBatchByBizId(String reportId, List bizIds, Map idAndNames, JimuReportExportRequestDTO param, Path xlsxStorePath, Map files) { for (String id : bizIds) { try { @@ -495,7 +506,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl listBizObjectIdAndName(String id, String paramKey, String apiUrl, boolean isHttps, String idFieldName, String nameFieldName) { + public HashMap listBizObjectIdAndName(String id, String paramKey, String apiUrl, boolean isHttps, String idFieldName, String nameFieldName, String apiMethod) { apiUrl = apiUrl.replace("'${id}'", id == null ? "" : id); apiUrl = apiUrl.replace("'${paramKey}'", paramKey); Map headers = new HashMap<>(); headers.put(Constant.AUTHORIZATION_HEADER, EpmetRequestHolder.getHeader(Constant.AUTHORIZATION_HEADER)); - Result stringResult = HttpClientManager.getInstance().sendPost(apiUrl, isHttps, "{\"id\":" + id + "}", headers); + + Result stringResult; + // 请求方法0-get,1-post + if (NumConstant.ONE_STR.equals(apiMethod)) { + stringResult = HttpClientManager.getInstance().sendPost(apiUrl, isHttps, "{\"id\":\"" + (id == null ? "" : id) + "\"}", headers); + } else { + stringResult = HttpClientManager.getInstance().sendGet(apiUrl, isHttps, null, headers); + } JSONObject dataJsonObject = JSON.parseObject(stringResult.getData()); Object data = dataJsonObject.get("data"); - JSONArray array = new JSONArray(); + JSONArray array; HashMap idAndNames = new HashMap<>(); if (data instanceof JSONObject) { From 6167d22a66a10684afa75840bb17cfb9028222cf Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 18 Aug 2022 12:58:40 +0800 Subject: [PATCH 005/397] =?UTF-8?q?=E3=80=90=E6=8A=A5=E8=A1=A8=E3=80=91pc?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8D=95=E6=8A=A5=E8=A1=A8=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD-=E7=94=B1=E4=BA=8E=E7=A7=AF=E6=9C=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8F=96=E6=B6=88=E5=A4=9A=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcCustomerReportServiceImpl.java | 76 +++++++------------ 1 file changed, 29 insertions(+), 47 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java index 4f6277d886..27450721d8 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java @@ -55,6 +55,8 @@ import java.nio.file.Path; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -277,29 +279,20 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl>> fResult = jiMuReportOpenFeignClient.fieldTree(reportId); - if (fResult == null || !fResult.isSuccess()) { - throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "根据报表id未找到字段列表,报表ID：" + reportId, "根据报表id未找到字段列表,报表ID：" + reportId); - } String datasourceId = fResult.getResult().get(0).get(0).getDbId(); // 报表数据源信息 JiMuResult dbData = jiMuReportOpenFeignClient.loadDbData(datasourceId); - if (fResult == null || !fResult.isSuccess()) { - throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "根据报表id未找到数据源,报表ID：" + reportId, "根据报表id未找到数据源,报表ID：" + reportId); - } JimuReportDbDataResultDTO.ReportDB reportDb = dbData.getResult().getReportDb(); // 报表简要信息 JiMuResult reportBriefResult = jiMuReportOpenFeignClient.getReportBrief(reportId); - if (fResult == null || !fResult.isSuccess()) { - throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "根据报表id未找到报表信息,报表ID：" + reportId, "根据报表id未找到报表信息,报表ID：" + reportId); - } JiMuReportBriefResultDTO reportBrief = reportBriefResult.getResult(); // api的url String apiUrl = reportDb.getApiUrl(); // api方法 - String apiMethod = reportDb.getApiMethod(); + //String apiMethod = reportDb.getApiMethod(); // 是否是集合 //String isList = reportDb.getIsList(); // 返回的列表中，哪个字段是ID @@ -325,13 +318,13 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl idAndNames = listBizObjectIdAndName(bizId, paramKey, apiUrl, isHttps, idFieldName, nameFieldName, apiMethod); + HashMap idAndNames = listBizObjectIdAndName(bizId, paramKey, apiUrl, isHttps, idFieldName, nameFieldName); // 3. 然后以这一列作为查询条件，循环，继续调用该接口，得到单条数据，每一条数据都下载一个excel，最后将其打包为一个压缩包下载 Path storePath = makeTemporaryDownloadDir(reportId); // 4.生成压缩文件 - Path zipFile = downloadAndCompress(storePath, reportId, reportBrief.getName(), paramKey, idAndNames); + Path zipFile = downloadAndComppress(storePath, reportId, reportBrief.getName(), paramKey, idAndNames); // 5.下载 try (FileInputStream fis = new FileInputStream(zipFile.toFile())) { @@ -357,7 +350,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl idAndNames) { + private Path downloadAndComppress(Path storePath, String reportId, String reportName, String paramKey, HashMap idAndNames) { // 请求头 Map headers = new HashMap<>(); headers.put(Constant.AUTHORIZATION_HEADER, EpmetRequestHolder.getHeader(Constant.AUTHORIZATION_HEADER)); @@ -389,22 +382,21 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl> idParts = ListUtils.partition(idList, 100); - // 1. 循环下载所有id对应的excel（积木报表的导出接口有并发问题，多线程会导出空表，暂时不用多线程了） - //CountDownLatch cdl = new CountDownLatch(idParts.size()); + // 1. 循环下载所有id对应的excel + CountDownLatch cdl = new CountDownLatch(idParts.size()); for (List idPart : idParts) { - downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files); - //CompletableFuture.runAsync(() -> { - // downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files, cdl); - //}, executorService); + CompletableFuture.runAsync(() -> { + downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files, cdl); + }, executorService); } // 等待多线程执行完成，再执行打包 - //try { - // cdl.await(); - //} catch (InterruptedException e) { - // log.error(ExceptionUtils.getErrorStackTrace(e)); - // throw new EpmetException("【报表批量导出】CountDownLatch等待被中断"); - //} + try { + cdl.await(); + } catch (InterruptedException e) { + log.error(ExceptionUtils.getErrorStackTrace(e)); + throw new EpmetException("【报表批量导出】CountDownLatch等待被中断"); + } // 2,打包 Path zipFile = storePath.resolve(reportName + "_" + currentTimeStr + ".zip"); @@ -417,9 +409,11 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl 0; ) { @@ -442,13 +436,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl bizObjNameAndCount, String bizObjName) { + public String getBizObjName(HashMap bizObjNameAndCount, String bizObjName) { Integer nameCount = bizObjNameAndCount.get(bizObjName); if (nameCount == null) { nameCount = 1; @@ -472,7 +460,8 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl bizIds, Map idAndNames, JimuReportExportRequestDTO param, Path xlsxStorePath, Map files) { + public void downloadXlsByBatchByBizId(String reportId, List bizIds, Map idAndNames, JimuReportExportRequestDTO param, Path xlsxStorePath, Map files, + CountDownLatch cdl) { for (String id : bizIds) { try { @@ -506,7 +495,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl listBizObjectIdAndName(String id, String paramKey, String apiUrl, boolean isHttps, String idFieldName, String nameFieldName, String apiMethod) { + public HashMap listBizObjectIdAndName(String id, String paramKey, String apiUrl, boolean isHttps, String idFieldName, String nameFieldName) { apiUrl = apiUrl.replace("'${id}'", id == null ? "" : id); apiUrl = apiUrl.replace("'${paramKey}'", paramKey); Map headers = new HashMap<>(); headers.put(Constant.AUTHORIZATION_HEADER, EpmetRequestHolder.getHeader(Constant.AUTHORIZATION_HEADER)); - - Result stringResult; - // 请求方法0-get,1-post - if (NumConstant.ONE_STR.equals(apiMethod)) { - stringResult = HttpClientManager.getInstance().sendPost(apiUrl, isHttps, "{\"id\":\"" + (id == null ? "" : id) + "\"}", headers); - } else { - stringResult = HttpClientManager.getInstance().sendGet(apiUrl, isHttps, null, headers); - } + Result stringResult = HttpClientManager.getInstance().sendPost(apiUrl, isHttps, "{\"id\":" + id + "}", headers); JSONObject dataJsonObject = JSON.parseObject(stringResult.getData()); Object data = dataJsonObject.get("data"); - JSONArray array; + JSONArray array = new JSONArray(); HashMap idAndNames = new HashMap<>(); if (data instanceof JSONObject) { From 9d8f2da056eb3baea5d1548cecdfaad2a0527c20 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 18 Aug 2022 13:01:38 +0800 Subject: [PATCH 006/397] =?UTF-8?q?=E3=80=90=E6=8A=A5=E8=A1=A8=E3=80=91pc?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8D=95=E6=8A=A5=E8=A1=A8=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD-=E7=94=B1=E4=BA=8E=E7=A7=AF=E6=9C=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8F=96=E6=B6=88=E5=A4=9A=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcCustomerReportServiceImpl.java | 76 ++++++++++++------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java index 27450721d8..4f6277d886 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java @@ -55,8 +55,6 @@ import java.nio.file.Path; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -279,20 +277,29 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl>> fResult = jiMuReportOpenFeignClient.fieldTree(reportId); + if (fResult == null || !fResult.isSuccess()) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "根据报表id未找到字段列表,报表ID：" + reportId, "根据报表id未找到字段列表,报表ID：" + reportId); + } String datasourceId = fResult.getResult().get(0).get(0).getDbId(); // 报表数据源信息 JiMuResult dbData = jiMuReportOpenFeignClient.loadDbData(datasourceId); + if (fResult == null || !fResult.isSuccess()) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "根据报表id未找到数据源,报表ID：" + reportId, "根据报表id未找到数据源,报表ID：" + reportId); + } JimuReportDbDataResultDTO.ReportDB reportDb = dbData.getResult().getReportDb(); // 报表简要信息 JiMuResult reportBriefResult = jiMuReportOpenFeignClient.getReportBrief(reportId); + if (fResult == null || !fResult.isSuccess()) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "根据报表id未找到报表信息,报表ID：" + reportId, "根据报表id未找到报表信息,报表ID：" + reportId); + } JiMuReportBriefResultDTO reportBrief = reportBriefResult.getResult(); // api的url String apiUrl = reportDb.getApiUrl(); // api方法 - //String apiMethod = reportDb.getApiMethod(); + String apiMethod = reportDb.getApiMethod(); // 是否是集合 //String isList = reportDb.getIsList(); // 返回的列表中，哪个字段是ID @@ -318,13 +325,13 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl idAndNames = listBizObjectIdAndName(bizId, paramKey, apiUrl, isHttps, idFieldName, nameFieldName); + HashMap idAndNames = listBizObjectIdAndName(bizId, paramKey, apiUrl, isHttps, idFieldName, nameFieldName, apiMethod); // 3. 然后以这一列作为查询条件，循环，继续调用该接口，得到单条数据，每一条数据都下载一个excel，最后将其打包为一个压缩包下载 Path storePath = makeTemporaryDownloadDir(reportId); // 4.生成压缩文件 - Path zipFile = downloadAndComppress(storePath, reportId, reportBrief.getName(), paramKey, idAndNames); + Path zipFile = downloadAndCompress(storePath, reportId, reportBrief.getName(), paramKey, idAndNames); // 5.下载 try (FileInputStream fis = new FileInputStream(zipFile.toFile())) { @@ -350,7 +357,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl idAndNames) { + private Path downloadAndCompress(Path storePath, String reportId, String reportName, String paramKey, HashMap idAndNames) { // 请求头 Map headers = new HashMap<>(); headers.put(Constant.AUTHORIZATION_HEADER, EpmetRequestHolder.getHeader(Constant.AUTHORIZATION_HEADER)); @@ -382,21 +389,22 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl> idParts = ListUtils.partition(idList, 100); - // 1. 循环下载所有id对应的excel - CountDownLatch cdl = new CountDownLatch(idParts.size()); + // 1. 循环下载所有id对应的excel（积木报表的导出接口有并发问题，多线程会导出空表，暂时不用多线程了） + //CountDownLatch cdl = new CountDownLatch(idParts.size()); for (List idPart : idParts) { - CompletableFuture.runAsync(() -> { - downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files, cdl); - }, executorService); + downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files); + //CompletableFuture.runAsync(() -> { + // downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files, cdl); + //}, executorService); } // 等待多线程执行完成，再执行打包 - try { - cdl.await(); - } catch (InterruptedException e) { - log.error(ExceptionUtils.getErrorStackTrace(e)); - throw new EpmetException("【报表批量导出】CountDownLatch等待被中断"); - } + //try { + // cdl.await(); + //} catch (InterruptedException e) { + // log.error(ExceptionUtils.getErrorStackTrace(e)); + // throw new EpmetException("【报表批量导出】CountDownLatch等待被中断"); + //} // 2,打包 Path zipFile = storePath.resolve(reportName + "_" + currentTimeStr + ".zip"); @@ -409,11 +417,9 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl 0; ) { @@ -436,7 +442,13 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl bizObjNameAndCount, String bizObjName) { + /** + * 为业务对象名称编号，解决重名对象问题 + * @param bizObjNameAndCount 业务对象名称/出现次数map + * @param bizObjName 原始业务对象名 + * @return + */ + public String getNumberedObjName(HashMap bizObjNameAndCount, String bizObjName) { Integer nameCount = bizObjNameAndCount.get(bizObjName); if (nameCount == null) { nameCount = 1; @@ -460,8 +472,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl bizIds, Map idAndNames, JimuReportExportRequestDTO param, Path xlsxStorePath, Map files, - CountDownLatch cdl) { + public void downloadXlsByBatchByBizId(String reportId, List bizIds, Map idAndNames, JimuReportExportRequestDTO param, Path xlsxStorePath, Map files) { for (String id : bizIds) { try { @@ -495,7 +506,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl listBizObjectIdAndName(String id, String paramKey, String apiUrl, boolean isHttps, String idFieldName, String nameFieldName) { + public HashMap listBizObjectIdAndName(String id, String paramKey, String apiUrl, boolean isHttps, String idFieldName, String nameFieldName, String apiMethod) { apiUrl = apiUrl.replace("'${id}'", id == null ? "" : id); apiUrl = apiUrl.replace("'${paramKey}'", paramKey); Map headers = new HashMap<>(); headers.put(Constant.AUTHORIZATION_HEADER, EpmetRequestHolder.getHeader(Constant.AUTHORIZATION_HEADER)); - Result stringResult = HttpClientManager.getInstance().sendPost(apiUrl, isHttps, "{\"id\":" + id + "}", headers); + + Result stringResult; + // 请求方法0-get,1-post + if (NumConstant.ONE_STR.equals(apiMethod)) { + stringResult = HttpClientManager.getInstance().sendPost(apiUrl, isHttps, "{\"id\":\"" + (id == null ? "" : id) + "\"}", headers); + } else { + stringResult = HttpClientManager.getInstance().sendGet(apiUrl, isHttps, null, headers); + } JSONObject dataJsonObject = JSON.parseObject(stringResult.getData()); Object data = dataJsonObject.get("data"); - JSONArray array = new JSONArray(); + JSONArray array; HashMap idAndNames = new HashMap<>(); if (data instanceof JSONObject) { From 799721ec86e6b1d54ba1b00b0b311582a84dbaad Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 18 Aug 2022 13:30:43 +0800 Subject: [PATCH 007/397] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E8=AE=BF=E5=AE=A2?= =?UTF-8?q?=E5=B9=B4=E9=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/util/dh/DhDeviceUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java index c46df703f3..ad47177cec 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java @@ -73,7 +73,7 @@ public class DhDeviceUtil { */ public void sendAuth(VisitVisitorFormDTO dto) { if (StringUtils.isBlank(dto.getIdCard())) { - dto.setIdCard(IDUtils.getIdNo(true)); + dto.setIdCard(IDUtils.getIdNo("19010101", true)); } DhPersonFormDTO formDTO = new DhPersonFormDTO(); From 8a81c9c9ecd8f50d0813fb881e8f6794c7c37f63 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 18 Aug 2022 13:49:49 +0800 Subject: [PATCH 008/397] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/SaveCollectVisitorFormDTO.java | 7 ------- .../resources/db/migration/V0.0.65__resi_collect_alter.sql | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.65__resi_collect_alter.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/SaveCollectVisitorFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/SaveCollectVisitorFormDTO.java index 2f7c71dfd8..0ec81f30ff 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/SaveCollectVisitorFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/SaveCollectVisitorFormDTO.java @@ -52,43 +52,36 @@ public class SaveCollectVisitorFormDTO implements Serializable { /** * 所属楼宇Id */ - @NotBlank(message = "楼宇Id不能为空") private String buildId; /** * 所属楼宇名称 */ - @NotBlank(message = "楼宇名称不能为空") private String buildName; /** * 单元id */ - @NotBlank(message = "单元id不能为空") private String unitId; /** * 单元名 */ - @NotBlank(message = "单元名不能为空") private String unitName; /** * 所属家庭Id */ - @NotBlank(message = "家庭Id不能为空") private String homeId; /** * 房间名 */ - @NotBlank(message = "房间名不能为空") private String homeName; /** * 详细地址 */ - @NotBlank(message = "家庭地址不能为空") private String address; /** diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.65__resi_collect_alter.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.65__resi_collect_alter.sql new file mode 100644 index 0000000000..32b3ec3d59 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.65__resi_collect_alter.sql @@ -0,0 +1 @@ +ALTER TABLE epmet_user.ic_resi_collect_visitor MODIFY COLUMN ADDRESS varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '详细地址'; From cfbc5396d428a81f8ed1bf0ed7f5098272daaa6b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 18 Aug 2022 14:45:28 +0800 Subject: [PATCH 009/397] =?UTF-8?q?=E9=98=B2=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/util/dh/DhDeviceUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java index ad47177cec..9d8d52149f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java @@ -9,6 +9,7 @@ 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.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.dto.DhTokenDTO; import com.epmet.dto.form.*; @@ -26,6 +27,7 @@ import java.awt.image.BufferedImage; import java.io.*; import java.math.BigDecimal; import java.net.URL; +import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.*; @@ -73,7 +75,7 @@ public class DhDeviceUtil { */ public void sendAuth(VisitVisitorFormDTO dto) { if (StringUtils.isBlank(dto.getIdCard())) { - dto.setIdCard(IDUtils.getIdNo("19010101", true)); + dto.setIdCard(IDUtils.getIdNo(new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(new Date()), true)); } DhPersonFormDTO formDTO = new DhPersonFormDTO(); From 297abded3c5c378cd7e120ccb2a440c2a736bd64 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 18 Aug 2022 15:30:02 +0800 Subject: [PATCH 010/397] =?UTF-8?q?=E6=9C=89=E5=A4=B4=E5=83=8F=E6=89=8D?= =?UTF-8?q?=E4=B8=8B=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiCollectServiceImpl.java | 16 +++++++++------- .../impl/IcResiCollectVisitorServiceImpl.java | 14 ++++++++------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index b2a3406576..0461ce2cba 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -189,13 +189,15 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl{ - VisitVisitorFormDTO visitor = new VisitVisitorFormDTO(); - visitor.setIdCard(item.getIdNum()); - visitor.setMobile(item.getMobile()); - visitor.setName(item.getName()); - visitor.setFaceImg(item.getFaceImg()); - dhDeviceUtil.sendAuth(visitor); + formDTO.getMemberList().forEach(item -> { + if (StringUtils.isNotBlank(item.getFaceImg())) { + VisitVisitorFormDTO visitor = new VisitVisitorFormDTO(); + visitor.setIdCard(item.getIdNum()); + visitor.setMobile(item.getMobile()); + visitor.setName(item.getName()); + visitor.setFaceImg(item.getFaceImg()); + dhDeviceUtil.sendAuth(visitor); + } }); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java index 1be91e180b..2dccca05b0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java @@ -64,6 +64,7 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl getVisitorList(VisitListFormDTO formDTO) { PageData result = new PageData<>(new ArrayList<>(), 0); - if (StringUtils.isBlank(formDTO.getStartTime()) && StringUtils.isBlank(formDTO.getEndTime()) ){ + if (StringUtils.isBlank(formDTO.getStartTime()) && StringUtils.isBlank(formDTO.getEndTime())) { CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); - if (null == staffInfo){ - throw new EpmetException("查询人员信息失败"+formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException("查询人员信息失败" + formDTO.getUserId()); } formDTO.setOrgId(staffInfo.getAgencyId()); } @@ -103,8 +105,8 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + 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); @@ -153,7 +155,7 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl Date: Thu, 18 Aug 2022 16:20:44 +0800 Subject: [PATCH 011/397] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/partymember/dto/IcPartyActDTO.java | 180 ++++++++++++++++++ .../partymember/dto/IcPartyActOrgDTO.java | 84 ++++++++ .../dto/IcPartyActSignInRecordDTO.java | 94 +++++++++ .../resi/partymember/dto/IcScheduleDTO.java | 99 ++++++++++ .../controller/IcPartyActController.java | 70 +++++++ .../controller/IcPartyActOrgController.java | 70 +++++++ .../IcPartyActSignInRecordController.java | 70 +++++++ .../controller/IcScheduleController.java | 70 +++++++ .../modules/partyOrg/dao/IcPartyActDao.java | 16 ++ .../partyOrg/dao/IcPartyActOrgDao.java | 16 ++ .../dao/IcPartyActSignInRecordDao.java | 16 ++ .../modules/partyOrg/dao/IcScheduleDao.java | 16 ++ .../partyOrg/entity/IcPartyActEntity.java | 149 +++++++++++++++ .../partyOrg/entity/IcPartyActOrgEntity.java | 54 ++++++ .../entity/IcPartyActSignInRecordEntity.java | 64 +++++++ .../partyOrg/entity/IcScheduleEntity.java | 69 +++++++ .../service/IcPartyActOrgService.java | 78 ++++++++ .../partyOrg/service/IcPartyActService.java | 78 ++++++++ .../IcPartyActSignInRecordService.java | 78 ++++++++ .../partyOrg/service/IcScheduleService.java | 78 ++++++++ .../impl/IcPartyActOrgServiceImpl.java | 82 ++++++++ .../service/impl/IcPartyActServiceImpl.java | 82 ++++++++ .../IcPartyActSignInRecordServiceImpl.java | 82 ++++++++ .../service/impl/IcScheduleServiceImpl.java | 82 ++++++++ .../mapper/partyOrg/IcPartyActDao.xml | 6 + .../mapper/partyOrg/IcPartyActOrgDao.xml | 6 + .../partyOrg/IcPartyActSignInRecordDao.xml | 6 + .../mapper/partyOrg/IcScheduleDao.xml | 6 + 28 files changed, 1801 insertions(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActOrgDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActSignInRecordDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcScheduleDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActSignInRecordEntity.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcScheduleEntity.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java new file mode 100644 index 0000000000..bc0c26dda9 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java @@ -0,0 +1,180 @@ +package com.epmet.resi.partymember.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 党建组织活动 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Data +public class IcPartyActDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 组织ID：当前工作人员所属组织id + */ + private String orgId; + + /** + * 组织ID的上级；如果org_id是根组织，那此列=0 + */ + private String pid; + + /** + * ORG_ID全路径，包含自身 + */ + private String orgIdPath; + + /** + * 发布活动党组织 + */ + private String publishPartyOrgId; + + /** + * 发布活动党组织名称 + */ + private String publishPartyOrgName; + + /** + * 参加活动党组织ID的上级节点 + */ + private String publishOrgPid; + + /** + * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + private String publishOrgType; + + /** + * PARTY_ORG_ID的全路径，包含自身。方便前端回显 + */ + private String publishOrgPath; + + /** + * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动； + */ + private String actType; + + /** + * 活动举办时间：yyyy + */ + private String holdYearId; + + /** + * 活动举办时间:yyyyMM + */ + private String holdMonthId; + + /** + * 举办活动时间 + */ + private Date holdTime; + + /** + * 活动主题 + */ + private String topic; + + /** + * 活动地点 + */ + private String address; + + /** + * 活动地点纬度 + */ + private String latitude; + + /** + * 活动地点经度 + */ + private String longitude; + + /** + * 活动开始前几天 + */ + private Integer autoPublicType; + + /** + * 自动发布时间，保存时算好时间存在这里 + */ + private Date autoPublicTime; + + /** + * 参加人员类型，0：全体党员；1：支部委员 + */ + private String joinUserType; + + /** + * 是否自动通知参加人员，0否；1是 + */ + private String isAutoInform; + + /** + * 活动介绍 + */ + private String introduce; + + /** + * 是否发布，0未发布；1已发布； + */ + private String isPublic; + + /** + * 活动发布人 + */ + private String publishStaffId; + + /** + * 活动发布人姓名 + */ + private String publishStaffName; + + /** + * 0未删除；1：已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActOrgDTO.java new file mode 100644 index 0000000000..0bfc7c123b --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActOrgDTO.java @@ -0,0 +1,84 @@ +package com.epmet.resi.partymember.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 参加活动党组织表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Data +public class IcPartyActOrgDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 活动id + */ + private String icPartyActId; + + /** + * 客户ID + */ + private String customerId; + + /** + * 参加活动党组织ID,groupId + */ + private String joinOrgId; + + /** + * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + private String orgType; + + /** + * 参加活动党组织ID的上级节点 + */ + private String pid; + + /** + * PARTY_ORG_ID的全路径，包含自身。方便前端回显 + */ + private String joinOrgPath; + + /** + * 0：未删除；1：已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActSignInRecordDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActSignInRecordDTO.java new file mode 100644 index 0000000000..8800ba1170 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActSignInRecordDTO.java @@ -0,0 +1,94 @@ +package com.epmet.resi.partymember.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 党组织活动签到记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Data +public class IcPartyActSignInRecordDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * 活动id + */ + private String icPartyActId; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 签到用户id + */ + private String epmetUserId; + + /** + * 签到用户姓名 + */ + private String userRealName; + + /** + * 签到地点 + */ + private String address; + + /** + * 签到地点纬度 + */ + private String latitude; + + /** + * 签到地点经度 + */ + private String longitude; + + /** + * 0：未删除；1：已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcScheduleDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcScheduleDTO.java new file mode 100644 index 0000000000..bf27e821bd --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcScheduleDTO.java @@ -0,0 +1,99 @@ +package com.epmet.resi.partymember.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 日程表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Data +public class IcScheduleDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 所属行政组织ID：当前工作人员所属组织id + */ + private String orgId; + + /** + * 组织ID的上级；如果org_id是根组织，那此列=0 + */ + private String pid; + + /** + * ORG_ID全路径，包含自身 + */ + private String orgIdPath; + + /** + * 当前登录用户userId + */ + private String staffId; + + /** + * 日程标题（35字） + */ + private String title; + + /** + * 提醒时间；其实就是日程所属日期 + */ + private Date remindTime; + + /** + * 是否公开，0：仅自己可见；1：组织内其他人可见 + */ + private String isPublic; + + /** + * 备注（500字） + */ + private String remark; + + /** + * 0：未删除；1已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java new file mode 100644 index 0000000000..edf1438c73 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -0,0 +1,70 @@ +package com.epmet.modules.partyOrg.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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.modules.partyOrg.service.IcPartyActService; +import com.epmet.resi.partymember.dto.IcPartyActDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 党建组织活动 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@RestController +@RequestMapping("icPartyAct") +public class IcPartyActController { + + @Autowired + private IcPartyActService icPartyActService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icPartyActService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcPartyActDTO data = icPartyActService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcPartyActDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icPartyActService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcPartyActDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icPartyActService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icPartyActService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java new file mode 100644 index 0000000000..19fb1ea357 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java @@ -0,0 +1,70 @@ +package com.epmet.modules.partyOrg.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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.modules.partyOrg.service.IcPartyActOrgService; +import com.epmet.resi.partymember.dto.IcPartyActOrgDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 参加活动党组织表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@RestController +@RequestMapping("icPartyActOrg") +public class IcPartyActOrgController { + + @Autowired + private IcPartyActOrgService icPartyActOrgService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icPartyActOrgService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcPartyActOrgDTO data = icPartyActOrgService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcPartyActOrgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icPartyActOrgService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcPartyActOrgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icPartyActOrgService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icPartyActOrgService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java new file mode 100644 index 0000000000..bb4ad0acf5 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java @@ -0,0 +1,70 @@ +package com.epmet.modules.partyOrg.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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.modules.partyOrg.service.IcPartyActSignInRecordService; +import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 党组织活动签到记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@RestController +@RequestMapping("icPartyActSignInRecord") +public class IcPartyActSignInRecordController { + + @Autowired + private IcPartyActSignInRecordService icPartyActSignInRecordService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icPartyActSignInRecordService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcPartyActSignInRecordDTO data = icPartyActSignInRecordService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcPartyActSignInRecordDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icPartyActSignInRecordService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcPartyActSignInRecordDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icPartyActSignInRecordService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icPartyActSignInRecordService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java new file mode 100644 index 0000000000..d3c28d2840 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -0,0 +1,70 @@ +package com.epmet.modules.partyOrg.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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.modules.partyOrg.service.IcScheduleService; +import com.epmet.resi.partymember.dto.IcScheduleDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 日程表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@RestController +@RequestMapping("icSchedule") +public class IcScheduleController { + + @Autowired + private IcScheduleService icScheduleService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icScheduleService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcScheduleDTO data = icScheduleService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcScheduleDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icScheduleService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcScheduleDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icScheduleService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icScheduleService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java new file mode 100644 index 0000000000..a1cfd4224e --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -0,0 +1,16 @@ +package com.epmet.modules.partyOrg.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 党建组织活动 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Mapper +public interface IcPartyActDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java new file mode 100644 index 0000000000..97cd8d2e9e --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java @@ -0,0 +1,16 @@ +package com.epmet.modules.partyOrg.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 参加活动党组织表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Mapper +public interface IcPartyActOrgDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java new file mode 100644 index 0000000000..fe8308ca62 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java @@ -0,0 +1,16 @@ +package com.epmet.modules.partyOrg.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 党组织活动签到记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Mapper +public interface IcPartyActSignInRecordDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java new file mode 100644 index 0000000000..4abde59690 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -0,0 +1,16 @@ +package com.epmet.modules.partyOrg.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 日程表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Mapper +public interface IcScheduleDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java new file mode 100644 index 0000000000..ee8fe199f2 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java @@ -0,0 +1,149 @@ +package com.epmet.modules.partyOrg.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 2022-08-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_party_act") +public class IcPartyActEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 组织ID：当前工作人员所属组织id + */ + private String orgId; + + /** + * 组织ID的上级；如果org_id是根组织，那此列=0 + */ + private String pid; + + /** + * ORG_ID全路径，包含自身 + */ + private String orgIdPath; + + /** + * 发布活动党组织 + */ + private String publishPartyOrgId; + + /** + * 发布活动党组织名称 + */ + private String publishPartyOrgName; + + /** + * 参加活动党组织ID的上级节点 + */ + private String publishOrgPid; + + /** + * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + private String publishOrgType; + + /** + * PARTY_ORG_ID的全路径，包含自身。方便前端回显 + */ + private String publishOrgPath; + + /** + * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动； + */ + private String actType; + + /** + * 活动举办时间：yyyy + */ + private String holdYearId; + + /** + * 活动举办时间:yyyyMM + */ + private String holdMonthId; + + /** + * 举办活动时间 + */ + private Date holdTime; + + /** + * 活动主题 + */ + private String topic; + + /** + * 活动地点 + */ + private String address; + + /** + * 活动地点纬度 + */ + private String latitude; + + /** + * 活动地点经度 + */ + private String longitude; + + /** + * 活动开始前几天 + */ + private Integer autoPublicType; + + /** + * 自动发布时间，保存时算好时间存在这里 + */ + private Date autoPublicTime; + + /** + * 参加人员类型，0：全体党员；1：支部委员 + */ + private String joinUserType; + + /** + * 是否自动通知参加人员，0否；1是 + */ + private String isAutoInform; + + /** + * 活动介绍 + */ + private String introduce; + + /** + * 是否发布，0未发布；1已发布； + */ + private String isPublic; + + /** + * 活动发布人 + */ + private String publishStaffId; + + /** + * 活动发布人姓名 + */ + private String publishStaffName; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java new file mode 100644 index 0000000000..c87e466c3a --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java @@ -0,0 +1,54 @@ +package com.epmet.modules.partyOrg.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 2022-08-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_party_act_org") +public class IcPartyActOrgEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 活动id + */ + private String icPartyActId; + + /** + * 客户ID + */ + private String customerId; + + /** + * 参加活动党组织ID,groupId + */ + private String joinOrgId; + + /** + * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + private String orgType; + + /** + * 参加活动党组织ID的上级节点 + */ + private String pid; + + /** + * PARTY_ORG_ID的全路径，包含自身。方便前端回显 + */ + private String joinOrgPath; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActSignInRecordEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActSignInRecordEntity.java new file mode 100644 index 0000000000..52b44ffaf6 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActSignInRecordEntity.java @@ -0,0 +1,64 @@ +package com.epmet.modules.partyOrg.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 2022-08-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_party_act_sign_in_record") +public class IcPartyActSignInRecordEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 活动id + */ + private String icPartyActId; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 签到用户id + */ + private String epmetUserId; + + /** + * 签到用户姓名 + */ + private String userRealName; + + /** + * 签到地点 + */ + private String address; + + /** + * 签到地点纬度 + */ + private String latitude; + + /** + * 签到地点经度 + */ + private String longitude; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcScheduleEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcScheduleEntity.java new file mode 100644 index 0000000000..9fe4024d82 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcScheduleEntity.java @@ -0,0 +1,69 @@ +package com.epmet.modules.partyOrg.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 2022-08-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_schedule") +public class IcScheduleEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 所属行政组织ID：当前工作人员所属组织id + */ + private String orgId; + + /** + * 组织ID的上级；如果org_id是根组织，那此列=0 + */ + private String pid; + + /** + * ORG_ID全路径，包含自身 + */ + private String orgIdPath; + + /** + * 当前登录用户userId + */ + private String staffId; + + /** + * 日程标题（35字） + */ + private String title; + + /** + * 提醒时间；其实就是日程所属日期 + */ + private Date remindTime; + + /** + * 是否公开，0：仅自己可见；1：组织内其他人可见 + */ + private String isPublic; + + /** + * 备注（500字） + */ + private String remark; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java new file mode 100644 index 0000000000..24dfde82b4 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java @@ -0,0 +1,78 @@ +package com.epmet.modules.partyOrg.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.resi.partymember.dto.IcPartyActOrgDTO; + +import java.util.List; +import java.util.Map; + +/** + * 参加活动党组织表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +public interface IcPartyActOrgService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcPartyActOrgDTO + * @author generator + * @date 2022-08-18 + */ + IcPartyActOrgDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void save(IcPartyActOrgDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void update(IcPartyActOrgDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-18 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java new file mode 100644 index 0000000000..6623b7f63f --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -0,0 +1,78 @@ +package com.epmet.modules.partyOrg.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import com.epmet.resi.partymember.dto.IcPartyActDTO; + +import java.util.List; +import java.util.Map; + +/** + * 党建组织活动 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +public interface IcPartyActService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcPartyActDTO + * @author generator + * @date 2022-08-18 + */ + IcPartyActDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void save(IcPartyActDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void update(IcPartyActDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-18 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java new file mode 100644 index 0000000000..ea54cd04e9 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java @@ -0,0 +1,78 @@ +package com.epmet.modules.partyOrg.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; +import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; + +import java.util.List; +import java.util.Map; + +/** + * 党组织活动签到记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +public interface IcPartyActSignInRecordService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcPartyActSignInRecordDTO + * @author generator + * @date 2022-08-18 + */ + IcPartyActSignInRecordDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void save(IcPartyActSignInRecordDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void update(IcPartyActSignInRecordDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-18 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java new file mode 100644 index 0000000000..a00d29f11e --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java @@ -0,0 +1,78 @@ +package com.epmet.modules.partyOrg.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import com.epmet.resi.partymember.dto.IcScheduleDTO; + +import java.util.List; +import java.util.Map; + +/** + * 日程表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +public interface IcScheduleService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcScheduleDTO + * @author generator + * @date 2022-08-18 + */ + IcScheduleDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void save(IcScheduleDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void update(IcScheduleDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-18 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java new file mode 100644 index 0000000000..0339c1dc77 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java @@ -0,0 +1,82 @@ +package com.epmet.modules.partyOrg.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.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; +import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.modules.partyOrg.service.IcPartyActOrgService; +import com.epmet.resi.partymember.dto.IcPartyActOrgDTO; +import org.apache.commons.lang3.StringUtils; +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 2022-08-18 + */ +@Service +public class IcPartyActOrgServiceImpl extends BaseServiceImpl implements IcPartyActOrgService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcPartyActOrgDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcPartyActOrgDTO.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 IcPartyActOrgDTO get(String id) { + IcPartyActOrgEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcPartyActOrgDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcPartyActOrgDTO dto) { + IcPartyActOrgEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActOrgEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcPartyActOrgDTO dto) { + IcPartyActOrgEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActOrgEntity.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-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java new file mode 100644 index 0000000000..0618ede967 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -0,0 +1,82 @@ +package com.epmet.modules.partyOrg.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.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.modules.partyOrg.dao.IcPartyActDao; +import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import com.epmet.modules.partyOrg.service.IcPartyActService; +import com.epmet.resi.partymember.dto.IcPartyActDTO; +import org.apache.commons.lang3.StringUtils; +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 2022-08-18 + */ +@Service +public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyActService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcPartyActDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcPartyActDTO.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 IcPartyActDTO get(String id) { + IcPartyActEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcPartyActDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcPartyActDTO dto) { + IcPartyActEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcPartyActDTO dto) { + IcPartyActEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActEntity.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-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java new file mode 100644 index 0000000000..fcedaa63ad --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -0,0 +1,82 @@ +package com.epmet.modules.partyOrg.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.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.modules.partyOrg.dao.IcPartyActSignInRecordDao; +import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; +import com.epmet.modules.partyOrg.service.IcPartyActSignInRecordService; +import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; +import org.apache.commons.lang3.StringUtils; +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 2022-08-18 + */ +@Service +public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl implements IcPartyActSignInRecordService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcPartyActSignInRecordDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcPartyActSignInRecordDTO.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 IcPartyActSignInRecordDTO get(String id) { + IcPartyActSignInRecordEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcPartyActSignInRecordDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcPartyActSignInRecordDTO dto) { + IcPartyActSignInRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActSignInRecordEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcPartyActSignInRecordDTO dto) { + IcPartyActSignInRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActSignInRecordEntity.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-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java new file mode 100644 index 0000000000..0702302c40 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -0,0 +1,82 @@ +package com.epmet.modules.partyOrg.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.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.modules.partyOrg.dao.IcScheduleDao; +import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import com.epmet.modules.partyOrg.service.IcScheduleService; +import com.epmet.resi.partymember.dto.IcScheduleDTO; +import org.apache.commons.lang3.StringUtils; +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 2022-08-18 + */ +@Service +public class IcScheduleServiceImpl extends BaseServiceImpl implements IcScheduleService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcScheduleDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcScheduleDTO.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 IcScheduleDTO get(String id) { + IcScheduleEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcScheduleDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcScheduleDTO dto) { + IcScheduleEntity entity = ConvertUtils.sourceToTarget(dto, IcScheduleEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcScheduleDTO dto) { + IcScheduleEntity entity = ConvertUtils.sourceToTarget(dto, IcScheduleEntity.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-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml new file mode 100644 index 0000000000..bc27e12d31 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml new file mode 100644 index 0000000000..f84e9ae594 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml new file mode 100644 index 0000000000..559157a57e --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml new file mode 100644 index 0000000000..01fb53be92 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 1f545cd332ae2d60e7b3ac592fbe06d578fd2410 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 16 Aug 2022 15:18:47 +0800 Subject: [PATCH 012/397] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E4=B8=8E=E5=85=9A=E7=BB=84=E7=BB=87=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/dto/group/ResiGroupDTO.java | 6 ++ .../group/form/ApplyCreateGroupFormDTO.java | 6 ++ .../dto/group/form/EditGroupFormDTO.java | 1 + .../result/ApplyingGroupDetailResult2DTO.java | 1 + .../result/ApplyingGroupDetailResultDTO.java | 2 + .../result/GroupEditionDetailResultDTO.java | 1 + .../group/feign/ResiGroupOpenFeignClient.java | 13 +++ .../ResiGroupOpenFeignClientFallback.java | 7 ++ .../group/controller/ResiGroupController.java | 17 ++- .../entity/GroupEditSubmitRecordEntity.java | 6 ++ .../modules/group/entity/ResiGroupEntity.java | 6 ++ .../group/service/ResiGroupService.java | 12 ++- .../service/impl/ResiGroupServiceImpl.java | 102 +++++++++++++++++- .../mapper/group/GroupEditSubmitRecordDao.xml | 1 + .../resources/mapper/group/ResiGroupDao.xml | 1 + .../feign/ResiPartyMemberOpenFeignClient.java | 15 ++- ...esiPartyMemberOpenFeignClientFallback.java | 17 ++- .../resi-partymember-server/pom.xml | 6 ++ .../controller/IcPartyOrgController.java | 18 ++++ .../partyOrg/service/IcPartyOrgService.java | 12 ++- .../service/impl/IcPartyOrgServiceImpl.java | 70 +++++++++++- 21 files changed, 303 insertions(+), 17 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java index 7994bf7d8d..d409b089b6 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java @@ -66,6 +66,12 @@ public class ResiGroupDTO implements Serializable { */ private String gridId; + /** + * 所属党组织 + */ + private String partyOrgId; + private String partyOrgPids; + /** * 状态：（审核通过 - approved 、 审核中 - under_auditting、 审核未通过 - rejected 、 已屏蔽 - hidden、 已关闭 - closed） Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审核未通过” diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java index bdfd703f91..404fc0d7e6 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java @@ -17,6 +17,8 @@ public class ApplyCreateGroupFormDTO implements Serializable { private static final long serialVersionUID = 1570620480398949075L; public interface AddUserInternalGroup { } + public interface AddPartyOrgGroup { + } /** * 添加用户操作的用户可见异常分组 * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup @@ -69,6 +71,10 @@ public class ApplyCreateGroupFormDTO implements Serializable { @NotBlank(message = "app不能为空",groups ={AddUserInternalGroup.class}) private String app; + @NotBlank(message = "所属党组织不能为空",groups ={AddPartyOrgGroup.class}) + private String partyOrgId; + private String partyOrgPids; + /** * 小组是否允许参观:允许：open;不允许：closed */ diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/EditGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/EditGroupFormDTO.java index ed56de167a..ccf51fe58c 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/EditGroupFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/EditGroupFormDTO.java @@ -35,5 +35,6 @@ public class EditGroupFormDTO { @NotBlank(message = "组介绍不能为空", groups = { SubmitGroupEditVG.class }) @Length(max = 500, message = "组介绍长度不能超过500个字", groups = { SubmitGroupEditVG.class }) private String groupIntroduction; + private String partyOrgId; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java index bb48e14b91..d3d1e38ddf 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java @@ -67,5 +67,6 @@ public class ApplyingGroupDetailResult2DTO implements Serializable { * 未读已读标识 unread read * */ private String readFlag; + private String partyOrgName; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java index 205d2d433c..c528e049d6 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java @@ -77,4 +77,6 @@ public class ApplyingGroupDetailResultDTO implements Serializable { * */ private String operationId; + private String partyOrgId; + } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupEditionDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupEditionDetailResultDTO.java index 0cf88d6802..08e2bb91ee 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupEditionDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupEditionDetailResultDTO.java @@ -39,4 +39,5 @@ public class GroupEditionDetailResultDTO implements Serializable { * 群主的昵称 xx路-xx先生/女士 */ private String groupLeaderName; + private String partyOrgName; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index 6f0ae98c44..6a0c43f14c 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -13,12 +13,14 @@ import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.*; import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallbackFactory; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 @@ -320,4 +322,15 @@ public interface ResiGroupOpenFeignClient { */ @PostMapping("/resi/group/group/list-groups-by-member") Result> listGroupsByMember(@RequestBody GroupsByMemberFormDTO formDTO); + + /** + * 获取客户下支部小组，根据所属党组织分组 + * + * @Param + * @Return {@link Result>>} + * @Author zhaoqifeng + * @Date 2022/8/16 14:04 + */ + @PostMapping("/resi/group/group/getBranchGroupList") + Result>> getBranchGroupList(); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index 9e228b2dce..98cddc7d9b 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -13,9 +13,11 @@ import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.*; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 @@ -234,4 +236,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien public Result> listGroupsByMember(GroupsByMemberFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listGroupsByMember", formDTO); } + + @Override + public Result>> getBranchGroupList() { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getBranchGroupList", null); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index e374a32136..5e60d0f535 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -34,12 +34,14 @@ import com.epmet.resi.group.dto.member.form.EditAuditSwitchFormDTO; import com.epmet.resi.group.dto.member.form.ResiIdentityFormDTO; import com.epmet.resi.group.dto.member.result.AchievementResultDTO; import com.epmet.resi.group.enums.SearchScopeTypeEnum; +import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.List; +import java.util.Map; /** @@ -399,7 +401,7 @@ public class ResiGroupController { @PostMapping("submit-edit") public Result submitGroupEdit(@RequestBody EditGroupFormDTO form, @LoginUser TokenDto tokenDto){ ValidatorUtils.validateEntity(form, EditGroupFormDTO.SubmitGroupEditVG.class); - resiGroupService.submitGroupEdit(form.getGroupId(), form.getGroupName(), form.getGroupHeadPhoto(), form.getGroupIntroduction(), tokenDto.getUserId()); + resiGroupService.submitGroupEdit(form.getGroupId(), form.getGroupName(), form.getGroupHeadPhoto(), form.getGroupIntroduction(), tokenDto.getUserId(), form.getPartyOrgId()); return new Result(); } @@ -649,4 +651,17 @@ public class ResiGroupController { List groups = resiGroupService.listGroupsByMember(userId, gridId); return new Result>().ok(groups); } + + /** + * 获取客户下支部小组，根据所属党组织分组 + * + * @Param tokenDto + * @Return {@link Result< Map< String, List< IcPartyOrgTreeDTO>>>} + * @Author zhaoqifeng + * @Date 2022/8/16 14:02 + */ + @PostMapping("getBranchGroupList") + public Result>> getBranchGroupList(@LoginUser TokenDto tokenDto) { + return new Result>>().ok(resiGroupService.getBranchGroupList(tokenDto.getCustomerId())); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java index a40c7b2d1f..ba6f29f424 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java @@ -52,6 +52,12 @@ public class GroupEditSubmitRecordEntity extends BaseEpmetEntity { */ private String gridId; + /** + * 所属党组织 + */ + private String partyOrgId; + private String partyOrgPids; + /** * 头像 */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java index da522bfcab..cc35c91b5b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java @@ -62,6 +62,12 @@ public class ResiGroupEntity extends BaseEpmetEntity { */ private String gridId; + /** + * 所属党组织 + */ + private String partyOrgId; + private String partyOrgPids; + /** * 状态：（审核通过 - approved 、 审核中 - under_auditting、 审核未通过 - rejected 、 已屏蔽 - hidden、 已关闭 - closed） Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审核未通过” diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index 3aaab6e4d4..d3176758d5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java @@ -30,6 +30,7 @@ import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.result.*; import com.epmet.resi.group.dto.member.form.EditAuditSwitchFormDTO; import com.epmet.resi.group.dto.member.result.AchievementResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import java.util.HashMap; import java.util.List; @@ -310,7 +311,7 @@ public interface ResiGroupService extends BaseService { GroupDetailResultDTO getGroupDetail(String groupId); - void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction, String editUserId); + void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction, String editUserId, String partyOrgId); /** * @Description 工作端 查询组变更待审核列表 @@ -471,4 +472,13 @@ public interface ResiGroupService extends BaseService { * @date 2021.09.08 13:59:31 */ List listGroupsByMember(String memberUserId, String gridId); + + /** + * 获取客户下支部小组，根据所属党组织分组 + * @Param customerId + * @Return {@link Map< String, List>} + * @Author zhaoqifeng + * @Date 2022/8/15 16:49 + */ + Map> getBranchGroupList(String customerId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 3bb3a435d7..1406f89ddf 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -27,6 +27,7 @@ import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg; import com.epmet.commons.tools.constant.*; import com.epmet.commons.tools.enums.AchievementTypeEnum; 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.scan.param.ImgScanParamDTO; @@ -83,6 +84,9 @@ import com.epmet.resi.group.dto.member.form.EditAuditSwitchFormDTO; import com.epmet.resi.group.dto.member.result.AchievementResultDTO; import com.epmet.resi.group.dto.member.result.GroupAchievementDTO; import com.epmet.resi.group.enums.SearchScopeTypeEnum; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; +import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; @@ -97,6 +101,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionSynchronizationAdapter; import org.springframework.transaction.support.TransactionSynchronizationManager; +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; @@ -120,7 +125,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl page(Map params) { @@ -457,6 +464,19 @@ public class ResiGroupServiceImpl extends BaseServiceImpl> partyOrgResult = resiPartyMemberOpenFeignClient.getPartyOrgList(); + if (!partyOrgResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取党组织信息失败", "获取党组织信息失败"); + } + if (partyOrgResult.getData().containsKey(applyCreateGroupFormDTO.getPartyOrgId())) { + applyCreateGroupFormDTO.setPartyOrgPids(partyOrgResult.getData().get(applyCreateGroupFormDTO.getPartyOrgId()).getOrgPids().concat(StrConstant.COLON).concat(applyCreateGroupFormDTO.getPartyOrgId())); + } else { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所选党组织不存在", "所选党组织不存在"); + } + } + String roleName = ""; if(NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag())){ roleName = ModuleConstant.PARTYMEMBER; @@ -586,6 +606,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl().ok(ConvertUtils.sourceToTarget(detail, ApplyingGroupDetailResult2DTO.class)); + ApplyingGroupDetailResult2DTO result = ConvertUtils.sourceToTarget(detail, ApplyingGroupDetailResult2DTO.class); + + if (StringUtils.isNotBlank(detail.getPartyOrgId())) { + Result> partyOrgResult = resiPartyMemberOpenFeignClient.getPartyOrgList(); + if (!partyOrgResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取党组织信息失败", "获取党组织信息失败"); + } + if (partyOrgResult.getData().containsKey(detail.getPartyOrgId())) { + result.setPartyOrgName(partyOrgResult.getData().get(detail.getPartyOrgId()).getPartyOrgName()); + } + } + + + return new Result().ok(result); } @Override @@ -1486,7 +1521,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl> partyOrgResult = resiPartyMemberOpenFeignClient.getPartyOrgList(); + if (!partyOrgResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取党组织信息失败", "获取党组织信息失败"); + } + if (partyOrgResult.getData().containsKey(partyOrgId)) { + partyOrgPids = partyOrgResult.getData().get(partyOrgId).getOrgPids().concat(StrConstant.COLON).concat(partyOrgId); + } else { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所选党组织不存在", "所选党组织不存在"); + } + } // 3.内容检查 scanGroupEditContent(groupName, groupIntroduction, groupHeadPhoto); @@ -1537,6 +1584,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl> partyOrgResult = resiPartyMemberOpenFeignClient.getPartyOrgList(); + if (!partyOrgResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取党组织信息失败", "获取党组织信息失败"); + } + if (partyOrgResult.getData().containsKey(edit.getPartyOrgId())) { + result.setPartyOrgName(partyOrgResult.getData().get(edit.getPartyOrgId()).getPartyOrgName()); + } + } + return result; } @@ -1863,4 +1922,37 @@ public class ResiGroupServiceImpl extends BaseServiceImpl listGroupsByMember(String memberUserId, String gridId) { return baseDao.listGroupsByMember(memberUserId, gridId); } + + /** + * 获取客户下支部小组，根据所属党组织分组 + * + * @param customerId + * @Param customerId + * @Return {@link Map< String, List>} + * @Author zhaoqifeng + * @Date 2022/8/15 16:49 + */ + @Override + public Map> getBranchGroupList(String customerId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ResiGroupEntity::getCustomerId, customerId); + wrapper.eq(ResiGroupEntity::getGroupType, ModuleConstant.GROUP_TYPE_BRANCH); + List entityList = baseDao.selectList(wrapper); + if (CollectionUtils.isEmpty(entityList)) { + return Collections.emptyMap(); + } + List list = entityList.stream().filter(i -> StringUtils.isNotBlank(i.getPartyOrgId())).map(item -> { + IcPartyOrgTreeDTO dto = new IcPartyOrgTreeDTO(); + dto.setId(item.getId()); + dto.setOrgPids(item.getPartyOrgPids()); + dto.setPid(item.getPartyOrgId()); + dto.setPartyOrgType(ModuleConstant.GROUP_TYPE_BRANCH); + dto.setPartyOrgName(item.getGroupName()); + return dto; + }).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.groupingBy(IcPartyOrgTreeDTO::getPid)); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml index d282690dea..8a212fc7d0 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml @@ -95,6 +95,7 @@ GROUP_NAME, GROUP_HEAD_PHOTO, GROUP_INTRODUCTION, + PARTY_ORG_ID, CREATED_BY, GRID_ID FROM diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index a9a11ac36f..b04c4aef48 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -354,6 +354,7 @@ gro.GROUP_NAME AS groupName, gro.GROUP_HEAD_PHOTO AS groupHeadPhoto, gro.GROUP_INTRODUCTION AS groupIntroduction, + gro.PARTY_ORG_ID AS partyOrgId, oper.READ_FLAG AS readFlag, oper.MESSAGE_TEXT AS messageText, oper.CREATED_TIME AS createdTime, diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index 0098acd036..430c6acb90 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -1,11 +1,9 @@ package com.epmet.resi.partymember.feign; -import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; -import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; -import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; @@ -20,6 +18,7 @@ import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 @@ -135,4 +134,14 @@ public interface ResiPartyMemberOpenFeignClient { @PostMapping("/resi/partymember/icPartyOrg/branchlist") public Result> branchlist(); + + /** + * 获取客户下支部列表 + * @Param tokenDto + * @Return {@link Result>} + * @Author zhaoqifeng + * @Date 2022/8/15 16:00 + */ + @PostMapping("/resi/partymember/icPartyOrg/getPartyOrgList") + Result> getPartyOrgList(); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index 57ce87c1e4..2a82324fa0 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -2,10 +2,9 @@ package com.epmet.resi.partymember.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; -import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; @@ -17,6 +16,7 @@ import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResult import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import java.util.List; +import java.util.Map; /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 @@ -101,4 +101,17 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp public Result> branchlist() { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "branchlist", null); } + + /** + * 获取客户下支部列表 + * + * @Param tokenDto + * @Return {@link Result< Map>} + * @Author zhaoqifeng + * @Date 2022/8/15 16:00 + */ + @Override + public Result> getPartyOrgList() { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartyOrgList", null); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index d03215171c..194ec74de1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -123,6 +123,12 @@ epmet-commons-rocketmq 2.0.0 + + com.epmet + resi-group-client + 2.0.0 + compile + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index 499c2a1d70..e1af2d4515 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -110,6 +110,12 @@ public class IcPartyOrgController { return icPartyOrgService.getSearchTreelist(formDTO); } + @PostMapping("getOrgTreeHaveGroup") + public Result> getOrgTreeHaveGroup(@LoginUser TokenDto tokenDto,PartyOrgTreeListDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(icPartyOrgService.getOrgTreeHaveGroup(formDTO)); + } + /** * @describe: 当前登录用户所属行政组织，及下级的党组织（只限支部） * @author wangtong @@ -137,4 +143,16 @@ public class IcPartyOrgController { return icPartyOrgService.getParentOrgList(formDTO); } + /** + * 获取客户下支部列表 + * @Param tokenDto + * @Return {@link Result>} + * @Author zhaoqifeng + * @Date 2022/8/15 16:00 + */ + @PostMapping("getPartyOrgList") + public Result> getPartyOrgList(@LoginUser TokenDto tokenDto){ + return new Result>().ok(icPartyOrgService.getPartyOrgList(tokenDto)); + } + } 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 6397916cc6..ea0c5615fd 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 @@ -108,7 +108,7 @@ public interface IcPartyOrgService extends BaseService { * @return com.epmet.commons.tools.utils.Result> */ Result> getSearchTreelist(PartyOrgTreeListDTO formDTO); - + List getOrgTreeHaveGroup(PartyOrgTreeListDTO formDTO); /** * @describe: 上级党组织列表 * @author wangtong @@ -117,4 +117,14 @@ public interface IcPartyOrgService extends BaseService { * @return com.epmet.commons.tools.utils.Result> */ Result> getParentOrgList(GetParentOrgFormDTO formDTO); + + /** + * 获取客户下支部列表 + * + * @Param tokenDto + * @Return {@link Map} + * @Author zhaoqifeng + * @Date 2022/8/15 15:52 + */ + Map getPartyOrgList(TokenDto tokenDto); } 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 70cb443864..b25f89cccf 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 @@ -1,9 +1,11 @@ package com.epmet.modules.partyOrg.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.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.PartyOrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -23,6 +25,7 @@ import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.modules.partymember.dao.IcPartyMemberDao; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; +import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; @@ -35,10 +38,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import javax.annotation.Resource; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 党组织表 @@ -54,6 +57,8 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl> getTreelist(PartyOrgTreeListDTO formDTO) { List list = baseDao.getTreelist(formDTO); + Result>> groupResult = resiGroupOpenFeignClient.getBranchGroupList(); + if (!groupResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询支部小组错误", "查询支部小组错误"); + } + for (IcPartyOrgTreeDTO org : list) { + getChildren(org, groupResult.getData()); + } return new Result>().ok(build(list)); } + private void getChildren(IcPartyOrgTreeDTO dto, Map> map) { + if (NumConstant.FIVE_STR.equals(dto.getPartyOrgType())) { + if (map.containsKey(dto.getId())) { + dto.setChildren(map.get(dto.getId())); + } + } else { + for (IcPartyOrgTreeDTO org : dto.getChildren()) { + getChildren(org, map); + } + } + } + @Override public Result> branchlist(TokenDto tokenDto) { CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); @@ -244,6 +268,21 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl>().ok(build(list)); } + @Override + public List getOrgTreeHaveGroup(PartyOrgTreeListDTO formDTO) { + List list = baseDao.getSearchTreelist(formDTO); + + Result>> groupResult = resiGroupOpenFeignClient.getBranchGroupList(); + if (!groupResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询支部小组错误", "查询支部小组错误"); + } + for (IcPartyOrgTreeDTO org : list) { + getChildren(org, groupResult.getData()); + } + + return list; + } + @Override public Result> getParentOrgList(GetParentOrgFormDTO formDTO) { Result agencyDTOResult = govOrgOpenFeignClient.getAgencyById(formDTO.getAgencyId()); @@ -270,6 +309,29 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl>().ok(list); } + /** + * 获取客户下支部列表 + * + * @param tokenDto + * @Param tokenDto + * @Return {@link Map} + * @Author zhaoqifeng + * @Date 2022/8/15 15:52 + */ + @Override + public Map getPartyOrgList(TokenDto tokenDto) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcPartyOrgEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(IcPartyOrgEntity::getPartyOrgType, NumConstant.FIVE_STR); + List list = baseDao.selectList(wrapper); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + List result = ConvertUtils.sourceToTarget(list, IcPartyOrgDTO.class); + + return result.stream().collect(Collectors.toMap(IcPartyOrgDTO::getId, Function.identity())); + } + /** * 构建树节点 */ From d4597d483d8109e863a2492e6edd9ed9df4608da Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 16 Aug 2022 17:39:03 +0800 Subject: [PATCH 013/397] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E4=B8=8E=E5=85=9A=E7=BB=84=E7=BB=87=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 b25f89cccf..6ff7041421 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 @@ -236,6 +236,10 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl { + item.setAgencyId(dto.getAgencyId()); + item.setAgencyPids(dto.getAgencyPids()); + }); } } else { for (IcPartyOrgTreeDTO org : dto.getChildren()) { From 3b04c371db6676519be4f41eb23040763d714ca6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 17 Aug 2022 09:45:34 +0800 Subject: [PATCH 014/397] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E4=B8=8E=E5=85=9A=E7=BB=84=E7=BB=87=E7=BB=91=E5=AE=9A=20sql?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.26__add_party_org_.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.26__add_party_org_.sql diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.26__add_party_org_.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.26__add_party_org_.sql new file mode 100644 index 0000000000..1747c6c553 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.26__add_party_org_.sql @@ -0,0 +1,8 @@ +ALTER TABLE `epmet_resi_group`.`resi_group` + ADD COLUMN `PARTY_ORG_ID` varchar(64) NULL COMMENT '党支部ID' AFTER `CUSTOMER_ID`, + ADD COLUMN `PARTY_ORG_PIDS` varchar(255) NULL COMMENT '党支部的所有上级ID' AFTER `PARTY_ORG_ID`; + + +ALTER TABLE `epmet_resi_group`.`group_edit_submit_record` + ADD COLUMN `PARTY_ORG_ID` varchar(64) NULL COMMENT '党支部ID' AFTER `GRID_ID`, + ADD COLUMN `PARTY_ORG_PIDS` varchar(255) NULL COMMENT '党支部的所有上级ID' AFTER `PARTY_ORG_ID`; \ No newline at end of file From bfa5a35b22123f0bf211f854b901742570645985 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 18 Aug 2022 16:33:15 +0800 Subject: [PATCH 015/397] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=94=B9?= =?UTF-8?q?=E5=9B=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/SaveCollectVisitorFormDTO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/SaveCollectVisitorFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/SaveCollectVisitorFormDTO.java index 0ec81f30ff..a56f6607f1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/SaveCollectVisitorFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/SaveCollectVisitorFormDTO.java @@ -99,6 +99,7 @@ public class SaveCollectVisitorFormDTO implements Serializable { /** * 身份证号 */ + @NotBlank(message = "身份证号不能为空") private String idCard; /** From 8ccafc581a4ca9d887746e6341a6140b7e096558 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 18 Aug 2022 16:35:35 +0800 Subject: [PATCH 016/397] =?UTF-8?q?=E3=80=90=E6=8A=A5=E8=A1=A8=E3=80=91?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89excel=E6=89=B9=E9=87=8F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8E=BB=E6=8E=89@NoRepeatSubmit=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=89=B9=E9=87=8F=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcResiUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3e268bf8d9..7604ebc5c7 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 @@ -560,7 +560,7 @@ public class IcResiUserController implements ResultDataResolver { * @remark 用于报表调用的接口 试试 */ @ReportRequest - @NoRepeatSubmit + //@NoRepeatSubmit @RequestMapping(value = "/exportExcelCustomData") public Map exportExcelCustomData(@LoginUser TokenDto tokenDto, @RequestParam("templateId") String templateId, @RequestBody ExportResiUserFormDTO pageFormDTO) throws Exception { From ead78b6619c5af679b0e8f0e3841e0adb8e5bc8c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 18 Aug 2022 16:37:19 +0800 Subject: [PATCH 017/397] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/group/service/impl/ResiGroupServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 1406f89ddf..939eb61d39 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1946,7 +1946,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Thu, 18 Aug 2022 16:37:21 +0800 Subject: [PATCH 018/397] =?UTF-8?q?=E3=80=90=E6=8A=A5=E8=A1=A8=E3=80=91?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89excel=E6=89=B9=E9=87=8F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8E=BB=E6=8E=89@NoRepeatSubmit=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=89=B9=E9=87=8F=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/IcResiUserController.java | 1 - 1 file changed, 1 deletion(-) 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 40e661a63b..c574eb3dcd 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 @@ -559,7 +559,6 @@ public class IcResiUserController implements ResultDataResolver { * @remark 用于报表调用的接口 试试 */ @ReportRequest - @NoRepeatSubmit @RequestMapping(value = "/exportExcelCustomData") public Map exportExcelCustomData(@LoginUser TokenDto tokenDto, @RequestParam("templateId") String templateId, @RequestBody ExportResiUserFormDTO pageFormDTO) throws Exception { From 0dfe9fb8b3113def4fbc392550b20034ea5339aa Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 18 Aug 2022 16:40:05 +0800 Subject: [PATCH 019/397] =?UTF-8?q?=E3=80=90=E6=8A=A5=E8=A1=A8=E3=80=91?= =?UTF-8?q?=E5=8F=88=E8=A6=81=E7=94=A8=E5=A4=9A=E7=BA=BF=E7=A8=8B=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcCustomerReportServiceImpl.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java index 4f6277d886..f9a1707342 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java @@ -55,6 +55,8 @@ import java.nio.file.Path; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -390,21 +392,20 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl> idParts = ListUtils.partition(idList, 100); // 1. 循环下载所有id对应的excel（积木报表的导出接口有并发问题，多线程会导出空表，暂时不用多线程了） - //CountDownLatch cdl = new CountDownLatch(idParts.size()); + CountDownLatch cdl = new CountDownLatch(idParts.size()); for (List idPart : idParts) { - downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files); - //CompletableFuture.runAsync(() -> { - // downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files, cdl); - //}, executorService); + CompletableFuture.runAsync(() -> { + downloadXlsByBatchByBizId(reportId, idPart, param, xlsxStorePath, files, cdl); + }, executorService); } // 等待多线程执行完成，再执行打包 - //try { - // cdl.await(); - //} catch (InterruptedException e) { - // log.error(ExceptionUtils.getErrorStackTrace(e)); - // throw new EpmetException("【报表批量导出】CountDownLatch等待被中断"); - //} + try { + cdl.await(); + } catch (InterruptedException e) { + log.error(ExceptionUtils.getErrorStackTrace(e)); + throw new EpmetException("【报表批量导出】CountDownLatch等待被中断"); + } // 2,打包 Path zipFile = storePath.resolve(reportName + "_" + currentTimeStr + ".zip"); @@ -472,7 +473,8 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl bizIds, Map idAndNames, JimuReportExportRequestDTO param, Path xlsxStorePath, Map files) { + public void downloadXlsByBatchByBizId(String reportId, List bizIds, JimuReportExportRequestDTO param, + Path xlsxStorePath, Map files, CountDownLatch cdl) { for (String id : bizIds) { try { @@ -506,7 +508,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl Date: Thu, 18 Aug 2022 16:59:09 +0800 Subject: [PATCH 020/397] =?UTF-8?q?=E3=80=90=E6=8A=A5=E8=A1=A8=E3=80=91?= =?UTF-8?q?=E5=A4=9A=E7=BA=BF=E7=A8=8B=E5=AF=BC=E5=87=BA=E4=B8=8D=E7=9D=A1?= =?UTF-8?q?=E7=9C=A0=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcCustomerReportServiceImpl.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java index f9a1707342..2775448c20 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java @@ -476,18 +476,6 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl bizIds, JimuReportExportRequestDTO param, Path xlsxStorePath, Map files, CountDownLatch cdl) { for (String id : bizIds) { - - try { - Thread.sleep(200l); - } catch (InterruptedException e) { - final String errorMsg = ExceptionUtils.getErrorStackTrace(e); - log.error("【报表批量导出】循环导出-请求jmreport，等待过程中睡眠发生意外:{}", errorMsg); - } - - //if (!Arrays.asList("1501821697823608834","1501821694665297922","1501821695114088450","1501821695177003009","1501821695269277697","1501821695344775169","1501821695579656193","1501821695676125186","1501821695755816962","1501821695843897346","1501821695978115074","1501821696108138497","1501821696179441665","1501821696229773313","1501821696284299266","1501821696334630913","1501821696393351170","1501821696452071426","1501821696502403073","1501821696582094849","1501821696645009409","1501821696758255617","1501821696871501826","1501821696917639169","1501821696955387906","1501821696993136641","1501821697135742977","1501821697181880321","1501821697232211969","1501821697274155009").contains(id)) { - // continue; - //} - param.getQueryParam().setId(id); final Response response = jiMuReportOpenFeignClient.exportAllExcelStream(param); // 取出文件后缀 From 7463493102ea0791d3912e4793e07855ccdada37 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 18 Aug 2022 17:20:58 +0800 Subject: [PATCH 021/397] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/AddOrEditScheduleFormDTO.java | 48 ++++++++++++++++++ .../controller/IcPartyActController.java | 3 ++ .../controller/IcScheduleController.java | 32 ++++++++++++ .../modules/partyOrg/dao/IcScheduleDao.java | 5 +- .../partyOrg/service/IcScheduleService.java | 17 +++++++ .../service/impl/IcScheduleServiceImpl.java | 49 +++++++++++++++++++ .../mapper/partyOrg/IcScheduleDao.xml | 11 +++++ 7 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java new file mode 100644 index 0000000000..5daa0a7aca --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java @@ -0,0 +1,48 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; + +/** + * @Author zxc + * @DateTime 2022/8/18 16:23 + * @DESC + */ +@Data +public class AddOrEditScheduleFormDTO implements Serializable { + + private static final long serialVersionUID = 6290505458783549828L; + + public interface AddScheduleForm{} + + private String scheduleId; + private String staffId; + private String customerId; + + /** + * 日程标题（35字） + */ + @NotBlank(message = "title不能为空",groups = AddScheduleForm.class) + private String title; + + /** + * 提醒时间；其实就是日程所属日期 + */ + @NotNull(message = "remindTime不能为空",groups = AddScheduleForm.class) + private Date remindTime; + + /** + * 是否公开，0：仅自己可见；1：组织内其他人可见 + */ + @NotBlank(message = "isPublic不能为空",groups = AddScheduleForm.class) + private String isPublic; + + /** + * 备注（500字） + */ + private String remark; +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index edf1438c73..6b94eaf18f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -66,5 +66,8 @@ public class IcPartyActController { icPartyActService.delete(ids); return new Result(); } + +// @PostMapping("homeMonthTotal") +// public Result } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index d3c28d2840..edae364122 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -1,7 +1,9 @@ package com.epmet.modules.partyOrg.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.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -10,9 +12,11 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; @@ -66,5 +70,33 @@ public class IcScheduleController { icScheduleService.delete(ids); return new Result(); } + + /** + * Desc: 新增或编辑日程 + * @param tokenDto + * @param formDTO + * @author zxc + * @date 2022/8/18 16:31 + */ + @PostMapping("addOrEdit") + public Result addOrEditSchedule(@LoginUser TokenDto tokenDto,@RequestBody AddOrEditScheduleFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddOrEditScheduleFormDTO.AddScheduleForm.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + icScheduleService.addOrEditSchedule(formDTO); + return new Result(); + } + + /** + * Desc: 删除日程 + * @param scheduleIds + * @author zxc + * @date 2022/8/18 17:00 + */ + @PostMapping("del") + public Result delSchedule(@RequestBody List scheduleIds){ + icScheduleService.delSchedule(scheduleIds); + return new Result(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java index 4abde59690..b8b407a170 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -2,6 +2,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import org.apache.ibatis.annotations.Mapper; /** @@ -12,5 +13,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcScheduleDao extends BaseDao { - + + void editSchedule(AddOrEditScheduleFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java index a00d29f11e..dbfc499d81 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java @@ -4,6 +4,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.resi.partymember.dto.IcScheduleDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import java.util.List; import java.util.Map; @@ -75,4 +76,20 @@ public interface IcScheduleService extends BaseService { * @date 2022-08-18 */ void delete(String[] ids); + + /** + * Desc: 新增或编辑日程 + * @param formDTO + * @author zxc + * @date 2022/8/18 16:31 + */ + void addOrEditSchedule(AddOrEditScheduleFormDTO formDTO); + + /** + * Desc: 删除日程 + * @param scheduleIds + * @author zxc + * @date 2022/8/18 17:00 + */ + void delSchedule(List scheduleIds); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java index 0702302c40..3c7861a02d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -4,12 +4,19 @@ 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.constant.FieldConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +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.AgencyInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -79,4 +86,46 @@ public class IcScheduleServiceImpl extends BaseServiceImpl scheduleIds) { + if (CollectionUtils.isNotEmpty(scheduleIds)){ + baseDao.deleteBatchIds(scheduleIds); + } + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 01fb53be92..878c3f9fec 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -3,4 +3,15 @@ + + UPDATE ic_schedule + SET UPDATED_TIME = NOW(), + title = #{title}, + remind_time = #{remindTime}, + + REMARK = #{remark}, + + is_public = #{isPublic} + WHERE ID = #{scheduleId} + \ No newline at end of file From 068265f814114a04134c157986fb1489db07436c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 18 Aug 2022 22:05:11 +0800 Subject: [PATCH 022/397] =?UTF-8?q?=E3=80=90=E6=8C=87=E6=8C=A5=E8=B0=83?= =?UTF-8?q?=E5=BA=A6=E3=80=91=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B&?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=80=8C?= =?UTF-8?q?=E4=B8=8D=E6=98=AF=E7=AE=A1=E7=90=86=E5=B9=B3=E5=8F=B0=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E6=9C=8D=E5=8A=A1=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/enums/CoveragePlaceTypeEnum.java | 4 +- .../IcPointNucleicMonitoringDao.java | 17 +++ .../IcPointVaccinesInoculationDao.java | 17 +++ .../IcPointNucleicMonitoringEntity.java | 77 +++++++++++++ .../IcPointVaccinesInoculationEntity.java | 102 ++++++++++++++++++ .../service/epmetuser/EpmetUserService.java | 10 ++ .../epmetuser/impl/EpmetUserServiceImpl.java | 48 +++++++++ .../service/impl/CoverageServiceImpl.java | 22 ++++ 8 files changed, 296 insertions(+), 1 deletion(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcPointNucleicMonitoringDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcPointVaccinesInoculationDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcPointNucleicMonitoringEntity.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcPointVaccinesInoculationEntity.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java index 6f71e122b0..d15036075b 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java @@ -18,7 +18,9 @@ public enum CoveragePlaceTypeEnum { VOLUNTEER("volunteer", "志愿者"), GROUP_RENT("group_rent", "群租房"), EVENT("event", "城市管理事件"), - ZHZL_RQ("zhzl_rq", "综合治理人群"); + ZHZL_RQ("zhzl_rq", "综合治理人群"), + NUCLEIC_POINT("nucleic_point", "核酸检测点"), + VACCINE_POINT("vaccine_point", "疫苗接种点"); private final String code; private final String name; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcPointNucleicMonitoringDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcPointNucleicMonitoringDao.java new file mode 100644 index 0000000000..599243a856 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcPointNucleicMonitoringDao.java @@ -0,0 +1,17 @@ +package com.epmet.dataaggre.dao.epmetuser; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.entity.epmetuser.IcPointNucleicMonitoringEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 核酸监测点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@Mapper +public interface IcPointNucleicMonitoringDao extends BaseDao { + + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcPointVaccinesInoculationDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcPointVaccinesInoculationDao.java new file mode 100644 index 0000000000..a3bfafee1a --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcPointVaccinesInoculationDao.java @@ -0,0 +1,17 @@ +package com.epmet.dataaggre.dao.epmetuser; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.entity.epmetuser.IcPointVaccinesInoculationEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 疫苗接种点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@Mapper +public interface IcPointVaccinesInoculationDao extends BaseDao { + + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcPointNucleicMonitoringEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcPointNucleicMonitoringEntity.java new file mode 100644 index 0000000000..b19ab6b721 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcPointNucleicMonitoringEntity.java @@ -0,0 +1,77 @@ +package com.epmet.dataaggre.entity.epmetuser; + +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 2022-06-20 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_point_nucleic_monitoring") +public class IcPointNucleicMonitoringEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 所属组织ID + */ + private String orgId; + + /** + * 所属组织名称 + */ + private String orgName; + + /** + * 组织ID上级 + */ + private String pid; + + /** + * 组织ID所有上级 + */ + private String pids; + + /** + * 核酸监测点名称 + */ + private String name; + + /** + * 服务时间 + */ + private String serveTime; + + /** + * 咨询电话 + */ + private String mobile; + + /** + * 监测点地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcPointVaccinesInoculationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcPointVaccinesInoculationEntity.java new file mode 100644 index 0000000000..3e60c7660e --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcPointVaccinesInoculationEntity.java @@ -0,0 +1,102 @@ +package com.epmet.dataaggre.entity.epmetuser; + +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 2022-06-20 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_point_vaccines_inoculation") +public class IcPointVaccinesInoculationEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 所属组织ID + */ + private String orgId; + + /** + * 所属组织名称 + */ + private String orgName; + + /** + * 组织ID上级 + */ + private String pid; + + /** + * 组织ID所有上级 + */ + private String pids; + + /** + * 疫苗接种点名称 + */ + private String name; + + /** + * 接种日期 + */ + private String inoculationDate; + + /** + * 接种上午开始时间 + */ + private String moStartTime; + + /** + * 接种上午结束时间 + */ + private String moEndTime; + + /** + * 接种下午开始时间 + */ + private String afStartTime; + + /** + * 接种下午结束时间 + */ + private String afEndTime; + + /** + * 暂无疫苗（1：是；2：否） + */ + private String noAvailableVaccines; + + /** + * 咨询电话 + */ + private String mobile; + + /** + * 接种点地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + +} 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 068b1176cd..901087a7ba 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 @@ -15,6 +15,8 @@ import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; import com.epmet.dataaggre.dto.govorg.result.MemberProjectInfoResultDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO; import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; +import com.epmet.dataaggre.entity.epmetuser.IcPointNucleicMonitoringEntity; +import com.epmet.dataaggre.entity.epmetuser.IcPointVaccinesInoculationEntity; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.UserBaseInfoDTO; @@ -240,4 +242,12 @@ public interface EpmetUserService { List listVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory); List getNowResiUser(NowStatsDataFormDTO formDTO); + + Integer countVaccinePoint(String customerId, String agencyId, String staffOrgIds, String search); + + Integer countNucleicPoint(String customerId, String agencyId, String staffOrgIds, String search); + + List listVaccinePoints(String customerId, String agencyId, String staffOrgIds, String search); + + List listNucleicPoints(String customerId, String agencyId,String staffOrgIds, String search); } 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 26c5ef1b3a..d9dd1269ea 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 @@ -94,6 +94,10 @@ public class EpmetUserServiceImpl implements EpmetUserService { private CustomerFootBarService customerFootBarService; @Resource private RegisterRelationDao registerRelationDao; + @Resource + private IcPointVaccinesInoculationDao pointVaccinesInoculationDao; + @Resource + private IcPointNucleicMonitoringDao pointNucleicMonitoringDao; /** * @Description 根据UserIds查询 @@ -923,4 +927,48 @@ public class EpmetUserServiceImpl implements EpmetUserService { List list = registerRelationDao.selectNowResiUser(formDTO); return list; } + + @Override + public Integer countVaccinePoint(String customerId, String agencyId, String staffOrgIds, String search) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcPointVaccinesInoculationEntity::getCustomerId, customerId); + query.and(w -> w.likeRight(IcPointVaccinesInoculationEntity::getPids, staffOrgIds) + .or() + .eq(IcPointVaccinesInoculationEntity::getOrgId, agencyId)); + query.like(StringUtils.isNotBlank(search), IcPointVaccinesInoculationEntity::getName, search); + return pointVaccinesInoculationDao.selectCount(query); + } + + @Override + public Integer countNucleicPoint(String customerId, String agencyId, String staffOrgIds, String search) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcPointNucleicMonitoringEntity::getCustomerId, customerId); + query.and(w -> w.likeRight(IcPointNucleicMonitoringEntity::getPids, staffOrgIds) + .or() + .eq(IcPointNucleicMonitoringEntity::getOrgId, agencyId)); + query.like(StringUtils.isNotBlank(search), IcPointNucleicMonitoringEntity::getName, search); + return pointNucleicMonitoringDao.selectCount(query); + } + + @Override + public List listVaccinePoints(String customerId, String agencyId, String staffOrgIds, String search) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcPointVaccinesInoculationEntity::getCustomerId, customerId); + query.and(w -> w.likeRight(IcPointVaccinesInoculationEntity::getPids, staffOrgIds) + .or() + .eq(IcPointVaccinesInoculationEntity::getOrgId, agencyId)); + query.like(StringUtils.isNotBlank(search), IcPointVaccinesInoculationEntity::getName, search); + return pointVaccinesInoculationDao.selectList(query); + } + + @Override + public List listNucleicPoints(String customerId, String agencyId, String staffOrgIds, String search) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcPointNucleicMonitoringEntity::getCustomerId, customerId); + query.and(w -> w.likeRight(IcPointNucleicMonitoringEntity::getPids, staffOrgIds) + .or() + .eq(IcPointNucleicMonitoringEntity::getOrgId, agencyId)); + query.like(StringUtils.isNotBlank(search), IcPointNucleicMonitoringEntity::getName, search); + return pointNucleicMonitoringDao.selectList(query); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 19b7c71d7e..ff931888c3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -30,6 +30,8 @@ import com.epmet.dataaggre.dto.govorg.form.DataListLeftSubTotalFormDTO; import com.epmet.dataaggre.dto.govorg.form.SearchDetailFormDTO; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; +import com.epmet.dataaggre.entity.epmetuser.IcPointNucleicMonitoringEntity; +import com.epmet.dataaggre.entity.epmetuser.IcPointVaccinesInoculationEntity; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dataaggre.entity.govorg.*; import com.epmet.dataaggre.entity.govproject.IcEventEntity; @@ -628,6 +630,12 @@ public class CoverageServiceImpl implements CoverageService { // 志愿者 String[] parts = categoryKey.split("_"); return epmetUserService.countVolunteers(customerId, agencyId, staffOrgIds, search, parts[1]); + } else if (CoveragePlaceTypeEnum.VACCINE_POINT.getCode().equals(placeType)) { + // 疫苗接种点 + return epmetUserService.countVaccinePoint(customerId, agencyId, staffOrgIds, search); + } else if (CoveragePlaceTypeEnum.NUCLEIC_POINT.getCode().equals(placeType)) { + // 核酸检测点 + return epmetUserService.countNucleicPoint(customerId, agencyId, staffOrgIds, search); } return 0; @@ -805,6 +813,20 @@ public class CoverageServiceImpl implements CoverageService { coordinates[1], coordinates[0]); }).collect(Collectors.toList()); + } else if (CoveragePlaceTypeEnum.VACCINE_POINT.getCode().equals(placeType)) { + // 疫苗接种点 + List vps = epmetUserService.listVaccinePoints(customerId, agencyId, staffOrgIds, search); + return vps.stream() + .map(vp -> new CoverageAnalisisDataListResultDTO(vp.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, + placeType, vp.getName(), vp.getLatitude(), vp.getLongitude())) + .collect(Collectors.toList()); + } else if (CoveragePlaceTypeEnum.NUCLEIC_POINT.getCode().equals(placeType)) { + // 核酸检测点 + List nps = epmetUserService.listNucleicPoints(customerId, agencyId, staffOrgIds, search); + return nps.stream() + .map(np -> new CoverageAnalisisDataListResultDTO(np.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, + placeType, np.getName(), np.getLatitude(), np.getLongitude())) + .collect(Collectors.toList()); } return new ArrayList<>(); } From 1e1e95ad5f168ee1dbd6812534d5b19cc9e2eb00 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 09:01:30 +0800 Subject: [PATCH 023/397] isPublish --- .../resi/partymember/dto/IcPartyActDTO.java | 2 +- .../dto/icpartyact/IcPartActTypeDTO.java | 17 +++++ .../controller/IcPartyActController.java | 64 +++++------------ .../modules/partyOrg/dao/IcPartyActDao.java | 11 ++- .../partyOrg/entity/IcPartyActEntity.java | 6 +- .../partyOrg/service/IcPartyActService.java | 65 ++--------------- .../service/impl/IcPartyActServiceImpl.java | 71 ++++--------------- .../mapper/partyOrg/IcPartyActDao.xml | 14 ++++ 8 files changed, 82 insertions(+), 168 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java index bc0c26dda9..15094578aa 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java @@ -135,7 +135,7 @@ public class IcPartyActDTO implements Serializable { /** * 是否发布，0未发布；1已发布； */ - private String isPublic; + private String isPublish; /** * 活动发布人 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java new file mode 100644 index 0000000000..4e864ab3cc --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java @@ -0,0 +1,17 @@ +package com.epmet.resi.partymember.dto.icpartyact; + +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2022/8/18 18:45 + */ +@Data +public class IcPartActTypeDTO { + private String label; + private String value; + private Integer yearCount; + private String frequencyDesc; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 6b94eaf18f..2c2c2cacd3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -1,19 +1,16 @@ package com.epmet.modules.partyOrg.controller; -import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.page.PageData; +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.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.DefaultGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.modules.partyOrg.service.IcPartyActService; -import com.epmet.resi.partymember.dto.IcPartyActDTO; +import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import java.util.Map; +import java.util.List; /** @@ -29,43 +26,16 @@ public class IcPartyActController { @Autowired private IcPartyActService icPartyActService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icPartyActService.page(params); - return new Result>().ok(page); - } - - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - IcPartyActDTO data = icPartyActService.get(id); - return new Result().ok(data); - } - - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody IcPartyActDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icPartyActService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody IcPartyActDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - icPartyActService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - icPartyActService.delete(ids); - return new Result(); - } + /** + * 活动类型 + * @param tokenDto + * @return + */ + @PostMapping("/acttypelist") + public com.epmet.commons.tools.utils.Result> actTypeList(@LoginUser TokenDto tokenDto){ + List list=icPartyActService.actTypeList(tokenDto.getCustomerId()); + return new Result>().ok(list); + } // @PostMapping("homeMonthTotal") // public Result diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index a1cfd4224e..4d25b88ff4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -2,8 +2,11 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 党建组织活动 * @@ -12,5 +15,11 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPartyActDao extends BaseDao { - + + /** + * 活动类型列表 + * @param customerId + * @return + */ + List actTypeList(String customerId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java index ee8fe199f2..4c414a1631 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java @@ -62,12 +62,12 @@ public class IcPartyActEntity extends BaseEpmetEntity { private String publishOrgType; /** - * PARTY_ORG_ID的全路径，包含自身。方便前端回显 + * PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ private String publishOrgPath; /** - * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动； + * 活动类型，来源于ic_party_act_type_dict */ private String actType; @@ -134,7 +134,7 @@ public class IcPartyActEntity extends BaseEpmetEntity { /** * 是否发布，0未发布；1已发布； */ - private String isPublic; + private String isPublish; /** * 活动发布人 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 6623b7f63f..86aaf9f015 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -1,12 +1,10 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; -import com.epmet.resi.partymember.dto.IcPartyActDTO; +import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; import java.util.List; -import java.util.Map; /** * 党建组织活动 @@ -17,62 +15,9 @@ import java.util.Map; public interface IcPartyActService extends BaseService { /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-08-18 + * 活动类型列表 + * @param customerId + * @return */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2022-08-18 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return IcPartyActDTO - * @author generator - * @date 2022-08-18 - */ - IcPartyActDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2022-08-18 - */ - void save(IcPartyActDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2022-08-18 - */ - void update(IcPartyActDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2022-08-18 - */ - void delete(String[] ids); + List actTypeList(String customerId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 0618ede967..2a75432068 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -1,22 +1,15 @@ package com.epmet.modules.partyOrg.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.constant.FieldConstant; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.Constant; import com.epmet.modules.partyOrg.dao.IcPartyActDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.service.IcPartyActService; -import com.epmet.resi.partymember.dto.IcPartyActDTO; -import org.apache.commons.lang3.StringUtils; +import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; import java.util.List; -import java.util.Map; /** * 党建组织活动 @@ -27,56 +20,22 @@ import java.util.Map; @Service public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyActService { - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcPartyActDTO.class); - } + /** + * 活动类型列表 + * + * @param customerId + * @return + */ @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IcPartyActDTO.class); + public List actTypeList(String customerId) { + List list= baseDao.actTypeList(customerId); + if(CollectionUtils.isEmpty(list)){ + return baseDao.actTypeList(Constant.DEFAULT_CUSTOMER); + } + return list; } - 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 IcPartyActDTO get(String id) { - IcPartyActEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, IcPartyActDTO.class); - } - @Override - @Transactional(rollbackFor = Exception.class) - public void save(IcPartyActDTO dto) { - IcPartyActEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(IcPartyActDTO dto) { - IcPartyActEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActEntity.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-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index bc27e12d31..83401d36a0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -3,4 +3,18 @@ + \ No newline at end of file From ddae26a7eeb9419381a45ca9fcf81caa99d2a376 Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 09:37:25 +0800 Subject: [PATCH 024/397] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=B0=8F=E5=8A=A9?= =?UTF-8?q?=E6=89=8Bmq=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constants/ConsomerGroupConstants.java | 5 + .../rocketmq/constants/TopicConstants.java | 5 + .../messages/PartyMeetingMessageMQMsg.java | 26 +++++ .../com/epmet/constant/SystemMessageType.java | 5 + .../impl/SystemMessageServiceImpl.java | 3 + .../epmet/mq/RocketMQConsumerRegister.java | 5 + .../listener/PartyMeetingMessageListener.java | 99 +++++++++++++++++++ 7 files changed, 148 insertions(+) create mode 100644 epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.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 2aadd34cb4..babe79da88 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 @@ -98,4 +98,9 @@ public interface ConsomerGroupConstants { * 创建党员居民信息消费者组，将user库的党员信息同步到partymember库的党员表。 */ String CREATE_RESI_PARTYMEMBER_SYNC_GROUP = "create_resi_sync_group"; + + /** + * 党建小助手监听器分组 + */ + String PARTY_MEETING_MESSAGE = "party_meeting_message"; } diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java index cea27769bc..30505f546e 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java @@ -84,4 +84,9 @@ public interface TopicConstants { * 居民的党员信息 */ String PARTYMEMBER_RESI = "partymember_resi"; + + /** + * 消息-党建小助手 + */ + String IC_MESSAGE = "ic_message"; } diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java new file mode 100644 index 0000000000..4e21d2179d --- /dev/null +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java @@ -0,0 +1,26 @@ +package com.epmet.commons.rocketmq.messages; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 党建小助手发布活动、活动到期提醒、活动发布提醒推送MQ + * @author sun + */ +@Data +public class PartyMeetingMessageMQMsg implements Serializable { + + //客户Id + private String customerId; + //活动Id + private String icPartyActId; + //动作类型 发布活动:publish 提前提醒:remind 提前通知:notify + private String type; + //党组织Id + private String publishOrgId; + //党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + private String publishOrgType; + + +} diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java index b60b3b8fe1..fd1387fd43 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java @@ -170,4 +170,9 @@ public interface SystemMessageType { */ String PARTYMEMBER_RESI_IMPORT = "partymember_resi_import"; + /** + * 党建小助手消息 + */ + String PARTY_MEETING_MESSAGE = "party_meeting_message"; + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java index d43fc223dc..8373666cc4 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java @@ -237,6 +237,9 @@ public class SystemMessageServiceImpl implements SystemMessageService { case SystemMessageType.PARTYMEMBER_RESI_IMPORT: topic=TopicConstants.PARTYMEMBER_RESI; break; + case SystemMessageType.PARTY_MEETING_MESSAGE: + topic=TopicConstants.IC_MESSAGE; + break; default: logger.error("getTopicByMsgType msgType:{} is not support for any topic", msgType); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java index 67ceeb7651..6761e5685f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java @@ -4,6 +4,8 @@ import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants; import com.epmet.commons.rocketmq.constants.TopicConstants; import com.epmet.commons.rocketmq.register.MQAbstractRegister; import com.epmet.commons.rocketmq.register.MQConsumerProperties; +import com.epmet.constant.SystemMessageType; +import com.epmet.mq.listener.PartyMeetingMessageListener; import com.epmet.mq.listener.ResiPartyMemberSyncListener; import org.apache.rocketmq.common.protocol.heartbeat.MessageModel; import org.springframework.stereotype.Component; @@ -15,5 +17,8 @@ public class RocketMQConsumerRegister extends MQAbstractRegister { public void registerAllListeners(String env, MQConsumerProperties consumerProperties) { register(consumerProperties, ConsomerGroupConstants.CREATE_RESI_PARTYMEMBER_SYNC_GROUP, MessageModel.CLUSTERING, TopicConstants.PARTYMEMBER_RESI, "*", new ResiPartyMemberSyncListener()); + + register(consumerProperties, ConsomerGroupConstants.PARTY_MEETING_MESSAGE, MessageModel.CLUSTERING, + TopicConstants.IC_MESSAGE, SystemMessageType.PARTY_MEETING_MESSAGE, new PartyMeetingMessageListener()); } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java new file mode 100644 index 0000000000..8c044e3f5a --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java @@ -0,0 +1,99 @@ +package com.epmet.mq.listener; + +import com.alibaba.fastjson.JSON; +import com.epmet.commons.rocketmq.constants.MQUserPropertys; +import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; +import com.epmet.commons.tools.distributedlock.DistributedLock; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.utils.SpringContextUtils; +import org.apache.commons.lang.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 sun + * @Description 党建小助手发布活动、活动提前提醒、活动发布提醒通知 + */ +public class PartyMeetingMessageListener 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; + } + + /** + * 逐条消费 + * @param messageExt + */ + private void consumeMessage(MessageExt messageExt) { + // msg即为消息体 + String msg = new String(messageExt.getBody()); + logger.info("msg is {}",msg); + String tags = messageExt.getTags(); + String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL); + + logger.info("【党建小助手消息】-活动消息-收到消息内容:{},操作:{}", msg, tags); + PartyMeetingMessageMQMsg obj = JSON.parseObject(msg, PartyMeetingMessageMQMsg.class); + logger.info("obj is {}",JSON.toJSONString(obj)); + + DistributedLock distributedLock = null; + RLock lock = null; + try { + distributedLock = SpringContextUtils.getBean(DistributedLock.class); + lock = distributedLock.getLock(String.format("lock:ic_warn_stats:%s", obj.getCustomerId()), + 30L, 30L, TimeUnit.SECONDS); + //待执行方法 + //SpringContextUtils.getBean(IcVolunteerPolyService.class).volunteerChanged(obj); + + } catch (EpmetException e) { + // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 + logger.error("【党建小助手消息】-活动消息MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + } catch (Exception e) { + // 不是我们自己抛出的异常，可以让MQ重试 + logger.error("【党建小助手消息】-活动消息MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + throw e; + } finally { + assert distributedLock != null; + distributedLock.unLock(lock); + } + + if (StringUtils.isNotBlank(pendingMsgLabel)) { + try { + removePendingMqMsgCache(pendingMsgLabel); + } catch (Exception e) { + logger.error("【党建小助手消息】-删除mq阻塞消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + } + + private void removePendingMqMsgCache(String pendingMsgLabel) { + String key = RedisKeys.blockedMqMsgKey(pendingMsgLabel); + Boolean rst = redisUtils.delete(key); + } +} From 357ec1da1260e0ef85dcf126fd3615fdb4393274 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 09:40:53 +0800 Subject: [PATCH 025/397] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/form/HomeMonthTotalFormDTO.java | 41 ++++++++++++++++ .../result/HomeMonthTotalResultDTO.java | 28 +++++++++++ .../controller/IcPartyActController.java | 20 +++++++- .../partyOrg/service/IcPartyActService.java | 10 ++++ .../service/impl/IcPartyActServiceImpl.java | 47 +++++++++++++++++++ 5 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/HomeMonthTotalResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java new file mode 100644 index 0000000000..74f392a890 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java @@ -0,0 +1,41 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/19 08:59 + * @DESC + */ +@Data +public class HomeMonthTotalFormDTO implements Serializable { + + private static final long serialVersionUID = 1128815856169903825L; + + public interface HomeMonthTotalForm{} + + /** + * 年份ID + */ + @NotBlank(message = "yearId不能为空",groups = HomeMonthTotalForm.class) + private String yearId; + + /** + * 党支部ID + */ + @NotBlank(message = "orgId不能为空",groups = HomeMonthTotalForm.class) + private String orgId; + + /** + * 是否本人创建的活动，1：是；0：否 + */ + @NotBlank(message = "isSelf不能为空",groups = HomeMonthTotalForm.class) + private String isSelf; + + private String staffId; + + private String customerId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/HomeMonthTotalResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/HomeMonthTotalResultDTO.java new file mode 100644 index 0000000000..f3ba554fd6 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/HomeMonthTotalResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/19 08:57 + * @DESC + */ +@Data +public class HomeMonthTotalResultDTO implements Serializable { + + private static final long serialVersionUID = -4647982500373510830L; + + private String monthId; + + private Integer count; + + public HomeMonthTotalResultDTO() { + this.monthId = ""; + this.count = NumConstant.ZERO; + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 2c2c2cacd3..5d58f8396d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -3,10 +3,14 @@ package com.epmet.modules.partyOrg.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.commons.tools.validator.ValidatorUtils; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; 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; @@ -37,7 +41,19 @@ public class IcPartyActController { return new Result>().ok(list); } -// @PostMapping("homeMonthTotal") -// public Result + /** + * Desc: 【党建日历】首页-获取每月总数 + * @param tokenDto + * @param formDTO + * @author zxc + * @date 2022/8/19 09:05 + */ + @PostMapping("homeMonthTotal") + public Result> getHomeMonthTotal(@LoginUser TokenDto tokenDto,@RequestBody HomeMonthTotalFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, HomeMonthTotalFormDTO.HomeMonthTotalForm.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icPartyActService.getHomeMonthTotal(formDTO)); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 86aaf9f015..0be952a650 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -3,6 +3,8 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import java.util.List; @@ -20,4 +22,12 @@ public interface IcPartyActService extends BaseService { * @return */ List actTypeList(String customerId); + + /** + * Desc: 【党建日历】首页-获取每月总数 + * @param formDTO + * @author zxc + * @date 2022/8/19 09:05 + */ + List getHomeMonthTotal(HomeMonthTotalFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 2a75432068..d6c41ded06 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -2,13 +2,20 @@ package com.epmet.modules.partyOrg.service.impl; 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.modules.partyOrg.dao.IcPartyActDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; import java.util.List; /** @@ -38,4 +45,44 @@ public class IcPartyActServiceImpl extends BaseServiceImpl getHomeMonthTotal(HomeMonthTotalFormDTO formDTO) { + List result = constructMonthData(formDTO.getYearId()); + + return result; + } + + /** + * Desc: 构造结果集 + * @param yearId + * @author zxc + * @date 2022/8/19 09:31 + */ + public List constructMonthData(String yearId){ + List result = new ArrayList<>(); + if (StringUtils.isNotBlank(yearId)){ + String[] array = new String[NumConstant.TWELVE]; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM"); + Calendar cal = Calendar.getInstance(); + cal.set(Calendar.YEAR,Integer.parseInt(yearId)); + cal.set(Calendar.MONTH, NumConstant.ZERO); + for(int i=NumConstant.ZERO; i Date: Fri, 19 Aug 2022 10:06:28 +0800 Subject: [PATCH 026/397] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/IcMessageDTO.java | 104 ++++++++++++++++++ .../epmet/controller/IcMessageController.java | 73 ++++++++++++ .../main/java/com/epmet/dao/IcMessageDao.java | 16 +++ .../com/epmet/entity/IcMessageEntity.java | 74 +++++++++++++ .../com/epmet/service/IcMessageService.java | 78 +++++++++++++ .../service/impl/IcMessageServiceImpl.java | 83 ++++++++++++++ .../main/resources/mapper/IcMessageDao.xml | 8 ++ 7 files changed, 436 insertions(+) create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java new file mode 100644 index 0000000000..3451d342f3 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java @@ -0,0 +1,104 @@ +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 2022-08-19 + */ +@Data +public class IcMessageDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * app=resi时，此列为gridId,其他情况暂定 * + */ + private String gridId; + + /** + * 被通知的用户id + */ + private String userId; + + /** + * 消息通知对象：居民端用户resi、政府端工作人员gov、运营端工作人员oper + */ + private String app; + + /** + * 消息分类 党建小助手:party + */ + private String messageType; + + /** + * 消息类型对应的业务Id + */ + private String targetId; + + /** + * 消息标题 + */ + private String title; + + /** + * 消息通知内容 + */ + private String messageContent; + + /** + * read已读、unread未读 + */ + private String readFlag; + + /** + * 删除标记 0：未删除，1：已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人(发布消息的人) + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 调用者 + */ + private String referer; + +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java new file mode 100644 index 0000000000..2d12517d89 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java @@ -0,0 +1,73 @@ +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.IcMessageDTO; +import com.epmet.service.IcMessageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 用户消息表(党建小助手) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-19 + */ +@RestController +@RequestMapping("icMessage") +public class IcMessageController { + + @Autowired + private IcMessageService icMessageService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icMessageService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcMessageDTO data = icMessageService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcMessageDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icMessageService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcMessageDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icMessageService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icMessageService.delete(ids); + return new Result(); + } + + + + +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java new file mode 100644 index 0000000000..f8b474aecf --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcMessageEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 用户消息表(党建小助手) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-19 + */ +@Mapper +public interface IcMessageDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java new file mode 100644 index 0000000000..dc937c6639 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java @@ -0,0 +1,74 @@ +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 2022-08-19 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_message") +public class IcMessageEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * app=resi时，此列为gridId,其他情况暂定 * + */ + private String gridId; + + /** + * 被通知的用户id + */ + private String userId; + + /** + * 消息通知对象：居民端用户resi、政府端工作人员gov、运营端工作人员oper + */ + private String app; + + /** + * 消息分类 党建小助手:party + */ + private String messageType; + + /** + * 消息类型对应的业务Id + */ + private String targetId; + + /** + * 消息标题 + */ + private String title; + + /** + * 消息通知内容 + */ + private String messageContent; + + /** + * read已读、unread未读 + */ + private String readFlag; + + /** + * 调用者 + */ + private String referer; + +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java new file mode 100644 index 0000000000..59a374a341 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.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.IcMessageDTO; +import com.epmet.entity.IcMessageEntity; + +import java.util.List; +import java.util.Map; + +/** + * 用户消息表(党建小助手) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-19 + */ +public interface IcMessageService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-19 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-19 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcMessageDTO + * @author generator + * @date 2022-08-19 + */ + IcMessageDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-19 + */ + void save(IcMessageDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-19 + */ + void update(IcMessageDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-19 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java new file mode 100644 index 0000000000..144d7b67ab --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.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.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.IcMessageDao; +import com.epmet.dto.IcMessageDTO; +import com.epmet.entity.IcMessageEntity; +import com.epmet.service.IcMessageService; +import org.apache.commons.lang3.StringUtils; +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 2022-08-19 + */ +@Service +public class IcMessageServiceImpl extends BaseServiceImpl implements IcMessageService { + + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcMessageDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcMessageDTO.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 IcMessageDTO get(String id) { + IcMessageEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcMessageDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcMessageDTO dto) { + IcMessageEntity entity = ConvertUtils.sourceToTarget(dto, IcMessageEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcMessageDTO dto) { + IcMessageEntity entity = ConvertUtils.sourceToTarget(dto, IcMessageEntity.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-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml new file mode 100644 index 0000000000..5f186be462 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From cf001dbdc9ad4f4698d3a51ca4829def80848645 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 10:16:22 +0800 Subject: [PATCH 027/397] =?UTF-8?q?=E6=94=B9=E4=B8=8B=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/IcPartyActAddOrUpdateFormDTO.java | 18 +++++++ .../form/IcPartyActPageFormDTO.java | 19 +++++++ .../{ => result}/IcPartActTypeDTO.java | 2 +- .../result/IcPartyActDetailResDTO.java | 16 ++++++ .../result/IcPartyActPageResultDTO.java | 16 ++++++ .../controller/IcPartyActController.java | 52 +++++++++++++++++-- .../modules/partyOrg/dao/IcPartyActDao.java | 2 +- .../partyOrg/service/IcPartyActService.java | 31 ++++++++++- .../service/impl/IcPartyActServiceImpl.java | 46 +++++++++++++++- .../mapper/partyOrg/IcPartyActDao.xml | 2 +- 10 files changed, 194 insertions(+), 10 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java rename epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/{ => result}/IcPartActTypeDTO.java (80%) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java new file mode 100644 index 0000000000..1649460dea --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -0,0 +1,18 @@ +package com.epmet.resi.partymember.dto.icpartyact.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/19 9:58 + */ +@Data +public class IcPartyActAddOrUpdateFormDTO implements Serializable { + private static final long serialVersionUID = -2554822505755122067L; + private String customerId; + private String publishStaffId; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java new file mode 100644 index 0000000000..e722f5fab7 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.resi.partymember.dto.icpartyact.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/19 10:02 + */ +@Data +public class IcPartyActPageFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = -8171649039313981541L; + private String customerId; + private String publishStaffId; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartActTypeDTO.java similarity index 80% rename from epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java rename to epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartActTypeDTO.java index 4e864ab3cc..5242b94d7b 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartActTypeDTO.java @@ -1,4 +1,4 @@ -package com.epmet.resi.partymember.dto.icpartyact; +package com.epmet.resi.partymember.dto.icpartyact.result; import lombok.Data; diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java new file mode 100644 index 0000000000..7cde53d040 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java @@ -0,0 +1,16 @@ +package com.epmet.resi.partymember.dto.icpartyact.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/19 10:08 + */ +@Data +public class IcPartyActDetailResDTO implements Serializable { + private static final long serialVersionUID = -8102085878449811977L; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java new file mode 100644 index 0000000000..46becccdfe --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java @@ -0,0 +1,16 @@ +package com.epmet.resi.partymember.dto.icpartyact.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/19 10:06 + */ +@Data +public class IcPartyActPageResultDTO implements Serializable { + private static final long serialVersionUID = 1414832133227703667L; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 5d58f8396d..e06022ac52 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -1,20 +1,23 @@ package com.epmet.modules.partyOrg.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.modules.partyOrg.service.IcPartyActService; -import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; +import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; 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; +import java.util.Map; /** @@ -30,6 +33,45 @@ public class IcPartyActController { @Autowired private IcPartyActService icPartyActService; + /** + * 添加、修改活动 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("addOrUpdate") + public Result> addOrUpdate(@LoginUser TokenDto tokenDto,@RequestBody IcPartyActAddOrUpdateFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setPublishStaffId(tokenDto.getUserId()); + Map map=icPartyActService.addOrUpdate(formDTO); + return new Result>().ok(map); + } + + /** + * 活动列表分页 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("page-list") + public Result> pageList(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActPageFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setPublishStaffId(tokenDto.getUserId()); + return new Result>().ok(icPartyActService.pageList(formDTO)); + } + + /** + * 活动列表活动详情 + * @param tokenDto + * @param icPartyActId + * @return + */ + @PostMapping("act-detail/{icPartyActId}") + public Result actDetail(@LoginUser TokenDto tokenDto, @PathVariable("icPartyActId")String icPartyActId){ + return new Result().ok(icPartyActService.queryActDetail(tokenDto.getCustomerId(),tokenDto.getUserId(),icPartyActId)); + } + + /** * 活动类型 * @param tokenDto diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 4d25b88ff4..374dd39b7d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -2,7 +2,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; -import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 0be952a650..5dca25642b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -1,12 +1,18 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; -import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; +import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import java.util.List; +import java.util.Map; /** * 党建组织活动 @@ -30,4 +36,27 @@ public interface IcPartyActService extends BaseService { * @date 2022/8/19 09:05 */ List getHomeMonthTotal(HomeMonthTotalFormDTO formDTO); + + /** + * 添加、修改活动 + * @param formDTO + * @return + */ + Map addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO); + + /** + * 活动列表-分页查询 + * @param formDTO + * @return + */ + PageData pageList(IcPartyActPageFormDTO formDTO); + + /** + * 活动列表活动详情 + * @param customerId + * @param userId + * @param icPartyActId + * @return + */ + IcPartyActDetailResDTO queryActDetail(String customerId, String userId, String icPartyActId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index d6c41ded06..0a20fe8935 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -3,10 +3,15 @@ package com.epmet.modules.partyOrg.service.impl; 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.page.PageData; import com.epmet.modules.partyOrg.dao.IcPartyActDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.service.IcPartyActService; -import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; +import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.commons.collections4.CollectionUtils; @@ -17,6 +22,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.List; +import java.util.Map; /** * 党建组织活动 @@ -85,4 +91,42 @@ public class IcPartyActServiceImpl extends BaseServiceImpl addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO) { + //todo + return null; + } + + /** + * 活动列表-分页查询 + * + * @param formDTO + * @return + */ + @Override + public PageData pageList(IcPartyActPageFormDTO formDTO) { + //todo + return null; + } + + /** + * 活动列表活动详情 + * + * @param customerId + * @param userId + * @param icPartyActId + * @return + */ + @Override + public IcPartyActDetailResDTO queryActDetail(String customerId, String userId, String icPartyActId) { + //todo + return null; + } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 83401d36a0..066206184f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -3,7 +3,7 @@ - SELECT d.TYPE_KEY as value, d.TYPE_NAME as label, From 2aba676712d5ce77814d045c3f97d039ff2548df Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 10:16:58 +0800 Subject: [PATCH 028/397] =?UTF-8?q?mq=E9=85=8D=E7=BD=AE=E9=81=97=E6=BC=8F?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/send/SendMqMsgUtil.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java index debd15686f..7b9d1d877b 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java @@ -243,4 +243,28 @@ public class SendMqMsgUtil { return false; } + /** + * @Description 党建小助手消息同步Mq + * @author sun + */ + public boolean partyMeetingMQMsg(String msgType, PartyMeetingMessageMQMsg msgContent) { + try { + SystemMsgFormDTO form = new SystemMsgFormDTO(msgType,msgContent); + Result sendMsgResult; + log.info("partyMeetingMQMsg param:{}",msgContent); + int retryTime = 0; + do { + sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); + } while ((sendMsgResult == null || !sendMsgResult.success()) && retryTime++ < NumConstant.TWO); + + if (sendMsgResult != null && sendMsgResult.success()) { + return true; + } + log.error("发送党建小助手系统消息到message服务失败:{},msg:{}", JSON.toJSONString(sendMsgResult), JSON.toJSONString(form)); + } catch (Exception e) { + log.error("partyMeetingMQMsg exception", e); + } + return false; + } + } From e2957b81295a986a4d40381f3a871d6c2fe1e893 Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 10:31:13 +0800 Subject: [PATCH 029/397] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/IcMessageFormDTO.java | 66 +++++++++++++++++++ .../feign/EpmetMessageOpenFeignClient.java | 8 +++ .../EpmetMessageOpenFeignClientFallback.java | 6 ++ .../epmet/controller/IcMessageController.java | 12 +++- .../com/epmet/service/IcMessageService.java | 4 ++ .../service/impl/IcMessageServiceImpl.java | 7 ++ 6 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageFormDTO.java diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageFormDTO.java new file mode 100644 index 0000000000..679621c430 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageFormDTO.java @@ -0,0 +1,66 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@Data +public class IcMessageFormDTO implements Serializable { + private static final long serialVersionUID = 2697079163476964749L; + + /** + * 客户id + */ + @NotBlank(message = "客户id不能为空") + private String customerId; + + /** + * app=resi时，此列为gridId,其他情况暂定 * + */ + private String gridId; + + /** + * 对应用户id + */ + @NotBlank(message = "通知用户id为空") + private String userId; + + /** + * 消息通知对象：居民端用户resi、政府端工作人员gov、运营端工作人员oper + */ + @NotBlank(message = "消息通知对象不能为空") + private String app; + + /** + * 消息标题 + */ + @NotBlank(message = "消息标题不能为空") + private String title; + + /** + * 消息通知内容 + */ + @NotBlank(message = "通知内容不能为空") + private String messageContent; + + /** + * read已读、unread未读 + */ + @NotBlank(message = "readFlag不能为空") + private String readFlag; + + /** + * 调用者 【分内部调用和外部调用，内部调用值为空，外部默认为：外挂-站内信】 + */ + private String referer; + + /** + * 消息分类:info-上传下达消息 详见UserMessageTypeConstant + */ + private String messageType; + /** + * 消息对应的业务id,比如message_type=info时，此列存储的是消息id,可跳转到消息详情 + */ + private String targetId; +} diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java index 8b9f06198f..f1f7b5dfa5 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java @@ -127,4 +127,12 @@ public interface EpmetMessageOpenFeignClient { @PostMapping(value = "message/sms/send-msg", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result sendMsg(@RequestBody List formDTO); + + /** + * @Author sun + * @Description 党建小助手-批量插入未读消息 + **/ + @PostMapping(value = "message/icMessage/saveicmessagelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result saveIcMessageList(List msgList); + } diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java index 2d5c0d9073..100dc4ff10 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java @@ -78,4 +78,10 @@ public class EpmetMessageOpenFeignClientFallback implements EpmetMessageOpenFeig public Result sendMsg(List formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "sendMsg",formDTO); } + + @Override + public Result saveIcMessageList(List msgList) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveIcMessageList", msgList); + } + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java index 2d12517d89..034601b985 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java @@ -9,10 +9,12 @@ 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.IcMessageDTO; +import com.epmet.dto.form.IcMessageFormDTO; import com.epmet.service.IcMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; @@ -67,7 +69,15 @@ public class IcMessageController { return new Result(); } - + /** + * @Author sun + * @Description 批量插入未读消息 + **/ + @PostMapping("saveicmessagelist") + public Result saveIcMessageList(@RequestBody List msgList) { + icMessageService.saveIcMessageList(msgList); + return new Result(); + } } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java index 59a374a341..04524957b4 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java @@ -2,7 +2,9 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcMessageDTO; +import com.epmet.dto.form.IcMessageFormDTO; import com.epmet.entity.IcMessageEntity; import java.util.List; @@ -75,4 +77,6 @@ public interface IcMessageService extends BaseService { * @date 2022-08-19 */ void delete(String[] ids); + + void saveIcMessageList(List msgList); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java index 144d7b67ab..305dff1f02 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java @@ -8,6 +8,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcMessageDao; import com.epmet.dto.IcMessageDTO; +import com.epmet.dto.form.IcMessageFormDTO; import com.epmet.entity.IcMessageEntity; import com.epmet.service.IcMessageService; import org.apache.commons.lang3.StringUtils; @@ -80,4 +81,10 @@ public class IcMessageServiceImpl extends BaseServiceImpl msgList) { + List entityList = ConvertUtils.sourceToTarget(msgList, IcMessageEntity.class); + insertBatch(entityList); + } + } \ No newline at end of file From e9bbe6eeec3611f0f27ae3151a43c4ed3460060c Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 19 Aug 2022 10:39:54 +0800 Subject: [PATCH 030/397] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=20=E5=88=A0=E9=99=A4=E9=A1=B9=E7=9B=AE=E5=92=8C?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=B8=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/EpmetHeartOpenFeignClient.java | 9 ++++ .../EpmetHeartOpenFeignClientFallback.java | 7 ++- .../controller/IcUserDemandRecController.java | 19 ++++++-- .../epmet/service/IcUserDemandRecService.java | 11 ++++- .../impl/IcUserDemandRecServiceImpl.java | 13 ++++++ .../com/epmet/enums/ProjectOriginEnum.java | 46 +++++++++++++++++++ .../com/epmet/service/ProjectService.java | 11 ++++- .../service/impl/IcEventServiceImpl.java | 20 +++++++- .../service/impl/ProjectServiceImpl.java | 9 ++++ 9 files changed, 134 insertions(+), 11 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/enums/ProjectOriginEnum.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java index e3b04df7bb..59e3476245 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java @@ -171,4 +171,13 @@ public interface EpmetHeartOpenFeignClient { @PostMapping("/heart/icpartyunit/editpartyorcommunity") Result editPartyOrCommunity(@RequestBody CheckStaffInfoResultDTO formDTO); + /** + * desc:根据来源id 删除需求 只删主表 + * @param originId + * @param origin + * @return + */ + @PostMapping("/heart/userdemand/deleteByOriginId/{originId}/{origin}") + Result deleteUserDemandByOriginId(String originId, String origin); + } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java index 558cd43f2b..247495bdf5 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java @@ -13,7 +13,6 @@ import com.epmet.dto.form.IcDemandFormDTO; import com.epmet.dto.form.PartyUnitListFormDTO; import com.epmet.dto.form.demand.DemandRecId; import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO; -import com.epmet.dto.form.demand.ServiceItemSelectFormDTO; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; @@ -21,7 +20,6 @@ import com.epmet.dto.form.resi.VolunteerCommonFormDTO; import com.epmet.dto.result.CheckStaffInfoResultDTO; import com.epmet.dto.result.PartyUnitListResultDTO; import com.epmet.dto.result.demand.IcResiDemandDictDTO; -import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO; import com.epmet.feign.EpmetHeartOpenFeignClient; @@ -172,4 +170,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli public Result editPartyOrCommunity(CheckStaffInfoResultDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "editPartyOrCommunity", formDTO); } + + @Override + public Result deleteUserDemandByOriginId(String originId, String origin) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "deleteUserDemandByOriginId", originId,origin); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java index 25db823b01..7db80a3dbd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java @@ -47,10 +47,7 @@ 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.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 javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -399,5 +396,17 @@ public class IcUserDemandRecController implements ResultDataResolver { return new Result(); } + /** + * desc:根据来源id 删除需求 只删主表 + * @param originId + * @param origin + * @return + */ + @PostMapping("deleteByOriginId/{originId}/{origin}") + public Result deleteByOriginId(@PathVariable String originId, @PathVariable String origin) { + Integer effectRow = icUserDemandRecService.deleteByOriginId(originId,origin); + return new Result().ok(effectRow); + } + -} \ No newline at end of file +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java index 68a295422a..ce4b03c9b7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java @@ -265,4 +265,13 @@ public interface IcUserDemandRecService extends BaseService wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcUserDemandRecEntity::getOriginId,originId) + .eq(IcUserDemandRecEntity::getOrigin,origin); + return baseDao.delete(wrapper); + } + /** * 完成并评价 * diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/enums/ProjectOriginEnum.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/enums/ProjectOriginEnum.java new file mode 100644 index 0000000000..5388c889a9 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/enums/ProjectOriginEnum.java @@ -0,0 +1,46 @@ +package com.epmet.enums; + +/** + * 项目来源枚举 + * @author liujianjun + */ +public enum ProjectOriginEnum { + /** + * 项目来源 + */ + ISSUE("issue", "议题上报"), + AGENCY("agency", "直接立项"), + WORK_EVENT("work_event", "巡查上报"), + IC_EVENT("ic_event", "居民上报"), + RESI_EVENT("resi_event", "旧的居民上报（已废弃）"); + + private String code; + private String name; + + ProjectOriginEnum(String code, String name) { + this.code = code; + this.name = name; + } + + /** + * 根据sourceType查询对应的枚举对象 + * @param code + * @return + */ + public static ProjectOriginEnum getEnumByCode(String code) { + for (ProjectOriginEnum e : ProjectOriginEnum.values()) { + if (e.getCode().equals(code)) { + return e; + } + } + return null; + } + + public String getCode() { + return code; + } + + public String getName() { + return name; + } +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index c57ac318a6..7dba649107 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -397,4 +397,13 @@ public interface ProjectService extends BaseService { List staffPendingProject(ProjectListFromDTO fromDTO); PageData orgProjectList(OrgProjectListFormDTO formDTO); -} \ No newline at end of file + + /** + * desc:根据来源id和类型 删除项目 （只删了主表） + * @param originId + * @param origin + * @return + */ + Integer deleteByOriginId(String originId, String origin); + +} 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 f11fd1044d..fea81dc3b6 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 @@ -29,6 +29,7 @@ import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO; import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.enums.EcEventProcessStatusEnum; +import com.epmet.enums.ProjectOriginEnum; import com.epmet.feign.*; import com.epmet.resi.group.constant.TopicConstant; import com.epmet.service.*; @@ -407,8 +408,23 @@ public class IcEventServiceImpl extends BaseServiceImpl effectRow = epmetHeartOpenFeignClient.deleteUserDemandByOriginId(entity.getId(), ProjectOriginEnum.IC_EVENT.getCode()); + log.info("delete userDemand effectRow:{},eventId:{}", effectRow, id); + } + baseDao.deleteById(id); + } } /** diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 0267a6f59b..9c77a99edd 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.alibaba.fastjson.JSON; +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; @@ -3562,5 +3563,13 @@ public class ProjectServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } + @Override + public Integer deleteByOriginId(String originId, String origin) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectEntity::getOriginId, originId) + .eq(ProjectEntity::getOrigin,origin); + return baseDao.delete(wrapper); + } + } From 535de4e6d65891d9361853a366ada149482c3c69 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 19 Aug 2022 10:50:18 +0800 Subject: [PATCH 031/397] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=20=E5=88=A0=E9=99=A4=E9=A1=B9=E7=9B=AE=E5=92=8C?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=B8=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java | 2 +- .../java/com/epmet/controller/IcUserDemandRecController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java index 59e3476245..27d88957b5 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java @@ -178,6 +178,6 @@ public interface EpmetHeartOpenFeignClient { * @return */ @PostMapping("/heart/userdemand/deleteByOriginId/{originId}/{origin}") - Result deleteUserDemandByOriginId(String originId, String origin); + Result deleteUserDemandByOriginId(@PathVariable("originId") String originId, @PathVariable("origin")String origin); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java index 7db80a3dbd..99894e3165 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java @@ -403,7 +403,7 @@ public class IcUserDemandRecController implements ResultDataResolver { * @return */ @PostMapping("deleteByOriginId/{originId}/{origin}") - public Result deleteByOriginId(@PathVariable String originId, @PathVariable String origin) { + public Result deleteByOriginId(@PathVariable("originId") String originId, @PathVariable("origin")String origin) { Integer effectRow = icUserDemandRecService.deleteByOriginId(originId,origin); return new Result().ok(effectRow); } From e36d9368da9055531c580209a6ddecf8944ed0af Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 11:15:40 +0800 Subject: [PATCH 032/397] ... --- .../commons/rocketmq/messages/PartyMeetingMessageMQMsg.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java index 4e21d2179d..9ca6c76c5d 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java @@ -15,7 +15,7 @@ public class PartyMeetingMessageMQMsg implements Serializable { private String customerId; //活动Id private String icPartyActId; - //动作类型 发布活动:publish 提前提醒:remind 提前通知:notify + //动作类型 发布活动:publish 提前提醒:remind 日程通知:notify private String type; //党组织Id private String publishOrgId; From c6ce21c6ac7783a4113b5f461ee5b7b5816b807f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 11:18:01 +0800 Subject: [PATCH 033/397] =?UTF-8?q?=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/form/HomeMonthTotalFormDTO.java | 7 +++++ .../modules/partyOrg/dao/IcScheduleDao.java | 6 ++++ .../service/impl/IcPartyActServiceImpl.java | 26 +++++++++++++++- .../src/main/resources/logback-spring.xml | 3 +- .../mapper/partyOrg/IcScheduleDao.xml | 30 +++++++++++++++++++ 5 files changed, 70 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java index 74f392a890..396ba3611a 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java @@ -38,4 +38,11 @@ public class HomeMonthTotalFormDTO implements Serializable { private String staffId; private String customerId; + + /** + * 工作人员所属组织ID + */ + private String agencyId; + + private String path; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java index b8b407a170..48aa6fd599 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -3,8 +3,12 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 日程表 * @@ -16,4 +20,6 @@ public interface IcScheduleDao extends BaseDao { void editSchedule(AddOrEditScheduleFormDTO formDTO); + List getScheduleAndActCount(HomeMonthTotalFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 0a20fe8935..5e0a463d14 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -3,19 +3,26 @@ package com.epmet.modules.partyOrg.service.impl; 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.dto.result.CustomerStaffInfoCacheResult; +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.modules.partyOrg.dao.IcPartyActDao; +import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.service.IcPartyActService; +import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; 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 java.text.SimpleDateFormat; @@ -33,6 +40,10 @@ import java.util.Map; @Service public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyActService { + @Autowired + private IcScheduleDao scheduleDao; + @Autowired + private IcPartyOrgService partyOrgService; /** * 活动类型列表 @@ -61,8 +72,21 @@ public class IcPartyActServiceImpl extends BaseServiceImpl getHomeMonthTotal(HomeMonthTotalFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException("查询工作人员失败："+formDTO.getStaffId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId()); + if (null == icPartyOrgDTO){ + throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId()); + } + formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId())); List result = constructMonthData(formDTO.getYearId()); - + List countList = scheduleDao.getScheduleAndActCount(formDTO); + if (CollectionUtils.isNotEmpty(countList)){ + countList.forEach(c -> result.stream().filter(r -> c.getMonthId().equals(r.getMonthId())).forEach(r -> r.setCount(c.getCount()))); + } return result; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml index f4fc5a99ea..b8b3161188 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml @@ -160,11 +160,12 @@ - + + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 878c3f9fec..c4933d7934 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -14,4 +14,34 @@ is_public = #{isPublic} WHERE ID = #{scheduleId} + + \ No newline at end of file From ea2e8106b54dd3841bab380d91975df33612bbc0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 11:19:41 +0800 Subject: [PATCH 034/397] =?UTF-8?q?=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index c4933d7934..39bae20e11 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -38,7 +38,7 @@ AND CUSTOMER_ID = #{customerId} AND HOLD_YEAR_ID = #{yearId} - AND CREATED_BY = '周星驰' + AND CREATED_BY = #{staffId} AND PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') GROUP BY HOLD_MONTH_ID)t From 54ffc7598a92fec0793f885e7fbe17e9d5932f69 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 19 Aug 2022 12:27:22 +0800 Subject: [PATCH 035/397] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=20=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=20=E5=92=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcEventServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 fea81dc3b6..5ac629487d 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 @@ -1,5 +1,6 @@ package com.epmet.service.impl; +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.*; @@ -19,6 +20,7 @@ import com.epmet.commons.tools.scan.param.ImgTaskDTO; import com.epmet.commons.tools.scan.param.TextScanParamDTO; import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.*; import com.epmet.constant.*; import com.epmet.dao.IcEventDao; @@ -95,6 +97,8 @@ public class IcEventServiceImpl extends BaseServiceImpl effectRow = epmetHeartOpenFeignClient.deleteUserDemandByOriginId(entity.getId(), ProjectOriginEnum.IC_EVENT.getCode()); log.info("delete userDemand effectRow:{},eventId:{}", effectRow, id); } - baseDao.deleteById(id); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper(); + wrapper.eq(IcEventEntity::getId,id).set(IcEventEntity::getUpdatedTime,new Date()).set(IcEventEntity::getCreatedBy,loginUserUtil.getLoginUserId()); + baseDao.delete(wrapper); } } From 23a1cac51b7fa384fdeda60039ea530ed2925d06 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 19 Aug 2022 12:33:51 +0800 Subject: [PATCH 036/397] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=20=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=20=E5=92=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcEventServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 5ac629487d..9042b2aa74 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 @@ -428,8 +428,10 @@ public class IcEventServiceImpl extends BaseServiceImpl wrapper = new LambdaUpdateWrapper(); - wrapper.eq(IcEventEntity::getId,id).set(IcEventEntity::getUpdatedTime,new Date()).set(IcEventEntity::getCreatedBy,loginUserUtil.getLoginUserId()); - baseDao.delete(wrapper); + wrapper.eq(IcEventEntity::getId,id).set(IcEventEntity::getUpdatedTime,new Date()) + .set(IcEventEntity::getCreatedBy,loginUserUtil.getLoginUserId()) + .set(IcEventEntity::getDelFlag,NumConstant.ONE_STR); + baseDao.update(null,wrapper); } } From ddc7285cbef043bae32cb26a11f84da0ce1f052e Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 19 Aug 2022 12:43:53 +0800 Subject: [PATCH 037/397] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=20=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=20=E5=92=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcUserDemandRecServiceImpl.java | 16 +++++++++++----- .../epmet/service/impl/ProjectServiceImpl.java | 11 +++++++---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index e4477dcf27..9ecec05fa1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -18,8 +18,8 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; -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.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -39,6 +39,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.scan.param.TextScanParamDTO; import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; @@ -114,6 +115,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcUserDemandRecEntity::getOriginId,originId) - .eq(IcUserDemandRecEntity::getOrigin,origin); - return baseDao.delete(wrapper); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper(); + wrapper.eq(IcUserDemandRecEntity::getOriginId, originId) + .eq(IcUserDemandRecEntity::getOrigin,origin) + .set(IcUserDemandRecEntity::getUpdatedTime,new Date()) + .set(IcUserDemandRecEntity::getCreatedBy,loginUserUtil.getLoginUserId()) + .set(IcUserDemandRecEntity::getDelFlag,NumConstant.ONE_STR); + return baseDao.update(null, wrapper); } /** diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 9c77a99edd..9e679c824b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -19,8 +19,8 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.alibaba.fastjson.JSON; -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.rocketmq.messages.ProjectChangedMQMsg; @@ -3565,10 +3565,13 @@ public class ProjectServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper(); wrapper.eq(ProjectEntity::getOriginId, originId) - .eq(ProjectEntity::getOrigin,origin); - return baseDao.delete(wrapper); + .eq(ProjectEntity::getOrigin,origin) + .set(ProjectEntity::getUpdatedTime,new Date()) + .set(ProjectEntity::getCreatedBy,loginUserUtil.getLoginUserId()) + .set(ProjectEntity::getDelFlag,NumConstant.ONE_STR); + return baseDao.update(null, wrapper); } From 4ebe75943d006bab5b7e64f4bec62bbad5ad78a3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 19 Aug 2022 12:54:16 +0800 Subject: [PATCH 038/397] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=20=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=20=E5=92=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcEventServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9042b2aa74..6f4d7afe6e 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 @@ -425,7 +425,7 @@ public class IcEventServiceImpl extends BaseServiceImpl effectRow = epmetHeartOpenFeignClient.deleteUserDemandByOriginId(entity.getId(), ProjectOriginEnum.IC_EVENT.getCode()); - log.info("delete userDemand effectRow:{},eventId:{}", effectRow, id); + log.info("delete userDemand result:{},eventId:{}", effectRow, id); } LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper(); wrapper.eq(IcEventEntity::getId,id).set(IcEventEntity::getUpdatedTime,new Date()) From e290cfa4b2ee2da89be8b1f01b0094662221d8e8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 13:26:56 +0800 Subject: [PATCH 039/397] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E5=85=B8=E8=A1=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?flyway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V0.0.23_party_publish_Time.sql | 7 + .../epmet/commons/tools/utils/DateUtils.java | 6 + .../form/IcPartyActAddOrUpdateFormDTO.java | 146 ++++++++++++++++++ .../dto/icpartyact/form/JoinOrgDTO.java | 53 +++++++ .../controller/IcPartyActController.java | 8 + .../partyOrg/entity/IcPartyActEntity.java | 6 +- .../service/impl/IcPartyActServiceImpl.java | 32 +++- 7 files changed, 253 insertions(+), 5 deletions(-) create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql new file mode 100644 index 0000000000..d6f288b2c7 --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql @@ -0,0 +1,7 @@ +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458000894500866', 'icpartyact_auto_publish_time', '党组织活动自动发布时间', '党组织活动自动发布时间', 35, 0, 0, '1', '2022-08-19 10:45:54', '1', '2022-08-19 10:46:11'); + + +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458233091170305', 1560458000894500866, '活动开始前1天', '1', '0', '活动开始前1天', 1, 0, 0, '1', '2022-08-19 10:46:49', '1', '2022-08-19 10:46:49'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458276439302146', 1560458000894500866, '活动开始前3天', '3', '0', '活动开始前3天', 2, 0, 0, '1', '2022-08-19 10:47:00', '1', '2022-08-19 10:47:00'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458332076744705', 1560458000894500866, '活动开始前5天', '5', '0', '活动开始前5天', 3, 0, 0, '1', '2022-08-19 10:47:13', '1', '2022-08-19 10:47:13'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458388007788545', 1560458000894500866, '活动开始前7天', '7', '0', '活动开始前7天', 4, 0, 0, '1', '2022-08-19 10:47:26', '1', '2022-08-19 10:47:26'); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index d5e6be9ab4..34511b68bc 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -1070,4 +1070,10 @@ public class DateUtils { return cal.getTime(); } + public static Date calDateBaseDay(Date date, int day) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.DAY_OF_MONTH, day); + return calendar.getTime(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index 1649460dea..88e791c889 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -1,8 +1,18 @@ package com.epmet.resi.partymember.dto.icpartyact.form; +import com.epmet.commons.tools.dto.form.FileCommonDTO; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.Date; +import java.util.List; /** * @Description @@ -12,7 +22,143 @@ import java.io.Serializable; @Data public class IcPartyActAddOrUpdateFormDTO implements Serializable { private static final long serialVersionUID = -2554822505755122067L; + + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + public interface UpdateUserInternalGroup { + } + + public interface UpdateUserShowGroup extends CustomerClientShowGroup { + } + + @NotBlank(message = "customerId不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) private String customerId; + + @NotBlank(message = "publishStaffId不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) private String publishStaffId; + + @NotBlank(message = "icPartyActId不能为空", groups = {UpdateUserInternalGroup.class}) + private String icPartyActId; + + /** + * 活动类型，来源于ic_party_act_type_dict + */ + @NotBlank(message = "活动类型不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String actType; + + /** + * 活动举办时间：yyyy + */ + @NotBlank(message = "holdYearId不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + private String holdYearId; + + /** + * 活动举办时间:yyyyMM + */ + @NotBlank(message = "holdMonthId不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + private String holdMonthId; + + /** + * 举办活动时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @NotNull(message = "活动举办时间不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private Date holdTime; + + /** + * 活动主题 + */ + @NotBlank(message = "活动主题不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + @Length(max = 35, message = "最多输入35个字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String topic; + + /** + * 活动地点 + */ + @NotBlank(message = "活动地点不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + @Length(max = 100, message = "活动地点最多输入100字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String address; + + /** + * 活动地点纬度 + */ + private String latitude; + + /** + * 活动地点经度 + */ + private String longitude; + + /** + * 活动开始前几天 + */ + @NotBlank(message = "自动发布时间不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private Integer autoPublicType; + /** + * 发布活动党组织 + */ + @NotBlank(message = "发布活动党组织不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String publishPartyOrgId; + + /** + * 发布活动党组织名称 + */ + @NotBlank(message = "发布活动党组织名称不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String publishPartyOrgName; + + /** + * 发布活动党组织ID的上级节点 + */ + @NotBlank(message = "参加活动党组织ID的上级节点不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + private String publishOrgPid; + + /** + * 发布活动党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + @NotBlank(message = "发布活动党组织类型不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String publishOrgType; + + /** + * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 + */ + @NotBlank(message = "", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + private String publishOrgPath; + + /** + * 参加人员类型，0：全体党员；1：支部委员 + */ + @NotBlank(message = "参加人员类型不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String joinUserType; + + /** + * 是否自动通知参加人员，0否；1是 + */ + @NotBlank(message = "自动通知参加人员不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String isAutoInform; + + /** + * 活动介绍 + */ + @NotBlank(message = "活动介绍不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + @Length(max = 1000, message = "活动介绍最多输入1000字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String introduce; + + /** + * 参加活动党组织 + */ + @Valid + @NotEmpty(message = "参加活动党组织不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private List joinOrgList; + + + /** + * 附件表 + */ + private List attachmentList; + } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java new file mode 100644 index 0000000000..682b4306ec --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java @@ -0,0 +1,53 @@ +package com.epmet.resi.partymember.dto.icpartyact.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/19 10:31 + */ +@Data +public class JoinOrgDTO implements Serializable { + private static final long serialVersionUID = 6994576136698569857L; + + //前端传入 + /** + * 参加活动党组织ID,groupId + */ + @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserShowGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserShowGroup.class}) + private String joinOrgId; + + /** + * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + @NotBlank(message = "参加活动党组织类型不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserShowGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserShowGroup.class}) + private String orgType; + + /** + * 参加活动党组织ID的上级节点 + */ + @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class}) + private String pid; + + /** + * PARTY_ORG_ID的全路径，包含自身。方便前端回显 + */ + @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class}) + private String joinOrgPath; + + //接口内部赋值 + /** + * 活动id + */ + private String icPartyActId; + + /** + * 客户ID + */ + private String customerId; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index e06022ac52..9886fb6b13 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -13,6 +13,7 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -43,6 +44,13 @@ public class IcPartyActController { public Result> addOrUpdate(@LoginUser TokenDto tokenDto,@RequestBody IcPartyActAddOrUpdateFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setPublishStaffId(tokenDto.getUserId()); + if(StringUtils.isNotBlank(formDTO.getIcPartyActId())){ + //修改活动 + ValidatorUtils.validateEntity(formDTO,IcPartyActAddOrUpdateFormDTO.UpdateUserShowGroup.class,IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class); + }else{ + //添加活动 + ValidatorUtils.validateEntity(formDTO,IcPartyActAddOrUpdateFormDTO.AddUserShowGroup.class,IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class); + } Map map=icPartyActService.addOrUpdate(formDTO); return new Result>().ok(map); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java index 4c414a1631..23065472fb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java @@ -52,17 +52,17 @@ public class IcPartyActEntity extends BaseEpmetEntity { private String publishPartyOrgName; /** - * 参加活动党组织ID的上级节点 + * 发布活动党组织ID的上级节点 */ private String publishOrgPid; /** - * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + * 发布活动党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 */ private String publishOrgType; /** - * PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 + * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ private String publishOrgPath; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 0a20fe8935..c5cda02162 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -3,8 +3,15 @@ package com.epmet.modules.partyOrg.service.impl; 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.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.DateUtils; import com.epmet.modules.partyOrg.dao.IcPartyActDao; +import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; @@ -16,7 +23,9 @@ import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; 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.text.SimpleDateFormat; import java.util.ArrayList; @@ -32,7 +41,8 @@ import java.util.Map; */ @Service public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyActService { - + @Autowired + private IcPartyActOrgDao icPartyActOrgDao; /** * 活动类型列表 @@ -99,11 +109,29 @@ public class IcPartyActServiceImpl extends BaseServiceImpl addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO) { - //todo + IcPartyActEntity icPartyActEntity= ConvertUtils.sourceToTarget(formDTO,IcPartyActEntity.class); + icPartyActEntity.setAutoPublicTime(DateUtils.calDateBaseDay(formDTO.getHoldTime(),formDTO.getAutoPublicType())); + CustomerStaffInfoCacheResult staffInfo=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getPublishStaffId()); + if (null == staffInfo) { + String msg = "查询工作人员信息异常"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } + icPartyActEntity.setPublishStaffName(staffInfo.getRealName()); + icPartyActEntity.setOrgId(staffInfo.getAgencyId()); + icPartyActEntity.setPid(staffInfo.getParentAgency().getId()); + icPartyActEntity.setOrgIdPath(staffInfo.getAgencyPIds()); + if(StringUtils.isNotBlank(formDTO.getIcPartyActId())){ + //删除附件、删除参加组织 + + } + + return null; } + /** * 活动列表-分页查询 * From fc7ff10327b1932137ee48f7fa89e770ebb9f1a9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 13:37:09 +0800 Subject: [PATCH 040/397] =?UTF-8?q?=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 39bae20e11..d4cd5a8674 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -37,7 +37,7 @@ WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND HOLD_YEAR_ID = #{yearId} - + AND CREATED_BY = #{staffId} AND PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') From 0a47cf70d23ce1e6bfb393a0ba8b44e04bbcb108 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 13:45:41 +0800 Subject: [PATCH 041/397] someupdate --- .../controller/IcNeighborHoodController.java | 14 ++++++++++ .../epmet/service/IcNeighborHoodService.java | 13 +++++++++ .../impl/IcNeighborHoodServiceImpl.java | 27 +++++++++++++++++++ 3 files changed, 54 insertions(+) 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 627b5a5d8b..b947f13004 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 @@ -150,6 +150,20 @@ public class IcNeighborHoodController { return new Result>().ok(icNeighborHoodService.getNeighborHoodOptions(dto.getAgencyId(), dto.getGridId(),tokenDto.getUserId(),tokenDto.getCustomerId())); } + /** + * 获取用户组织下小区列表 + * + * @param tokenDto + * @param dto + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/8/19 13:32 + */ + @PostMapping("neighborhoodlist") + public Result> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) { + return new Result>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto)); + } + /** * @Description 小区信息导入 * @param tokenDTO 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 085c363819..d5408e73af 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 @@ -20,6 +20,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.IcNeighborHoodDTO; import com.epmet.dto.ImportGeneralDTO; @@ -30,6 +31,7 @@ import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.entity.IcNeighborHoodEntity; import com.epmet.entity.IcNeighborHoodPropertyEntity; import com.epmet.entity.IcPropertyManagementEntity; +import org.springframework.web.bind.annotation.RequestBody; import java.io.IOException; import java.io.InputStream; @@ -115,6 +117,17 @@ public interface IcNeighborHoodService extends BaseService */ List getNeighborHoodOptions(String agencyId, String gridId,String staffId,String customerId); + /** + * 获取用户组织下小区列表 + * + * @param tokenDto + * @param dto + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/8/19 13:32 + */ + List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto); + /** * @Description 通过ID查询小区信息 * @Param ids 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 14c9af3048..bbc85379ad 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 @@ -40,6 +40,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.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.CustomerGridConstant; @@ -210,6 +211,32 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) { + if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) { + log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区"); + CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == result || StringUtils.isBlank(result.getAgencyId())) { + log.error(String.format("staffId:%s,工作人员缓存信息查询异常")); + return Collections.emptyList(); + } + dto.setAgencyId(result.getAgencyId()); + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(dto.getAgencyId()),IcNeighborHoodEntity::getAgencyId, dto.getAgencyId()); + wrapper.eq(StringUtils.isNotBlank(dto.getGridId()), IcNeighborHoodEntity::getGridId, dto.getGridId()); + wrapper.last("ORDER BY CONVERT ( NEIGHBOR_HOOD_NAME USING gbk ) ASC"); + List list = baseDao.selectList(wrapper); + if(CollectionUtils.isEmpty(list)) { + return Collections.emptyList(); + } + return list.stream().map(item -> { + OptionResultDTO result = new OptionResultDTO(); + result.setValue(item.getId()); + result.setLabel(item.getNeighborHoodName()); + return result; + }).collect(Collectors.toList()); + } + /** * @param ids * @Description 通过ID查询小区信息 From 576a1fc54540d2952abbd9fc71ed54b4a7879724 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 14:02:46 +0800 Subject: [PATCH 042/397] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ActAndScheduleListFormDTO.java | 33 ++++++++++++ .../result/ActAndScheduleListResultDTO.java | 53 +++++++++++++++++++ .../controller/IcPartyActController.java | 30 +++++++++++ .../partyOrg/service/IcPartyActService.java | 18 +++++++ .../service/impl/IcPartyActServiceImpl.java | 29 ++++++++-- 5 files changed, 159 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java new file mode 100644 index 0000000000..5789e543e8 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/19 13:52 + * @DESC + */ +@Data +public class ActAndScheduleListFormDTO implements Serializable { + + private static final long serialVersionUID = -6776882545589530612L; + + private String startDate; + private String endDate; + private String dateId; + + /** + * 是否本人创建的活动，1：是；0：否 + */ + private String isSelf; + + /** + * 党组织ID + */ + private String orgId; + + private String customerId; + private String staffId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java new file mode 100644 index 0000000000..611d4bf6ed --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java @@ -0,0 +1,53 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/8/19 13:41 + * @DESC + */ +@Data +public class ActAndScheduleListResultDTO implements Serializable { + + private static final long serialVersionUID = 7378300105829566449L; + + private Integer scheduleTotal; + private Integer activityTotal; + private String dateId; + + private List activityList; + + private List scheduleList; + + + @Data + public static class ActivityListDTO implements Serializable{ + + private static final long serialVersionUID = -9050507457068805831L; + + private String activityId; + private String topic; + private String address; + private String holdTime; + private String type; + private String isPublicValue; + private String joinTypeValue; + private Boolean isMe; + + } + + public static class ScheduleListDTO implements Serializable{ + + private static final long serialVersionUID = 5372167729733804267L; + + private String scheduleId; + private String title; + private String remindTime; + private String remark; + private Boolean isMe; + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 9886fb6b13..2de07478c1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -11,7 +11,9 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -105,5 +107,33 @@ public class IcPartyActController { formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icPartyActService.getHomeMonthTotal(formDTO)); } + + /** + * Desc:【党建日历】活动、日程列表 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2022/8/19 13:57 + */ + @PostMapping("actAndScheduleList") + public Result getActAndScheduleList(@RequestBody ActAndScheduleListFormDTO formDTO, @LoginUser TokenDto tokenDto){ + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result().ok(icPartyActService.getActAndScheduleList(formDTO)); + } + + /** + * Desc:【党建日历】某月/天数据搜索列表 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2022/8/19 14:00 + */ + @PostMapping("homeSearch") + public Result> homeSearch(@RequestBody ActAndScheduleListFormDTO formDTO, @LoginUser TokenDto tokenDto){ + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(icPartyActService.homeSearch(formDTO)); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 5dca25642b..d0f1d68d65 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -8,7 +8,9 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import java.util.List; @@ -59,4 +61,20 @@ public interface IcPartyActService extends BaseService { * @return */ IcPartyActDetailResDTO queryActDetail(String customerId, String userId, String icPartyActId); + + /** + * Desc: 【党建日历】活动、日程列表 + * @param formDTO + * @author zxc + * @date 2022/8/19 13:57 + */ + ActAndScheduleListResultDTO getActAndScheduleList(ActAndScheduleListFormDTO formDTO); + + /** + * Desc: 【党建日历】某月/天数据搜索列表 + * @param formDTO + * @author zxc + * @date 2022/8/19 14:01 + */ + List homeSearch(ActAndScheduleListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 86e6fbe505..4721faea3e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -4,18 +4,15 @@ 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.dto.result.CustomerStaffInfoCacheResult; -import com.epmet.commons.tools.exception.EpmetException; -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.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.modules.partyOrg.dao.IcPartyActDao; -import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; +import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyOrgService; @@ -25,7 +22,9 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -181,4 +180,26 @@ public class IcPartyActServiceImpl extends BaseServiceImpl homeSearch(ActAndScheduleListFormDTO formDTO) { + return null; + } } \ No newline at end of file From 3a0d23a91d3d8330000684b9712c57c700459b86 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 14:18:49 +0800 Subject: [PATCH 043/397] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=B0=8F=E5=8C=BA-?= =?UTF-8?q?=E6=A5=BC=E6=A0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/IcNeighborHoodDao.java | 23 +++++++++++++ .../impl/IcNeighborHoodServiceImpl.java | 15 +-------- .../resources/mapper/IcNeighborHoodDao.xml | 33 +++++++++++++++++++ 3 files changed, 57 insertions(+), 14 deletions(-) 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 a1999a0ee6..a25bb785ef 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 @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.NeighborHoodAndManagementDTO; @@ -211,4 +212,26 @@ public interface IcNeighborHoodDao extends BaseDao { * @Date 2022/6/29 16:48 */ List getHouseList(HouseInformationFormDTO formDTO); + + /** + * 小区-楼栋列表 + * + * @param formDTO + * @return java.util.List + * @author zhy + * @date 2022/8/19 14:01 + */ + List getNeighborhoodBuildingList(IcNeighborHoodDTO formDTO); + + + /** + * 楼栋列表 + * + * @param formDTO + * @return java.util.List + * @author zhy + * @date 2022/8/19 14:01 + */ + List selectBuildingList(IcNeighborHoodDTO 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 bbc85379ad..2ddc07a897 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 @@ -221,20 +221,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(dto.getAgencyId()),IcNeighborHoodEntity::getAgencyId, dto.getAgencyId()); - wrapper.eq(StringUtils.isNotBlank(dto.getGridId()), IcNeighborHoodEntity::getGridId, dto.getGridId()); - wrapper.last("ORDER BY CONVERT ( NEIGHBOR_HOOD_NAME USING gbk ) ASC"); - List list = baseDao.selectList(wrapper); - if(CollectionUtils.isEmpty(list)) { - return Collections.emptyList(); - } - return list.stream().map(item -> { - OptionResultDTO result = new OptionResultDTO(); - result.setValue(item.getId()); - result.setLabel(item.getNeighborHoodName()); - return result; - }).collect(Collectors.toList()); + return baseDao.getNeighborhoodBuildingList(dto); } /** 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 2f76bc1b7a..603947caf1 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 @@ -25,6 +25,15 @@ + + + + + + + + + update ic_neighbor_hood @@ -663,5 +672,29 @@ SORT, DOOR_NAME+0 + + + From ce4295f1d1219adb790669ef40d3da068d7c121a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 14:30:24 +0800 Subject: [PATCH 044/397] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E6=A0=BCID?= =?UTF-8?q?=E5=92=8C=E5=AE=A2=E6=88=B7ID=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IcNeighborHoodDao.java | 4 ++-- .../com/epmet/service/impl/IcNeighborHoodServiceImpl.java | 1 + .../src/main/resources/mapper/IcNeighborHoodDao.xml | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) 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 a25bb785ef..b3dd464835 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 @@ -227,11 +227,11 @@ public interface IcNeighborHoodDao extends BaseDao { /** * 楼栋列表 * - * @param formDTO + * @param neighborhoodId * @return java.util.List * @author zhy * @date 2022/8/19 14:01 */ - List selectBuildingList(IcNeighborHoodDTO formDTO); + List selectBuildingList(@Param("value") String neighborhoodId); } 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 2ddc07a897..85bd613f1d 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 @@ -212,6 +212,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) { + dto.setCustomerId(tokenDto.getCustomerId()); if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) { log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区"); CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); 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 603947caf1..ada7bb8199 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 @@ -25,6 +25,7 @@ + @@ -681,6 +682,9 @@ WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} + + AND GRID_ID = #{gridId} + AND ( AGENCY_ID = #{agencyId} OR AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%')) From 0094b18942db6518f8ac4a76f3e674d72bbfbc82 Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 14:41:18 +0800 Subject: [PATCH 045/397] =?UTF-8?q?mq=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messages/PartyMeetingMessageMQMsg.java | 3 ++- .../java/com/epmet/send/SendMqMsgUtil.java | 24 ------------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java index 9ca6c76c5d..c41ae46729 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java @@ -1,5 +1,6 @@ package com.epmet.commons.rocketmq.messages; +import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO; import lombok.Data; import java.io.Serializable; @@ -9,7 +10,7 @@ import java.io.Serializable; * @author sun */ @Data -public class PartyMeetingMessageMQMsg implements Serializable { +public class PartyMeetingMessageMQMsg extends MqBaseFormDTO implements Serializable { //客户Id private String customerId; diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java index 7b9d1d877b..debd15686f 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java @@ -243,28 +243,4 @@ public class SendMqMsgUtil { return false; } - /** - * @Description 党建小助手消息同步Mq - * @author sun - */ - public boolean partyMeetingMQMsg(String msgType, PartyMeetingMessageMQMsg msgContent) { - try { - SystemMsgFormDTO form = new SystemMsgFormDTO(msgType,msgContent); - Result sendMsgResult; - log.info("partyMeetingMQMsg param:{}",msgContent); - int retryTime = 0; - do { - sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); - } while ((sendMsgResult == null || !sendMsgResult.success()) && retryTime++ < NumConstant.TWO); - - if (sendMsgResult != null && sendMsgResult.success()) { - return true; - } - log.error("发送党建小助手系统消息到message服务失败:{},msg:{}", JSON.toJSONString(sendMsgResult), JSON.toJSONString(form)); - } catch (Exception e) { - log.error("partyMeetingMQMsg exception", e); - } - return false; - } - } From c54d288b421258e1a7858b33fd391bc6d5743b5b Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 14:46:28 +0800 Subject: [PATCH 046/397] =?UTF-8?q?=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rocketmq/messages/PartyMeetingMessageMQMsg.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java index c41ae46729..98c617255a 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * 党建小助手发布活动、活动到期提醒、活动发布提醒推送MQ @@ -18,10 +19,10 @@ public class PartyMeetingMessageMQMsg extends MqBaseFormDTO implements Serializa private String icPartyActId; //动作类型 发布活动:publish 提前提醒:remind 日程通知:notify private String type; - //党组织Id - private String publishOrgId; - //党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 - private String publishOrgType; + //党小组之外的党组织Id集合 + private List partyOrgIdList; + //党小组Id集合 + private List groupIdList; } From a07e869aa5c60490c42e7db15b0866cbea63ce5b Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 14:48:18 +0800 Subject: [PATCH 047/397] =?UTF-8?q?=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/rocketmq/messages/PartyMeetingMessageMQMsg.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java index 98c617255a..f019090330 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java @@ -19,10 +19,5 @@ public class PartyMeetingMessageMQMsg extends MqBaseFormDTO implements Serializa private String icPartyActId; //动作类型 发布活动:publish 提前提醒:remind 日程通知:notify private String type; - //党小组之外的党组织Id集合 - private List partyOrgIdList; - //党小组Id集合 - private List groupIdList; - } From 783a0868b80b15728b3caadf37e0ebaa78a7b1b7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 14:50:12 +0800 Subject: [PATCH 048/397] tiyixia --- .../controller/IcPartyActOrgController.java | 39 --------- .../partyOrg/dao/IcPartyActOrgDao.java | 6 +- .../dao/ResiPartymemberAttachmentDao.java | 24 ++++++ .../ResiPartymemberAttachmentEntity.java | 82 +++++++++++++++++++ .../service/IcPartyActOrgService.java | 64 +-------------- .../ResiPartymemberAttachmentService.java | 16 ++++ .../impl/IcPartyActOrgServiceImpl.java | 65 ++------------- .../service/impl/IcPartyActServiceImpl.java | 54 ++++++++---- .../ResiPartymemberAttachmentServiceImpl.java | 29 +++++++ .../mapper/partyOrg/IcPartyActOrgDao.xml | 8 +- .../partyOrg/ResiPartymemberAttachmentDao.xml | 34 ++++++++ 11 files changed, 244 insertions(+), 177 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/ResiPartymemberAttachmentEntity.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/ResiPartymemberAttachmentService.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/ResiPartymemberAttachmentServiceImpl.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java index 19fb1ea357..a42a752523 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java @@ -28,43 +28,4 @@ public class IcPartyActOrgController { @Autowired private IcPartyActOrgService icPartyActOrgService; - - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icPartyActOrgService.page(params); - return new Result>().ok(page); - } - - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - IcPartyActOrgDTO data = icPartyActOrgService.get(id); - return new Result().ok(data); - } - - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody IcPartyActOrgDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icPartyActOrgService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody IcPartyActOrgDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - icPartyActOrgService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - icPartyActOrgService.delete(ids); - return new Result(); - } - } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java index 97cd8d2e9e..e38cde539a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java @@ -3,6 +3,9 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 参加活动党组织表 @@ -12,5 +15,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPartyActOrgDao extends BaseDao { - + + int deleteByPartyActId(@Param("customerId") String customerId, @Param("icPartyActIds")List icPartyActIds); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java new file mode 100644 index 0000000000..5b42ff57e4 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java @@ -0,0 +1,24 @@ +package com.epmet.modules.partyOrg.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; +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 2022-08-19 + */ +@Mapper +public interface ResiPartymemberAttachmentDao extends BaseDao { + /** + * + * @param businessIds + * @return + */ + int deleteByBusinessId(@Param("customerId")String customerId,@Param("businessIds") List businessIds); +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/ResiPartymemberAttachmentEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/ResiPartymemberAttachmentEntity.java new file mode 100644 index 0000000000..aa190b4ea9 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/ResiPartymemberAttachmentEntity.java @@ -0,0 +1,82 @@ +package com.epmet.modules.partyOrg.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 2022-08-19 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("resi_partymember_attachment") +public class ResiPartymemberAttachmentEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 业务id + */ + private String businessId; + + /** + * 党组织活动：ic_party_act + */ + private String attachTo; + + /** + * 附件名 + */ + private String name; + + /** + * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） + */ + private String format; + + /** + * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） + */ + private String type; + + /** + * 附件地址 + */ + private String url; + + /** + * 排序字段 + */ + private Integer sort; + + /** + * 附件状态（审核中：auditing； +auto_passed: 自动通过； +review：结果不确定，需要人工审核； +block: 结果违规； +rejected：人工审核驳回; +approved：人工审核通过） +现在图片是同步审核的，所以图片只有auto_passed一种状态 + */ + private String status; + + /** + * 失败原因 + */ + private String reason; + + /** + * 语音或视频时长,秒 + */ + private Integer duration; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java index 24dfde82b4..9e5a6e2be2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java @@ -1,12 +1,9 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; -import com.epmet.resi.partymember.dto.IcPartyActOrgDTO; import java.util.List; -import java.util.Map; /** * 参加活动党组织表 @@ -15,64 +12,5 @@ import java.util.Map; * @since v1.0.0 2022-08-18 */ public interface IcPartyActOrgService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-08-18 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2022-08-18 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return IcPartyActOrgDTO - * @author generator - * @date 2022-08-18 - */ - IcPartyActOrgDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2022-08-18 - */ - void save(IcPartyActOrgDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2022-08-18 - */ - void update(IcPartyActOrgDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2022-08-18 - */ - void delete(String[] ids); + int deleteByPartyActId(String customerId, List icPartyActIds); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/ResiPartymemberAttachmentService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/ResiPartymemberAttachmentService.java new file mode 100644 index 0000000000..6c70b77d3f --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/ResiPartymemberAttachmentService.java @@ -0,0 +1,16 @@ +package com.epmet.modules.partyOrg.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; + +import java.util.List; + +/** + * 本库附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-19 + */ +public interface ResiPartymemberAttachmentService extends BaseService { + int deleteByBusinessId(String customerId, List businessIds); +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java index 0339c1dc77..dc767f47e0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java @@ -1,22 +1,13 @@ package com.epmet.modules.partyOrg.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.constant.FieldConstant; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; import com.epmet.modules.partyOrg.service.IcPartyActOrgService; -import com.epmet.resi.partymember.dto.IcPartyActOrgDTO; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; import java.util.List; -import java.util.Map; /** * 参加活动党组织表 @@ -28,55 +19,13 @@ import java.util.Map; public class IcPartyActOrgServiceImpl extends BaseServiceImpl implements IcPartyActOrgService { @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcPartyActOrgDTO.class); + public int deleteByPartyActId(String customerId, List icPartyActIds) { + if (CollectionUtils.isEmpty(icPartyActIds)) { + return 0; + } + return baseDao.deleteByPartyActId(customerId, icPartyActIds); } - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IcPartyActOrgDTO.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 IcPartyActOrgDTO get(String id) { - IcPartyActOrgEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, IcPartyActOrgDTO.class); - } - @Override - @Transactional(rollbackFor = Exception.class) - public void save(IcPartyActOrgDTO dto) { - IcPartyActOrgEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActOrgEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(IcPartyActOrgDTO dto) { - IcPartyActOrgEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActOrgEntity.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-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 86e6fbe505..f8d8067598 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -4,21 +4,24 @@ 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.dto.result.CustomerStaffInfoCacheResult; -import com.epmet.commons.tools.exception.EpmetException; -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.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.modules.partyOrg.dao.IcPartyActDao; -import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; +import com.epmet.modules.partyOrg.dao.IcScheduleDao; +import com.epmet.modules.partyOrg.dao.ResiPartymemberAttachmentDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; +import com.epmet.modules.partyOrg.service.IcPartyActOrgService; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyOrgService; +import com.epmet.modules.partyOrg.service.ResiPartymemberAttachmentService; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; @@ -34,10 +37,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 党建组织活动 @@ -54,7 +54,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO) { - IcPartyActEntity icPartyActEntity= ConvertUtils.sourceToTarget(formDTO,IcPartyActEntity.class); - icPartyActEntity.setAutoPublicTime(DateUtils.calDateBaseDay(formDTO.getHoldTime(),formDTO.getAutoPublicType())); CustomerStaffInfoCacheResult staffInfo=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getPublishStaffId()); if (null == staffInfo) { String msg = "查询工作人员信息异常"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); } + IcPartyActEntity icPartyActEntity= ConvertUtils.sourceToTarget(formDTO,IcPartyActEntity.class); + icPartyActEntity.setAutoPublicTime(DateUtils.calDateBaseDay(formDTO.getHoldTime(),formDTO.getAutoPublicType())); icPartyActEntity.setPublishStaffName(staffInfo.getRealName()); icPartyActEntity.setOrgId(staffInfo.getAgencyId()); icPartyActEntity.setPid(staffInfo.getParentAgency().getId()); icPartyActEntity.setOrgIdPath(staffInfo.getAgencyPIds()); if(StringUtils.isNotBlank(formDTO.getIcPartyActId())){ + icPartyActEntity.setId(formDTO.getIcPartyActId()); //删除附件、删除参加组织 - + SpringContextUtils.getBean(ResiPartymemberAttachmentService.class).deleteByBusinessId(formDTO.getCustomerId(), Arrays.asList(formDTO.getIcPartyActId())); + SpringContextUtils.getBean(IcPartyActOrgService.class).deleteByPartyActId(formDTO.getCustomerId(), Arrays.asList(formDTO.getIcPartyActId())); + baseDao.updateById(icPartyActEntity); + }else{ + baseDao.insert(icPartyActEntity); } - - - return null; + //新增参加参加活动党组织 + List orgList=ConvertUtils.sourceToTarget(formDTO.getJoinOrgList(),IcPartyActOrgEntity.class); + orgList.forEach(joinOrg->{ + joinOrg.setCustomerId(formDTO.getCustomerId()); + joinOrg.setIcPartyActId(icPartyActEntity.getId()); + icPartyActOrgDao.insert(joinOrg); + }); + //批量新增附件 + List attachmentEntityList=ConvertUtils.sourceToTarget(formDTO.getAttachmentList(),ResiPartymemberAttachmentEntity.class); + int attSort = 1; + for (ResiPartymemberAttachmentEntity att : attachmentEntityList) { + att.setCustomerId(formDTO.getCustomerId()); + att.setBusinessId(icPartyActEntity.getId()); + att.setAttachTo("ic_party_act"); + att.setSort(attSort); + attSort++; + resiPartymemberAttachmentDao.insert(att); + } + Map map=new HashMap<>(); + map.put("icPartyActId",icPartyActEntity.getId()); + return map; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/ResiPartymemberAttachmentServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/ResiPartymemberAttachmentServiceImpl.java new file mode 100644 index 0000000000..df42c273c0 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/ResiPartymemberAttachmentServiceImpl.java @@ -0,0 +1,29 @@ +package com.epmet.modules.partyOrg.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.modules.partyOrg.dao.ResiPartymemberAttachmentDao; +import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; +import com.epmet.modules.partyOrg.service.ResiPartymemberAttachmentService; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 本库附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-19 + */ +@Service +public class ResiPartymemberAttachmentServiceImpl extends BaseServiceImpl implements ResiPartymemberAttachmentService { + + + @Override + public int deleteByBusinessId(String customerId, List businessIds) { + if(CollectionUtils.isEmpty(businessIds)){ + return 0; + } + return baseDao.deleteByBusinessId(customerId,businessIds); + } +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml index f84e9ae594..ce671cd13c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml @@ -2,5 +2,11 @@ - + + delete from ic_party_act_org + where customer_id = #{customerId} + + IC_PARTY_ACT_ID = #{icPartyActId} + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml new file mode 100644 index 0000000000..955f5f4664 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + delete from resi_partymember_attachment + where customer_id=#{customerId} + + BUSINESS_ID = #{businessId} + + + \ No newline at end of file From 4d75e92e7832e6067d235c5bb73b30646f9b71a6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 14:59:45 +0800 Subject: [PATCH 049/397] =?UTF-8?q?=E6=BC=8F=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index b96dd74b60..05deb51cad 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -10,19 +10,27 @@ 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.DateUtils; +import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.modules.partyOrg.dao.IcPartyActDao; import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; import com.epmet.modules.partyOrg.dao.IcScheduleDao; +import com.epmet.modules.partyOrg.dao.ResiPartymemberAttachmentDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; +import com.epmet.modules.partyOrg.service.IcPartyActOrgService; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyOrgService; +import com.epmet.modules.partyOrg.service.ResiPartymemberAttachmentService; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; From dc1b929138d9166d2cbc8b1a00136cb7c0dcc1f8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 15:25:55 +0800 Subject: [PATCH 050/397] =?UTF-8?q?=E6=9A=82=E6=8F=90=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ActAndScheduleListFormDTO.java | 2 + .../result/ActAndScheduleListResultDTO.java | 30 ++++++++++++- .../modules/partyOrg/dao/IcPartyActDao.java | 4 ++ .../modules/partyOrg/dao/IcPartyOrgDao.java | 3 ++ .../modules/partyOrg/dao/IcScheduleDao.java | 4 ++ .../service/impl/IcPartyActServiceImpl.java | 43 ++++++++++++++++--- .../mapper/partyOrg/IcPartyActDao.xml | 43 +++++++++++++++++++ .../mapper/partyOrg/IcPartyOrgDao.xml | 13 ++++++ .../mapper/partyOrg/IcScheduleDao.xml | 16 ++++++- 9 files changed, 150 insertions(+), 8 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java index 5789e543e8..b6b33564d2 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java @@ -30,4 +30,6 @@ public class ActAndScheduleListFormDTO implements Serializable { private String customerId; private String staffId; + private String agencyId; + private String path; } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java index 611d4bf6ed..20b1e69408 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.resi.partymember.dto.partyOrg.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -30,16 +32,22 @@ public class ActAndScheduleListResultDTO implements Serializable { private static final long serialVersionUID = -9050507457068805831L; private String activityId; + private String staffId; private String topic; private String address; private String holdTime; private String type; private String isPublicValue; + private String isPublish; private String joinTypeValue; - private Boolean isMe; + private String joinUserType; + private List joinOrgList; + private List joinOrgs; + private Boolean isMe = false; } + @Data public static class ScheduleListDTO implements Serializable{ private static final long serialVersionUID = 5372167729733804267L; @@ -48,6 +56,24 @@ public class ActAndScheduleListResultDTO implements Serializable { private String title; private String remindTime; private String remark; - private Boolean isMe; + private Boolean isMe = false; + private String staffId; + } + + @Data + public static class JoinOrgDTO implements Serializable{ + + private static final long serialVersionUID = -981758371558960097L; + + private String partyOrgId; + private String partyOrgName; + } + + public ActAndScheduleListResultDTO() { + this.scheduleTotal = NumConstant.ZERO; + this.activityTotal = NumConstant.ZERO; + this.dateId = ""; + this.activityList = new ArrayList<>(); + this.scheduleList = new ArrayList<>(); } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 374dd39b7d..83774e4a62 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -3,6 +3,8 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -22,4 +24,6 @@ public interface IcPartyActDao extends BaseDao { * @return */ List actTypeList(String customerId); + + List getActivityList(ActAndScheduleListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index 93fa4d8a64..bf28e8663b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.apache.ibatis.annotations.Mapper; @@ -104,4 +105,6 @@ public interface IcPartyOrgDao extends BaseDao { * @return com.epmet.modules.partyOrg.entity.IcPartyOrgEntity */ IcPartyOrgEntity selectByCustomerIdAndFirstOrg(@Param("customerId") String customerId); + + List getPartyOrg(@Param("orgIds")List orgIds); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java index 48aa6fd599..131ef13279 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -2,8 +2,10 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.ibatis.annotations.Mapper; @@ -22,4 +24,6 @@ public interface IcScheduleDao extends BaseDao { List getScheduleAndActCount(HomeMonthTotalFormDTO formDTO); + List getScheduleList(ActAndScheduleListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 05deb51cad..fdefb4989a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -11,10 +11,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.SpringContextUtils; -import com.epmet.modules.partyOrg.dao.IcPartyActDao; -import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; -import com.epmet.modules.partyOrg.dao.IcScheduleDao; -import com.epmet.modules.partyOrg.dao.ResiPartymemberAttachmentDao; +import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; @@ -40,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * 党建组织活动 @@ -57,6 +55,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl activityList = baseDao.getActivityList(formDTO); + if (CollectionUtils.isNotEmpty(activityList)){ + List partyOrgIdsNoDistinct = new ArrayList<>(); + activityList.forEach(a -> { + partyOrgIdsNoDistinct.addAll(a.getJoinOrgList().stream().map(m -> m.getPartyOrgId()).collect(Collectors.toList())); + }); + List partyOrgIds = partyOrgIdsNoDistinct.stream().distinct().collect(Collectors.toList()); + List partyOrg = partyOrgDao.getPartyOrg(partyOrgIds); + activityList.forEach(a -> { + a.setIsMe(formDTO.getStaffId().equals(a.getStaffId())); + a.getJoinOrgList().forEach(po -> partyOrg.stream().filter(p -> p.getPartyOrgId().equals(po.getPartyOrgId())).forEach(p -> po.setPartyOrgName(p.getPartyOrgName()))); + a.setJoinOrgs(a.getJoinOrgList().stream().map(m -> m.getPartyOrgName()).collect(Collectors.toList())); + }); + } + List scheduleList = scheduleDao.getScheduleList(formDTO); + if (CollectionUtils.isNotEmpty(scheduleList)){ + scheduleList.forEach(s -> { + s.setIsMe(formDTO.getStaffId().equals(s.getStaffId())); + }); + } + ActAndScheduleListResultDTO result = new ActAndScheduleListResultDTO(); + result.setActivityList(activityList); + result.setScheduleList(scheduleList); + return result; } /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 066206184f..3f36691815 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -17,4 +17,47 @@ ORDER BY d.SORT ASC + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 1af1738da2..43c5697437 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -146,5 +146,18 @@ and ORG_PID = '0' + + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index d4cd5a8674..990fa16220 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -38,10 +38,24 @@ AND CUSTOMER_ID = #{customerId} AND HOLD_YEAR_ID = #{yearId} - AND CREATED_BY = #{staffId} + AND PUBLISH_STAFF_ID = #{staffId} AND PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') GROUP BY HOLD_MONTH_ID)t GROUP BY t.monthId + \ No newline at end of file From 5cc4cceb7c835dbd6390c1019e963a15f08df52e Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 15:36:58 +0800 Subject: [PATCH 051/397] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=BF=E5=AE=A2?= =?UTF-8?q?=E6=AC=A3=E5=96=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/VisitorInfoFormDTO.java | 14 +++++ .../IcResiCollectVisitorController.java | 60 ++++++++++++------- .../epmet/dao/IcResiCollectVisitorDao.java | 15 ++++- .../service/IcResiCollectVisitorService.java | 41 ++++++++----- .../impl/IcResiCollectVisitorServiceImpl.java | 12 +++- .../mapper/IcResiCollectVisitorDao.xml | 13 ++++ 6 files changed, 114 insertions(+), 41 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitorInfoFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitorInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitorInfoFormDTO.java new file mode 100644 index 0000000000..4c1467a774 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitorInfoFormDTO.java @@ -0,0 +1,14 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class VisitorInfoFormDTO implements Serializable { + + private String userId; + + private String customerId; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java index 60995a0211..05d5ba667b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java @@ -1,7 +1,6 @@ package com.epmet.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.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -17,7 +16,7 @@ import com.epmet.dto.SaveCollectVisitorFormDTO; import com.epmet.dto.form.CollectDetailFormDTO; import com.epmet.dto.form.CollectListFormDTO; import com.epmet.dto.form.VisitListFormDTO; -import com.epmet.dto.result.CollectListResultDTO; +import com.epmet.dto.form.VisitorInfoFormDTO; import com.epmet.excel.IcResiCollectVisitorExcel; import com.epmet.service.IcResiCollectVisitorService; import org.springframework.beans.factory.annotation.Autowired; @@ -42,7 +41,7 @@ public class IcResiCollectVisitorController { private IcResiCollectVisitorService icResiCollectVisitorService; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { // PageData page = icResiCollectVisitorService.page(params); PageData page = icResiCollectVisitorService.getPhrasePage(params); return new Result>().ok(page); @@ -52,6 +51,7 @@ public class IcResiCollectVisitorController { /** * Desc: 访客记录列表 + * * @param formDTO * @param tokenDto * @author wgf @@ -60,22 +60,22 @@ public class IcResiCollectVisitorController { @PostMapping("list") // @MaskResponse(fieldNames = { "memberIdNum", "memberMobile" }, // fieldsMaskType = { MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_MOBILE }) - public Result> getVisitorList(@RequestBody VisitListFormDTO formDTO, @LoginUser TokenDto tokenDto){ - ValidatorUtils.validateEntity(formDTO,CollectListFormDTO.CollectListForm.class); + public Result> getVisitorList(@RequestBody VisitListFormDTO formDTO, @LoginUser TokenDto tokenDto) { + ValidatorUtils.validateEntity(formDTO, CollectListFormDTO.CollectListForm.class); formDTO.setUserId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icResiCollectVisitorService.getVisitorList(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) { IcResiCollectVisitorDTO data = icResiCollectVisitorService.get(id); return new Result().ok(data); } @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody IcResiCollectVisitorDTO dto){ + public Result save(@RequestBody IcResiCollectVisitorDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); icResiCollectVisitorService.save(dto); @@ -84,7 +84,7 @@ public class IcResiCollectVisitorController { @NoRepeatSubmit @PostMapping("update") - public Result update(@RequestBody IcResiCollectVisitorDTO dto){ + public Result update(@RequestBody IcResiCollectVisitorDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); icResiCollectVisitorService.update(dto); @@ -92,7 +92,7 @@ public class IcResiCollectVisitorController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); icResiCollectVisitorService.delete(ids); @@ -106,32 +106,46 @@ public class IcResiCollectVisitorController { } /** - * @describe: 保存访客信息 - * @author wangtong - * @date 2022/8/3 10:33 - * @params [dto] - * @return com.epmet.commons.tools.utils.Result - */ + * @return com.epmet.commons.tools.utils.Result + * @describe: 保存访客信息 + * @author wangtong + * @date 2022/8/3 10:33 + * @params [dto] + */ @NoRepeatSubmit @PostMapping("saveInfo") - public Result saveInfo(@RequestBody SaveCollectVisitorFormDTO dto){ + public Result saveInfo(@RequestBody SaveCollectVisitorFormDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto); return icResiCollectVisitorService.saveInfo(dto); } /** - * @describe: 访客信息详情 - * @author wangtong - * @date 2022/8/3 15:41 - * @params [dto] - * @return com.epmet.commons.tools.utils.Result - */ + * @return com.epmet.commons.tools.utils.Result + * @describe: 访客信息详情 + * @author wangtong + * @date 2022/8/3 15:41 + * @params [dto] + */ @PostMapping("getVisitorDetail") public Result getVisitorDetail(@RequestBody CollectDetailFormDTO dto) { ValidatorUtils.validateEntity(dto); return icResiCollectVisitorService.getVisitorDetail(dto); } + /** + * 登陆访客用户信息 + * + * @param tokenDto + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author zhy + * @date 2022/8/19 15:24 + */ + @PostMapping("visitorinfo") + public Result getVisitorInfo(@LoginUser TokenDto tokenDto, @RequestBody VisitorInfoFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return icResiCollectVisitorService.getVisitorInfo(tokenDto, dto); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java index acf3fe568c..dac7126438 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java @@ -2,9 +2,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcResiCollectVisitorDTO; -import com.epmet.dto.form.CollectListFormDTO; import com.epmet.dto.form.VisitListFormDTO; -import com.epmet.dto.result.CollectListResultDTO; +import com.epmet.dto.form.VisitorInfoFormDTO; import com.epmet.entity.IcResiCollectVisitorEntity; import org.apache.ibatis.annotations.Mapper; @@ -22,6 +21,7 @@ public interface IcResiCollectVisitorDao extends BaseDao getCollectList(VisitListFormDTO formDTO); + /** + * 最新一条访客信息 + * + * @param formDTO + * @return com.epmet.entity.IcResiCollectVisitorEntity + * @author zhy + * @date 2022/8/19 15:33 + */ + IcResiCollectVisitorEntity getLastInfo(VisitorInfoFormDTO formDTO); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java index 5f7f3e4d25..b8908d1db0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java @@ -2,13 +2,13 @@ package com.epmet.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.commons.tools.utils.Result; import com.epmet.dto.IcResiCollectVisitorDTO; import com.epmet.dto.SaveCollectVisitorFormDTO; import com.epmet.dto.form.CollectDetailFormDTO; -import com.epmet.dto.form.CollectListFormDTO; import com.epmet.dto.form.VisitListFormDTO; -import com.epmet.dto.result.CollectListResultDTO; +import com.epmet.dto.form.VisitorInfoFormDTO; import com.epmet.entity.IcResiCollectVisitorEntity; import java.util.List; @@ -34,6 +34,7 @@ public interface IcResiCollectVisitorService extends BaseService + From 770bf2f34903e6e19717fc993f94a3814c033268 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 15:47:46 +0800 Subject: [PATCH 052/397] =?UTF-8?q?=E5=8F=AA=E8=BF=94=E5=9B=9E=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=AD=97=E7=9F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiCollectVisitorDao.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml index 7182768b9d..8884c9189c 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml @@ -106,7 +106,10 @@ + SELECT + * + FROM + resi_group_member + WHERE + del_flag = '0' + AND `status` IN ( 'approved', 'silent' ) + + #{groupId} + + ORDER BY + group_leader_flag ASC, created_time ASC + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index d0f1d68d65..100c47fead 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -1,6 +1,8 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; +import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; @@ -62,6 +64,8 @@ public interface IcPartyActService extends BaseService { */ IcPartyActDetailResDTO queryActDetail(String customerId, String userId, String icPartyActId); + void partyMeetingMessage(PartyMeetingMessageMQMsg dto); + /** * Desc: 【党建日历】活动、日程列表 * @param formDTO diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index fdefb4989a..9021a6a90d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -1,23 +1,33 @@ package com.epmet.modules.partyOrg.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; import com.epmet.commons.tools.constant.Constant; 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.RenException; 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.DateUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.modules.partyOrg.dao.IcPartyActDao; +import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; +import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; import com.epmet.modules.partyOrg.service.IcPartyActOrgService; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyOrgService; +import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; +import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.modules.partyOrg.service.ResiPartymemberAttachmentService; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; @@ -36,6 +46,11 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import java.util.*; import java.util.stream.Collectors; @@ -47,7 +62,8 @@ import java.util.stream.Collectors; */ @Service public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyActService { - + @Autowired + private ResiGroupOpenFeignClient resiGroupOpenFeignClient; @Autowired private IcScheduleDao scheduleDao; @Autowired @@ -262,4 +278,45 @@ public class IcPartyActServiceImpl extends BaseServiceImpl homeSearch(ActAndScheduleListFormDTO formDTO) { return null; } + + /** + * 党建小助手活动触发为用户推送消息 + */ + @Override + public void partyMeetingMessage(PartyMeetingMessageMQMsg formDTO) { + //1.校验活动数据是否存在 + IcPartyActEntity entity = baseDao.selectById(formDTO.getIcPartyActId()); + if(null==entity){ + String msg = "活动信息不存在，活动Id:" + formDTO.getIcPartyActId(); + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), msg, msg); + } + //2.根据不同类型消息触发不同处理逻辑 + //2-1.发布活动给居民端涉及党员已经工作端活动发布站推送党建活动消息 + if("publish".equals(formDTO.getType())){ + //查询活动对应的发布范围信息 + LambdaQueryWrapper orgWrapper = new LambdaQueryWrapper<>(); + orgWrapper.eq(IcPartyActOrgEntity::getDelFlag, NumConstant.ZERO_STR); + orgWrapper.eq(IcPartyActOrgEntity::getIcPartyActId, formDTO.getIcPartyActId()); + List list = icPartyActOrgDao.selectList(orgWrapper); + List groupIdList = list.stream().filter(ca -> ca.getOrgType().equals("6")).map(m -> m.getJoinOrgId()).collect(Collectors.toList()); + List partyOrgIdList = list.stream().filter(ca -> !ca.getOrgType().equals("6")).map(m -> m.getJoinOrgId()).collect(Collectors.toList()); + //分别查询党组织、党小组下的人 + List userIdList = new ArrayList<>(); + if(!CollectionUtils.isEmpty(groupIdList)){ + Result> result = resiGroupOpenFeignClient.getMemberList(groupIdList); + if (!result.success()) { + throw new RenException("调用common service查询secret失败"); + } + userIdList = result.getData().stream().map(ResiGroupMemberDTO::getCustomerUserId).collect(Collectors.toList()); + } + if(!CollectionUtils.isEmpty(groupIdList)){ + //TODO + } + + //组装消息 + + } + + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java index 8c044e3f5a..d968dac4a1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.SpringContextUtils; +import com.epmet.modules.partyOrg.service.IcPartyActService; import org.apache.commons.lang.StringUtils; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; @@ -69,7 +70,7 @@ public class PartyMeetingMessageListener implements MessageListenerConcurrently lock = distributedLock.getLock(String.format("lock:ic_warn_stats:%s", obj.getCustomerId()), 30L, 30L, TimeUnit.SECONDS); //待执行方法 - //SpringContextUtils.getBean(IcVolunteerPolyService.class).volunteerChanged(obj); + SpringContextUtils.getBean(IcPartyActService.class).partyMeetingMessage(obj); } catch (EpmetException e) { // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 From 426d3d003283dc43f7cdae3a3c700e5e7f6e693d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 16:03:00 +0800 Subject: [PATCH 054/397] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=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 | 5 +++ .../controller/IcNeighborHoodController.java | 8 ++-- .../java/com/epmet/dao/IcNeighborHoodDao.java | 20 ++------- .../epmet/service/IcNeighborHoodService.java | 6 +-- .../impl/IcNeighborHoodServiceImpl.java | 4 +- .../resources/mapper/IcNeighborHoodDao.xml | 42 ++++++------------- 6 files changed, 30 insertions(+), 55 deletions(-) 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 d50508c522..90ec898127 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 @@ -69,6 +69,11 @@ public class IcNeighborHoodDTO implements Serializable { */ private String gridId; + /** + * 网格 + */ + private String gridName; + /** * 详细地址 */ 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 b947f13004..183a8e3165 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 @@ -155,13 +155,13 @@ public class IcNeighborHoodController { * * @param tokenDto * @param dto - * @return com.epmet.commons.tools.utils.Result> + * @return com.epmet.commons.tools.utils.Result> * @author zhy - * @date 2022/8/19 13:32 + * @date 2022/8/19 15:56 */ @PostMapping("neighborhoodlist") - public Result> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) { - return new Result>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto)); + public Result> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) { + return new Result>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto)); } /** 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 b3dd464835..cbb29806f4 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 @@ -18,7 +18,6 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.NeighborHoodAndManagementDTO; @@ -214,24 +213,13 @@ public interface IcNeighborHoodDao extends BaseDao { List getHouseList(HouseInformationFormDTO formDTO); /** - * 小区-楼栋列表 + * 小区 * * @param formDTO - * @return java.util.List + * @return java.util.List * @author zhy - * @date 2022/8/19 14:01 + * @date 2022/8/19 15:57 */ - List getNeighborhoodBuildingList(IcNeighborHoodDTO formDTO); - - - /** - * 楼栋列表 - * - * @param neighborhoodId - * @return java.util.List - * @author zhy - * @date 2022/8/19 14:01 - */ - List selectBuildingList(@Param("value") String neighborhoodId); + List getNeighborhoodList(IcNeighborHoodDTO formDTO); } 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 d5408e73af..7a8105458c 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 @@ -122,11 +122,11 @@ public interface IcNeighborHoodService extends BaseService * * @param tokenDto * @param dto - * @return com.epmet.commons.tools.utils.Result> + * @return java.util.List * @author zhy - * @date 2022/8/19 13:32 + * @date 2022/8/19 15:57 */ - List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto); + List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto); /** * @Description 通过ID查询小区信息 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 85bd613f1d..327c472cc3 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 @@ -211,7 +211,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) { + public List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) { dto.setCustomerId(tokenDto.getCustomerId()); if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) { log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区"); @@ -222,7 +222,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl - - - - - - - - - - update ic_neighbor_hood @@ -673,32 +663,24 @@ SORT, DOOR_NAME+0 - SELECT - id AS 'value', - NEIGHBOR_HOOD_NAME AS label + n.id, + n.NEIGHBOR_HOOD_NAME, + n.GRID_ID, + g.GRID_NAME FROM - ic_neighbor_hood + ic_neighbor_hood n + LEFT JOIN customer_grid g ON n.GRID_ID = g.id WHERE - DEL_FLAG = '0' - AND CUSTOMER_ID = #{customerId} + n.DEL_FLAG = '0' + AND n.CUSTOMER_ID = #{customerId} - AND GRID_ID = #{gridId} + AND n.GRID_ID = #{gridId} AND ( - AGENCY_ID = #{agencyId} - OR AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%')) - - - From b4ca75470b44d378c3aa8d60778083b5466cd089 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 16:19:38 +0800 Subject: [PATCH 055/397] =?UTF-8?q?=E6=9A=82=E6=8F=90=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ActAndScheduleListResultDTO.java | 2 + .../service/impl/IcPartyActServiceImpl.java | 68 ++++++++++++++++--- .../mapper/partyOrg/IcPartyActDao.xml | 12 +++- .../mapper/partyOrg/IcScheduleDao.xml | 15 +++- 4 files changed, 82 insertions(+), 15 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java index 20b1e69408..9b3248a0f3 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java @@ -33,6 +33,7 @@ public class ActAndScheduleListResultDTO implements Serializable { private String activityId; private String staffId; + private String dateId; private String topic; private String address; private String holdTime; @@ -58,6 +59,7 @@ public class ActAndScheduleListResultDTO implements Serializable { private String remark; private Boolean isMe = false; private String staffId; + private String dateId; } @Data diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 9021a6a90d..9ef8a4acbe 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -14,21 +14,17 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.modules.partyOrg.dao.IcPartyActDao; -import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; -import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; -import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; import com.epmet.modules.partyOrg.service.IcPartyActOrgService; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyOrgService; +import com.epmet.modules.partyOrg.service.ResiPartymemberAttachmentService; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; -import com.epmet.modules.partyOrg.service.ResiPartymemberAttachmentService; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; @@ -46,11 +42,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; import java.util.*; import java.util.stream.Collectors; @@ -276,9 +267,64 @@ public class IcPartyActServiceImpl extends BaseServiceImpl homeSearch(ActAndScheduleListFormDTO formDTO) { - return null; + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException("查询工作人员失败："+formDTO.getStaffId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId()); + if (null == icPartyOrgDTO){ + throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId()); + } + formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId())); + List result = constructHomeSearchData(formDTO.getStartDate(), formDTO.getEndDate()); + List activityList = baseDao.getActivityList(formDTO); + if (CollectionUtils.isNotEmpty(activityList)){ + activityList.forEach(a -> { + a.setIsMe(formDTO.getStaffId().equals(a.getStaffId())); + }); + Map> groupByDateId = activityList.stream().collect(Collectors.groupingBy(ActAndScheduleListResultDTO.ActivityListDTO::getDateId)); + result.forEach(r -> { + groupByDateId.forEach((dateId,list) -> { + if (r.getDateId().equals(dateId)){ + r.setActivityList(list); + r.setActivityTotal(list.size()); + } + }); + }); + } + List scheduleList = scheduleDao.getScheduleList(formDTO); + if (CollectionUtils.isNotEmpty(scheduleList)){ + scheduleList.forEach(s -> { + s.setIsMe(formDTO.getStaffId().equals(s.getStaffId())); + }); + Map> groupByDateId = scheduleList.stream().collect(Collectors.groupingBy(ActAndScheduleListResultDTO.ScheduleListDTO::getDateId)); + result.forEach(r -> { + groupByDateId.forEach((dateId,list) -> { + if (r.getDateId().equals(dateId)){ + r.setScheduleList(list); + r.setScheduleTotal(list.size()); + } + }); + }); + } + return result; } + public static List constructHomeSearchData(String startDate,String endDate){ + List result = new ArrayList<>(); + if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){ + List days = DateUtils.getDaysBetween(startDate, endDate); + days.forEach(d -> { + ActAndScheduleListResultDTO dto = new ActAndScheduleListResultDTO(); + dto.setDateId(d); + result.add(dto); + }); + } + return result; + } + + /** * 党建小助手活动触发为用户推送消息 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 3f36691815..ed8d97111b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -21,6 +21,7 @@ + @@ -39,6 +40,7 @@ pa.TOPIC, pa.ADDRESS, DATE_FORMAT(pa.HOLD_TIME,'%Y-%m-%d %H:%i:%s') AS holdTime, + DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') AS dateId, pa.ACT_TYPE AS type, (CASE WHEN pa.JOIN_USER_TYPE = '1' THEN '支部委员' WHEN pa.JOIN_USER_TYPE = '0' THEN '全体党员' @@ -54,10 +56,18 @@ LEFT JOIN ic_party_act_org ao ON (ao.IC_PARTY_ACT_ID = pa.ID AND ao.DEL_FLAG = 0) WHERE pa.DEL_FLAG = 0 AND pa.CUSTOMER_ID = #{customerId} - AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') = #{dateId} + + AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') = #{dateId} + AND pa.PUBLISH_STAFF_ID = #{staffId} + + AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') >= #{startDate} + + + AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') #{endDate} + AND pa.PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 990fa16220..a9c155a9e1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -25,10 +25,10 @@ FROM ic_schedule WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} - AND DATE_FORMAT(CREATED_TIME,'%Y') = #{yearId} + AND DATE_FORMAT(REMIND_TIME,'%Y') = #{yearId} AND ORG_ID_PATH LIKE CONCAT('%',#{agencyId},'%') AND IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0') - GROUP BY DATE_FORMAT(CREATED_TIME,'%Y%m') + GROUP BY DATE_FORMAT(REMIND_TIME,'%Y%m') UNION ALL SELECT COUNT(id) as count, @@ -49,12 +49,21 @@ ID AS scheduleId, TITLE, DATE_FORMAT(REMIND_TIME,'%Y-%m-%d %H:%i:%s') AS remindTime, + DATE_FORMAT(REMIND_TIME,'%Y%m%d') AS dateId, REMARK, STAFF_ID FROM ic_schedule WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} - AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') = #{dateId} + + AND DATE_FORMAT(REMIND_TIME,'%Y%m%d') = #{dateId} + + + AND DATE_FORMAT(REMIND_TIME,'%Y%m%d') >= #{startDate} + + + AND DATE_FORMAT(REMIND_TIME,'%Y%m%d') #{endDate} + AND ORG_ID_PATH LIKE CONCAT('%',#{agencyId},'%') AND IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0') From d73c25869071396368e7c0cf62b583b158ea47b1 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 16:23:02 +0800 Subject: [PATCH 056/397] =?UTF-8?q?=20=20=E8=A1=A5=E5=85=85=E5=AE=A2?= =?UTF-8?q?=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcNeighborHoodDao.xml | 1 + 1 file changed, 1 insertion(+) 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 1f0386d3ca..d799b0873c 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 @@ -667,6 +667,7 @@ SELECT n.id, n.NEIGHBOR_HOOD_NAME, + n.CUSTOMER_ID, n.GRID_ID, g.GRID_NAME FROM From cc34cb2ead75ba6b1332219844e08c987e392ea2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 16:31:06 +0800 Subject: [PATCH 057/397] =?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 --- .../partyOrg/service/impl/IcScheduleServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java index 3c7861a02d..2d38215d07 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.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.rocketmq.messages.PartyMeetingMessageMQMsg; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; @@ -11,11 +12,15 @@ 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.utils.ConvertUtils; +import com.epmet.commons.tools.utils.SpringContextUtils; +import com.epmet.constant.SystemMessageType; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import com.epmet.send.SendMqMsgUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -112,6 +117,13 @@ public class IcScheduleServiceImpl extends BaseServiceImpl Date: Fri, 19 Aug 2022 16:35:59 +0800 Subject: [PATCH 058/397] tiyixia --- .../form/IcPartyActPageFormDTO.java | 18 +++++++++++ .../controller/IcPartyActController.java | 2 ++ .../service/impl/IcPartyActServiceImpl.java | 30 ++++++++++--------- 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java index e722f5fab7..2a52c6cc2a 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.resi.partymember.dto.icpartyact.form; import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -13,7 +14,24 @@ import java.io.Serializable; @Data public class IcPartyActPageFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = -8171649039313981541L; + // tokenDto取值 + @NotBlank(message = "cusotomerId不能为空",groups = AddUserInternalGroup.class) private String customerId; + @NotBlank(message = "publishStaffId不能为空",groups = AddUserInternalGroup.class) private String publishStaffId; + /** + * 接口内部查询 + * 当前登录用户所属的行政组织id + */ + private String staffAgencyId; + // 界面传参数 + private String publishPartyOrgId; + private String startDate; + private String endDate; + private String address; + private String topic; + private String isPublish; + private String actType; + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 2de07478c1..073e707bd1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -1,6 +1,7 @@ package com.epmet.modules.partyOrg.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -67,6 +68,7 @@ public class IcPartyActController { public Result> pageList(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActPageFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setPublishStaffId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); return new Result>().ok(icPartyActService.pageList(formDTO)); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index fdefb4989a..643d525bd2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -85,10 +85,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl getHomeMonthTotal(HomeMonthTotalFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); - if (null == staffInfo){ - throw new EpmetException("查询工作人员失败："+formDTO.getStaffId()); - } + CustomerStaffInfoCacheResult staffInfo = queryStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); formDTO.setAgencyId(staffInfo.getAgencyId()); IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId()); if (null == icPartyOrgDTO){ @@ -138,11 +135,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfo=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getPublishStaffId()); - if (null == staffInfo) { - String msg = "查询工作人员信息异常"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); - } + CustomerStaffInfoCacheResult staffInfo=queryStaffInfo(formDTO.getCustomerId(),formDTO.getPublishStaffId()); IcPartyActEntity icPartyActEntity= ConvertUtils.sourceToTarget(formDTO,IcPartyActEntity.class); icPartyActEntity.setAutoPublicTime(DateUtils.calDateBaseDay(formDTO.getHoldTime(),formDTO.getAutoPublicType())); icPartyActEntity.setPublishStaffName(staffInfo.getRealName()); @@ -181,6 +174,15 @@ public class IcPartyActServiceImpl extends BaseServiceImpl pageList(IcPartyActPageFormDTO formDTO) { - //todo + CustomerStaffInfoCacheResult staffInfo = queryStaffInfo(formDTO.getCustomerId(),formDTO.getPublishStaffId()); + formDTO.setStaffAgencyId(staffInfo.getAgencyId()); + // todo + return null; } @@ -216,10 +221,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Fri, 19 Aug 2022 16:36:08 +0800 Subject: [PATCH 059/397] =?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 --- .../feign/fallback/ResiGroupOpenFeignClientFallback.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index f42d54799f..db43abe079 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -244,7 +244,8 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien } @Override - public Result> getMemberList(String groupId) { - return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getMemberList", groupId); + public Result> getMemberList(List groupIdList) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getMemberList", groupIdList); } + } From c1f84de7102932d5b9d0960fd7640c3f027779e1 Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 16:45:14 +0800 Subject: [PATCH 060/397] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messages/PartyMeetingMessageMQMsg.java | 2 +- .../group/feign/ResiGroupOpenFeignClient.java | 4 +- .../ResiGroupOpenFeignClientFallback.java | 4 +- .../controller/ResiGroupMemberController.java | 2 +- .../service/impl/IcPartyActServiceImpl.java | 59 ++++++++++++++----- 5 files changed, 49 insertions(+), 22 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java index f019090330..af8792ea1c 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java @@ -15,7 +15,7 @@ public class PartyMeetingMessageMQMsg extends MqBaseFormDTO implements Serializa //客户Id private String customerId; - //活动Id + //活动/日程Id private String icPartyActId; //动作类型 发布活动:publish 提前提醒:remind 日程通知:notify private String type; diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index f3003fc047..b7a4f54672 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -339,7 +339,7 @@ public interface ResiGroupOpenFeignClient { * @Author sun * @Description 查询小组成员列表 **/ - @PostMapping("/resi/group/member/getmemberlist") - Result> getMemberList(@RequestBody List groupIdList); + @PostMapping("/resi/group/member/groupmemberlist") + Result> groupMemberList(@RequestBody List groupIdList); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index db43abe079..d3bff53996 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -244,8 +244,8 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien } @Override - public Result> getMemberList(List groupIdList) { - return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getMemberList", groupIdList); + public Result> groupMemberList(List groupIdList) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "groupMemberList", groupIdList); } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java index b931bab11c..cf99c5a61b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java @@ -205,7 +205,7 @@ public class ResiGroupMemberController { return new Result().ok(operationService.applyEnterByLink(param)); } - @PostMapping("getmemberlist") + @PostMapping("groupmemberlist") public Result> groupMemberList(@RequestBody List groupIdList){ return new Result>().ok(resiGroupMemberService.groupMemberList(groupIdList)); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index ce7530def5..8cd94b00eb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; +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.dto.result.CustomerStaffInfoCacheResult; @@ -14,6 +15,12 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.ReadFlagConstant; +import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.feign.EpmetMessageOpenFeignClient; +import com.epmet.modules.partyOrg.dao.IcPartyActDao; +import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; +import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; @@ -35,6 +42,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -51,6 +59,7 @@ import java.util.stream.Collectors; * @author generator generator@elink-cn.com * @since v1.0.0 2022-08-18 */ +@Slf4j @Service public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyActService { @Autowired @@ -65,6 +74,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl constructHomeSearchData(String startDate,String endDate){ - List result = new ArrayList<>(); - if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){ - List days = DateUtils.getDaysBetween(startDate, endDate); - days.forEach(d -> { - ActAndScheduleListResultDTO dto = new ActAndScheduleListResultDTO(); - dto.setDateId(d); - result.add(dto); - }); - } - return result; - } - - /** * 党建小助手活动触发为用户推送消息 */ @@ -338,6 +335,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl msgList = new ArrayList<>(); //2.根据不同类型消息触发不同处理逻辑 //2-1.发布活动给居民端涉及党员已经工作端活动发布站推送党建活动消息 if("publish".equals(formDTO.getType())){ @@ -351,7 +349,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl userIdList = new ArrayList<>(); if(!CollectionUtils.isEmpty(groupIdList)){ - Result> result = resiGroupOpenFeignClient.getMemberList(groupIdList); + Result> result = resiGroupOpenFeignClient.groupMemberList(groupIdList); if (!result.success()) { throw new RenException("调用common service查询secret失败"); } @@ -362,9 +360,38 @@ public class IcPartyActServiceImpl extends BaseServiceImpl{ + UserMessageFormDTO msg = new UserMessageFormDTO(); + msg.setCustomerId(formDTO.getCustomerId()); + msg.setApp(AppClientConstant.APP_RESI); + msg.setTitle("您收到一个新的活动通知"); + msg.setReadFlag(ReadFlagConstant.UN_READ); + StringBuffer str = new StringBuffer(); + str.append("主题:").append(entity.getTopic()).append("\n").append("时间:").append(entity.getHoldTime()).append("\n").append("地点:").append(entity.getAddress()); + msg.setMessageContent(str.toString()); + msg.setMessageType("party"); + msg.setTargetId(formDTO.getIcPartyActId()); + msg.setUserId(id); + msgList.add(msg); + }); + //工作人员 + UserMessageFormDTO msg = new UserMessageFormDTO(); + msg.setCustomerId(formDTO.getCustomerId()); + msg.setApp(AppClientConstant.APP_GOV); + msg.setTitle("您有一个活动已经发布"); + msg.setReadFlag(ReadFlagConstant.UN_READ); + StringBuffer str = new StringBuffer(); + str.append("主题:").append(entity.getTopic()).append("\n").append("时间:").append(entity.getHoldTime()).append("\n").append("地点:").append(entity.getAddress()); + msg.setMessageContent(str.toString()); + msg.setMessageType("party"); + msg.setTargetId(formDTO.getIcPartyActId()); + msg.setUserId(entity.getPublishStaffId()); + msgList.add(msg); } + + //推送消息 + Result sendMessageRes = messageOpenFeignClient.saveIcMessageList(msgList); } } \ No newline at end of file From cf53b34dcf241edd0d7ba0304cbeb1175a9d8d3f Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 16:47:35 +0800 Subject: [PATCH 061/397] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 8cd94b00eb..d4fcb3ae92 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -323,6 +323,18 @@ public class IcPartyActServiceImpl extends BaseServiceImpl constructHomeSearchData(String startDate,String endDate){ + List result = new ArrayList<>(); + if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){ + List days = DateUtils.getDaysBetween(startDate, endDate); + days.forEach(d -> { + ActAndScheduleListResultDTO dto = new ActAndScheduleListResultDTO(); + dto.setDateId(d); + result.add(dto); + }); + } + return result; + } /** * 党建小助手活动触发为用户推送消息 From cc09e3c628bca2cc1d224a5fd6e893e2084c070f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 17:01:47 +0800 Subject: [PATCH 062/397] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/IcPartyActPageResultDTO.java | 51 +++++++++++++++++++ .../controller/IcPartyActController.java | 6 ++- .../modules/partyOrg/dao/IcPartyActDao.java | 9 ++++ .../partyOrg/service/IcPartyActService.java | 3 +- .../service/impl/IcPartyActServiceImpl.java | 12 +++-- .../mapper/partyOrg/IcPartyActDao.xml | 44 ++++++++++++++++ 6 files changed, 117 insertions(+), 8 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java index 46becccdfe..b5c9589d5d 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.resi.partymember.dto.icpartyact.result; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @Description @@ -12,5 +14,54 @@ import java.io.Serializable; @Data public class IcPartyActPageResultDTO implements Serializable { private static final long serialVersionUID = 1414832133227703667L; + + private String icPartyActId; + /** + * 活动主题 + */ + private String topic; + + /** + * 发布活动党组织名称 + */ + private String publishPartyOrgName; + + /** + * 活动发布人姓名 + */ + private String publishStaffName; + + /** + * 活动类型，来源于ic_party_act_type_dict + */ + private String actType; + + /** + * 活动类型，来源于ic_party_act_type_dict + */ + private String actTypeName; + + /** + * 举办活动时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date holdTime; + + /** + * 活动地点 + */ + private String address; + + /** + * 是否发布，0未发布；1已发布； + */ + private String isPublish; + + /** + * 活动发布人 + */ + private String publishStaffId; + + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 073e707bd1..a5c2855bb6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -59,7 +59,7 @@ public class IcPartyActController { } /** - * 活动列表分页 + * 【活动列表】分页查询(工作端小程序通用) * @param tokenDto * @param formDTO * @return @@ -74,12 +74,16 @@ public class IcPartyActController { /** * 活动列表活动详情 + * 居民端小程序活动详情、工作端小程序活动详情通用 * @param tokenDto * @param icPartyActId * @return */ @PostMapping("act-detail/{icPartyActId}") public Result actDetail(@LoginUser TokenDto tokenDto, @PathVariable("icPartyActId")String icPartyActId){ + if(StringUtils.isBlank(icPartyActId)){ + return new Result<>(); + } return new Result().ok(icPartyActService.queryActDetail(tokenDto.getCustomerId(),tokenDto.getUserId(),icPartyActId)); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 83774e4a62..87b393293c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -2,7 +2,9 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import org.apache.ibatis.annotations.Mapper; @@ -26,4 +28,11 @@ public interface IcPartyActDao extends BaseDao { List actTypeList(String customerId); List getActivityList(ActAndScheduleListFormDTO formDTO); + + /** + * pc活动列表分页 + * @param formDTO + * @return + */ + List selectPageList(IcPartyActPageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 100c47fead..3c4d7a92e0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -2,7 +2,6 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; -import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; @@ -49,7 +48,7 @@ public interface IcPartyActService extends BaseService { Map addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO); /** - * 活动列表-分页查询 + * 【活动列表】分页查询(工作端小程序通用) * @param formDTO * @return */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index ce7530def5..e94fa39ec6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -35,6 +35,8 @@ import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +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; @@ -192,18 +194,18 @@ public class IcPartyActServiceImpl extends BaseServiceImpl pageList(IcPartyActPageFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfo = queryStaffInfo(formDTO.getCustomerId(),formDTO.getPublishStaffId()); + CustomerStaffInfoCacheResult staffInfo = queryStaffInfo(formDTO.getCustomerId(), formDTO.getPublishStaffId()); formDTO.setStaffAgencyId(staffInfo.getAgencyId()); - // todo - - return null; + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.selectPageList(formDTO)); + return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); } /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index ed8d97111b..f690934076 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -70,4 +70,48 @@ AND pa.PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') + + \ No newline at end of file From fc94ca79b5be52fb19acbd7886f0110c6e8b01fa Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 17:05:51 +0800 Subject: [PATCH 063/397] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActServiceImpl.java | 68 +++++++++++++++---- 1 file changed, 56 insertions(+), 12 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index d4fcb3ae92..f8a9127c08 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -25,6 +25,7 @@ import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; import com.epmet.modules.partyOrg.service.IcPartyActOrgService; import com.epmet.modules.partyOrg.service.IcPartyActService; @@ -341,16 +342,27 @@ public class IcPartyActServiceImpl extends BaseServiceImpl msgList = new ArrayList<>(); //2.根据不同类型消息触发不同处理逻辑 //2-1.发布活动给居民端涉及党员已经工作端活动发布站推送党建活动消息 - if("publish".equals(formDTO.getType())){ + if ("publish".equals(formDTO.getType())) { //查询活动对应的发布范围信息 LambdaQueryWrapper orgWrapper = new LambdaQueryWrapper<>(); orgWrapper.eq(IcPartyActOrgEntity::getDelFlag, NumConstant.ZERO_STR); @@ -360,19 +372,19 @@ public class IcPartyActServiceImpl extends BaseServiceImpl partyOrgIdList = list.stream().filter(ca -> !ca.getOrgType().equals("6")).map(m -> m.getJoinOrgId()).collect(Collectors.toList()); //分别查询党组织、党小组下的人 List userIdList = new ArrayList<>(); - if(!CollectionUtils.isEmpty(groupIdList)){ + if (!CollectionUtils.isEmpty(groupIdList)) { Result> result = resiGroupOpenFeignClient.groupMemberList(groupIdList); if (!result.success()) { throw new RenException("调用common service查询secret失败"); } userIdList = result.getData().stream().map(ResiGroupMemberDTO::getCustomerUserId).collect(Collectors.toList()); } - if(!CollectionUtils.isEmpty(groupIdList)){ + if (!CollectionUtils.isEmpty(groupIdList)) { //TODO } //组装消息 - userIdList.forEach(id->{ + for (String id : userIdList){ UserMessageFormDTO msg = new UserMessageFormDTO(); msg.setCustomerId(formDTO.getCustomerId()); msg.setApp(AppClientConstant.APP_RESI); @@ -385,7 +397,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Fri, 19 Aug 2022 17:06:34 +0800 Subject: [PATCH 064/397] =?UTF-8?q?=E5=8F=88tm=E4=B8=A2=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 57a777bbac..90f6baabd6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; +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.dto.result.CustomerStaffInfoCacheResult; @@ -15,6 +16,9 @@ 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.constant.ReadFlagConstant; +import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; @@ -35,9 +39,10 @@ import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; -import org.apache.commons.collections4.CollectionUtils; 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.stereotype.Service; From a4de7bbb920858a57fd610a273296e2974faee78 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 17:17:41 +0800 Subject: [PATCH 065/397] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActServiceImpl.java | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 42274e8368..c6d123626f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -248,17 +248,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl activityList = baseDao.getActivityList(formDTO); if (CollectionUtils.isNotEmpty(activityList)){ - List partyOrgIdsNoDistinct = new ArrayList<>(); - activityList.forEach(a -> { - partyOrgIdsNoDistinct.addAll(a.getJoinOrgList().stream().map(m -> m.getPartyOrgId()).collect(Collectors.toList())); - }); - List partyOrgIds = partyOrgIdsNoDistinct.stream().distinct().collect(Collectors.toList()); - List partyOrg = partyOrgDao.getPartyOrg(partyOrgIds); - activityList.forEach(a -> { - a.setIsMe(formDTO.getStaffId().equals(a.getStaffId())); - a.getJoinOrgList().forEach(po -> partyOrg.stream().filter(p -> p.getPartyOrgId().equals(po.getPartyOrgId())).forEach(p -> po.setPartyOrgName(p.getPartyOrgName()))); - a.setJoinOrgs(a.getJoinOrgList().stream().map(m -> m.getPartyOrgName()).collect(Collectors.toList())); - }); + disposeActivityList(formDTO,activityList); } List scheduleList = scheduleDao.getScheduleList(formDTO); if (CollectionUtils.isNotEmpty(scheduleList)){ @@ -293,9 +283,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl result = constructHomeSearchData(formDTO.getStartDate(), formDTO.getEndDate()); List activityList = baseDao.getActivityList(formDTO); if (CollectionUtils.isNotEmpty(activityList)){ - activityList.forEach(a -> { - a.setIsMe(formDTO.getStaffId().equals(a.getStaffId())); - }); + disposeActivityList(formDTO,activityList); Map> groupByDateId = activityList.stream().collect(Collectors.groupingBy(ActAndScheduleListResultDTO.ActivityListDTO::getDateId)); result.forEach(r -> { groupByDateId.forEach((dateId,list) -> { @@ -323,6 +311,23 @@ public class IcPartyActServiceImpl extends BaseServiceImpl activityList){ + List partyOrgIdsNoDistinct = new ArrayList<>(); + activityList.forEach(a -> { + partyOrgIdsNoDistinct.addAll(a.getJoinOrgList().stream().map(m -> m.getPartyOrgId()).collect(Collectors.toList())); + }); + List partyOrgIds = partyOrgIdsNoDistinct.stream().distinct().collect(Collectors.toList()); + List partyOrg = partyOrgDao.getPartyOrg(partyOrgIds); + if (CollectionUtils.isNotEmpty(activityList)) { + activityList.forEach(a -> { + a.setIsMe(formDTO.getStaffId().equals(a.getStaffId())); + a.getJoinOrgList().forEach(po -> partyOrg.stream().filter(p -> p.getPartyOrgId().equals(po.getPartyOrgId())).forEach(p -> po.setPartyOrgName(p.getPartyOrgName()))); + a.setJoinOrgs(a.getJoinOrgList().stream().map(m -> m.getPartyOrgName()).collect(Collectors.toList())); + }); + } + } + public static List constructHomeSearchData(String startDate,String endDate){ List result = new ArrayList<>(); if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){ From 2b1cfe0e7e3041e1bf8a9c1b14ec0dddf85f9dae Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 17:31:39 +0800 Subject: [PATCH 066/397] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActServiceImpl.java | 46 ++++++++++++------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index c6d123626f..0a1c09f318 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -239,13 +239,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl activityList = baseDao.getActivityList(formDTO); if (CollectionUtils.isNotEmpty(activityList)){ disposeActivityList(formDTO,activityList); @@ -270,16 +264,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl homeSearch(ActAndScheduleListFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); - if (null == staffInfo){ - throw new EpmetException("查询工作人员失败："+formDTO.getStaffId()); - } - formDTO.setAgencyId(staffInfo.getAgencyId()); - IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId()); - if (null == icPartyOrgDTO){ - throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId()); - } - formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId())); + disposeActAndScheduleListFormDTO(formDTO); List result = constructHomeSearchData(formDTO.getStartDate(), formDTO.getEndDate()); List activityList = baseDao.getActivityList(formDTO); if (CollectionUtils.isNotEmpty(activityList)){ @@ -312,6 +297,33 @@ public class IcPartyActServiceImpl extends BaseServiceImpl activityList){ List partyOrgIdsNoDistinct = new ArrayList<>(); activityList.forEach(a -> { From 61499f71f92854a259a9720311ca01c20c529c26 Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 17:34:44 +0800 Subject: [PATCH 067/397] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/IcMessageListFormDTO.java | 19 ++++++++++ .../epmet/controller/IcMessageController.java | 12 ++++-- .../main/java/com/epmet/dao/IcMessageDao.java | 7 +++- .../com/epmet/service/IcMessageService.java | 15 ++------ .../service/impl/IcMessageServiceImpl.java | 38 +++++++++++-------- .../main/resources/mapper/IcMessageDao.xml | 20 +++++++++- 6 files changed, 77 insertions(+), 34 deletions(-) create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java new file mode 100644 index 0000000000..b498576824 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@Data +public class IcMessageListFormDTO implements Serializable { + private static final long serialVersionUID = 2697079163476964749L; + + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = false; + //token中信息 + private String customerId; + private String userId; + +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java index 034601b985..daae8cb210 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java @@ -1,7 +1,9 @@ package com.epmet.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.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -10,6 +12,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcMessageDTO; import com.epmet.dto.form.IcMessageFormDTO; +import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.service.IcMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,10 +34,11 @@ public class IcMessageController { @Autowired private IcMessageService icMessageService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icMessageService.page(params); - return new Result>().ok(page); + @RequestMapping("list") + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcMessageListFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result>().ok(icMessageService.list(formDTO)); } @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java index f8b474aecf..3e51845040 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcMessageDTO; +import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.entity.IcMessageEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 用户消息表(党建小助手) * @@ -12,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcMessageDao extends BaseDao { - + + List selectMessageList(IcMessageListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java index 04524957b4..bb2c4e7284 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcMessageDTO; import com.epmet.dto.form.IcMessageFormDTO; +import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.entity.IcMessageEntity; import java.util.List; @@ -18,25 +19,15 @@ import java.util.Map; */ public interface IcMessageService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-08-19 - */ - PageData page(Map params); - /** * 默认查询 * - * @param params + * @param formDTO * @return java.util.List * @author generator * @date 2022-08-19 */ - List list(Map params); + PageData list(IcMessageListFormDTO formDTO); /** * 单条查询 diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java index 305dff1f02..611ab78964 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java @@ -4,20 +4,34 @@ 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.constant.FieldConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.DictTypeEnum; +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.Result; import com.epmet.dao.IcMessageDao; import com.epmet.dto.IcMessageDTO; import com.epmet.dto.form.IcMessageFormDTO; +import com.epmet.dto.form.IcMessageListFormDTO; +import com.epmet.dto.form.IcMoveInListFormDTO; +import com.epmet.dto.result.AllGridsByUserIdResultDTO; +import com.epmet.dto.result.HouseInfoDTO; +import com.epmet.dto.result.IcMoveInListResultDTO; import com.epmet.entity.IcMessageEntity; import com.epmet.service.IcMessageService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 用户消息表(党建小助手) @@ -30,19 +44,11 @@ public class IcMessageServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcMessageDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IcMessageDTO.class); + public PageData list(IcMessageListFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = baseDao.selectMessageList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); } private QueryWrapper getWrapper(Map params){ diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml index 5f186be462..b9adf18986 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -3,6 +3,24 @@ - + \ No newline at end of file From 9043c65be1effda4562574a8961e8cf730e38c91 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 17:44:27 +0800 Subject: [PATCH 068/397] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/BuildingResultDTO.java | 10 ++++++- .../controller/IcNeighborHoodController.java | 7 ++--- .../java/com/epmet/dao/IcBuildingDao.java | 11 ++++++++ .../java/com/epmet/dao/IcNeighborHoodDao.java | 10 ------- .../epmet/service/IcNeighborHoodService.java | 5 ++-- .../impl/IcNeighborHoodServiceImpl.java | 5 ++-- .../main/resources/mapper/IcBuildingDao.xml | 27 +++++++++++++++++++ .../resources/mapper/IcNeighborHoodDao.xml | 21 --------------- 8 files changed, 57 insertions(+), 39 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java index 212c85a700..dc2624e160 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java @@ -11,13 +11,21 @@ import java.io.Serializable; */ @Data public class BuildingResultDTO implements Serializable { + private static final long serialVersionUID = -2129418426919785999L; + private String buildingId; + private String buildingName; + + private String gridId; + private String gridName; + private String neighborhoodId; + private String neighborhoodName; - private String buildingName; + private String label; } 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 183a8e3165..f44e52c44f 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 @@ -39,6 +39,7 @@ import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.ImportInfoFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcNeighborHoodService; @@ -155,13 +156,13 @@ public class IcNeighborHoodController { * * @param tokenDto * @param dto - * @return com.epmet.commons.tools.utils.Result> + * @return com.epmet.commons.tools.utils.Result> * @author zhy * @date 2022/8/19 15:56 */ @PostMapping("neighborhoodlist") - public Result> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) { - return new Result>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto)); + public Result> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) { + return new Result>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto)); } /** 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 8b0cd3f470..d48d12b987 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.IcNeighborHoodDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.IcBuildingListFormDTO; import com.epmet.dto.result.*; @@ -224,4 +225,14 @@ public interface IcBuildingDao extends BaseDao { IcBuildingEntity selectByCoding(@Param("coding") String coding, @Param("id") String id); + /** + * 展示所有楼栋和小区信息 + * + * @param dto + * @return java.util.List + * @author zhy + * @date 2022/8/19 17:32 + */ + List listBuildingInfo(IcNeighborHoodDTO dto); + } 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 cbb29806f4..ee7361724d 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 @@ -212,14 +212,4 @@ public interface IcNeighborHoodDao extends BaseDao { */ List getHouseList(HouseInformationFormDTO formDTO); - /** - * 小区 - * - * @param formDTO - * @return java.util.List - * @author zhy - * @date 2022/8/19 15:57 - */ - List getNeighborhoodList(IcNeighborHoodDTO formDTO); - } 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 7a8105458c..913b4496c4 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 @@ -27,6 +27,7 @@ import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.NeighborHoodAndManagementDTO; import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.ImportInfoFormDTO; +import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.entity.IcNeighborHoodEntity; import com.epmet.entity.IcNeighborHoodPropertyEntity; @@ -122,11 +123,11 @@ public interface IcNeighborHoodService extends BaseService * * @param tokenDto * @param dto - * @return java.util.List + * @return java.util.List * @author zhy * @date 2022/8/19 15:57 */ - List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto); + List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto); /** * @Description 通过ID查询小区信息 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 327c472cc3..3ca505d172 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 @@ -50,6 +50,7 @@ import com.epmet.dto.*; import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.ImportInfoFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.InfoByNamesResultDTO; import com.epmet.dto.result.UploadImgResultDTO; @@ -211,7 +212,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) { + public List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) { dto.setCustomerId(tokenDto.getCustomerId()); if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) { log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区"); @@ -222,7 +223,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl + + 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 d799b0873c..d972dd5e06 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 @@ -663,25 +663,4 @@ SORT, DOOR_NAME+0 - - From 083ca8fe8586351df6f1c4246804640830902a76 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 17:49:23 +0800 Subject: [PATCH 069/397] xiangqing --- .../dto/icpartyact/form/JoinOrgDTO.java | 12 +- .../result/IcPartyActDetailResDTO.java | 113 ++++++++++++++++++ .../modules/partyOrg/dao/IcPartyActDao.java | 2 + .../dao/ResiPartymemberAttachmentDao.java | 3 + .../IcPartyActSignInRecordService.java | 9 ++ .../service/impl/IcPartyActServiceImpl.java | 20 +++- .../IcPartyActSignInRecordServiceImpl.java | 19 +++ .../mapper/partyOrg/IcPartyActDao.xml | 9 ++ .../partyOrg/ResiPartymemberAttachmentDao.xml | 17 +++ 9 files changed, 197 insertions(+), 7 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java index 682b4306ec..383cd43417 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java @@ -20,7 +20,11 @@ public class JoinOrgDTO implements Serializable { */ @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserShowGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserShowGroup.class}) private String joinOrgId; - + /** + * 参加党组织名称 + */ + @NotBlank(message = "参加党组织名称不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserShowGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserShowGroup.class}) + private String joinOrgName; /** * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 */ @@ -49,5 +53,11 @@ public class JoinOrgDTO implements Serializable { * 客户ID */ private String customerId; + + /** + * ic_party_act_org.id + * 详情接口返回 + */ + private String icPartyActOrgRecId; } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java index 7cde53d040..04bfc3ddcc 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java @@ -1,8 +1,14 @@ package com.epmet.resi.partymember.dto.icpartyact.result; +import com.epmet.commons.tools.dto.form.FileCommonDTO; +import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import javax.validation.Valid; import java.io.Serializable; +import java.util.Date; +import java.util.List; /** * @Description @@ -12,5 +18,112 @@ import java.io.Serializable; @Data public class IcPartyActDetailResDTO implements Serializable { private static final long serialVersionUID = -8102085878449811977L; + private String customerId; + + private String publishStaffId; + + private String icPartyActId; + + /** + * 活动类型，来源于ic_party_act_type_dict + */ + private String actType; + private String actTypeName; + + /** + * 活动举办时间：yyyy + */ + private String holdYearId; + + /** + * 活动举办时间:yyyyMM + */ + private String holdMonthId; + + /** + * 举办活动时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date holdTime; + + /** + * 活动主题 + */ + private String topic; + + /** + * 活动地点 + */ + private String address; + + /** + * 活动地点纬度 + */ + private String latitude; + + /** + * 活动地点经度 + */ + private String longitude; + + /** + * 活动开始前几天 + */ + private Integer autoPublicType; + /** + * 发布活动党组织 + */ + private String publishPartyOrgId; + + /** + * 发布活动党组织名称 + */ + private String publishPartyOrgName; + + /** + * 发布活动党组织ID的上级节点 + */ + private String publishOrgPid; + + /** + * 发布活动党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + private String publishOrgType; + + /** + * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 + */ + private String publishOrgPath; + + /** + * 参加人员类型，0：全体党员；1：支部委员 + */ + private String joinUserType; + private String joinUserTypeName; + + + /** + * 是否自动通知参加人员，0否；1是 + */ + private String isAutoInform; + + /** + * 活动介绍 + */ + private String introduce; + + /** + * 参加活动党组织 + */ + @Valid + private List joinOrgList; + + /** + * 附件表 + */ + private List attachmentList; + + private Boolean isSignIn; + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 87b393293c..5212f9bb34 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -35,4 +35,6 @@ public interface IcPartyActDao extends BaseDao { * @return */ List selectPageList(IcPartyActPageFormDTO formDTO); + + String selectActTypeName(String actType); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java index 5b42ff57e4..f068318861 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java @@ -1,6 +1,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,6 @@ public interface ResiPartymemberAttachmentDao extends BaseDao businessIds); + + List selectListByBusinessId(String businessId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java index ea54cd04e9..6cb940b2cc 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java @@ -75,4 +75,13 @@ public interface IcPartyActSignInRecordService extends BaseService wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcPartyActSignInRecordEntity::getIcPartyActId,icPartyActId).eq(IcPartyActSignInRecordEntity::getEpmetUserId,userId); + if(baseDao.selectCount(wrapper)>0){ + return true; + } + return false; + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index f690934076..7587cc4ef6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -114,4 +114,13 @@ order by a.HOLD_TIME desc + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml index 955f5f4664..adbfeeaa0d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml @@ -31,4 +31,21 @@ BUSINESS_ID = #{businessId} + + \ No newline at end of file From 9e64429aea8b5fae6fd2678994f3f5f371b6ce44 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 18:03:32 +0800 Subject: [PATCH 070/397] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=BE=91=E9=9C=80=E8=A6=81=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActServiceImpl.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index dc3a22fe5f..3a7254f146 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -17,6 +17,7 @@ import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.constant.ReadFlagConstant; +import com.epmet.constant.SystemMessageType; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.*; @@ -37,6 +38,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -157,13 +159,23 @@ public class IcPartyActServiceImpl extends BaseServiceImpl map=new HashMap<>(); map.put("icPartyActId",icPartyActEntity.getId()); + //已经发布的，编辑需要发消息 + if(sendMsg){ + PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); + msg.setCustomerId(formDTO.getCustomerId()); + msg.setIcPartyActId(icPartyActEntity.getId()); + msg.setType("publish"); + SendMqMsgUtil.build() + .openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class)) + .sendRocketMqMsg(SystemMessageType.PARTY_MEETING_MESSAGE, msg); + } return map; } From 9242d2fef64674d48c00c8ee5a0672092b8d8383 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 22 Aug 2022 09:08:50 +0800 Subject: [PATCH 071/397] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=91=E6=8A=A4=E7=85=A7-=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/IdCardTypeEnum.java | 27 ++++++++ .../com/epmet/entity/IcResiUserEntity.java | 7 +- .../impl/IcResiUserImportServiceImpl.java | 66 ++++++++++++------- 3 files changed, 74 insertions(+), 26 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/IdCardTypeEnum.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/IdCardTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/IdCardTypeEnum.java new file mode 100644 index 0000000000..7ca7f04641 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/IdCardTypeEnum.java @@ -0,0 +1,27 @@ +package com.epmet.commons.tools.enums; + +/** + * 唯一整件类型 + */ +public enum IdCardTypeEnum { + + OTHERS("0", "其他"), + SFZH("1", "身份证号"), + PASSPORT("2", "护照"); + + private String type; + private String name; + + IdCardTypeEnum(String type, String name) { + this.type = type; + this.name = name; + } + + public String getType() { + return type; + } + + public String getName() { + return name; + } +} 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 f787399b23..d7849f5592 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 @@ -96,10 +96,15 @@ public class IcResiUserEntity extends BaseEpmetEntity { private String gender; /** - * 身份证号 + * 证件号 */ private String idCard; + /** + * 证件类型。1：身份证号；2：护照 + */ + private String idCardType; + /** * 出生日期 */ 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 7f8921443f..adc9a94eb4 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 @@ -18,6 +18,7 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum; +import com.epmet.commons.tools.enums.IdCardTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -98,6 +99,11 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res */ private final Pattern PATTERN_18_ID = Pattern.compile("^\\d{6}(?\\d{4})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)[0-9a-xA-X]$"); + /** + * 9位护照 + */ + private final Pattern PATTERN_9_PASSPORT = Pattern.compile("^\\w{2}\\d{7}|\\w{1}\\d{8}$"); + /** * 日期解析，不含时间 */ @@ -623,14 +629,10 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res if (StringUtils.isBlank(idCard)) { log.debug("【居民信息导入】specifiedCheck身份证号为空的：{},{}", mobile, name); - String errorMsg = "身份证号不能为空"; + String errorMsg = "证件号不能为空"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); } - if (idCard.length() != 18 && idCard.length() != 15) { - errors.add("身份证号长度错误"); - } - if (StringUtils.isNotBlank(mobile) && mobile.length() > 15) { errors.add("手机号长度错误"); } @@ -642,12 +644,13 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } // ================== 数据补充 =================== - String year; - String month; - String day; - String sex; + String year = null, month = null, day = null, sex = null; + + // 证件类型，默认是1身份证号 + String idCardType = IdCardTypeEnum.SFZH.getType(); if (idCard.length() == 15) { + // 身份证 Matcher matcher = PATTERN_15_ID.matcher(idCard); if (matcher.matches()) { year = "19".concat(matcher.group("year")); @@ -655,10 +658,11 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res day = matcher.group("day"); sex = matcher.group("sex"); } else { - String s = "身份证号解析错误"; + String s = "证件号解析错误"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); } } else if (idCard.length() == 18) { + // 身份证 Matcher matcher = PATTERN_18_ID.matcher(idCard); if (matcher.matches()) { year = matcher.group("year"); @@ -666,28 +670,40 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res day = matcher.group("day"); sex = matcher.group("sex"); } else { - String s = "身份证号解析错误"; + String s = "证件号解析错误"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); } + } else if (idCard.length() == 9) { + // 护照 + Matcher matcher = PATTERN_9_PASSPORT.matcher(idCard); + if (matcher.matches()) { + idCardType = IdCardTypeEnum.PASSPORT.getType(); + } } else { - String s = "身份证号位数错误"; + String s = "证件号解析错误"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); } - // 出生日期 & 年龄 - LocalDate birthday = null; - try { - birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); - } catch (DateTimeException e) { - throw new EpmetException("身份证号中日期信息错误"); - } - int age = Period.between(birthday, LocalDate.now()).getYears(); + // 存储证件类型 + columnAndValues.put("ID_CARD_TYPE", idCardType); - // 性别 & 生日 & 老年人 - Boolean isMale = (Integer.parseInt(sex) % 2) == 1; - columnAndValues.put("BIRTHDAY", String.join("-", Arrays.asList(year, month,day))); - columnAndValues.put("GENDER", isMale ? "1" : "2"); - columnAndValues.put("IS_OLD_PEOPLE", age >= 60 ? "1" : "0"); + if (idCardType.equals(IdCardTypeEnum.SFZH.getType())) { + //只有证件类型是身份证号才做相关解析 + // 出生日期 & 年龄 + LocalDate birthday = null; + try { + birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); + } catch (DateTimeException e) { + throw new EpmetException("身份证号中日期信息错误"); + } + int age = Period.between(birthday, LocalDate.now()).getYears(); + + // 性别 & 生日 & 老年人 + Boolean isMale = (Integer.parseInt(sex) % 2) == 1; + columnAndValues.put("BIRTHDAY", String.join("-", Arrays.asList(year, month, day))); + columnAndValues.put("GENDER", isMale ? "1" : "2"); + columnAndValues.put("IS_OLD_PEOPLE", age >= 60 ? "1" : "0"); + } } /** From 4455a67f53d8cecbca3be1cd0054463c1d662b50 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 09:23:05 +0800 Subject: [PATCH 072/397] =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/dao/IcPartyActOrgDao.java | 14 ++++++++++++++ .../service/impl/IcPartyActServiceImpl.java | 1 + .../mapper/partyOrg/IcPartyActOrgDao.xml | 17 +++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java index e38cde539a..09304e8ecb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java @@ -2,6 +2,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,5 +17,18 @@ import java.util.List; @Mapper public interface IcPartyActOrgDao extends BaseDao { + /** + * 删除活动时，同时删除，参与活动党组织表 + * @param customerId + * @param icPartyActIds + * @return + */ int deleteByPartyActId(@Param("customerId") String customerId, @Param("icPartyActIds")List icPartyActIds); + + /** + * 查询活动的参与活动党组织列表 + * @param icPartyActId + * @return + */ + List selectJoinOrgList(String icPartyActId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 3a7254f146..bab46cb4ff 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -258,6 +258,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl + + \ No newline at end of file From c02382f0a401cced2b8a4f0dfbb2e00f7b2b0897 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 09:56:32 +0800 Subject: [PATCH 073/397] =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=81=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartyActController.java | 35 ++++++++++++- .../modules/partyOrg/dao/IcPartyActDao.java | 3 ++ .../partyOrg/dao/IcPartyActOrgDao.java | 2 + .../partyOrg/service/IcPartyActService.java | 16 ++++++ .../service/impl/IcPartyActServiceImpl.java | 51 +++++++++++++++++++ .../mapper/partyOrg/IcPartyActDao.xml | 9 ++++ .../mapper/partyOrg/IcPartyActOrgDao.xml | 8 +++ 7 files changed, 122 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index a5c2855bb6..73784ef2ad 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -16,6 +16,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +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.*; @@ -38,7 +39,7 @@ public class IcPartyActController { private IcPartyActService icPartyActService; /** - * 添加、修改活动 + * 添加、修改活动各端通用 * @param tokenDto * @param formDTO * @return @@ -141,5 +142,35 @@ public class IcPartyActController { formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icPartyActService.homeSearch(formDTO)); } - + + /** + * pc活动列表-发布活动 + * pc党建日历左下角列表，点击发布 + * 工作端小程序点击发布 + * @param tokenDto + * @param icPartyActId + * @return + */ + @PostMapping("publish/{icPartyActId}") + public Result publicshIcPartyAct(@LoginUser TokenDto tokenDto,@PathVariable("icPartyActId")String icPartyActId){ + icPartyActService.publicshIcPartyAct(tokenDto.getUserId(),icPartyActId); + return new Result(); + } + + /** + * pc活动列表-发布活动 + * pc党建日历左下角列表，点击删除 + * pc生成年度记录，删除活动 + * 工作端小程序-详情页面，删除 + * @param tokenDto + * @param icPartyActIds + * @return + */ + @PostMapping("del") + public Result deleteIcPartyAct(@LoginUser TokenDto tokenDto,@RequestBody List icPartyActIds){ + if(CollectionUtils.isNotEmpty(icPartyActIds)){ + icPartyActService.deleteIcPartyAct(tokenDto.getCustomerId(),tokenDto.getUserId(),icPartyActIds); + } + return new Result(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 5212f9bb34..febc8ec2ba 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -8,6 +8,7 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -37,4 +38,6 @@ public interface IcPartyActDao extends BaseDao { List selectPageList(IcPartyActPageFormDTO formDTO); String selectActTypeName(String actType); + + int deleteIcPartyAct(@Param("customerId") String customerId, @Param("userId")String userId, @Param("icPartyActId")String icPartyActId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java index 09304e8ecb..9351804f7c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java @@ -31,4 +31,6 @@ public interface IcPartyActOrgDao extends BaseDao { * @return */ List selectJoinOrgList(String icPartyActId); + + int updateToDel(@Param("userId") String userId, @Param("icPartyActId") String icPartyActId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 3c4d7a92e0..512c38a99d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -80,4 +80,20 @@ public interface IcPartyActService extends BaseService { * @date 2022/8/19 14:01 */ List homeSearch(ActAndScheduleListFormDTO formDTO); + + /** + * * pc活动列表-发布活动 + * pc党建日历左下角列表，点击发布 + * 工作端小程序点击发布 + * @param userId + * @param icPartyActId + */ + void publicshIcPartyAct(String userId, String icPartyActId); + + /** + * 删除活动 + * @param userId + * @param icPartyActIds + */ + void deleteIcPartyAct(String customerId,String userId, List icPartyActIds); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index bab46cb4ff..de4d785935 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -497,4 +497,55 @@ public class IcPartyActServiceImpl extends BaseServiceImpl icPartyActIds) { + if(CollectionUtils.isEmpty(icPartyActIds)){ + return; + } + icPartyActIds.forEach(icPartyActId->{ + //删除活动主表和参与活动党组织关系表记录 + baseDao.deleteIcPartyAct(customerId,userId,icPartyActId); + icPartyActOrgDao.updateToDel(userId,icPartyActId); + }); + + } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 7587cc4ef6..7ef1aca4d1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -123,4 +123,13 @@ WHERE d.type_key = #{actType} + + + update ic_party_act + set del_flag='1', + UPDATED_BY=#{userId}, + UPDATED_TIME=now() + where customerId=#{customerId} + and id=#{icPartyActId} + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml index ad074e65ef..a639a41a8d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml @@ -26,4 +26,12 @@ o.DEL_FLAG = '0' AND o.IC_PARTY_ACT_ID = #{icPartyActId} + + + update ic_party_act_org + set del_flag='1', + UPDATED_BY=#{userId}, + UPDATED_TIME=now() + where IC_PARTY_ACT_ID=#{icPartyActId} + \ No newline at end of file From 0d62ced0f57fddc6f92b5fb582a3652fb033787d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 10:03:49 +0800 Subject: [PATCH 074/397] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=8A=98=E7=BA=BF?= =?UTF-8?q?=E5=9B=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/VisitVisitorChartFormDTO.java | 24 +++++++++++++++ .../result/VisitVisitorChartResultDTO.java | 30 +++++++++++++++++++ .../IcResiCollectVisitorController.java | 22 +++++++++++--- .../epmet/dao/IcResiCollectVisitorDao.java | 12 ++++++++ .../service/IcResiCollectVisitorService.java | 12 ++++++++ .../impl/IcResiCollectVisitorServiceImpl.java | 16 +++++++--- .../mapper/IcResiCollectVisitorDao.xml | 12 ++++++++ 7 files changed, 120 insertions(+), 8 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitVisitorChartFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VisitVisitorChartResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitVisitorChartFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitVisitorChartFormDTO.java new file mode 100644 index 0000000000..aee3bdb042 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitVisitorChartFormDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 租客表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-07-26 + */ +@Data +public class VisitVisitorChartFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 时间 + */ + private String date; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VisitVisitorChartResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VisitVisitorChartResultDTO.java new file mode 100644 index 0000000000..7836d3a866 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VisitVisitorChartResultDTO.java @@ -0,0 +1,30 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 租客表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-07-26 + */ +@Data +public class VisitVisitorChartResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 时间 + */ + private String hour; + + /** + * 数量 + */ + private String num; + + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java index 05d5ba667b..2019de84d1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java @@ -13,10 +13,8 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcResiCollectVisitorDTO; import com.epmet.dto.SaveCollectVisitorFormDTO; -import com.epmet.dto.form.CollectDetailFormDTO; -import com.epmet.dto.form.CollectListFormDTO; -import com.epmet.dto.form.VisitListFormDTO; -import com.epmet.dto.form.VisitorInfoFormDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.VisitVisitorChartResultDTO; import com.epmet.excel.IcResiCollectVisitorExcel; import com.epmet.service.IcResiCollectVisitorService; import org.springframework.beans.factory.annotation.Autowired; @@ -148,4 +146,20 @@ public class IcResiCollectVisitorController { return icResiCollectVisitorService.getVisitorInfo(tokenDto, dto); } + /** + * 访客折线图 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/8/22 9:56 + */ + @NoRepeatSubmit + @PostMapping("chart/traffic") + public Result> getTraffic(@RequestBody VisitVisitorChartFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + return new Result>().ok(icResiCollectVisitorService.getTraffic(dto)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java index dac7126438..f4ef4e0178 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java @@ -3,7 +3,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcResiCollectVisitorDTO; import com.epmet.dto.form.VisitListFormDTO; +import com.epmet.dto.form.VisitVisitorChartFormDTO; import com.epmet.dto.form.VisitorInfoFormDTO; +import com.epmet.dto.result.VisitVisitorChartResultDTO; import com.epmet.entity.IcResiCollectVisitorEntity; import org.apache.ibatis.annotations.Mapper; @@ -46,4 +48,14 @@ public interface IcResiCollectVisitorDao extends BaseDao getTraffic(VisitVisitorChartFormDTO dto); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java index b8908d1db0..6b92a7b16b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java @@ -8,7 +8,9 @@ import com.epmet.dto.IcResiCollectVisitorDTO; import com.epmet.dto.SaveCollectVisitorFormDTO; import com.epmet.dto.form.CollectDetailFormDTO; import com.epmet.dto.form.VisitListFormDTO; +import com.epmet.dto.form.VisitVisitorChartFormDTO; import com.epmet.dto.form.VisitorInfoFormDTO; +import com.epmet.dto.result.VisitVisitorChartResultDTO; import com.epmet.entity.IcResiCollectVisitorEntity; import java.util.List; @@ -121,4 +123,14 @@ public interface IcResiCollectVisitorService extends BaseService getTraffic(VisitVisitorChartFormDTO dto); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java index ebd7424b34..5a5937324a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java @@ -15,10 +15,8 @@ import com.epmet.dao.IcResiCollectVisitorDao; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.IcResiCollectVisitorDTO; import com.epmet.dto.SaveCollectVisitorFormDTO; -import com.epmet.dto.form.CollectDetailFormDTO; -import com.epmet.dto.form.VisitListFormDTO; -import com.epmet.dto.form.VisitVisitorFormDTO; -import com.epmet.dto.form.VisitorInfoFormDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.VisitVisitorChartResultDTO; import com.epmet.entity.IcResiCollectVisitorEntity; import com.epmet.redis.IcResiCollectVisitorRedis; import com.epmet.service.IcResiCollectVisitorService; @@ -30,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -179,4 +178,13 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl getTraffic(VisitVisitorChartFormDTO dto) { + if (StringUtils.isBlank(dto.getDate())) { + dto.setDate(LocalDate.now().toString()); + } + return baseDao.getTraffic(dto); + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml index 8884c9189c..f525fb9e6d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml @@ -121,4 +121,16 @@ LIMIT 1 + + From e5a08afb8c2718aaff10b15ab5075b8c32660d96 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 22 Aug 2022 10:18:31 +0800 Subject: [PATCH 075/397] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=91=E6=8A=A4=E7=85=A7-=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=AD=A3=E5=88=99=E5=B7=A5=E5=85=B7=E7=B1=BB=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=B8=BA=E6=AD=A3=E5=88=99=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/IdCardRegexUtils.java | 123 ++++++++++++++++++ .../impl/IcResiUserImportServiceImpl.java | 101 +++++++------- 2 files changed, 173 insertions(+), 51 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java new file mode 100644 index 0000000000..deaf9997c1 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java @@ -0,0 +1,123 @@ +package com.epmet.commons.tools.utils; + +import com.epmet.commons.tools.enums.IdCardTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * 唯一整件正则工具 + */ +public class IdCardRegexUtils { + + /** + * 15位身份证号的正则表达式 + */ + private static final Pattern PATTERN_15_ID = Pattern.compile("^\\d{6}(?\\d{2})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)$"); + /** + * 18位身份证号的正则表达式 + */ + private static final Pattern PATTERN_18_ID = Pattern.compile("^\\d{6}(?\\d{4})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)[0-9a-xA-X]$"); + + /** + * 9位护照 + */ + private static final Pattern PATTERN_9_PASSPORT = Pattern.compile("^\\w{2}\\d{7}$|^\\w{1}\\d{8}$"); + + private String inputText; + + private Matcher matcher; + + private IdCardTypeEnum idCardType; + + private IdCardRegexUtils(IdCardTypeEnum idCardType, Matcher matcher, String inputText) { + this.idCardType = idCardType; + this.matcher = matcher; + this.inputText = inputText; + } + + /** + * 正则解析结果 + */ + @Data + @AllArgsConstructor + @NoArgsConstructor + public static class ParsedContent { + private String birthdayYear; + private String birthdayMonth; + private String birthdayDay; + private String sex; + } + + /** + * 解析正则 + * @param input + * @return + */ + public static IdCardRegexUtils parse(String input) { + if (input == null) { + return null; + } + + if (input.length() == 15) { + Matcher matcher = PATTERN_15_ID.matcher(input); + if (matcher.matches()) { + return new IdCardRegexUtils(IdCardTypeEnum.SFZH, matcher, input); + } + } + + if (input.length() == 18) { + Matcher matcher = PATTERN_18_ID.matcher(input); + if (matcher.matches()) { + return new IdCardRegexUtils(IdCardTypeEnum.SFZH, matcher, input); + } + } + + if (input.length() == 9) { + Matcher matcher = PATTERN_9_PASSPORT.matcher(input); + if (matcher.matches()) { + return new IdCardRegexUtils(IdCardTypeEnum.PASSPORT, matcher, input); + } + } + return null; + } + + /** + * 获取解析结果 + * @return + */ + public ParsedContent getParsedResult() { + if (matcher == null || idCardType == null) { + return null; + } + + if (IdCardTypeEnum.SFZH == idCardType) { + //是身份证号，可以解析 + String year; + if (inputText.length() == 15) { + // 15位身份证号，years前需要拼上19 + year = "19".concat(matcher.group("year")); + } else { + year = matcher.group("year"); + } + String month = matcher.group("month"); + String day = matcher.group("day"); + String sex = matcher.group("sex"); + return new ParsedContent(year, month, day, sex); + } + + // 其他类型暂时不可解析 + return null; + } + + /** + * 获取类型枚举 + * @return + */ + public IdCardTypeEnum getTypeEnum() { + return idCardType; + } +} 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 adc9a94eb4..342fb23760 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 @@ -90,20 +90,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res public static final List controlGroup1 = Arrays.asList("input", "textarea", "datepicker", "daterange"); public static final List controlGroup2 = Arrays.asList("select", "radio", "cascader"); - /** - * 15位身份证号的正则表达式 - */ - private final Pattern PATTERN_15_ID = Pattern.compile("^\\d{6}(?\\d{2})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)$"); - /** - * 18位身份证号的正则表达式 - */ - private final Pattern PATTERN_18_ID = Pattern.compile("^\\d{6}(?\\d{4})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)[0-9a-xA-X]$"); - - /** - * 9位护照 - */ - private final Pattern PATTERN_9_PASSPORT = Pattern.compile("^\\w{2}\\d{7}|\\w{1}\\d{8}$"); - /** * 日期解析，不含时间 */ @@ -646,48 +632,61 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res // ================== 数据补充 =================== String year = null, month = null, day = null, sex = null; - // 证件类型，默认是1身份证号 - String idCardType = IdCardTypeEnum.SFZH.getType(); - - if (idCard.length() == 15) { - // 身份证 - Matcher matcher = PATTERN_15_ID.matcher(idCard); - if (matcher.matches()) { - year = "19".concat(matcher.group("year")); - month = matcher.group("month"); - day = matcher.group("day"); - sex = matcher.group("sex"); - } else { - String s = "证件号解析错误"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); - } - } else if (idCard.length() == 18) { - // 身份证 - Matcher matcher = PATTERN_18_ID.matcher(idCard); - if (matcher.matches()) { - year = matcher.group("year"); - month = matcher.group("month"); - day = matcher.group("day"); - sex = matcher.group("sex"); - } else { - String s = "证件号解析错误"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); - } - } else if (idCard.length() == 9) { - // 护照 - Matcher matcher = PATTERN_9_PASSPORT.matcher(idCard); - if (matcher.matches()) { - idCardType = IdCardTypeEnum.PASSPORT.getType(); - } - } else { - String s = "证件号解析错误"; + //if (idCard.length() == 15) { + // // 身份证 + // Matcher matcher = PATTERN_15_ID.matcher(idCard); + // if (matcher.matches()) { + // year = "19".concat(matcher.group("year")); + // month = matcher.group("month"); + // day = matcher.group("day"); + // sex = matcher.group("sex"); + // } else { + // String s = "证件号解析错误"; + // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); + // } + //} else if (idCard.length() == 18) { + // // 身份证 + // Matcher matcher = PATTERN_18_ID.matcher(idCard); + // if (matcher.matches()) { + // year = matcher.group("year"); + // month = matcher.group("month"); + // day = matcher.group("day"); + // sex = matcher.group("sex"); + // } else { + // String s = "证件号解析错误"; + // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); + // } + //} else if (idCard.length() == 9) { + // // 护照 + // Matcher matcher = PATTERN_9_PASSPORT.matcher(idCard); + // if (matcher.matches()) { + // idCardType = IdCardTypeEnum.PASSPORT.getType(); + // } + //} else { + // String s = "证件号解析错误"; + // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); + //} + + IdCardRegexUtils regexUtilInstance = IdCardRegexUtils.parse(idCard); + IdCardTypeEnum idCardType = regexUtilInstance.getTypeEnum(); + + if (idCardType == null || IdCardTypeEnum.OTHERS == idCardType) { + String s = "证件号解析错误，或不支持的证件类型。(请使用身份证号或者护照号)"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); } + IdCardRegexUtils.ParsedContent parsedResult = regexUtilInstance.getParsedResult(); + if (parsedResult != null) { + year = parsedResult.getBirthdayYear(); + month = parsedResult.getBirthdayMonth(); + day = parsedResult.getBirthdayDay(); + sex = parsedResult.getSex(); + } + // 存储证件类型 - columnAndValues.put("ID_CARD_TYPE", idCardType); + columnAndValues.put("ID_CARD_TYPE", idCardType.getType()); - if (idCardType.equals(IdCardTypeEnum.SFZH.getType())) { + if (idCardType == IdCardTypeEnum.SFZH) { //只有证件类型是身份证号才做相关解析 // 出生日期 & 年龄 LocalDate birthday = null; From 161ca5145535268612d442d5312f9e6d39828081 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 22 Aug 2022 10:27:37 +0800 Subject: [PATCH 076/397] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=B7=B2=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/ReadIcMessageFormDTO.java | 18 ++++++++++++++++++ .../epmet/controller/IcMessageController.java | 13 +++++++++++++ .../main/java/com/epmet/dao/IcMessageDao.java | 3 +++ .../com/epmet/service/IcMessageService.java | 3 +++ .../service/impl/IcMessageServiceImpl.java | 14 ++++++++++++++ .../src/main/resources/mapper/IcMessageDao.xml | 11 +++++++++++ 6 files changed, 62 insertions(+) create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/ReadIcMessageFormDTO.java diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/ReadIcMessageFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/ReadIcMessageFormDTO.java new file mode 100644 index 0000000000..d5c875bd87 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/ReadIcMessageFormDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ReadIcMessageFormDTO implements Serializable { + private static final long serialVersionUID = 2697079163476964749L; + + /** + * 消息Id + */ + private String id; + //token中信息 + private String customerId; + private String userId; +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java index daae8cb210..b93bd93fbc 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java @@ -13,6 +13,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcMessageDTO; import com.epmet.dto.form.IcMessageFormDTO; import com.epmet.dto.form.IcMessageListFormDTO; +import com.epmet.dto.form.ReadIcMessageFormDTO; import com.epmet.service.IcMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -83,5 +84,17 @@ public class IcMessageController { return new Result(); } + /** + * @Author sun + * @Description 单条或批量修改已读 + **/ + @PostMapping("read") + public Result read(@LoginUser TokenDto tokenDto, @RequestBody ReadIcMessageFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icMessageService.read(formDTO); + return new Result(); + } + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java index 3e51845040..998f48b62a 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcMessageDTO; import com.epmet.dto.form.IcMessageListFormDTO; +import com.epmet.dto.form.ReadIcMessageFormDTO; import com.epmet.entity.IcMessageEntity; import org.apache.ibatis.annotations.Mapper; @@ -18,4 +19,6 @@ import java.util.List; public interface IcMessageDao extends BaseDao { List selectMessageList(IcMessageListFormDTO formDTO); + + void upByUserId(ReadIcMessageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java index bb2c4e7284..c13639c418 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcMessageDTO; import com.epmet.dto.form.IcMessageFormDTO; import com.epmet.dto.form.IcMessageListFormDTO; +import com.epmet.dto.form.ReadIcMessageFormDTO; import com.epmet.entity.IcMessageEntity; import java.util.List; @@ -70,4 +71,6 @@ public interface IcMessageService extends BaseService { void delete(String[] ids); void saveIcMessageList(List msgList); + + void read(ReadIcMessageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java index 611ab78964..5d2678c49d 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java @@ -16,6 +16,7 @@ import com.epmet.dto.IcMessageDTO; import com.epmet.dto.form.IcMessageFormDTO; import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.dto.form.IcMoveInListFormDTO; +import com.epmet.dto.form.ReadIcMessageFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.IcMoveInListResultDTO; @@ -93,4 +94,17 @@ public class IcMessageServiceImpl extends BaseServiceImpl + + UPDATE ic_message + SET read_flag = 'read', + updated_by = #{userId}, + updated_time = NOW() + WHERE + del_flag = '0' + AND customer_id = #{customerId} + AND user_id = #{userId} + + \ No newline at end of file From 55fc092534909ddd82fc89b85bb5aebf31d42d76 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 22 Aug 2022 10:28:38 +0800 Subject: [PATCH 077/397] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ActAndScheduleListFormDTO.java | 6 +++ .../dto/partyOrg/form/YearSearchFormDTO.java | 25 ++++++++++ .../result/ActAndScheduleListResultDTO.java | 4 ++ .../partyOrg/result/YearSearchResultDTO.java | 46 +++++++++++++++++++ .../controller/IcPartyActController.java | 17 +++++++ .../partyOrg/service/IcPartyActService.java | 10 ++++ .../service/impl/IcPartyActServiceImpl.java | 38 +++++++++++++-- .../mapper/partyOrg/IcPartyActDao.xml | 17 ++++++- 8 files changed, 158 insertions(+), 5 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java index b6b33564d2..19998a2448 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java @@ -17,6 +17,7 @@ public class ActAndScheduleListFormDTO implements Serializable { private String startDate; private String endDate; private String dateId; + private String yearId; /** * 是否本人创建的活动，1：是；0：否 @@ -32,4 +33,9 @@ public class ActAndScheduleListFormDTO implements Serializable { private String staffId; private String agencyId; private String path; + + /** + * 当seachType = 'yearSearch'时，不需要查询党组织 + */ + private String searchType = ""; } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java new file mode 100644 index 0000000000..983f48548d --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/22 09:26 + * @DESC + */ +@Data +public class YearSearchFormDTO implements Serializable { + + private static final long serialVersionUID = 4557112229519696741L; + + public interface YearSearchForm{} + + @NotBlank(message = "yaerId不能为空",groups = YearSearchForm.class) + private String yearId; + + private String staffId; + private String customerId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java index 9b3248a0f3..fe782a2083 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java @@ -37,6 +37,10 @@ public class ActAndScheduleListResultDTO implements Serializable { private String topic; private String address; private String holdTime; + private String autoPublicTime; + private String isAutoInformValue; + private String isAutoInform; + private String autoInformDay; private String type; private String isPublicValue; private String isPublish; diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchResultDTO.java new file mode 100644 index 0000000000..e03e53c13b --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchResultDTO.java @@ -0,0 +1,46 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/8/22 09:27 + * @DESC + */ +@Data +public class YearSearchResultDTO implements Serializable { + + private static final long serialVersionUID = 8961924457475202790L; + + private String type; + private String frequency; + private List activityList; + + @Data + public static class YearSearchActivityListDTO implements Serializable{ + + private static final long serialVersionUID = -9050507457068805831L; + + private String activityId; + private String staffId; + private String dateId; + private String topic; + private String address; + private String holdTime; + private String type; + private String isPublicValue; + private String isPublish; + private String joinTypeValue; + private String joinUserType; + private String isAutoInformValue; + private String autoInformDay; + private String autoPublicTime; + private List joinOrgList; + private List joinOrgs; + private Boolean isMe = false; + + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 73784ef2ad..1f1ccfe249 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -14,8 +14,10 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -173,4 +175,19 @@ public class IcPartyActController { } return new Result(); } + + /** + * Desc:【党建日历】生成年度活动计划查询 + * @param tokenDto + * @param formDTO + * @author zxc + * @date 2022/8/22 09:33 + */ + @PostMapping("yearSearch") + public Result> yearSearch(@LoginUser TokenDto tokenDto, @RequestBody YearSearchFormDTO formDTO){ + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(icPartyActService.yearSearch(formDTO)); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 512c38a99d..eeba74188a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -11,8 +11,10 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; import java.util.List; import java.util.Map; @@ -96,4 +98,12 @@ public interface IcPartyActService extends BaseService { * @param icPartyActIds */ void deleteIcPartyAct(String customerId,String userId, List icPartyActIds); + + /** + * Desc: 【党建日历】生成年度活动计划查询 + * @param formDTO + * @author zxc + * @date 2022/8/22 09:33 + */ + List yearSearch(YearSearchFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index de4d785935..f8d7f8ec98 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -36,8 +36,10 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -328,6 +330,32 @@ public class IcPartyActServiceImpl extends BaseServiceImpl yearSearch(YearSearchFormDTO formDTO) { + ActAndScheduleListFormDTO secondForm = ConvertUtils.sourceToTarget(formDTO, ActAndScheduleListFormDTO.class); + secondForm.setSearchType("yearSearch"); + disposeActAndScheduleListFormDTO(secondForm); + List activityList = baseDao.getActivityList(secondForm); + List result = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(activityList)) { + disposeActivityList(secondForm, activityList); + Map> groupByType = activityList.stream().collect(Collectors.groupingBy(ActAndScheduleListResultDTO.ActivityListDTO::getType)); + groupByType.forEach((type,list) -> { + YearSearchResultDTO dto = new YearSearchResultDTO(); + dto.setType(type); + dto.setActivityList(ConvertUtils.sourceToTarget(list, YearSearchResultDTO.YearSearchActivityListDTO.class)); + result.add(dto); + }); + } + return result; + } + /** * Desc: * @param formDTO @@ -340,11 +368,13 @@ public class IcPartyActServiceImpl extends BaseServiceImpl + + + + @@ -40,6 +44,12 @@ pa.TOPIC, pa.ADDRESS, DATE_FORMAT(pa.HOLD_TIME,'%Y-%m-%d %H:%i:%s') AS holdTime, + (CASE WHEN pa.IS_AUTO_INFORM = '1' THEN '是' + WHEN pa.IS_AUTO_INFORM = '0' THEN '否' + ELSE '否' END) AS isAutoInformValue, + pa.IS_AUTO_INFORM as isAutoInform, + if(IS_AUTO_INFORM = '1',DATE_FORMAT(pa.AUTO_PUBLIC_TIME,'%Y-%m-%d %H:%i:%s'),'') AS autoPublicTime, + if(IS_AUTO_INFORM = '1',concat('活动开始前',pa.AUTO_PUBLIC_TYPE,'天'),'') as autoInformDay, DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') AS dateId, pa.ACT_TYPE AS type, (CASE WHEN pa.JOIN_USER_TYPE = '1' THEN '支部委员' @@ -59,6 +69,9 @@ AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') = #{dateId} + + AND pa.ORG_ID_PATH like concat('%',#{agencyId},'%') + AND pa.PUBLISH_STAFF_ID = #{staffId} @@ -68,7 +81,9 @@ AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') #{endDate} - AND pa.PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') + + AND pa.PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') + + From 8db73367ca28e79f2963be4930d6d43f65789cde Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 10:56:13 +0800 Subject: [PATCH 079/397] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/template/index.vue.vm | 103 ++++++++++++------ 1 file changed, 71 insertions(+), 32 deletions(-) diff --git a/epmet-cloud-generator/src/main/resources/template/index.vue.vm b/epmet-cloud-generator/src/main/resources/template/index.vue.vm index aa5bcb3494..9b3ba8bee8 100644 --- a/epmet-cloud-generator/src/main/resources/template/index.vue.vm +++ b/epmet-cloud-generator/src/main/resources/template/index.vue.vm @@ -1,52 +1,52 @@ + From 822744f373b33488b8af6f98e010e03775ccd011 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 11:07:50 +0800 Subject: [PATCH 080/397] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/DefaultPartyOrgResDTO.java | 37 +++++++++++++++++++ .../controller/IcPartyOrgController.java | 11 ++++++ .../modules/partyOrg/dao/IcPartyOrgDao.java | 2 + .../partyOrg/service/IcPartyOrgService.java | 9 +++++ .../service/impl/IcPartyOrgServiceImpl.java | 27 ++++++++++++++ .../mapper/partyOrg/IcPartyOrgDao.xml | 27 +++++++++++++- 6 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java new file mode 100644 index 0000000000..827aad2257 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java @@ -0,0 +1,37 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/22 10:25 + */ +@Data +public class DefaultPartyOrgResDTO implements Serializable { + private static final long serialVersionUID = -7563161453372080189L; + /** + * 当前登录用户所属的组织 + */ + private String staffAgencyId; + /** + * 当前登录用户所属的组织名称 + */ + private String staffAgencyName; + /** + * 当前登录用户所属的行政组织下，默认的党组织名称 + */ + private String defaultPartyOrgId; + private String defaultPartyOrgPid; + /** + * 党组织名称 + */ + private String defaultPartyOrgName; + /** + * 党组织路径 + */ + private String defaultPartyOrgPath; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index e1af2d4515..73b7b83e0f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -17,6 +17,7 @@ import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.DefaultPartyOrgResDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -155,4 +156,14 @@ public class IcPartyOrgController { return new Result>().ok(icPartyOrgService.getPartyOrgList(tokenDto)); } + /** + * 党组织活动发布时， + * 查询当前登录用户所属行政组织下，默认的党组织，取第一个 + * @param tokenDto + * @return + */ + @PostMapping("defaultpartyorg") + public Result defaultPartyOrg(@LoginUser TokenDto tokenDto){ + return new Result().ok(icPartyOrgService.defaultPartyOrg(tokenDto.getCustomerId(), tokenDto.getUserId())); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index bf28e8663b..5bd233d672 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -107,4 +107,6 @@ public interface IcPartyOrgDao extends BaseDao { IcPartyOrgEntity selectByCustomerIdAndFirstOrg(@Param("customerId") String customerId); List getPartyOrg(@Param("orgIds")List orgIds); + + IcPartyOrgEntity selectDefaultPartyOrg(@Param("agencyId") String agencyId, @Param("level") String level); } 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 ea0c5615fd..defd146e01 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 @@ -9,6 +9,7 @@ import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.DefaultPartyOrgResDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import java.util.List; @@ -127,4 +128,12 @@ public interface IcPartyOrgService extends BaseService { * @Date 2022/8/15 15:52 */ Map getPartyOrgList(TokenDto tokenDto); + + /** + * 党组织活动发布时， + * 查询当前登录用户所属行政组织下，默认的党组织，取第一个 + * @param tokenDto + * @return + */ + DefaultPartyOrgResDTO defaultPartyOrg(String customerId, String userId); } 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 6ff7041421..47918419cd 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; 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.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.PartyOrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -31,6 +32,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.DefaultPartyOrgResDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -361,4 +363,29 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl - + From 3ef027ba0dce72caef931d3a7f4a8e00e0180f1f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 12:37:18 +0800 Subject: [PATCH 081/397] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=B9=B4=E5=BA=A6?= =?UTF-8?q?=E8=AE=A1=E5=88=92=EF=BC=8C=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/BatchAddPartyActFormDTO.java | 21 ++++++++++++++++ .../controller/IcPartyActController.java | 25 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/BatchAddPartyActFormDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/BatchAddPartyActFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/BatchAddPartyActFormDTO.java new file mode 100644 index 0000000000..128eaaae3a --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/BatchAddPartyActFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.resi.partymember.dto.icpartyact.form; + +import lombok.Data; + +import javax.validation.Valid; +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2022/8/22 12:25 + */ +@Data +public class BatchAddPartyActFormDTO implements Serializable { + private static final long serialVersionUID = 2616937693642413548L; + private List delActIds; + @Valid + private List actList; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 1f1ccfe249..d1dddac4a5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -7,6 +7,7 @@ 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.partyOrg.service.IcPartyActService; +import com.epmet.resi.partymember.dto.icpartyact.form.BatchAddPartyActFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; @@ -61,6 +62,30 @@ public class IcPartyActController { return new Result>().ok(map); } + /** + * 生成年度计划 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("batch-add") + public Result batchAdd(@LoginUser TokenDto tokenDto,@RequestBody BatchAddPartyActFormDTO formDTO){ + formDTO.getActList().forEach(dto->{ + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setPublishStaffId(tokenDto.getUserId()); + if(StringUtils.isNotBlank(dto.getIcPartyActId())){ + //修改活动 + ValidatorUtils.validateEntity(dto,IcPartyActAddOrUpdateFormDTO.UpdateUserShowGroup.class,IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class); + }else{ + //添加活动 + ValidatorUtils.validateEntity(dto,IcPartyActAddOrUpdateFormDTO.AddUserShowGroup.class,IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class); + } + icPartyActService.addOrUpdate(dto); + }); + icPartyActService.deleteIcPartyAct(tokenDto.getCustomerId(),tokenDto.getUserId(),formDTO.getDelActIds()); + return new Result(); + } + /** * 【活动列表】分页查询(工作端小程序通用) * @param tokenDto From d4c17337eb54fd4efe996eb5d34709437b3103e5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 13:09:59 +0800 Subject: [PATCH 082/397] daochu --- .../result/IcPartyActDetailResDTO.java | 2 - .../result/IcPartyActPageResultDTO.java | 14 ++++ .../controller/IcPartyActController.java | 65 +++++++++++++++ .../excel/IcPartyActExpoprtExcel.java | 79 +++++++++++++++++++ .../service/impl/IcPartyActServiceImpl.java | 5 ++ .../mapper/partyOrg/IcPartyActDao.xml | 13 ++- 6 files changed, 175 insertions(+), 3 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java index 04bfc3ddcc..a9356e0bbb 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java @@ -5,7 +5,6 @@ import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import javax.validation.Valid; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -115,7 +114,6 @@ public class IcPartyActDetailResDTO implements Serializable { /** * 参加活动党组织 */ - @Valid private List joinOrgList; /** diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java index b5c9589d5d..1fe0c4254a 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java @@ -1,10 +1,12 @@ package com.epmet.resi.partymember.dto.icpartyact.result; +import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * @Description @@ -62,6 +64,18 @@ public class IcPartyActPageResultDTO implements Serializable { */ private String publishStaffId; + //以下返参，用于导出 + /** + * 是否发布，0未发布；1已发布； + * 返回名称 + */ + private String isPublishName; + /** + * 参加人员类型，0：全体党员；1：支部委员 + */ + private String joinUserType; + private String joinUserTypeName; + private List joinOrgList; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index d1dddac4a5..89582f8b47 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -1,11 +1,24 @@ package com.epmet.modules.partyOrg.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.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; +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.modules.partyOrg.excel.IcPartyActExpoprtExcel; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.resi.partymember.dto.icpartyact.form.BatchAddPartyActFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; @@ -19,13 +32,19 @@ import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; +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.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; +import java.util.stream.Collectors; /** @@ -34,6 +53,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2022-08-18 */ +@Slf4j @RestController @RequestMapping("icPartyAct") public class IcPartyActController { @@ -47,6 +67,7 @@ public class IcPartyActController { * @param formDTO * @return */ + @NoRepeatSubmit @PostMapping("addOrUpdate") public Result> addOrUpdate(@LoginUser TokenDto tokenDto,@RequestBody IcPartyActAddOrUpdateFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -68,6 +89,7 @@ public class IcPartyActController { * @param formDTO * @return */ + @NoRepeatSubmit @PostMapping("batch-add") public Result batchAdd(@LoginUser TokenDto tokenDto,@RequestBody BatchAddPartyActFormDTO formDTO){ formDTO.getActList().forEach(dto->{ @@ -178,6 +200,7 @@ public class IcPartyActController { * @param icPartyActId * @return */ + @NoRepeatSubmit @PostMapping("publish/{icPartyActId}") public Result publicshIcPartyAct(@LoginUser TokenDto tokenDto,@PathVariable("icPartyActId")String icPartyActId){ icPartyActService.publicshIcPartyAct(tokenDto.getUserId(),icPartyActId); @@ -193,6 +216,7 @@ public class IcPartyActController { * @param icPartyActIds * @return */ + @NoRepeatSubmit @PostMapping("del") public Result deleteIcPartyAct(@LoginUser TokenDto tokenDto,@RequestBody List icPartyActIds){ if(CollectionUtils.isNotEmpty(icPartyActIds)){ @@ -215,4 +239,45 @@ public class IcPartyActController { return new Result>().ok(icPartyActService.yearSearch(formDTO)); } + @NoRepeatSubmit + @PostMapping("/export-act") + public void export(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActPageFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setPublishStaffId(tokenDto.getUserId()); + 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), IcPartyActExpoprtExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icPartyActService.pageList(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcPartyActExpoprtExcel.class); + list.forEach(l->{ + List orgNameList = l.getJoinOrgList().stream().map(m -> m.getJoinOrgName()).distinct().collect(Collectors.toList()); + l.setJoinOrgNameStr(orgNameList.stream().map(String::valueOf).collect(Collectors.joining(","))); + }); + 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/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java new file mode 100644 index 0000000000..06dc61ed31 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java @@ -0,0 +1,79 @@ +package com.epmet.modules.partyOrg.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2022/8/22 12:48 + */ +@Data +public class IcPartyActExpoprtExcel { + /** + * 活动主题 + */ + @ExcelProperty(value = "活动主题") + @ColumnWidth(20) + private String topic; + + /** + * 发布活动党组织名称 + */ + @ExcelProperty(value = "所属组织") + @ColumnWidth(20) + private String publishPartyOrgName; + + /** + * 活动发布人姓名 + */ + @ExcelProperty(value = "发布人") + @ColumnWidth(10) + private String publishStaffName; + + /** + * 活动类型，来源于ic_party_act_type_dict + */ + @ExcelProperty(value = "活动类型") + @ColumnWidth(15) + private String actTypeName; + + /** + * 举办活动时间 + */ + @ExcelProperty(value = "活动开始时间") + @ColumnWidth(20) + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date holdTime; + + /** + * 活动地点 + */ + @ExcelProperty(value = "活动地点") + @ColumnWidth(25) + private String address; + + /** + * 是否发布，0未发布；1已发布； + */ + @ExcelProperty(value = "发布状态") + @ColumnWidth(8) + private String isPublishName; + + @ExcelProperty(value = "参加人员") + @ColumnWidth(8) + private String joinUserTypeName; + + @ExcelProperty(value = "参加活动党组织") + @ColumnWidth(40) + private String joinOrgNameStr; + + private List joinOrgList; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index ec14369f19..8b63ca081f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -235,6 +235,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.selectPageList(formDTO)); + if(!formDTO.getIsPage()){ + pageInfo.getList().forEach(l->{ + l.setJoinOrgList(icPartyActOrgDao.selectJoinOrgList(l.getIcPartyActId())); + }); + } return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 8c485147af..040a6ee89e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -96,7 +96,18 @@ a.HOLD_TIME, a.ADDRESS, a.IS_PUBLISH, - a.PUBLISH_STAFF_ID + a.PUBLISH_STAFF_ID, + (case when a.IS_PUBLISH='0' then '未发布' + when a.IS_PUBLISH='1' then '已发布' + else '' + end + )as isPublishName, + a.JOIN_USER_TYPE as joinUserType, + (case when a.JOIN_USER_TYPE='0' then '全体党员' + when a.JOIN_USER_TYPE='1' then '支部委员' + else '' + end + )as joinUserTypeName FROM ic_party_act a LEFT JOIN ic_party_act_type_dict d ON ( a.ACT_TYPE = d.TYPE_KEY and a.customer_id=d.customer_id) From 6f9c4312e25bed1bb9e870d640e66223521a3387 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 13:27:27 +0800 Subject: [PATCH 083/397] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/form/IcPartyActPageFormDTO.java | 8 ++++++++ .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java index 2a52c6cc2a..818a59061c 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java @@ -33,5 +33,13 @@ public class IcPartyActPageFormDTO extends PageFormDTO implements Serializable { private String isPublish; private String actType; + /** + * 工作端小程序用yyyy + */ + private String holdYearId; + /** + * 工作端小程序用yyyyMM + */ + private String holdMonthId; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 040a6ee89e..21776df47f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -138,6 +138,12 @@ AND DATE_FORMAT(a.HOLD_TIME,'%Y%m%d') #{endDate} + + AND a.HOLD_YEAR_ID = #{holdYearId} + + + AND a.HOLD_MONTH_ID = #{holdMonthId} + order by a.HOLD_TIME desc From f31aa9ffdca005c79f7cd1db657476dd40a53a1b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 22 Aug 2022 13:28:41 +0800 Subject: [PATCH 084/397] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/IcPartyActTypeDictDTO.java | 77 +++++++++++++++++++ .../modules/partyOrg/dao/IcPartyActDao.java | 4 +- .../partyOrg/dao/IcPartyActTypeDictDao.java | 16 ++++ .../entity/IcPartyActTypeDictEntity.java | 64 +++++++++++++++ .../service/IcPartyActTypeDictService.java | 14 ++++ .../service/impl/IcPartyActServiceImpl.java | 31 ++++++-- .../impl/IcPartyActTypeDictServiceImpl.java | 18 +++++ .../mapper/partyOrg/IcPartyActDao.xml | 5 +- .../mapper/partyOrg/IcPartyActTypeDictDao.xml | 6 ++ 9 files changed, 222 insertions(+), 13 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyActTypeDictDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActTypeDictDao.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActTypeDictEntity.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActTypeDictService.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActTypeDictServiceImpl.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActTypeDictDao.xml diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyActTypeDictDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyActTypeDictDTO.java new file mode 100644 index 0000000000..bfcc4d97a2 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyActTypeDictDTO.java @@ -0,0 +1,77 @@ +package com.epmet.resi.partymember.dto.partyOrg; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 党组织活动类型字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-22 + */ +@Data +public class IcPartyActTypeDictDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 活动类型key + */ + private String typeKey; + + /** + * 活动名称 + */ + private String typeName; + + /** + * 每年几次 + */ + private Integer yearCount; + + /** + * 频次单位 + */ + private String frequencyUnit; + + /** + * 频次数量 + */ + private Integer frequencyCount; + + /** + * 频率描述 + */ + private String frequencyDesc; + + /** + * 排序 + */ + private Integer sort; + + /** + * 0未删除；1：已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + private String label; + private String value; + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 9e6f471e6d..7308aeb25a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -3,8 +3,8 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; -import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import org.apache.ibatis.annotations.Mapper; @@ -26,7 +26,7 @@ public interface IcPartyActDao extends BaseDao { * @param customerId * @return */ - List actTypeList(String customerId); + List actTypeList(String customerId); List getActivityList(ActAndScheduleListFormDTO formDTO); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActTypeDictDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActTypeDictDao.java new file mode 100644 index 0000000000..58eda1e4b2 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActTypeDictDao.java @@ -0,0 +1,16 @@ +package com.epmet.modules.partyOrg.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.partyOrg.entity.IcPartyActTypeDictEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 党组织活动类型字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-22 + */ +@Mapper +public interface IcPartyActTypeDictDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActTypeDictEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActTypeDictEntity.java new file mode 100644 index 0000000000..715a79cd39 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActTypeDictEntity.java @@ -0,0 +1,64 @@ +package com.epmet.modules.partyOrg.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 2022-08-22 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_party_act_type_dict") +public class IcPartyActTypeDictEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 活动类型key + */ + private String typeKey; + + /** + * 活动名称 + */ + private String typeName; + + /** + * 每年几次 + */ + private Integer yearCount; + + /** + * 频次单位 + */ + private String frequencyUnit; + + /** + * 频次数量 + */ + private Integer frequencyCount; + + /** + * 频率描述 + */ + private String frequencyDesc; + + /** + * 排序 + */ + private Integer sort; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActTypeDictService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActTypeDictService.java new file mode 100644 index 0000000000..a74118179c --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActTypeDictService.java @@ -0,0 +1,14 @@ +package com.epmet.modules.partyOrg.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.modules.partyOrg.entity.IcPartyActTypeDictEntity; + +/** + * 党组织活动类型字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-22 + */ +public interface IcPartyActTypeDictService extends BaseService { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 8b63ca081f..1d6ff26174 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.modules.partyOrg.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; import com.epmet.commons.tools.constant.AppClientConstant; @@ -21,10 +22,7 @@ import com.epmet.constant.SystemMessageType; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.*; -import com.epmet.modules.partyOrg.entity.IcPartyActEntity; -import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; -import com.epmet.modules.partyOrg.entity.IcScheduleEntity; -import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; +import com.epmet.modules.partyOrg.entity.*; import com.epmet.modules.partyOrg.service.*; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; @@ -33,6 +31,7 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; @@ -77,6 +76,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl actTypeList(String customerId) { - List list= baseDao.actTypeList(customerId); + List list= baseDao.actTypeList(customerId); if(CollectionUtils.isEmpty(list)){ - return baseDao.actTypeList(Constant.DEFAULT_CUSTOMER); + List icPartActTypeDTOS = baseDao.actTypeList(Constant.DEFAULT_CUSTOMER); + List entities = ConvertUtils.sourceToTarget(icPartActTypeDTOS, IcPartyActTypeDictEntity.class); + entities.forEach(e -> { + e.setId(IdWorker.getIdStr()); + e.setCustomerId(customerId); + }); + partyActTypeDictService.insertBatch(entities); + list = icPartActTypeDTOS; } - return list; + return ConvertUtils.sourceToTarget(list,IcPartActTypeDTO.class); } @@ -347,13 +356,19 @@ public class IcPartyActServiceImpl extends BaseServiceImpl activityList = baseDao.getActivityList(secondForm); + List activityTypeList = actTypeList(formDTO.getCustomerId()); List result = new ArrayList<>(); if (CollectionUtils.isNotEmpty(activityList)) { disposeActivityList(secondForm, activityList); Map> groupByType = activityList.stream().collect(Collectors.groupingBy(ActAndScheduleListResultDTO.ActivityListDTO::getType)); groupByType.forEach((type,list) -> { YearSearchResultDTO dto = new YearSearchResultDTO(); - dto.setType(type); + activityTypeList.forEach(at -> { + if (at.getValue().equals(type)){ + dto.setType(at.getLabel()); + dto.setFrequency(at.getFrequencyDesc()); + } + }); dto.setActivityList(ConvertUtils.sourceToTarget(list, YearSearchResultDTO.YearSearchActivityListDTO.class)); result.add(dto); }); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActTypeDictServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActTypeDictServiceImpl.java new file mode 100644 index 0000000000..220b5c7e1d --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActTypeDictServiceImpl.java @@ -0,0 +1,18 @@ +package com.epmet.modules.partyOrg.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.modules.partyOrg.dao.IcPartyActTypeDictDao; +import com.epmet.modules.partyOrg.entity.IcPartyActTypeDictEntity; +import com.epmet.modules.partyOrg.service.IcPartyActTypeDictService; +import org.springframework.stereotype.Service; + +/** + * 党组织活动类型字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-22 + */ +@Service +public class IcPartyActTypeDictServiceImpl extends BaseServiceImpl implements IcPartyActTypeDictService { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 040a6ee89e..6b0f35513a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -3,12 +3,11 @@ - SELECT d.TYPE_KEY as value, d.TYPE_NAME as label, - d.FREQUENCY_DESC as frequencyDesc, - d.YEAR_COUNT as yearCount + d.* FROM ic_party_act_type_dict d WHERE diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActTypeDictDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActTypeDictDao.xml new file mode 100644 index 0000000000..3c57ca3243 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActTypeDictDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 8f74aab460a6966908c78e5cc418b52d55624f66 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 13:29:20 +0800 Subject: [PATCH 085/397] =?UTF-8?q?=E6=8B=BC=E9=94=99=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java index 818a59061c..7e35c92f39 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java @@ -15,7 +15,7 @@ import java.io.Serializable; public class IcPartyActPageFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = -8171649039313981541L; // tokenDto取值 - @NotBlank(message = "cusotomerId不能为空",groups = AddUserInternalGroup.class) + @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class) private String customerId; @NotBlank(message = "publishStaffId不能为空",groups = AddUserInternalGroup.class) private String publishStaffId; From b4810eb48fe638e4ee54210690fbbaea894771d8 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 13:34:20 +0800 Subject: [PATCH 086/397] =?UTF-8?q?=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.66__chart_hour.sql | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.66__chart_hour.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.66__chart_hour.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.66__chart_hour.sql new file mode 100644 index 0000000000..85d2713385 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.66__chart_hour.sql @@ -0,0 +1,56 @@ +/* + Navicat Premium Data Transfer + + Source Server : epmet_cloud_dev_user + Source Server Type : MySQL + Source Server Version : 50726 + Source Host : 192.168.1.140:3306 + Source Schema : epmet_user + + Target Server Type : MySQL + Target Server Version : 50726 + File Encoding : 65001 + + Date: 22/08/2022 13:31:44 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for pli_chart_hour +-- ---------------------------- +DROP TABLE IF EXISTS `pli_chart_hour`; +CREATE TABLE `pli_chart_hour` ( + `hour` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '图表日期链表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of pli_chart_hour +-- ---------------------------- +INSERT INTO `pli_chart_hour` VALUES ('01'); +INSERT INTO `pli_chart_hour` VALUES ('02'); +INSERT INTO `pli_chart_hour` VALUES ('03'); +INSERT INTO `pli_chart_hour` VALUES ('04'); +INSERT INTO `pli_chart_hour` VALUES ('05'); +INSERT INTO `pli_chart_hour` VALUES ('06'); +INSERT INTO `pli_chart_hour` VALUES ('07'); +INSERT INTO `pli_chart_hour` VALUES ('08'); +INSERT INTO `pli_chart_hour` VALUES ('09'); +INSERT INTO `pli_chart_hour` VALUES ('10'); +INSERT INTO `pli_chart_hour` VALUES ('11'); +INSERT INTO `pli_chart_hour` VALUES ('12'); +INSERT INTO `pli_chart_hour` VALUES ('13'); +INSERT INTO `pli_chart_hour` VALUES ('14'); +INSERT INTO `pli_chart_hour` VALUES ('15'); +INSERT INTO `pli_chart_hour` VALUES ('16'); +INSERT INTO `pli_chart_hour` VALUES ('17'); +INSERT INTO `pli_chart_hour` VALUES ('18'); +INSERT INTO `pli_chart_hour` VALUES ('19'); +INSERT INTO `pli_chart_hour` VALUES ('20'); +INSERT INTO `pli_chart_hour` VALUES ('21'); +INSERT INTO `pli_chart_hour` VALUES ('22'); +INSERT INTO `pli_chart_hour` VALUES ('23'); +INSERT INTO `pli_chart_hour` VALUES ('00'); + +SET FOREIGN_KEY_CHECKS = 1; From f5c511735edc5b6737b423d51b019b9ed64c25f5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 22 Aug 2022 13:38:46 +0800 Subject: [PATCH 087/397] =?UTF-8?q?=E6=94=AF=E9=83=A8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8F=8A=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/EpmetMessageOpenFeignClient.java | 4 +++ .../EpmetMessageOpenFeignClientFallback.java | 5 ++++ .../epmet/controller/IcMessageController.java | 5 ++++ .../main/java/com/epmet/dao/IcMessageDao.java | 3 ++ .../com/epmet/service/IcMessageService.java | 2 ++ .../service/impl/IcMessageServiceImpl.java | 5 ++++ .../main/resources/mapper/IcMessageDao.xml | 10 +++++++ .../result/IcPartyInfoResultDTO.java | 27 +++++++++++++++++ .../partymember/dao/IcPartyMemberDao.java | 3 ++ .../service/IcPartyMemberService.java | 3 ++ .../impl/IcPartyMemberServiceImpl.java | 30 ++++++++++++++++--- .../mapper/partymember/IcPartyMemberDao.xml | 11 +++++++ 12 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/IcPartyInfoResultDTO.java diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java index f1f7b5dfa5..1083526f67 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java @@ -1,6 +1,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.SysSmsDTO; import com.epmet.dto.form.*; @@ -135,4 +136,7 @@ public interface EpmetMessageOpenFeignClient { @PostMapping(value = "message/icMessage/saveicmessagelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result saveIcMessageList(List msgList); + @PostMapping(value = "message/icMessage/unreadcount/{userId}", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result unReadCount(@PathVariable("userId") String userId); + } diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java index 100dc4ff10..9538233fe2 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java @@ -84,4 +84,9 @@ public class EpmetMessageOpenFeignClientFallback implements EpmetMessageOpenFeig return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveIcMessageList", msgList); } + @Override + public Result unReadCount(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "unReadCount", userId); + } + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java index b93bd93fbc..3824123ace 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java @@ -96,5 +96,10 @@ public class IcMessageController { return new Result(); } + @PostMapping("unreadcount/{userId}") + public Result unReadCount(@PathVariable ("userId") String userId) { + return new Result().ok(icMessageService.unReadCount(userId)); + } + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java index 998f48b62a..9c1ca666b8 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java @@ -6,6 +6,7 @@ import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.dto.form.ReadIcMessageFormDTO; import com.epmet.entity.IcMessageEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -21,4 +22,6 @@ public interface IcMessageDao extends BaseDao { List selectMessageList(IcMessageListFormDTO formDTO); void upByUserId(ReadIcMessageFormDTO formDTO); + + Integer selectUnReadCount(@Param("userId") String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java index c13639c418..d0547f4bbd 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java @@ -73,4 +73,6 @@ public interface IcMessageService extends BaseService { void saveIcMessageList(List msgList); void read(ReadIcMessageFormDTO formDTO); + + Integer unReadCount(String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java index 5d2678c49d..660ea7f7fd 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java @@ -107,4 +107,9 @@ public class IcMessageServiceImpl extends BaseServiceImpl + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/IcPartyInfoResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/IcPartyInfoResultDTO.java new file mode 100644 index 0000000000..78207b0293 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/IcPartyInfoResultDTO.java @@ -0,0 +1,27 @@ +package com.epmet.resi.partymember.dto.partymember.result; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class IcPartyInfoResultDTO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * 所属支部Id + */ + private String id = ""; + + /** + * 所属支部名称 + */ + private String partOrgName = ""; + + /** + * 未读消息数 + */ + private Integer count; + +} 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 00ea198d81..0f18a60ac5 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 @@ -6,6 +6,7 @@ import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; 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 org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -74,4 +75,6 @@ public interface IcPartyMemberDao extends BaseDao { * @return java.util.List */ List getPartyMemberAgeStatistics(@Param("agencyId") String agencyId,@Param("orgId") String orgId); + + IcPartyInfoResultDTO selectByUserId(@Param("userId") String userId); } 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 20373c3ca5..c88113ae6a 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 @@ -11,6 +11,7 @@ import com.epmet.dto.result.PartyMemberEducationResultDTO; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; 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 java.nio.file.Path; @@ -147,4 +148,6 @@ public interface IcPartyMemberService extends BaseService { * @param filePath */ void execAsyncExcelImport(Path filePath, String importTaskId); + + IcPartyInfoResultDTO partyInfo(TokenDto tokenDto); } 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 e6e8fd9c44..bd28a7ef30 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 @@ -13,12 +13,14 @@ import com.epmet.commons.tools.dto.form.DictListFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.DictListResultDTO; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; +import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.enums.IcFormCodeEnum; import com.epmet.commons.tools.enums.PartyPostEnum; 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.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; @@ -31,10 +33,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.feign.EpmetAdminOpenFeignClient; -import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.feign.OperCustomizeOpenFeignClient; -import com.epmet.feign.OssFeignClient; +import com.epmet.feign.*; import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.modules.partyOrg.service.IcPartyOrgService; @@ -49,6 +48,7 @@ import com.epmet.modules.partymember.excel.handler.IcPartyMemberImportListener; import com.epmet.modules.partymember.service.IcPartyMemberService; 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.utils.ImportTaskUtils; import com.github.pagehelper.PageHelper; @@ -60,6 +60,7 @@ 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; @@ -101,6 +102,8 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl page(TokenDto tokenDto, IcPartyMemberFromDTO formDTO) { @@ -706,4 +709,23 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl result = epmetMessageOpenFeignClient.unReadCount(tokenDto.getUserId()); + if (!result.success()) { + throw new RenException("获取用户未读消息数据失败"); + } + resultDTO.setCount(result.getData()); + return resultDTO; + } + + } \ 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 21ea480cca..3a39b8e54f 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 @@ -267,5 +267,16 @@ GROUP BY ageGroup + From 9611fd719c2b882e44c6418afe7c75eec8f19cf5 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 22 Aug 2022 13:49:53 +0800 Subject: [PATCH 088/397] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=91=E6=8A=A4=E7=85=A7-=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E5=AF=BC=E5=85=A5=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserServiceImpl.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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 d8f57e4e81..3734309c8c 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 @@ -294,6 +294,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Mon, 22 Aug 2022 13:52:42 +0800 Subject: [PATCH 089/397] =?UTF-8?q?=E6=8E=92=E4=BA=86=E4=B8=AA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 1 + .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 8ec8db4b55..ad7db30b76 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -83,6 +83,7 @@ AND pa.PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') + order by pa.HOLD_TIME desc,ao.JOIN_ORG_ID \ No newline at end of file From 6bde4c221e51f597901f588fef879f5a842e2d30 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 22 Aug 2022 14:02:50 +0800 Subject: [PATCH 090/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcVaccinePrarmeterDTO.java | 184 ++++++++++++++++++ .../IcVaccinePrarmeterController.java | 82 ++++++++ .../com/epmet/dao/IcVaccinePrarmeterDao.java | 16 ++ .../entity/IcVaccinePrarmeterEntity.java | 154 +++++++++++++++ .../epmet/excel/IcVaccinePrarmeterExcel.java | 117 +++++++++++ .../epmet/redis/IcVaccinePrarmeterRedis.java | 30 +++ .../service/IcVaccinePrarmeterService.java | 78 ++++++++ .../impl/IcVaccinePrarmeterServiceImpl.java | 87 +++++++++ .../mapper/IcVaccinePrarmeterDao.xml | 43 ++++ 9 files changed, 791 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcVaccinePrarmeterRedis.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java new file mode 100644 index 0000000000..08c5da3ce1 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java @@ -0,0 +1,184 @@ +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 2022-08-22 + */ +@Data +public class IcVaccinePrarmeterDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 网格ID + */ + private String gridId; + + /** + * 网格名称 + */ + private String gridName; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 组织的pids + */ + private String pids; + + /** + * 所属小区ID； + */ + private String villageId; + + /** + * 所属小区名称 + */ + private String villageName; + + /** + * 所属楼宇Id + */ + private String buildId; + + /** + * 所属楼宇名称 + */ + private String buildName; + + /** + * 单元id + */ + private String unitId; + + /** + * 单元名 + */ + private String unitName; + + /** + * 所属家庭Id + */ + private String homeId; + + /** + * 房间名 + */ + private String homeName; + + /** + * 户口性质：0户籍 1外来 + */ + private String householdType; + + /** + * 姓名 + */ + private String name; + + /** + * 联系电话 + */ + private String mobile; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 是否接种：0否1是 + */ + private String isVaccination; + + /** + * 第一次接种时间 + */ + private String firstVacTime; + + /** + * 第一次接种地点 + */ + private String firstVacSite; + + /** + * 第二次接种时间 + */ + private String secondVacTime; + + /** + * 第二次接种地点 + */ + private String secondVacSite; + + /** + * 第三次接种时间 + */ + private String thirdVacTime; + + /** + * 第三次接种地点 + */ + private String thirdVacSite; + + /** + * 原因：禁忌症/拒绝接种/其他原因 + */ + private String reason; + + /** + * 备注 + */ + private String note; + + /** + * 删除标识 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-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java new file mode 100644 index 0000000000..102e5e0ea7 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -0,0 +1,82 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +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.IcVaccinePrarmeterDTO; +import com.epmet.excel.IcVaccinePrarmeterExcel; +import com.epmet.service.IcVaccinePrarmeterService; +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 2022-08-22 + */ +@RestController +@RequestMapping("icVaccinePrarmeter") +public class IcVaccinePrarmeterController { + + @Autowired + private IcVaccinePrarmeterService icVaccinePrarmeterService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icVaccinePrarmeterService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcVaccinePrarmeterDTO data = icVaccinePrarmeterService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcVaccinePrarmeterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icVaccinePrarmeterService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PutMapping("update") + public Result update(@RequestBody IcVaccinePrarmeterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icVaccinePrarmeterService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icVaccinePrarmeterService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = icVaccinePrarmeterService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IcVaccinePrarmeterExcel.class); + } + + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java new file mode 100644 index 0000000000..a2e7c17a67 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcVaccinePrarmeterEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 新冠病毒疫苗接种人员信息台账 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-22 + */ +@Mapper +public interface IcVaccinePrarmeterDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java new file mode 100644 index 0000000000..c5dde0c103 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java @@ -0,0 +1,154 @@ +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 2022-08-22 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_vaccine_prarmeter") +public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 网格ID + */ + private String gridId; + + /** + * 网格名称 + */ + private String gridName; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 组织的pids + */ + private String pids; + + /** + * 所属小区ID； + */ + private String villageId; + + /** + * 所属小区名称 + */ + private String villageName; + + /** + * 所属楼宇Id + */ + private String buildId; + + /** + * 所属楼宇名称 + */ + private String buildName; + + /** + * 单元id + */ + private String unitId; + + /** + * 单元名 + */ + private String unitName; + + /** + * 所属家庭Id + */ + private String homeId; + + /** + * 房间名 + */ + private String homeName; + + /** + * 户口性质：0户籍 1外来 + */ + private String householdType; + + /** + * 姓名 + */ + private String name; + + /** + * 联系电话 + */ + private String mobile; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 是否接种：0否1是 + */ + private String isVaccination; + + /** + * 第一次接种时间 + */ + private String firstVacTime; + + /** + * 第一次接种地点 + */ + private String firstVacSite; + + /** + * 第二次接种时间 + */ + private String secondVacTime; + + /** + * 第二次接种地点 + */ + private String secondVacSite; + + /** + * 第三次接种时间 + */ + private String thirdVacTime; + + /** + * 第三次接种地点 + */ + private String thirdVacSite; + + /** + * 原因：禁忌症/拒绝接种/其他原因 + */ + private String reason; + + /** + * 备注 + */ + private String note; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java new file mode 100644 index 0000000000..dc58b059b3 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -0,0 +1,117 @@ +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 2022-08-22 + */ +@Data +public class IcVaccinePrarmeterExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "客户Id customer.id") + private String customerId; + + @Excel(name = "网格ID") + private String gridId; + + @Excel(name = "网格名称") + private String gridName; + + @Excel(name = "组织Id") + private String agencyId; + + @Excel(name = "组织的pids") + private String pids; + + @Excel(name = "所属小区ID；") + private String villageId; + + @Excel(name = "所属小区名称") + private String villageName; + + @Excel(name = "所属楼宇Id") + private String buildId; + + @Excel(name = "所属楼宇名称") + private String buildName; + + @Excel(name = "单元id") + private String unitId; + + @Excel(name = "单元名") + private String unitName; + + @Excel(name = "所属家庭Id") + private String homeId; + + @Excel(name = "房间名") + private String homeName; + + @Excel(name = "户口性质：0户籍 1外来") + private String householdType; + + @Excel(name = "姓名") + private String name; + + @Excel(name = "联系电话") + private String mobile; + + @Excel(name = "身份证号") + private String idCard; + + @Excel(name = "是否接种：0否1是") + private String isVaccination; + + @Excel(name = "第一次接种时间") + private String firstVacTime; + + @Excel(name = "第一次接种地点") + private String firstVacSite; + + @Excel(name = "第二次接种时间") + private String secondVacTime; + + @Excel(name = "第二次接种地点") + private String secondVacSite; + + @Excel(name = "第三次接种时间") + private String thirdVacTime; + + @Excel(name = "第三次接种地点") + private String thirdVacSite; + + @Excel(name = "原因：禁忌症/拒绝接种/其他原因") + private String reason; + + @Excel(name = "备注") + private String note; + + @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/redis/IcVaccinePrarmeterRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcVaccinePrarmeterRedis.java new file mode 100644 index 0000000000..176cb28247 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcVaccinePrarmeterRedis.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 2022-08-22 + */ +@Component +public class IcVaccinePrarmeterRedis { + @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/IcVaccinePrarmeterService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java new file mode 100644 index 0000000000..c9f1e9de1e --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.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.IcVaccinePrarmeterDTO; +import com.epmet.entity.IcVaccinePrarmeterEntity; + +import java.util.List; +import java.util.Map; + +/** + * 新冠病毒疫苗接种人员信息台账 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-22 + */ +public interface IcVaccinePrarmeterService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-22 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-22 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcVaccinePrarmeterDTO + * @author generator + * @date 2022-08-22 + */ + IcVaccinePrarmeterDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-22 + */ + void save(IcVaccinePrarmeterDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-22 + */ + void update(IcVaccinePrarmeterDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-22 + */ + 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/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java new file mode 100644 index 0000000000..a30c43a58a --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -0,0 +1,87 @@ +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.IcVaccinePrarmeterDao; +import com.epmet.dto.IcVaccinePrarmeterDTO; +import com.epmet.entity.IcVaccinePrarmeterEntity; +import com.epmet.redis.IcVaccinePrarmeterRedis; +import com.epmet.service.IcVaccinePrarmeterService; +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 2022-08-22 + */ +@Service +public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl implements IcVaccinePrarmeterService { + + @Autowired + private IcVaccinePrarmeterRedis icVaccinePrarmeterRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcVaccinePrarmeterDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcVaccinePrarmeterDTO.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 IcVaccinePrarmeterDTO get(String id) { + IcVaccinePrarmeterEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcVaccinePrarmeterDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcVaccinePrarmeterDTO dto) { + IcVaccinePrarmeterEntity entity = ConvertUtils.sourceToTarget(dto, IcVaccinePrarmeterEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcVaccinePrarmeterDTO dto) { + IcVaccinePrarmeterEntity entity = ConvertUtils.sourceToTarget(dto, IcVaccinePrarmeterEntity.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/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml new file mode 100644 index 0000000000..363554832c --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 35874ef073dc2aa38c5c440e999d3c64fc8a47cf Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 14:07:10 +0800 Subject: [PATCH 091/397] =?UTF-8?q?=E6=94=B9=E5=96=84=E5=8E=9F=E6=9D=A5?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcNeighborHoodDTO.java | 5 +++++ .../src/main/resources/mapper/IcBuildingDao.xml | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) 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 90ec898127..67b2af7180 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 @@ -149,4 +149,9 @@ public class IcNeighborHoodDTO implements Serializable { */ private Integer realBuilding; + /** + * 楼栋名 + */ + private Integer 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 514e9a5472..8d8cc4535e 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 @@ -452,12 +452,11 @@ + + + From 607cd08dd8e808632388f188eeb7ba2724e41f75 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 14:20:58 +0800 Subject: [PATCH 093/397] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IcResiCollectVisitorDao.xml | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml index f525fb9e6d..51d9d601dc 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml @@ -60,8 +60,32 @@ UPDATED_TIME from ic_resi_collect_visitor where DEL_FLAG = '0' - - AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} + + AND ID_CARD = #{idCard} + + + AND NAME = #{name} + + + AND MOBILE = #{mobile} + + + AND VILLAGE_ID = #{villageId} + + + AND BUILD_ID = #{buildId} + + + AND UNIT_ID = #{unitId} + + + AND HOME_ID = #{homeId} + + + AND CREATED_TIME >= #{startTime} + + + AND CREATED_TIME <= #{endTime} order by CREATED_TIME desc From f628fc5b25c14661ed3d208a562a37284b1b18d8 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 22 Aug 2022 14:24:22 +0800 Subject: [PATCH 094/397] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=AF=81=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/IdCardRegexUtils.java | 12 +++++++++++- .../form/resi/ResiVolunteerAuthenticateFormDTO.java | 2 +- .../epmet/controller/ResiVolunteerController.java | 8 ++++++++ .../mine/controller/PersonalCenterController.java | 10 ++++++++++ .../java/com/epmet/dto/form/EditInfoFormDTO.java | 2 +- .../java/com/epmet/dto/form/IcTripReportFormDTO.java | 2 +- .../controller/IcTripReportRecordController.java | 7 +++++++ 7 files changed, 39 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java index deaf9997c1..bc56e52604 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java @@ -52,13 +52,23 @@ public class IdCardRegexUtils { private String sex; } + /** + * desc:校验输入的证件号是否合法 + * @param input + * @return + */ + public static boolean validateIdCard(String input){ + IdCardRegexUtils parse = IdCardRegexUtils.parse(input); + return parse != null; + } + /** * 解析正则 * @param input * @return */ public static IdCardRegexUtils parse(String input) { - if (input == null) { + if (input == null || input.trim().length() == 0) { return null; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java index 877abcb74c..2169dda0d8 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java @@ -59,7 +59,7 @@ public class ResiVolunteerAuthenticateFormDTO implements Serializable { /** * 身份证号码 */ - @NotBlank(message = "身份证号码不能为空", groups = {AddUserShowGroup.class }) + @NotBlank(message = "证件号能为空", groups = {AddUserShowGroup.class }) private String idNum; /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java index b54acc67ec..22e724e5a1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.IdCardRegexUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.SystemMessageType; @@ -38,6 +39,7 @@ import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.send.SendMqMsgUtil; import com.epmet.service.VolunteerInfoService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -72,6 +74,12 @@ public class ResiVolunteerController { formDTO.setUserId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(formDTO, ResiVolunteerAuthenticateFormDTO.AddUserShowGroup.class, ResiVolunteerAuthenticateFormDTO.AddUserInternalGroup.class); + if (StringUtils.isNotBlank(formDTO.getIdNum())){ + boolean b = IdCardRegexUtils.validateIdCard(formDTO.getIdNum()); + if (!b){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"请输入正确的证件号","请输入正确的证件号"); + } + } volunteerInfoService.authenticate(formDTO); //发送志愿者人员消息变动 diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/PersonalCenterController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/PersonalCenterController.java index 48ea31f06b..8666aca88c 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/PersonalCenterController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/PersonalCenterController.java @@ -1,7 +1,10 @@ package com.epmet.modules.mine.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.IdCardRegexUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.EditInfoFormDTO; @@ -10,6 +13,7 @@ import com.epmet.dto.form.SendCodeFormDTO; 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.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -55,6 +59,12 @@ public class PersonalCenterController { formDTO.setUserId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(formDTO,EditInfoFormDTO.AddUserShowGroup.class,EditInfoFormDTO.AddUserInternalGroup.class); + if (StringUtils.isNotBlank(formDTO.getIdNum())){ + boolean b = IdCardRegexUtils.validateIdCard(formDTO.getIdNum()); + if (!b){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"请输入正确的证件号","请输入正确的证件号"); + } + } personalCenterService.editInfo(tokenDto, formDTO); return new Result(); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java index 7917113509..6ef7eb715e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java @@ -47,7 +47,7 @@ public class EditInfoFormDTO implements Serializable { private String name; //@NotBlank(message = "身份证号不能为空") - @Length(max=18,message = "身份证号不能超过18位",groups = AddUserShowGroup.class) + @Length(max=18,message = "证件号不能超过18位",groups = AddUserShowGroup.class) //别的小程序不统一升级，没办法限制必填。 private String idNum; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index d9a7f4d565..5c7a53e335 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -57,7 +57,7 @@ public class IcTripReportFormDTO implements Serializable { /** * 身份证号 */ - @NotBlank(message = "身份证号不能为空", groups = {ResiUserRequired.class,PcAddRequired.class,PcUpdateRequired.class}) + @NotBlank(message = "证件号能为空", groups = {ResiUserRequired.class,PcAddRequired.class,PcUpdateRequired.class}) private String idCard; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 6e1aff48ff..cfc1313c69 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -33,6 +33,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; @@ -159,6 +160,12 @@ public class IcTripReportRecordController implements ResultDataResolver { formDTO.setUserId(tokenDto.getUserId()); formDTO.setUserType(IcResiUserConstant.USER_TYPE_RESI); ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.ResiUserRequired.class,IcTripReportFormDTO.ResiUserInternalGroup.class); + if (StringUtils.isNotBlank(formDTO.getIdCard())){ + boolean b = IdCardRegexUtils.validateIdCard(formDTO.getIdCard()); + if (!b){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"请输入正确的证件号","请输入正确的证件号"); + } + } return new Result().ok(icTripReportRecordService.resiSave(formDTO)); } From 580c0c990ad8bc20a1f4239021dbd9eff5a05eef Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 14:28:25 +0800 Subject: [PATCH 095/397] orgType --- .../partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java | 2 ++ .../modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java | 1 + 2 files changed, 3 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java index 827aad2257..5474c78ba3 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java @@ -33,5 +33,7 @@ public class DefaultPartyOrgResDTO implements Serializable { * 党组织路径 */ private String defaultPartyOrgPath; + + private String orgType; } 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 47918419cd..00355dedd4 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 @@ -386,6 +386,7 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl Date: Mon, 22 Aug 2022 14:33:43 +0800 Subject: [PATCH 096/397] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/form/PartyActSignFormDTO.java | 23 +++++++++++++++++++ .../IcPartyActSignInRecordController.java | 13 +++++++---- .../dao/IcPartyActSignInRecordDao.java | 8 ++++++- .../IcPartyActSignInRecordService.java | 18 +++------------ .../IcPartyActSignInRecordServiceImpl.java | 22 ++++++++---------- .../partyOrg/IcPartyActSignInRecordDao.xml | 18 +++++++++++++++ 6 files changed, 70 insertions(+), 32 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java new file mode 100644 index 0000000000..4677442fef --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@Data +public class PartyActSignFormDTO implements Serializable { + /** + * 活动Id + */ + @NotBlank(message = "活动Id不能为空",groups = {AddGroup.class}) + private String icPartyActId; + + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = false; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java index bb4ad0acf5..de93f1d2c3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java @@ -1,15 +1,20 @@ package com.epmet.modules.partyOrg.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.AssertUtils; 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.IcMessageDTO; +import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.modules.partyOrg.service.IcPartyActSignInRecordService; import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,10 +34,10 @@ public class IcPartyActSignInRecordController { @Autowired private IcPartyActSignInRecordService icPartyActSignInRecordService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icPartyActSignInRecordService.page(params); - return new Result>().ok(page); + @RequestMapping("list") + public Result> list(@RequestBody PartyActSignFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + return new Result>().ok(icPartyActSignInRecordService.list(formDTO)); } @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java index fe8308ca62..72e00ccdc1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java @@ -2,7 +2,11 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; +import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 党组织活动签到记录表 @@ -12,5 +16,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPartyActSignInRecordDao extends BaseDao { - + + List selectSignList(@Param("icPartyActId") String icPartyActId); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java index 6cb940b2cc..413be5fd54 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java @@ -4,9 +4,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; - -import java.util.List; -import java.util.Map; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; /** * 党组织活动签到记录表 @@ -16,25 +14,15 @@ import java.util.Map; */ public interface IcPartyActSignInRecordService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-08-18 - */ - PageData page(Map params); - /** * 默认查询 * - * @param params + * @param formDTO * @return java.util.List * @author generator * @date 2022-08-18 */ - List list(Map params); + PageData list(PartyActSignFormDTO formDTO); /** * 单条查询 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java index 841550fb35..12adb63035 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -7,10 +7,15 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dto.IcMessageDTO; +import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.modules.partyOrg.dao.IcPartyActSignInRecordDao; import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; import com.epmet.modules.partyOrg.service.IcPartyActSignInRecordService; import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; +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; @@ -28,20 +33,13 @@ import java.util.Map; @Service public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl implements IcPartyActSignInRecordService { - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcPartyActSignInRecordDTO.class); - } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IcPartyActSignInRecordDTO.class); + public PageData list(PartyActSignFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = baseDao.selectSignList(formDTO.getIcPartyActId()); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); } private QueryWrapper getWrapper(Map params){ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml index 559157a57e..b5fc4d414b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml @@ -3,4 +3,22 @@ + + \ No newline at end of file From 21bcbd251b7fdd2c44cb291388ce1504118f1c0c Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 14:33:58 +0800 Subject: [PATCH 097/397] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcResiCollectVisitorServiceImpl.java | 5 +++++ .../src/main/resources/mapper/IcResiCollectVisitorDao.xml | 1 + 2 files changed, 6 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java index 5a5937324a..ebf5832ca8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java @@ -9,6 +9,7 @@ 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.security.dto.TokenDto; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcResiCollectVisitorDao; @@ -49,6 +50,9 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl getPhrasePage(Map params) { + params.put("customerId", loginUserUtil.getLoginUserCustomerId()); IPage page = getPage(params); List list = baseDao.getPhrasePage(params); return new PageData<>(list, page.getTotal()); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml index 51d9d601dc..4ec0676f2c 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml @@ -60,6 +60,7 @@ UPDATED_TIME from ic_resi_collect_visitor where DEL_FLAG = '0' + AND CUSTOMER_ID = #{customerId} AND ID_CARD = #{idCard} From 591fe43687cab6881f0842c8ad6bdc6368a96d35 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 22 Aug 2022 14:42:37 +0800 Subject: [PATCH 098/397] =?UTF-8?q?=E9=87=8D=E5=86=99=E5=B9=B4=E5=BA=A6?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ActAndScheduleListFormDTO.java | 2 ++ .../dto/partyOrg/form/YearSearchFormDTO.java | 5 ++- .../result/YearSearchDetailResultDTO.java | 22 ++++++++++++ .../controller/IcPartyActController.java | 12 +++++-- .../partyOrg/service/IcPartyActService.java | 5 ++- .../service/impl/IcPartyActServiceImpl.java | 34 ++++++++++++++++++- .../mapper/partyOrg/IcPartyActDao.xml | 3 ++ 7 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java index 19998a2448..03e24570ad 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java @@ -38,4 +38,6 @@ public class ActAndScheduleListFormDTO implements Serializable { * 当seachType = 'yearSearch'时，不需要查询党组织 */ private String searchType = ""; + + private String type = ""; } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java index 983f48548d..db2d4d8de5 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java @@ -17,9 +17,12 @@ public class YearSearchFormDTO implements Serializable { public interface YearSearchForm{} - @NotBlank(message = "yaerId不能为空",groups = YearSearchForm.class) + @NotBlank(message = "yearId不能为空",groups = YearSearchForm.class) private String yearId; + @NotBlank(message = "type不能为空",groups = YearSearchForm.class) + private String type; + private String staffId; private String customerId; } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java new file mode 100644 index 0000000000..24ff5a1061 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java @@ -0,0 +1,22 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/8/22 09:27 + * @DESC + */ +@Data +public class YearSearchDetailResultDTO implements Serializable { + + private static final long serialVersionUID = 8961924457475202790L; + + private String type; + private String frequency; + private List activityList; +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 89582f8b47..0e52bdad31 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -31,6 +31,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -232,11 +233,18 @@ public class IcPartyActController { * @author zxc * @date 2022/8/22 09:33 */ + @PostMapping("yearSearch01") + public Result> yearSearch01(@LoginUser TokenDto tokenDto, @RequestBody YearSearchFormDTO formDTO){ + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(icPartyActService.yearSearch01(formDTO)); + } + @PostMapping("yearSearch") - public Result> yearSearch(@LoginUser TokenDto tokenDto, @RequestBody YearSearchFormDTO formDTO){ + public Result> yearSearch(@LoginUser TokenDto tokenDto, @RequestBody YearSearchFormDTO formDTO){ formDTO.setStaffId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); - return new Result>().ok(icPartyActService.yearSearch(formDTO)); + return new Result>().ok(icPartyActService.yearSearch(formDTO)); } @NoRepeatSubmit diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index eeba74188a..434a0bf657 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -14,6 +14,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; import java.util.List; @@ -105,5 +106,7 @@ public interface IcPartyActService extends BaseService { * @author zxc * @date 2022/8/22 09:33 */ - List yearSearch(YearSearchFormDTO formDTO); + List yearSearch01(YearSearchFormDTO formDTO); + + List yearSearch(YearSearchFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 3b6869a53e..c48ab658dd 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -38,6 +38,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; @@ -351,7 +352,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl yearSearch(YearSearchFormDTO formDTO) { + public List yearSearch01(YearSearchFormDTO formDTO) { ActAndScheduleListFormDTO secondForm = ConvertUtils.sourceToTarget(formDTO, ActAndScheduleListFormDTO.class); secondForm.setSearchType("yearSearch"); disposeActAndScheduleListFormDTO(secondForm); @@ -376,6 +377,37 @@ public class IcPartyActServiceImpl extends BaseServiceImpl yearSearch(YearSearchFormDTO formDTO) { + ActAndScheduleListFormDTO secondForm = ConvertUtils.sourceToTarget(formDTO, ActAndScheduleListFormDTO.class); + secondForm.setSearchType("yearSearch"); + disposeActAndScheduleListFormDTO(secondForm); + List activityList = baseDao.getActivityList(secondForm); + List activityDetailList = new ArrayList<>(); + if (CollectionUtils.isEmpty(activityList)){ + return new ArrayList<>(); + } + activityList.forEach(al -> { + IcPartyActDetailResDTO icPartyActDetailResDTO = queryActDetail(formDTO.getCustomerId(), formDTO.getStaffId(), al.getActivityId()); + activityDetailList.add(icPartyActDetailResDTO); + }); + List result = new ArrayList<>(); + List activityTypeList = actTypeList(formDTO.getCustomerId()); + Map> groupByType = activityDetailList.stream().collect(Collectors.groupingBy(IcPartyActDetailResDTO::getActType)); + groupByType.forEach((type,list) -> { + YearSearchDetailResultDTO dto = new YearSearchDetailResultDTO(); + activityTypeList.forEach(at -> { + if (at.getValue().equals(type)){ + dto.setType(at.getLabel()); + dto.setFrequency(at.getFrequencyDesc()); + } + }); + dto.setActivityList(list); + result.add(dto); + }); + return result; + } + /** * Desc: * @param formDTO diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index ad7db30b76..00602f0c03 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -68,6 +68,9 @@ AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') = #{dateId} + + AND act_type = #{type} + AND pa.ORG_ID_PATH like concat('%',#{agencyId},'%') From fe34eb801c633c062f288654e0d77909e5cb36b1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 22 Aug 2022 14:49:39 +0800 Subject: [PATCH 099/397] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/partymember/IcPartyMemberDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3a39b8e54f..17ba9f8a12 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 @@ -267,7 +267,7 @@ GROUP BY ageGroup - SELECT ipo.id id, ipo.PARTY_ORG_NAME partOrgName From 039a7a02f332f7dda2d11a66aaa47fd72e52afbe Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 14:50:55 +0800 Subject: [PATCH 100/397] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IcResiCollectVisitorDao.xml | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml index 4ec0676f2c..35189406b9 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml @@ -120,8 +120,33 @@ UPDATED_TIME from ic_resi_collect_visitor where DEL_FLAG = '0' - - AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} + AND CUSTOMER_ID = #{customerId} + + AND ID_CARD = #{idCard} + + + AND NAME = #{name} + + + AND MOBILE = #{mobile} + + + AND VILLAGE_ID = #{villageId} + + + AND BUILD_ID = #{buildId} + + + AND UNIT_ID = #{unitId} + + + AND HOME_ID = #{homeId} + + + AND CREATED_TIME >= #{startTime} + + + AND CREATED_TIME <= #{endTime} AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%') From 2fcf6267bb7d9a0416ffa7e168a44a0268c4abff Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 15:12:59 +0800 Subject: [PATCH 101/397] no message --- .../java/com/epmet/dto/form/VisitListFormDTO.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java index 09ca9bf294..a12f07b46d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java @@ -23,4 +23,16 @@ public class VisitListFormDTO extends PageFormDTO { private String orgId; + private String idCard; + + private String name; + + private String villageId; + + private String buildId; + + private String unitId; + + private String homeId; + } From bbc7cbfcecd2748f42b9532d5f1a777c0b33a5c9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 15:13:03 +0800 Subject: [PATCH 102/397] like --- .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 00602f0c03..cd2b68d772 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -118,7 +118,7 @@ a.DEL_FLAG = '0' AND a.CUSTOMER_ID = #{customerId} - and a.ORG_ID_PATH CONCAT('%',#{staffAgencyId},'%') + and a.ORG_ID_PATH like CONCAT('%',#{staffAgencyId},'%') AND a.ADDRESS LIKE CONCAT('%',#{address},'%') From 2b5e6733abc41b59aa8e58f2c6da26f09735ef2c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 15:15:31 +0800 Subject: [PATCH 103/397] todo --- .../epmet/task/AutoPublishIcPartyActTask.java | 24 ++++++++++++++++++ .../task/NoticePartyActAutoPublishTask.java | 25 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java new file mode 100644 index 0000000000..531f41ebeb --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java @@ -0,0 +1,24 @@ +package com.epmet.task; + +import org.springframework.stereotype.Component; + +/** + * @Description + * @Author yzm + * @Date 2022/8/22 15:13 + */ +@Component("autoPublishIcPartyActTask") +public class AutoPublishIcPartyActTask implements ITask { + /** + * 活动时间2022-08-15 10:30 选择的是提前3天自动发布 + * 本任务是自动发布活动 + * //2022-8-9号 8:00 收到一个：您有一个活动3天后即将自动发布 + * + * @param params 参数，多参数使用JSON数据 + */ + @Override + public void run(String params) { + + } +} + diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java new file mode 100644 index 0000000000..8f872218e4 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java @@ -0,0 +1,25 @@ +package com.epmet.task; + +import org.springframework.stereotype.Component; + +/** + * @Description + * @Author yzm + * @Date 2022/8/22 15:07 + */ +@Component("noticePartyActAutoPublishTask") +public class NoticePartyActAutoPublishTask implements ITask { + + /** + * 活动时间2022-08-15 10:30 选择的是提前3天自动发布 + * //2022-8-12 10:30自动发布，收到消息：您有一个活动已经发布 + * 本任务是通知：2022-8-9号 8:00 收到一个：您有一个活动3天后即将自动发布 + * + * @param params 参数，多参数使用JSON数据 + */ + @Override + public void run(String params) { + // todo + } +} + From 3d52c9fa110b8efec76a3bbeb83442c71087385c Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 15:20:19 +0800 Subject: [PATCH 104/397] =?UTF-8?q?=E8=AF=95=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/VisitListFormDTO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java index a12f07b46d..4ec572ad88 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java @@ -35,4 +35,6 @@ public class VisitListFormDTO extends PageFormDTO { private String homeId; + private String mobile; + } From e6b392d988d3f07466abe126c975e424ef98dabf Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 22 Aug 2022 15:25:03 +0800 Subject: [PATCH 105/397] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=91=E6=8A=A4=E7=85=A7-=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E5=87=BA=E7=94=9F=E3=80=81=E8=BF=81=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcBirthRecordServiceImpl.java | 12 ++++++++++++ .../service/impl/IcMoveInRecordServiceImpl.java | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java index 163d15c563..37a65965d7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java @@ -7,12 +7,15 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.GenderEnum; import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum; +import com.epmet.commons.tools.enums.IdCardTypeEnum; import com.epmet.commons.tools.enums.RelationshipEnum; +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.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.IdCardRegexUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcBirthRecordDao; import com.epmet.dao.IcResiUserDao; @@ -144,6 +147,15 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl Date: Mon, 22 Aug 2022 15:40:29 +0800 Subject: [PATCH 106/397] todo --- .../epmet/task/NoticePartyActAutoPublishTask.java | 14 +++++++++++++- .../feign/ResiPartyMemberOpenFeignClient.java | 2 ++ .../ResiPartyMemberOpenFeignClientFallback.java | 5 +++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java index 8f872218e4..c0bbf5fcb8 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java @@ -1,5 +1,9 @@ package com.epmet.task; +import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** @@ -7,8 +11,11 @@ import org.springframework.stereotype.Component; * @Author yzm * @Date 2022/8/22 15:07 */ +@Slf4j @Component("noticePartyActAutoPublishTask") public class NoticePartyActAutoPublishTask implements ITask { + @Autowired + private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient; /** * 活动时间2022-08-15 10:30 选择的是提前3天自动发布 @@ -19,7 +26,12 @@ public class NoticePartyActAutoPublishTask implements ITask { */ @Override public void run(String params) { - // todo + Result result=resiPartyMemberOpenFeignClient.noticePartyActAutoPublishTask(); + if(result.success()){ + log.info("noticePartyActAutoPublishTask执行成功"); + }else{ + log.info("noticePartyActAutoPublishTask执行失败"); + } } } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index 430c6acb90..6ad7273758 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -144,4 +144,6 @@ public interface ResiPartyMemberOpenFeignClient { */ @PostMapping("/resi/partymember/icPartyOrg/getPartyOrgList") Result> getPartyOrgList(); + + Result noticePartyActAutoPublishTask(); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index 2a82324fa0..ebf4f9dda1 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -114,4 +114,9 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp public Result> getPartyOrgList() { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartyOrgList", null); } + + @Override + public Result noticePartyActAutoPublishTask() { + return null; + } } From 3132156c58a9775bde9b2b69155cb41daccbff55 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 15:41:26 +0800 Subject: [PATCH 107/397] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiCollectVisitorDao.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml index 35189406b9..a4cd1d67cc 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml @@ -148,9 +148,6 @@ AND CREATED_TIME <= #{endTime} - - AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%') - order by CREATED_TIME desc From 5e5568022cc4a6a3f69996ee5955016ff0ccedfc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 22 Aug 2022 15:42:15 +0800 Subject: [PATCH 108/397] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/form/IcPartyActListFormDTO.java | 29 +++++++++++++ .../result/IcPartyActListResultDTO.java | 43 +++++++++++++++++++ .../controller/IcPartyActController.java | 15 +++++-- .../modules/partyOrg/dao/IcPartyActDao.java | 4 ++ .../partyOrg/service/IcPartyActService.java | 9 ++-- .../service/impl/IcPartyActServiceImpl.java | 29 +++++++++++-- .../mapper/partyOrg/IcPartyActDao.xml | 38 ++++++++++++++++ 7 files changed, 155 insertions(+), 12 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java new file mode 100644 index 0000000000..c78a205625 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class IcPartyActListFormDTO implements Serializable { + /** + * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动； + */ + private String actType; + /** + * 签到状态[已签到：signIn 未签到：unSignIn] + */ + private String signIn; + + //参加活动党组织ID,groupId + private String joinOrgId; + + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = false; + + //token中信息 + private String customerId; + private String userId; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java new file mode 100644 index 0000000000..29c968ba90 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java @@ -0,0 +1,43 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import com.epmet.resi.partymember.dto.partymember.result.AdditionalInfoDTO; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@NoArgsConstructor +@Data +public class IcPartyActListResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 活动Id + */ + private String icPartyActId; + /** + * 活动主题 + */ + private String topic; + /** + * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动； + */ + private String actType; + /** + * 活动时间 + */ + private String holdTime; + /** + * 活动地点 + */ + private String address; + /** + * 签到状态[已签到：signIn 未签到：unSignIn] + */ + private String signIn; + /** + * 签到状态名 + */ + private String signInName; + + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 0e52bdad31..004e86c2d2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -28,11 +28,9 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -288,4 +286,13 @@ public class IcPartyActController { } } } + + @RequestMapping("list") + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActListFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result>().ok(icPartyActService.list(formDTO)); + } + + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 7308aeb25a..5426dfc9e4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -6,7 +6,9 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyActListResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -40,4 +42,6 @@ public interface IcPartyActDao extends BaseDao { String selectActTypeName(@Param("customerId") String customerId,@Param("actType")String actType); int deleteIcPartyAct(@Param("customerId") String customerId, @Param("userId")String userId, @Param("icPartyActId")String icPartyActId); + + List selectresiPartyActList(IcPartyActListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 434a0bf657..6bb134d35f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -11,11 +11,9 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.*; import java.util.List; import java.util.Map; @@ -109,4 +107,7 @@ public interface IcPartyActService extends BaseService { List yearSearch01(YearSearchFormDTO formDTO); List yearSearch(YearSearchFormDTO formDTO); + + PageData list(IcPartyActListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index c48ab658dd..a18b2161d4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.*; import com.epmet.modules.partyOrg.service.*; +import com.epmet.modules.partymember.dao.IcPartyMemberDao; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; @@ -35,11 +36,10 @@ import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.*; +import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO; import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -79,6 +79,10 @@ public class IcPartyActServiceImpl extends BaseServiceImpl list(IcPartyActListFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + //1.查询当前用户所属党支部信息 + IcPartyInfoResultDTO dto = icPartyMemberDao.selectByUserId(formDTO.getUserId()); + if(null == dto){ + return new PageData<>(new ArrayList<>(), 0); + } + formDTO.setJoinOrgId(dto.getId()); + + //2.根据所属支部及查询条件筛选数据 + List list = baseDao.selectresiPartyActList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index cd2b68d772..05cf3aab8a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -159,6 +159,44 @@ and d.type_key = #{actType} + + update ic_party_act set del_flag='1', From f1cd61fbd9c9f9e65fae52b8ed69430651f203ab Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 15:46:10 +0800 Subject: [PATCH 109/397] bugfix --- .../dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index 88e791c889..9fa96d1dc9 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -96,7 +96,7 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { /** * 活动开始前几天 */ - @NotBlank(message = "自动发布时间不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + @NotNull(message = "自动发布时间不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) private Integer autoPublicType; /** * 发布活动党组织 @@ -125,7 +125,7 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { /** * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ - @NotBlank(message = "", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + @NotBlank(message = "publishOrgPath不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) private String publishOrgPath; /** From 271d931e8c1216cf4ed6369710900c922c9ef96a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 15:47:10 +0800 Subject: [PATCH 110/397] =?UTF-8?q?=E5=B0=B1=E6=98=AF=E8=BF=99=E6=A0=B7?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiCollectVisitorDao.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml index a4cd1d67cc..35189406b9 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml @@ -148,6 +148,9 @@ AND CREATED_TIME <= #{endTime} + + AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%') + order by CREATED_TIME desc From 925a2f2e5ae92e2578dfd24a15d68bbdb58583fc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 15:53:08 +0800 Subject: [PATCH 111/397] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BB=8B=E7=BB=8D?= =?UTF-8?q?=E4=B8=8D=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index 9fa96d1dc9..f6b234276b 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -143,7 +143,7 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { /** * 活动介绍 */ - @NotBlank(message = "活动介绍不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + // @NotBlank(message = "活动介绍不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) @Length(max = 1000, message = "活动介绍最多输入1000字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) private String introduce; From 789678a2178d1f7c91a2bed15bd35a2ee0fc3f37 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 22 Aug 2022 15:56:39 +0800 Subject: [PATCH 112/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/VaccinePrarmeterListFormDTO.java | 32 ++++++++++++ .../IcVaccinePrarmeterController.java | 27 ++++++++++ .../com/epmet/dao/IcVaccinePrarmeterDao.java | 11 +++- .../mapper/IcVaccinePrarmeterDao.xml | 51 ++++++++++++++++++- 4 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java new file mode 100644 index 0000000000..6f77ae6b3b --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author wgf + * @DateTime 2022/8/22 10:30 + * @DESC + */ +@Data +public class VaccinePrarmeterListFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = -498378993902522370L; + + /** + * 手机号 + */ + private String mobile; + + /** + * 地点名称 + */ + private String name; + + /** + * user所属组织ID + */ + private String orgId; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 102e5e0ea7..4c7091ba20 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -1,7 +1,10 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.dto.form.PageFormDTO; 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.commons.tools.validator.AssertUtils; @@ -9,7 +12,12 @@ 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.dao.IcVaccinePrarmeterDao; +import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.IcVaccinePrarmeterDTO; +import com.epmet.dto.form.PointHSYMFormDTO; +import com.epmet.dto.form.VaccinePrarmeterListFormDTO; +import com.epmet.excel.IcPointNucleicMonitoringExcel; import com.epmet.excel.IcVaccinePrarmeterExcel; import com.epmet.service.IcVaccinePrarmeterService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +41,9 @@ public class IcVaccinePrarmeterController { @Autowired private IcVaccinePrarmeterService icVaccinePrarmeterService; + @Autowired + private IcVaccinePrarmeterDao icVaccinePrarmeterDao; + @RequestMapping("page") public Result> page(@RequestParam Map params){ PageData page = icVaccinePrarmeterService.page(params); @@ -77,6 +88,22 @@ public class IcVaccinePrarmeterController { ExcelUtils.exportExcelToTarget(response, null, list, IcVaccinePrarmeterExcel.class); } + /** + * Desc: 【新冠病毒疫苗接种人员信息台账】导出 + * @param response + * @param formDTO + * @param tokenDto + * @author wgf + * @date 2022/6/24 13:57 + */ + @PostMapping("vaccine-export") + public void vaccineExport(HttpServletResponse response, @RequestBody VaccinePrarmeterListFormDTO formDTO, @LoginUser TokenDto tokenDto) throws Exception { + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + List list = icVaccinePrarmeterDao.vaccineExport(formDTO); + ExcelUtils.exportExcelToTarget(response, null, list, IcVaccinePrarmeterExcel.class); + + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java index a2e7c17a67..cbe6c686b4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java @@ -1,9 +1,14 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcPointNucleicMonitoringDTO; +import com.epmet.dto.IcVaccinePrarmeterDTO; +import com.epmet.dto.form.VaccinePrarmeterListFormDTO; import com.epmet.entity.IcVaccinePrarmeterEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 新冠病毒疫苗接种人员信息台账 * @@ -12,5 +17,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcVaccinePrarmeterDao extends BaseDao { - -} \ No newline at end of file + + List vaccineExport(VaccinePrarmeterListFormDTO formDTO); + +} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index 363554832c..68fffc3f4b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -39,5 +39,54 @@ + - \ No newline at end of file + + From a24696f745a82c5b7177034c932e0e55d4282181 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 22 Aug 2022 16:01:55 +0800 Subject: [PATCH 113/397] =?UTF-8?q?=E7=AD=BE=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/form/PartyActSignFormDTO.java | 21 ++++++++++++++- .../IcPartyActSignInRecordController.java | 11 +++++++- .../IcPartyActSignInRecordService.java | 2 ++ .../IcPartyActSignInRecordServiceImpl.java | 27 +++++++++++++++++++ 4 files changed, 59 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java index 4677442fef..1e647cad6d 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java @@ -13,11 +13,30 @@ public class PartyActSignFormDTO implements Serializable { /** * 活动Id */ - @NotBlank(message = "活动Id不能为空",groups = {AddGroup.class}) + @NotBlank(message = "活动Id不能为空",groups = {UpdateGroup.class}) private String icPartyActId; + /** + * 签到地点 + */ + @NotBlank(message = "签到地点不能为空",groups = {AddGroup.class}) + private String address; + /** + * 签到地点纬度 + */ + @NotBlank(message = "签到地点纬度不能为空",groups = {AddGroup.class}) + private String latitude; + /** + * 签到地点经度 + */ + @NotBlank(message = "签到地点经度不能为空",groups = {AddGroup.class}) + private String longitude; private Integer pageNo = 1; private Integer pageSize = 20; private Boolean isPage = false; + //token中信息 + private String customerId; + private String userId; + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java index de93f1d2c3..9a4b16fda7 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java @@ -36,7 +36,7 @@ public class IcPartyActSignInRecordController { @RequestMapping("list") public Result> list(@RequestBody PartyActSignFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, AddGroup.class); + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class); return new Result>().ok(icPartyActSignInRecordService.list(formDTO)); } @@ -71,5 +71,14 @@ public class IcPartyActSignInRecordController { icPartyActSignInRecordService.delete(ids); return new Result(); } + + @PostMapping("sign") + public Result sign(@LoginUser TokenDto tokenDto, @RequestBody PartyActSignFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icPartyActSignInRecordService.sign(formDTO); + return new Result(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java index 413be5fd54..bb1f91a727 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java @@ -72,4 +72,6 @@ public interface IcPartyActSignInRecordService extends BaseService implements IcPartyActSignInRecordService { + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Override @@ -96,4 +105,22 @@ public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl result = epmetUserOpenFeignClient.customerUserDetail(user); + if (!result.success() && null == result.getData()) { + throw new RenException("获取当前登录人居民信息失败"); + } + //保存签到记录数据 + IcPartyActSignInRecordEntity entity = ConvertUtils.sourceToTarget(formDTO, IcPartyActSignInRecordEntity.class); + entity.setEpmetUserId(formDTO.getUserId()); + entity.setIdCard(result.getData().getIdNum()); + entity.setUserRealName(result.getData().getName()); + insert(entity); + } + } \ No newline at end of file From 92b63c3ff5c8d79ecf0ba123174989bd180c9420 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 22 Aug 2022 16:02:50 +0800 Subject: [PATCH 114/397] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4=E4=B8=BA?= =?UTF-8?q?id=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiCollectServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index 93c25d9ec5..4c30ad809e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -175,7 +175,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl newMemberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class); From 2acd7578b3312b6d3cf520c3b55529f313c5cae1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 16:16:45 +0800 Subject: [PATCH 115/397] luyou --- .../feign/ResiPartyMemberOpenFeignClient.java | 1 + .../ResiPartyMemberOpenFeignClientFallback.java | 2 +- .../partyOrg/controller/IcPartyActController.java | 10 +++++++++- .../modules/partyOrg/service/IcPartyActService.java | 1 + .../partyOrg/service/impl/IcPartyActServiceImpl.java | 6 ++++++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index 6ad7273758..cae69c38a0 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -145,5 +145,6 @@ public interface ResiPartyMemberOpenFeignClient { @PostMapping("/resi/partymember/icPartyOrg/getPartyOrgList") Result> getPartyOrgList(); + @PostMapping("/resi/partymember/icPartyAct/noticePartyActAutoPublishTask") Result noticePartyActAutoPublishTask(); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index ebf4f9dda1..585e531797 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -117,6 +117,6 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp @Override public Result noticePartyActAutoPublishTask() { - return null; + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "noticePartyActAutoPublishTask"); } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 004e86c2d2..58dddab459 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -294,5 +294,13 @@ public class IcPartyActController { return new Result>().ok(icPartyActService.list(formDTO)); } - + /** + * 通知：您有一个活动3天后即将自动发布 + * @return + */ + @PostMapping("noticePartyActAutoPublishTask") + public Result noticePartyActAutoPublishTask(){ + icPartyActService.noticePartyActAutoPublishTask(); + return new Result(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 6bb134d35f..a8e150b79a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -110,4 +110,5 @@ public interface IcPartyActService extends BaseService { PageData list(IcPartyActListFormDTO formDTO); + void noticePartyActAutoPublishTask(); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index a18b2161d4..14bc6f198d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -653,4 +653,10 @@ public class IcPartyActServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } + @Override + public void noticePartyActAutoPublishTask() { + //todo + return; + } + } \ No newline at end of file From 53f3030915812e8f13a7004a1cf5db144065f100 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 16:18:33 +0800 Subject: [PATCH 116/397] =?UTF-8?q?=E5=8D=A1=E7=89=87=E5=8F=AA=E4=B8=8B?= =?UTF-8?q?=E6=94=BE=E4=B8=80=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/util/dh/DhDeviceUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java index 9d8d52149f..5e9a7442d2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java @@ -707,7 +707,7 @@ public class DhDeviceUtil { cardFormDTO.setCategory("0"); cardFormDTO.setCardStatus("ACTIVE"); cardFormDTO.setStartDate(LocalDate.now().toString()); - cardFormDTO.setEndDate(LocalDate.now().plusDays(180L).toString()); + cardFormDTO.setEndDate(LocalDate.now().toString()); String pwd; try { pwd = RSAUtils.getPwdByRsa(getPublicKey(), "123456"); From 19a36dc873f29db622f8a74893c5dcd43c5b5c9a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 16:24:17 +0800 Subject: [PATCH 117/397] =?UTF-8?q?=E5=AE=BD=E6=9D=BE=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/util/dh/DhDeviceUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java index 5e9a7442d2..89cb0bf770 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java @@ -816,7 +816,7 @@ public class DhDeviceUtil { DataInputStream dataInputStream = new DataInputStream(url.openStream()); byte[] originBytes = toByteArray(dataInputStream); - fileBytes = compressPicCycle(originBytes, 100L, 0.1); + fileBytes = compressPicCycle(originBytes, 100L, 0.2); } catch (IOException e) { logger.error("图片上传异常", e); throw new RenException("图片上传异常"); From d547281aa590a77d0fdb0a931a4c63b90aec1a9b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 16:24:50 +0800 Subject: [PATCH 118/397] =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.23_party_publish_Time.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql index d6f288b2c7..a2ad1f1ef8 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql @@ -5,3 +5,4 @@ INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, ` INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458276439302146', 1560458000894500866, '活动开始前3天', '3', '0', '活动开始前3天', 2, 0, 0, '1', '2022-08-19 10:47:00', '1', '2022-08-19 10:47:00'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458332076744705', 1560458000894500866, '活动开始前5天', '5', '0', '活动开始前5天', 3, 0, 0, '1', '2022-08-19 10:47:13', '1', '2022-08-19 10:47:13'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458388007788545', 1560458000894500866, '活动开始前7天', '7', '0', '活动开始前7天', 4, 0, 0, '1', '2022-08-19 10:47:26', '1', '2022-08-19 10:47:26'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1561627442626142210', 1560458000894500866, '现在发布', '0', '0', '', 5, 0, 0, '1', '2022-08-22 16:12:51', '1', '2022-08-22 16:12:51'); From 9726594ef6b949f2500d8c54c8754c1ff5d272a2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 16:30:56 +0800 Subject: [PATCH 119/397] =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 14bc6f198d..52fe2d99e4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -191,7 +191,12 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Mon, 22 Aug 2022 16:36:50 +0800 Subject: [PATCH 120/397] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/result/IcPartyActDetailResDTO.java | 5 +++++ .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 1 + .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java index a9356e0bbb..c413bb2d5a 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java @@ -45,6 +45,9 @@ public class IcPartyActDetailResDTO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date holdTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date autoPublicTime; + /** * 活动主题 */ @@ -69,6 +72,8 @@ public class IcPartyActDetailResDTO implements Serializable { * 活动开始前几天 */ private Integer autoPublicType; + + private String autoPublicTypeDesc; /** * 发布活动党组织 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 52fe2d99e4..e50c23836a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -278,6 +278,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Mon, 22 Aug 2022 16:40:38 +0800 Subject: [PATCH 121/397] =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=86=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E9=80=9A=E7=9F=A5=E5=8F=82=E5=8A=A0=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=9A=84=E6=89=8D=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 --- .../service/impl/IcPartyActServiceImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 52fe2d99e4..7a3595e618 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -186,7 +186,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Mon, 22 Aug 2022 16:43:29 +0800 Subject: [PATCH 122/397] louti --- .../epmet/modules/partyOrg/controller/IcPartyActController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 58dddab459..1ed8b5f813 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -240,6 +240,7 @@ public class IcPartyActController { @PostMapping("yearSearch") public Result> yearSearch(@LoginUser TokenDto tokenDto, @RequestBody YearSearchFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, YearSearchFormDTO.YearSearchForm.class); formDTO.setStaffId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icPartyActService.yearSearch(formDTO)); From a402d9e5b7ec99d14c7e9b4d6873d9ab50484cc2 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 22 Aug 2022 16:51:11 +0800 Subject: [PATCH 123/397] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=91=E6=8A=A4=E7=85=A7-=E8=AE=BF=E5=AE=A2?= =?UTF-8?q?=E3=80=81=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86=E3=80=81=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E7=A7=9F=E8=B5=81=E3=80=81=E5=85=9A=E5=91=98=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E3=80=81=E5=B1=85=E6=B0=91=E6=B3=A8=E5=86=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=8C=EF=BC=8C=E5=BE=85=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PartyMemberConfirmServiceImpl.java | 9 +++++++++ .../controller/IcResiCollectController.java | 16 ++++++++++++++++ .../IcResiCollectVisitorController.java | 9 +++++++++ .../controller/IcResiUserController.java | 18 ++++++++++++++++++ .../service/impl/UserResiInfoServiceImpl.java | 13 +++++++++++++ .../excel/ic_resi_import_template.xls | Bin 74240 -> 74240 bytes 6 files changed, 65 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 74b9ba9844..961197076d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -10,6 +10,7 @@ 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.utils.ConvertUtils; +import com.epmet.commons.tools.utils.IdCardRegexUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.*; import com.epmet.dto.*; @@ -167,6 +168,14 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService @Transactional(rollbackFor = Exception.class) public Result submit(PartymemberInfoDTO partyMemberInfoDTO) { log.info("submit param:{}",JSON.toJSONString(partyMemberInfoDTO)); + + // 证件类型判断----start---- + IdCardRegexUtils regex = IdCardRegexUtils.parse(partyMemberInfoDTO.getIdCard()); + if (regex == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误"); + } + // 证件类型判断----end---- + Result result = new Result(); //校验手机验证码是否正常 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java index cca091439f..d508f670e8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java @@ -4,15 +4,19 @@ 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.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.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.IdCardRegexUtils; 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.IcResiCollectService; +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; @@ -180,6 +184,18 @@ public class IcResiCollectController { //效验数据 ValidatorUtils.validateEntity(formDTO); formDTO.setOrigin("internal");//固定为内部 + + // 证件类型判断----start---- + for (IcResiCollectMemFormDTO member : formDTO.getMemberList()) { + if (StringUtils.isNotBlank(member.getIdNum())) { + IdCardRegexUtils regex = IdCardRegexUtils.parse(member.getIdNum()); + if (regex == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误"); + } + } + } + // 证件类型判断----end---- + return icResiCollectService.saveCollectInfo(formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java index 60995a0211..a3f86c1c28 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java @@ -3,9 +3,12 @@ package com.epmet.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.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.ExcelUtils; +import com.epmet.commons.tools.utils.IdCardRegexUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -117,6 +120,12 @@ public class IcResiCollectVisitorController { public Result saveInfo(@RequestBody SaveCollectVisitorFormDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto); + // 证件类型判断----start---- + IdCardRegexUtils regex = IdCardRegexUtils.parse(dto.getIdCard()); + if (regex == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误"); + } + // 证件类型判断----end---- return icResiCollectVisitorService.saveInfo(dto); } 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 7604ebc5c7..7ac26844dd 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 @@ -307,12 +307,30 @@ public class IcResiUserController implements ResultDataResolver { */ @PostMapping("rent/updateimage") public Result updateImage(@LoginUser TokenDto tokenDto, @RequestBody RentTenantFormDTO formDTO) { + + // 身份证号验证 + if (StringUtils.isNotBlank(formDTO.getUser().getIdCard())) { + checkIdCard(formDTO.getUser().getIdCard()); + } + + if (StringUtils.isNotBlank(formDTO.getIdCard())) { + checkIdCard(formDTO.getIdCard()); + } + String resiUserId = icResiUserService.updateImage(tokenDto, formDTO); //推送MQ事件 editResiMq(formDTO.getCustomerId(), resiUserId); return new Result(); } + private void checkIdCard(String idCard) { + // 证件类型判断----start---- + IdCardRegexUtils regex = IdCardRegexUtils.parse(idCard); + if (regex == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误"); + } + } + private void editResiMq(String customerId, String userId) { //推送MQ事件 IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg(); 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 44cd7c12a3..8e9af036e7 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 @@ -26,10 +26,13 @@ import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; 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.enums.IdCardTypeEnum; 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.utils.ConvertUtils; +import com.epmet.commons.tools.utils.IdCardRegexUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.SmsTemplateConstant; import com.epmet.constant.UserConstant; @@ -243,6 +246,16 @@ public class UserResiInfoServiceImpl extends BaseServiceImplcms;EPk z@#w>-R!hQ-q_mTa8BMG8o-t7s>`=-yozPP42tD8K=F*OCX76`@-~W8)`=4{ayA#iG z*>hYjlXW@(Afs+nVy=YV@oB>oA&O@Jo)m3FF&6*tJgw99rfa$`)J5;2?{qH8;n6Ke z(IeSKFUm1w=W&tVPIi4f&6X4Brrey$d48b2Iql;6(R_bawySIOQF`iUbx}Wa1jShl zRIWtO6~z$QocF)~#1638;qaM#W{^A6RZDCjuAMn95I07Q7FXbYmpQN&yHTm)q|<^d zE{vplvs38CF7em6x+sbbcLs7iwi>V*4P)wLjWE6tQ0=rV+}WZ<)6V4p?s#`R$S()f z2-?r8wMk`P)h(-Af*cl59aIL1lNIiw-c|$MU?tz$9$g|^lTZ4Z`@=P067?}V)yLKYvV3XTor!8$xLgq{kIwe$|Ul;<1lMe zax9*pIKI|XPri<$Oul|bi;`oLP8|>#Ojw)UCs*%zHoFTZe;d@$Ge7HS>a$uj{79#h zVF`ZsYiJh?ax>yv3-f2|}{%a{3_TLPu?K8f4j_SW1RP%D5r|RqJ zqm&rQB~x{Z3%k=r-m`!nqzrSqBpX13T@tGe4Zn!<-2l*2&Fs4uTO^Cw&_^f^{)(}) zZ@CTIP}}~kjnfP}c&3C>``lSXIqQq^ulV^BJjsHP3`n$ST0FPd2uPy+jiQBhQBOj4LMCWoWzfdWd3NU*nK-^qmnQmpLs*zLf zNti>1sU<=4Nx7WlsrfvOg!zdY3G5&s?J<6O~%P|X|XTV zmML1iXiI@cB6FceA~V|zc@UYWX(ZY*T_e$!85)VUaA~1+kxa9gP%?l7dKd(#MlY#w z;41ap`gu(~@s<=SKWzrMz7-&S2lwP}_2I@G9nPkV%}uW7XgP)Jxf%)A^E48!=W8Tf zFVIN1ep4gidZ9+b^&*Xg>%~mZy56>>CQRwK8(`>OfU13L@}Zjh;d#mORwz)M-3&_f zFA28UwnR%O3@=r^Te_m!e$QGH=Bo$yhiczRPx2KyS!Pn^eF^YYHNV?6f%-2Vye8o? zI#Mp`A9=U~zD-LGr==H#l1jYUSnz0MVOp+{mFXRgY)pI-0#8H&JJU*y989a!HWh;- zm35~8Hk|{IF9d3v^?hrdr8pGG#~Vga!=yRE+HiHSni*$K8l{BG^m^@JF|4i~DkaEt zp?0kpaxQvskLtg;BKVX`r4yIcGkF71&8q7t-cbLIQmOuGV2ZNpCX;8w@z89m>%qWJ zuJ;H9Vt@6$pF=Gxl@{M-eJ~!n)4eIr&R?JAao-B&89=*#D^zyg2Wa~U;2io|8StTM zZ8$IC8uH&0@0sZ9TH5}5pQLqKN5Ww!cr~&xt=GuP^sYuWrVVQ3ANOsN`z-gMtFM=g zPI14wwxiD@V{6GB#ofs8HOjcv?B@RvL?5g0HF9{{`D*l-foCh@4Vcdz@)eu#hy+Sy zav07RTw!MJV$qoO5s_B@tr1zQ{AV(4<5%hj+EtR^TWG_A_wDGCKhRfKRL0n`m+a`5 gd$eNYd35svPsa9ZJu51wM&SknZms+)8jZ$(0MJ-;DF6Tf delta 2282 zcmZvc3s96*6vxl~_S^S+SzSPuhdP?3V2Kr$3W#q7-w#5>RS-l|O!9?+h6;j!9&N4B zMspk;^Fi~WC}U!cW|o>cHK-FQqvNDWQHqaD?c80wV7WWrcfa5FzvtZlIeYIGoRAAn z$d$56)edy1RgJ|sRUp3@;96CGyh`+qsuvc?fjFP8SlNjw>JU6HN8(_0dvwzCVzmvA zt8^RGP8?5Ds^k!SKw-T|?ji@{Hrb{Wshw&}umoa)(Sf064OST(_=`ak-~xc=r#66% zcDvW;HG&+4SIlnTye`I2-@J)@G*e=V`NZgpWqt5~!G-5InIo{-XyvN5SNK(MLIAo= zE?W$N;j!T$_w=b2+()YMnM$r|!)n7o*89|U zSZ{JM8=f_Hqbgp*E#xTDq`^7luGFH(on|X@a#b7Un{U9aG;_Z}gDIq{EmohaR8t`K zw`lOXIgqu-sg@{a=6Rnv#-r3Hs)ohj0HaHJV%aat<86++N@c)LJ=hnxIyRzjz*KSw zT9!O!^7w|Nd1(`-rH{!hS_Q$dGmR^HmY7tZRFn9;8Ui$f4!&30ob-Ou1# zbblR_>0X43WO_wx)oRyS?Hbag@7?13=olwV^73sY+n+iJmZ7|+GIrQ4UVF)oC9 zWQcdOXnZN&osxNt2kBW!_OaamS_+2J8-BIxl#?$|kKgpGp6M@AuiwV)@gdTE71qWF zG8bN?HHYB6_)#v9tN=|97?0L8o#*3qfEXot;4T)_j=ydBaK%m+A65A3pq^TfW(z?X zW(=y-%fLP>dz|=XiQ*otQ7MtbK9zK3FlHct3Gle53qBd4lTMGrCQqU=abyUSDox75 zQ6;+0l+6IKbe~BV|G2>lsvywOBZDCN>U2t{i7|SqPZ~w4x&*>maC8{GYg;b~$#zKF|0f*=vodp1# z=gDU)ls`Nu`3!|&V?$Rwot|YFG8-W29ZHnLEu$_iQHh@Qm&B%F*V*NM^D$|Zq}BX% zLEOAY5H~+V5H~+l3Cf;p&|@AzhYtW2DdoA@GE2utOS~;@$q@5-TV@I3nKK3P%vpkX zW-{I4h_@wM5O2#ILA)(<1qBdMp}-^!NT7ycz?3(a9kNR^*C|b&p$zluGf>}fqD_PL zmS-7iHUfOL86bKKHRx|8XnmTB&BLV|pOr9QEWk_15yVSaAc&Xnt{`5*LP5NQTtU2q z_XP10775}dEGBAOLd~YH^@dJ60AAh&uyqfae4wn{c0poGaKer?{ytlmiWJ=BGG*_k z-b@*~vsfo3>~Agp*i0w78!ANu-pB9^12$Ib3}X)id|V6g>q%b|9)5mRVtIJEiZ@}w z!ES6hZaFw^!uu_&NVLf(LB1d}QGp-}(F#FUqLqSdM6^?UzpX@PcoGyU35SLU7_!a+ z8aHfp9{D%LS@>5YE?f%)<5hcIAd)wD%uJ~U6ZRR8n0iAEO z1{`T@-BuOS!V$NgTR89bivqU(USZ5@29W;&sALTP^xRjXn&|gkgVG&-LV5p- z@aUZZF~y>DCKw581(}IT1X+km1zCyKDbaVEt&;OR^{TfwRc0>!yt}Tuce~6wN=_$r zZHhNk%{DWqw_44L*@5af4NIs067Mb@JEFRx=e{0Rrx@5$YJs=T$c`{;^?DP_ZJE;- zpH65W;Ar_60AHJ7VHY^ Date: Mon, 22 Aug 2022 16:52:38 +0800 Subject: [PATCH 124/397] defaultorg --- .../src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 0a234b163e..1a7bbfadb6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -166,7 +166,7 @@ ic_party_org o WHERE o.DEL_FLAG = '0' - AND o.AGENCY_ID = #{agencyId} + AND o.AGENCY_ID like concat('%', #{agencyId}) AND o.PARTY_ORG_TYPE = '0' From a4e66109ed80895f86b695959a45b98b82595030 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 16:54:45 +0800 Subject: [PATCH 125/397] =?UTF-8?q?=E5=AE=BD=E6=9D=BE=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/util/dh/DhDeviceUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java index 89cb0bf770..7cb8c2d4c2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java @@ -816,7 +816,7 @@ public class DhDeviceUtil { DataInputStream dataInputStream = new DataInputStream(url.openStream()); byte[] originBytes = toByteArray(dataInputStream); - fileBytes = compressPicCycle(originBytes, 100L, 0.2); + fileBytes = compressPicCycle(originBytes, 100L, 0.3); } catch (IOException e) { logger.error("图片上传异常", e); throw new RenException("图片上传异常"); From 7c958d6fd98c303ba6e2c98cd7143acf70274aed Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 22 Aug 2022 16:54:46 +0800 Subject: [PATCH 126/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcVaccinePrarmeterController.java | 14 ++++++ .../epmet/excel/IcVaccinePrarmeterExcel.java | 41 ++---------------- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 0 -> 75264 bytes 3 files changed, 17 insertions(+), 38 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 4c7091ba20..d50fcfa1cb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -1,10 +1,12 @@ package com.epmet.controller; +import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -24,6 +26,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; @@ -104,6 +107,17 @@ public class IcVaccinePrarmeterController { } + /** + * 导出模板 + * @param response + * @throws Exception + */ + @PostMapping("exporttemplate") + public void exportTemplate( HttpServletResponse response) throws Exception { + TemplateExportParams templatePath = new TemplateExportParams("excel/ic_vaccine_prarmeter_excel.xls"); + ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"新冠病毒疫苗接种人员信息台账",response); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index dc58b059b3..ac28c37a33 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -14,49 +14,32 @@ import java.util.Date; @Data public class IcVaccinePrarmeterExcel { - @Excel(name = "主键") - private String id; - @Excel(name = "客户Id customer.id") - private String customerId; - - @Excel(name = "网格ID") - private String gridId; @Excel(name = "网格名称") private String gridName; - @Excel(name = "组织Id") - private String agencyId; @Excel(name = "组织的pids") private String pids; - @Excel(name = "所属小区ID；") - private String villageId; @Excel(name = "所属小区名称") private String villageName; - @Excel(name = "所属楼宇Id") - private String buildId; @Excel(name = "所属楼宇名称") private String buildName; - @Excel(name = "单元id") - private String unitId; @Excel(name = "单元名") private String unitName; - @Excel(name = "所属家庭Id") - private String homeId; @Excel(name = "房间名") private String homeName; - @Excel(name = "户口性质：0户籍 1外来") + @Excel(name = "户口性质", replace = {"户籍_0","外来_1"}) private String householdType; @Excel(name = "姓名") @@ -89,29 +72,11 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "第三次接种地点") private String thirdVacSite; - @Excel(name = "原因：禁忌症/拒绝接种/其他原因") + @Excel(name = "原因") private String reason; @Excel(name = "备注") private String note; - @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/resources/excel/ic_vaccine_prarmeter_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls new file mode 100644 index 0000000000000000000000000000000000000000..23d4778dc4a09ffc912ddcc7cae7fd02e157551b GIT binary patch literal 75264 zcmeHw2YeO9_W$1W-W#DM5J-Rk3B4y&DdDD)5JC+kfCNyQpp=N9A|PNv1;m0V_O4IR zfEBQ#qWF9&h$ucR=+lQNn*aIkxjT1v?rf;~)Boe%&)hxpJ!fZUXU@#doH;x9?YAQL z-|=YT0Zsb!(!90bYXdbu6YfQ{!-z*{+6q_v_uAT81HOz1ik|=cO-kT5%I6xYGj9q$ z6nrV5&iyF_Pzaa0!LE6y{O5 zl)`)psOtrETu5ONg=z`~l+tuMGl}ke8XafoXAt8QKXIfnhN^qfIY|Nd)wCV@uU?c) z(eKf>{OU9>;dT7N33 zSycPu=oj^II-eN2K2q|gaH`iw`iW?0^zkLlnN77im9C7kA4IiKsh0_mSycbi_4;OM z&)+oH{reE>RIiUVy5E&lU;wpZKVNNI=o|jeS35L6KTSKJd1;UMJWs!x_8Endq-nmI zBa<3g1~ssDTGAi?>7(aioCA5-K?U5?k*+xi3!;+tq29=sdZ`fVr2?o&3ZvdAf_kDT z>V*QS7mB4GsGgpC(hfR5TK|1mPwQFzx2N7`Y1+qAPh@l<`2b3Lf_Jtqw^ILYqW^}` zuS0uUKj)u1l1b?wr8H|7twyzLS5o;eFDuLi{;zX{BmDqPoxUC3%SJxJ1`o8sLv-BX zabGbuxLtlaY0skQJ<tXwA_?J5<|*9*5}^no@h~t}!x_9(``Kkxxfz00}DbGV0SS=vgw# z=ETm_YU+8O*oLlUcQxiU^65>t*~tFXy02^`GMS#|?KH<2EyvSWZ5*k3X;EUN^2Dse?z_Uww9#v5{`}^SARpr%sF?%__a2Bbq zI~C);CenZ?Q*~c*a-MgmlBnxaZK(~$YL1aKJTuo)3#z4&G(@xFBdN3-`E(`COjMuZ z))BjtyOVa-mrph_t-dOA`P%*I%1L#dURMs>3GLTMvzqo(Ej=H_XGaon2gP;#M}tu} zj*d_zZ-*mQmHhwDxI>>!;12QO^2EqrFNdEQHEY2``Lxw>%p6qdV0NLxJ=2fV)4`BcmlxMj}ocEMHm4@}2eT zde(bOoAT_ag!3{$3{l#?bMIUS>Q=7+*R+G(m7!5nCpnlrk1U_YehCWBOR~X~ym3IiEOHFSjID{d(ww>bfWg>wR%Lz^!`X z#*OkfUl;O5`jS2*xo}s0I32n#WxbG|XF~!X+}wIX#o>XQ^xTWn zcgsgONY6z&$bq%parv{nDIH6FnQ?xOa5`pODz^+-Z)r%4_S-?mksnIOLmoKEi}q{2 zt_io4r;a*{2Aa;DNOnL5|Krz%swEbvfr zIa4hxnKIw)xhSd4n>TxulzAP)Mv<^2Xmk)2l^DPqA43Ne4=cG{w4!s2M0n*>PQ-}g zXp<8xO0r7p&xLA-$L%P}c$n1Twx&dUNFP0$d0kEa6mAhqrS7NJE8lrOwP=+|0(NxqEgknpF){*H6`+T&KV}s&6J2(uh#GAG;Rle2S%B^o^yt3-@}whyY{L?^lZ6) zY}6i}4@OSdufsU$G;Rm36GkGh=bT}`n`KI*U3*m`M$T|_-A3nOssPiw^K@pvAl$G`VJH z3rECLmA%L$d$Rn_Fv(i;d%YJ8x2v_<>jDzB>r8_oheNCN(z=X(X&IfWK`Nr!zxH~s zWU{7*X^wW}-qK7oi!<+=CxturDA^uUm}qF z$jC$N`c)PA9=Y*~q1=FDhjK$&RPCqdDi*owP{%bqbCpWDs_P8Clt1~uIW)(& zqpk}`u-=xVeyv0M7CxwY`NUUy>p4k4PCA`dPSPkRb)8{cqF!}?e$$E7zWT9#bs!xB z$rqT)?QqqrYdp&>h{_EdP9m9HhU?57YEG`blsa>V2_Om}l$@D-G>8ABn{Q5{V!bY) zk+rnEqibnW?&2D!(CV`0s9Zj{=&FkJi5{nT1=A@8mrn^KeWQCtIv)4x9ZvTO4vU6s z$#Aqhxa`$6sbe|)Bx{zuI@bDXZoZMJChq&lRNO~|xDQOA`PQ4dPeJL)w;m}@F-j|$ z9DwSq2wYjNh@?6z!kwFD?%bd?%DIUWxxu^}H;_zT;&tW*^(p5jz0TZVHjbnNwN!4@ zzbG1Ytlp@9aW(2da)6?`y<_=JmwD8!R~(6g!>NXovkBGhj!B0m4lC@N-(%8s0dn2O zQ{B4xd|ER3z|ei#cSW5P_t}o_v#v8Z=~(h1Bga>3Ux*@WP5~nParh+H21q@op%dZc zSwlDV`wg4N+uc+G-ISY;BvHbxQEV4fbsy_dY~J;#*uY^?fAaRHzHC9MXJ3{`ec1vG zvGf$%B1Ny&t(_hzIvP-l;IL>i^>cNWXh%hfwyCp3VS+&}V#z1ZqeRgxr0t&{s-zoJ(si9-lxc^$a}BkUTVs{Lm&s3QSmgykF0^tf>tS6-w`ff<G8LAz$=FKD`V_0k8Q{5a|TCtK}J{x1FF(a)q@*mL;> zC5PWV*5b4NM_M%x^6K)N12^c-c22{!Z+}GA`J{UMf}BUTGm+tMN{3Fb-#OyB_`{2a zfBoE=2}hc?YvTV@ug{v#iRw4_ng;idy6~pROP)z;(S2*|?nkpPzjN}QA(wx0Y1%*i z23C)LXUxG){nvXP4{kW4q*cM47w+7Z+`4>B%D3we9DMy~=rdbq{4}o5bK_t49XEOB z!=vu|rIFJ+?z#^D{`ry%u2|LP*Nv;wLL)0$eEajv^b_}QYrOCx-*0v$r0(iJ{LxQ8`L1Ko1CCd-y3Ic};<<0uE$w__`okB0GG)u6;D>uZ zQ~OKe!i>XxVp>1zcj)I=5^F|JpE~3!e+^zYUrmD%j8S)rq*c6fT* z^1W+U2X69r&fS*Z_=%^2z8n%$)VFlhh1UcQIdu1kA#Z!X;;-dpUz0MZXV4N zsGYBO{_G{MMwtVS)w{%R|CQ@ryZY#)wFAE0ef;&8KJI;ZU&l-0Hy2;{>*FC$T>p=e zbH-Qgd3I=i%lsvU={Lqt_}&Abj9tI!vQK(#dT7|OqmQm!5_bZEwss0;m0MC{(z ze@2%tFJE>fIPjKhGb%=Bz0~I)RnsmW{_vU~>nAn-_KC)O=9M>nCZ+JExB9+x^RllW zo!oiApf6qs8R2m2FJ{M`j%PGue$lUzVBVK%X@I=yMJx;eDT(|;udeaeM9rj z6_;;GZU61ALmgj#;FpGPe&sXn!FEYsuN|G5(zEc{|J3{BwK+RKJ^0cy^TLW>x-|OR zth7BnI}DjVeqZd7*8hI4&-Ri@wTm8pd;NcZpnhR<%oT(0e{t->&))y?y9o!szpPJM z!&ke$d{v*@cKCL<{UYs(SDjR0F();hNU)iRS*X~1epUl7Z#g)CkI9xep z-t{d%p7PY1n(x~Lqxi+UPWyOrg2OZvZxKZ=+n9uI)w)gP7NzYDx=%d$e81Z9K+BL%y zI*hofcIC_cXNJzX|DV}~g)Jui`_@?}zL?`ZxOsNz&f9i;)38_bdhcDEms-}Z>D=S7 z12<0pd3oB9SC)RA9Qmc=gFCOkzjvRMFB&x)w6o;3w(n*aKA60&Y-+I2fm@q>;8!~D zgI&Gf`6lJyZXf@5a<*mO+2qzmzDwVF@`d9?>&G;BApOITcY3aPF?xE=#1mnQqozD@ zVaw{|$fMWXv-X1aDMyPRi+QZ#w+B1i-Dl1lA1vN_)_u>Ady z<((dhdTn{fc~|Uh^3vOF-Uz#G$g%rAe=2^&(=(iD+kAYUU2)r{BO5m*C%m`z`qKAe z4$iJuyl&Kre?B+<(H-r#+@mOgjIo(1{uyqM5zPTS3^`?lS*Ks%7OXi}5q&C z(UW7I&D*o7#~YdTHxGO&C@lc z8nLGN$5+4o;CtRnKJOUXDJv!a>u*9IN)Kpr)wr5lCU3jx*4@$L+kKKb>Au8(ZeQJa z@w(@y{^RRwvkT&!%RcNr;gPY6ubtlco7jnKhNKN`o>Gw3CiCVQVX1?!-|+S|MaQcj z>auB7@#jr8-Q9cFwzmf!o4w%n@7Fu#znt=1dBkOVwR&sw*3~}#TbIOT6Wcb98})mB z@0lMi^-a6;mDl$-U4LJW&#Pryx4!hLb>xurK*~Em)4etz2a{+zmi3)JZC1s!S!0Uk zT~sl16ow5Cu6fP*Vn#&&V*^iIaj5m+4Uc69H2Z4t&TDtxIe*8lTTB zd8eq)mZZ3<^bZd{^X1%;4;?#r`<#U9|5NnUu+fv2PFQeo%l$w8`bCRvds}Aad0&zG zz>kjWM}Kfr{Gl%*GFp6fchOfHyZ)=*^;N5y-t{m4lzX4(b?uJFR^A#oHtY7jGe^aA ze&y2glsD(T`u6PO)vc@ii&tINwb#0S4X!IbwsU#({qID)us{8go7Xk$_-WdQeRgf0 zS#$lR@$cL?Y0}KK8N(L(r7w86-MYhxMbjgW`wrNXk-qAshmW+Z?RjLy1JlbUKKlKf z?yn~O(DjGUe@XqK{puC%e-ED**gf#(574%B{3TZ-fZNPBtS`)UKQjVl=5xGy5)5Z)H^cw#x zdVL?%Q2q7W$@**k?daWt$+RH@wpegWsHu*WMtJZCFv6n}Mnm-&g>;Msh3W@)0+le>Ebb04c-a@$p?kHGCA@0LKSovc~yVo6}9uUfs<+NA;}H z@-_26znGg@`t=O?nu*$;PYv#Gbf&c&6ScsD2KUlRPj3Df%w0aE zX0|7H*;mX>Eqz(R-Sahb%g3p>fk&A;Z^kuKwmR=xWG;(1EyJH03u(ot^E#KCIf>eY zAaDX5y{B#|*y=o3Xy!K1wuFKkpmuck|cL+R-|b#^d_`}3M1Xce3-{kdC*MLcv|9E{N%mYQ7LlbDkLm50$XWTDR%Xsv zP)g)YWu+Ada*sNRtjK$Mv`hBTsFArY@~wr=sZY&#GM@zckIXgDr^+5QWV6dhkIY}x zV-g8~3?JF8&_&Lld{r5(3}AV}n^qie%$acvtn`T)C7sKM&L`HprJ+T17*gJCA~Ej2 z_BZGA%a0Y3a8dQI^S3%_eS-;?z$hoBUXoo-r}&p1uA)<}s)#ELzVz~60m1V@wF5fg39gCmlz+uzamuLUC;>Q~)^Wc<^OC^AK z=v@pRoz=FodC?1nALkPJ@5}c&_pG_~W+L+|?kzBpNQX?l_d7o*1ShQWm4&ND>v={E z4J#a)OShR*orsd!Hcwj}nTsU#A%PF;ORm;i_jOxBxziwoe_lkqdh>WaydF;+L zudF5Vs*1wgrK?V$gx_6wysXXWIpsv&FuK`TpHjbBM4~GEX6-=@K2_Fn_Kyp{&81At z$$#H@Y`IH4(k}~ix^(lS;_+qEE59kG63Nt#70#cm6VOds<7!(;_nb5)&>5vU+S9s1 z2K515Xz?YJHnHleujjR=-}W?Oz#crA)cPIHi60fyZB~{gPl_v_KRPS_n_@y67PN-; z;PPlclyq|_cA){1g`n zfwmQgQD}Iq;8ao%gX~TaRGQMxslEgH4kd#sP`N<1we!U>oy#f0V-Z&i&&|y$PaT`K zlH`G3Hh(#kVNc=n%MVpFM!T%Iy2Hx2MY`I7bm=F?D@cKoyRFbrM=B9x9OG(oh`MqQ z68R%_Sec(WGSQikyML^!4OW-8o#<+B5WB5#KS~!uM~iFL9xoe5!$Q##0cVY?KanKN zBOhcnKh)g>1Q|MU-WW6%64*SxQw2ymb?KO8Wz!Z_T#Xh-oZ}@AE_dnl3xx^g$TQvA zBQtR^C^$8L6z4|LxvKnE=cJCkX{4T_F}k88Q0i!nMBX|6G5st`!aal%5m(uu_iDU0 zG?!Fy{^a*c6Olm-eQH+eeV?QHwZiXn^PGoQlfXge#)9ERM4+YU1lq~)B1+Re4x{t; zty^*%?ul;DJYq3LT^GmAw;8SXkX?%2p`p$2B03%8-y@fdpF+uoI;Sr#xG8evtkG0q zS5+@}UR6DJUd{Z`^Io1!ODK<2+@AmP?02TzKl_8lo5#N~&lq$aEo=@=>Rf)X(4|zS zMvnr7FeR9NndVHMf(T050%VjtbCC|LkR=R2NCe6f1^@|a2hgKh+PUf$ZCpPdKw+N2 zJ8wl;cHRo6*{t!wL%kV|lCB(vUH2#%8hUxrzCPhP9ZA2~fsY=x_kRD*(DJ;jF*@E- z$6M*Yi*=;hG<0Z2?nk7pj?0PjyuLUQOQ~F;OE1xXn+xf~S*a#EP0&ZPTA1iNv?esf zm_VuGi#*Yua{p+w^ho~xEaT|VHqh$W2J;9;ms9-=qcj4v1^O_PcGruWOmQDQj`Vj0 zyW_N`ul*M2j(cm~+L{1&+=tF93wOtTG4u>_$Ngw%lV*zh)B87%hPe3{$TUg4P+T9A zL^D5#YV^4%w|p?|O4dEb9S@<^DYJY-8mgt4?x&H~+rsaot)uu9alQ2ze+5pVLLyD@ z!myABdc2=tfLDZ$jL>e-3w?*9k_O-rbPD*@E^MNXAu>WYA8FbS$0QxYaB+ld52|cO zxb~aA%cJose2u=xr|K%QfP6vH%yV?h*y zIgw+*6hq&`u@KsG5IqCOLWzfa=2#fT+`Mp#VM>8g!8`j^(l_39Rs!LeGH@F8DCSNh zkz%we>f+V6@ETAII>hHSq*#3sYeX@u05h*K#V{G-SQ5qX0x-vtDb`rTnoulB#F|np zS;SH()?nBMYvZE1hVbP>xSUTYD{w4B$DVr>MkJ;mCJSOgNoaOK0Bu02)X>y~-m6dOpqguwExZO4D-^tj6f2_G2XxPG(!-~RHr6r2+sDz%D@uEc@E~2cCJ=?s zaxzRW$0Nw~nLxGIkTlo3p8jBRP$x=Mz%2x8frqpvUQjT6@F2k;k_QptdS{DmnbDQP zi3S}BwpB(~0Lv4aJ+@OuQ^gj_y-8^tbfI|tSU_1ehI%-HhaIUmW$FCF$6bzKFM? zFOKQ-#j!PgacrZzuzFD^+*XfcpH1MI^u@6qeQ|70UmQEo7srnD#jz88aqLWA9J|mL zM_2`L>_%T4yVDoP9`wbrCw+13MPD4TlO&GW^u@6^eIIi~>4Pl2qV)}gp(8bpT9 zls+{{Q-Cco-kWBiv`078Rel2;(fY{#6jsbjZS zr_7;iSKmg4u8Xez=2A_&wYq9!GveM_om+AljfNvHZ|!{ZW||ri_Trds6K|R{ zdN{|xPaS)-`qImN6U#LM$pK#0KePj;df;|enU&~ zi=sn9sE!)i?o?HvXmIiIj_{F{Wv>=qRq+GeKa4k;wr?GNQ%j@iH+|xsd9<BeWBH3xsiv=8^h{a&)LBy*YdrfN=j{cDMmcg5T?L2CpxGibIMz5WP-X_B zy!c?<_M~ZdRu@u#dTHf)>MJp$ci$IUFp|Qt#!;wD3PZ2>NZnkhIe)xd)3!R($f6rc zzqI>1nHIM?L1TPvR4p11Y6QoVYzk&MiN5w#ll1JZy9O78x7^Tc123_%S zWDCi@dO3CZm(73k=0(#q?Zq+Sm%mJE$jYs0@6XQ~iMUk_(di(sIMz6pDlb4cs>Qc- zEUpZ7`c4}`nw~y!D^&=Lq4eA?n^{V(BQxHhHuLyM9OKHX@&}M&7SD5`BNkDtw2USD z0@>V>@LUg6KUAjHCDH_=z}XtqsxdbXw)i`G`l2#qZN&yma*I8MoYq_%9{DEXVPK#rX9e zeXE}KP5N&Ky_63)tMu5n!yz$e7JiSou#cvc=r!E%*GTe!2sGpL5F*D5Uug}VCE3J+T7w!%2Q z@8Hw$sH$;vR-Wd1=mbvGwEdKIZh^J6c&b4!v3K;ufOrbv@rTAC*h9vf#y@EPC$qGn zXW?l=Z&W24>iKpKdd`Qh}$-(})Qkd?vA zkA|8B_NG$yq1p@6>j-7e?o5UyD_R?_gF77A!jcuOz3sv(^cexp!6={l5#1`FvQQOJ zonsCHpSc10|8Zc3h(WN`ViToHVR+-T*kqjgxkv$nBqya}%tE~>X12*V^?&+cNnhgO z&N${rv2YRdr&xrD1yC$f!~!X1w#hgxHW{b>KO&rF2ub4E&#_R7QD5zfg;5Mc4(5eZ z43B+|MNo{|sVf#qF>1T6SQN!*2tf0X0Bs2sMGVbbjJb!VWfSM5bC3GeWKh2teTRk` za}WOG1!CxhiK>V?SFN;?I)T4SD}|lW`0R(#fIj=PPHqq92^*xX_V8Wd?pBCNS3Of4 z)353XHy>lNU9`(1S{>}^n2tSalE>)$>QJ{lre|h(Ow(dx+AM^%z`ej$qKOSAAY5$%1_i11J6fxGBjN{4M zmvQgb_7$XkZ+hxs9#a}JmI|EPPYCtsr7pgq&nP?oA1p(k$pY?rVht2eFP zhUcP;;pr%25v1yVu5vNT0O~JeQ3@v^`kg=>2FnJM>*^R?7WEV2lEeBkj~o8lBFrKNQIW^kgc=62<)Oc+yS*rOP?y^VwQXH0PA1ZUE@a$yD zPf-4X3J_GFpn?R2|E}V5Lj)BnDC~B|+;BmmT`-2$z!cg5Q_y^-pzlmU%b9|1GX;%i z3VO^Gw3jL9EK|@_rl6lpK`WVpE;0oT%%PEEKkaAgsH(hjwEbiV#VFuRzUc3gC`Gv) zVnYlWYofrKDzFp<)=YslS750MEKPx7QwKSJEfpC4-AR_i-U%|+T7k7uU~Lsxh62k} zVC@uGdj-}(fpt`1ofKGS1=dA@byZ;96j*l!)YK7Pzy|D zDa!4lw*u>aU(P=idN-k3sdF@-u}3N^zN>VqlN0#hh^rcmNcp`4jQ z=`w{fWeO$96v~e&lp0egE40>L8hM&)8E4#DPjeQF;TC4GFj8o>_Ew^B#fl`(t#P!i z%Q);_k;El%kG^!uP~|D9lw5q2qbmQ?d0FMO#oe?56HIm{*qtt}=e9$^ z?qrt7(`J9Hn~$n8^WjGDwaM-UHwZHy*6TecyIBNTU=6-8&qv+CdgHcR#c2JYm)Z`8 zd!8Sob2(NQ{V-!kU7nCHtF=J_&)T97f!^JNV4d>O+$U&b)cmod!q zWeoFt8N)nZ#xReRG0gL2EP`5RlvD4j9xdgJIfgksij^xtB>UrBj)&-W*a80Pzv zL=5wNS_gMYV!nT&h+!RMiilwygbbc8NvwlR6|rcFO`{mb5nfdO{N#i~l0ikfC~v`q z*BW!Z$xzFbkKpKw6W9V57%E%Rr>5QR|F(`u@CAjEqm>Vrpjuu?>JIsv{+!(<{55(M9!HpGM z^hL~#6Wln#MX$u%c)^VqT=Y-OO%U7!!9`ES+v>G>s;8E=sg^oR~Bgr4!H82+1Icy znfp>;nCZ(H=KL~-*}sgz4j^OA6c}s+vK*`gG6s8rjKOjsW3VB}7_1302D^fc!NMS8 zury}$Ck577fpt+}T@_e21=d}G^-y52fXL+nTZoLo zDq_a0_N64DFqxNT0!f{U%Ixy3;z4a(@Jng}kmletaBxlIKZddl1s!A%idXe@J^ z32rmNh3+!9x!^VzTxcU7 z3NG3VbK41SJHbWkVQzcDZ7;ZJN6hUYxE%x+EsD7v1-GN%qHQs^li+p|T(mOgb{5>u zf{XUX+%AIKMR3vbnA=rwy9zGaAalD3Za2Y2Yh-SB!R;=%XqU|GA-FvR*KMQhDY!ia z*KN1#CAhr=mu;D7t674ZrE~Ed%BBfemDia)e~hyX`=+^X00t|SjKN+dW3XJw7;IQF z)?b0at|iOC!X;y{b;%g4UNQ#zmyE#@CS$OP$r!9-G6p-DjKN|iV|fZJUx5`UutEh^ zq`-zLuwn&PqQHhLuu=(wj=61=*+Sd0g)X}7mc0eHx8OoIxDE6X+&+Q}En#k7!R;%! z&==Zy4iMY{f(vb8?gfH-f#5=~m^)B#2MR7UjJbmZcaY#h z*O)t4a0d%6w2rw$1b2wwLjRbXBe*$&3r%G1P{AE4xX?-F!uQXhjHfcRld)XE%@yZD zPnnx1xOsvLjb(1W;N}Z1beFk!+t#3r>q3heD-_&9aW3?kxkZ9oB)HIQ<_;6wVS)=C zXKu0J77H%4ow+4~TOzp7d*%)o+~I+M(gI5Z{(IrWu-x-5sh{8GBY}T1#i42R8en?o(yCM=B!9 z7u|@hVek&co6eRKUnso2VCO1qgyHtghRq!lV@$Y3Z?45$QJ;I!L>*L_E32WoZcP%WRf{SB!6DFQPVcA(pH1tZQ{)Q<<3MWZW(fM<;=mRVc0^W<-}!W*NwMk9`<}_N#vQC-(j-l z4=l4Vzb{?&ziW0sx9+3<7WdCT$~_djUc$`ob_zf59tyW?*Q=kH(P5Daud9WG`~mKv za3n{&`Ho%~JGPGYQ``8z+kU#5mWi-z)m&P(y4AGIg!W)wmcp`?Ssu$)eG<&eRuL9H zx;*pwQS_8DpC3)jRAup_NDpZF$O}s^w85$Vt6rum(p^d&B;j7B8YbLPn4rQ1g?7VNLu+9QZG%J&8Xri{UCDPu5J${0+PG6ut>8M7`YxR(x~YurMhVN5}< zn1VJj1s!4vn!^53N_6X>X#|hDpROSrci@Sq28E6 zZ83#9VhT0G6zYR1)B;m(GqT%c>^2X(O~G!nFPnJL51e;bwYnj}#Aenp^k*=v$r#LO zG6o}>jKOp!V=$P>Se^pQS6~GStWbd!DX?J*tXP4SD6ruQtW<%GkT9!>*KN*qn{M4^ zTDM8IKc&LD?KZW#&8lt_s@q(OdgC)tTTG#jm_p4kh5BF$wZIh0o+*?#Qz&PqP`XT^ zOqoJSGKKPE3Z=#r%8DtJ5K|}@xSV#=TGF&4;EY^O|3ot%rbu?XgShr0aJ!qrbq}wx zN7EGCp&z|y)Qa(z7wt^|{4C$jG^XEGo9V9%?$xv}9{69Keurpl!g#uDo$kUD5nUBN zp~5TEJ>3lzZy39$yP=ZzA*Q=BhN_h@8aaAk@XD0s$X?=s!7EdigFeX^yfS4BUYRlm zyN`^aEMyF(0U3i=ri?|9(#l&dfR&QCu5XuDaXE&nYhpYi%e=MLH}m#73|N!HWHBt+q3 z!jsR_c-N69n`bo1^z@Cm;}J{?u#4}x`KyUPasxaJn~l$3Z)>eT$2Y=r!@Tpp5hmXV z-E)ML+5OV-Io>)8+v>qL;>E4>n%xVum+G$n-S+cqXbBaxv4Lc?_N!}aIm1|kvV!k{ z+gKArub%_k;cy#kVzl|_0ts^)YYg9nYDckd=sEA3z`hC5k`W8W8X1GJM#f;Qkuex+ zWDLd{8H2G##$c?GF&JxP48|H6gRw@&V62fbOs{1O6Kxs8dasOO<=2cEz6s;trRxDz^6ob)@d43dw zxsGH06oaXgV*wO1ZzVc}e1r^M5bZ9$R(ejy*H*?)$oSdH_zM|-TbTeM z6JRS7C}aX{WrBoEkgZIxkik|6>hcK@G9k7yp+Y9qRwhiygxSi33z=|R85p0rE+TAY z(7&-vq^%74JC=#El|lckxu zhK#{mL&jiMl`(j5$QXP%WDH&%G6w$+8H1;XjKSy}$Cj|zx zs(f9TRb>ojRT+a>RmNael`;65$QZm%WDNc%G6qi+Glu6D^pD$Kl2X?p!`?n<56QMN z&`(aMiLDIum1UaR%0PcvCdF0;`ph!TY-OO|EYsXp2Kvr2skSoEf0jwJl|g%8nHIJ( zXdf)o(pCoTg=JdV%AozQOuDTM+7rvPwv|EqVwpC!GH7os)7Dmo&EC+B3|kpCh(jjR zRtD{puhq_02JMw)+S|&Y{jy94TN$)xmg#6KgZ9lboor>$-dU!ztqj^f%XG1oL4Uw9 zU2SF1Kd?+UTN(5hEYsaq2K@)i^stpdf5I|7ZDrWM4RzYfR)#&_Ad{t(!E==M-lFH| znLIt+=ir%%S6j_}8!&i4$rzR;WDLs^GKOUd8N;%KjA2|;27fCVgXfiu!3Rsm;Eg3?c?v9FffXpQLIqZ&z=kQXVg**Bz=kWZQUx|bft5)Z zo@x9lG;}jtshf~t4?4*7wv~ZCaa-wQD+B#vnZC9%&^MOpXDb8!W10T8GSEks8DJ{| z{bZR7Y-OOYEHltn2Kvh~gKTA>&nz?8RtEabGO$>v=a0~LmdUY|f&R11P+J+a2bRGf zt*Ebs_Q5i_wlZihER$y|gZ9HR`L;4>Pb^blD}(mMGKID>Xm2c2WGjRA$1=lgWzZg3 zrr1^n?UQ9nY-P}1S!TGc4B9Wtl-kOmJ+sURTN$)(_zf?D!fdfMv_QGRFP5d1V)&=mv5zd>uP5}Ds|H2ZEpPqlM2+Q_K{^iQ; zS&B@cB=MJuDC;x)|C|Q;J>tjkB>na+`j3xy=?@Y=_+MSD@Y4oLFKz~y{=Et>Zhjus zo3wxzGw|Z3Sss2{drbS2!pJty_2Q?o*ugJi!oZ7x4?ZDcvBSMzXb26pz}sQkFEm6l z>O-$(j9kb(FnFfQa_m`Xb@GR2sw@Z3R2hS3s*Irx$rw!9GKTw>F?goR7>wL922;0; zMNlJ<{Y4@bSd;>bR$ws-ELMTVDX@42mY~4uDX>HZR$qa^xF+8(jA=3k{rA)sJBDgYNt%}!H2Sw<=mN(av_N29()hprceE=hXBZlK(OvV)2Ht}55fnO6 z=K2ZBUr+&p3KUe3pn?SzBB)S7g$XKLP|#Ms8g!H?XeLw8N2Z{KOhNaUg2pigJ!1;m z#T0akDQFT?&>yDQB#Y8u!z(B@uYzJDDyDeXQuk5i)lJ(%HF>6A^lC6wnKca!PFyTFzv_~OgSZPbP)AImW|%^KFojxR3T4j}N}MS+DWNpja0H6YL!j6QbpG{6 zt3ILc!qnKTW56&KmN86yWeihY8N<|8#xRwYu{;HqufPfvSfK(dQeeXrSg`^tQDDOr zSg8UVAz{!qHtT?5;|(Y_(STw@3@A3Yfa*`FupYDN1Q;7gK(QGF6dOB0q2Blm)D}~y zBc@O@OrbuQLMc#C{w0Tl1!oem_n&Bg|cD_CBziUGM(mh6`2I^H-1{h8Cc-tJqiJ-czuG;@a}J7_K3-aoexA0E&LbT1 zIdr@(gmI*W!5ta%kHU>)k>=y@acrmAP=L0brXiTUM(7-eem<^&83r6s==UgoM`;7d zfh3CDynKBe$v})xi0=Buu?c!wxD&iG$!@4L|E9#e=vo7Hq0^lHN9b8{P?AI`|0UBp z9rvX{5N_zS_H#o``kvVfou0n74XL=#``U(3Eu8(|*uHA|+fF}P!Z7}J7JqvS_5CCM zwst?%N7|Rn?T>3ryYh5pHl|(qn*25XtQv{^_5OzXEdI9EZCfKs|HGei;(P1aj)r}D zz8yi&&%Pb~Iqk;q`OVf%W6=BaKI?zH&$?&3S^3%dcJp^?H|O`k#G`b1Km-L){1N+L z{%Oyfy@$@Xn{(4{{4C=%{O#NK(lX2+F>W*div9fa=l`}Hg?@Fu9i5wY^yiG*epJkN zcxkcPk*zNep+`PH-+^7`51sFPeZJkCn|9-?#hRA!|17(KY8-doZt&-i<5qrmz8#&L zc69#vW4K57kqyuMuBMZ$(FQMoc;zYxI^Yzw3U-&zjbvR@3(SIQ~cN*Wub1F849R-3w)dU{0dxO7bcFcJ=)vOM_6W%Z4DMbsh6NlM!(xn#!QD&7Fnt!-?tU@`cRv|JZz*F~%agH41s0{iq7@h|MtYRm2ACTpa%J6NfVshfYu#IbxgmmU-Bp0Op@M7O zPk^~$f@|GLfVtsFvgOj0*!QD{C;CLuwa6yzYI3vm! z+!AFB4vI1cS4A0v)1r*QeNo2X$S7kO3M^BBwNqg26<7xa)=`0VQed4GSQiD>Re^O= zU~r(6?-#C=G6ttg8H0PJjKR^;jNxek{o}T0eY>CA0K2iG4OrjnXD++8f@^)FpSkSr z3a<5Ce&(_ZEV$OU_?ZihoBPaV_gQeQ@9Z;|U24I#zOBz(cC!W7 z`kp>>q2rt@>l^yag|;)-`ffgRq4&(SzLn2hv;gK>-^XVz+5&T}Z{jl-t%AAMckr2u z_Q721+xN^xOJT0{y?f@O%`n&c#yxYY0o7#$4;$^vp%eW3Kf*dgh`HGS~VBJ#*Qe8MWI;ta0!t$F6M z+cUV<_vM+(uF&9G-;`%AyGMg-eMg?3L)kRNK39JLZtffK9D;+ajKNh_#^5w7V{o69 zvHl7SF14~8oNHwaZniQ8hg%tg>#dBz30KD8jw@qu%#|^?=*k$Jb!9A1f#oZ(0tHs6 zz={;uFa=huz)BR@a0OPXz(y#rG6}c0byYS3qw``nieG8ts&@evN`u;m}p=->wzWL5vXdQE{@4Pb?`o~=B+wRPTCNkIh zo;!1)lgzcg;m%xWCv&auwlf!c%3SMP?aYP7GS~V(J9DAC%(cGB&Rl3QbFJ^NGZ*^I zTs#u~MGIiA_5F0_qAf7j`er(F z(JGj0eJ7o{XdleAzKzaYv=ruA-$Q3E+6;58Z=f?5t%u(|pFk$k240QMXue=}w@)&; z+sD6s2JZG-)b933>r~zCVL5|KKCER}C-8K)kB@OA>kQY=AM9=)r5lSJlqsUZj4iHb z=qPdk(;*x?sZ!|6N8KJyv2**jz16Khp8OoK;&H}r*@vImGKr^q<>A2p)#VXQi*;@N zYb-B*Z*tGaUd(ry;@Gd@)qvhqXZ*Ik4>e%3JeK9ne7N&Bas3Yz(#PBRWK%f&F(CQ85PT5YBMSxUoa9v>-t#?rTz3)z&tPg0ctD- zdQ%L!VV)1g%$vXV(_0bq@Me^GL9rh_ijDIEh-Y3<>}Od}?5B4W7(Af;U7#;5{zB)* zXl+h+X)!{-5q`HOCHni82o~jMikK`RN&bOg+(uOjqdqWqJL0=!AKd=qG7jeD~8PA>n z+cp%bsoM|+a>jEgO7R?uaxMRxpF@2#thv{a84XI*_axu`^jtXC&m^q(+dY$33!djQ zX^r3o(evs$5euf+^&%ERu^U8;{>4$dQN+S1wpPT#DRz^HVPbl-h(%Hi+n2+QW;8vJ zW9TnObvGI^+j!F?8n4;#$M!XXQ2oJ-CPY+-XFH8N+4#_PfxpcG;}(pMu+I>>C^(i- zanY!Yw3GrI12CHBeSY9Fr|IJpUbyGCf1%Nsmf(pF|ByI3##2ae#jyxop8`fv4JkCD z(3k>b&wu`JOCXS5sG&En!`FH3MV0Gy{%iO~@Aac!x@#u=g>5Y<$PRM%!spLE>KBEA z(q}&fy8iFTik=S_PTisY+3&)Qql`nyavsO^^uXKCagcT0=kL&4__6-3F*l7W29@y8*$I0RURqs#}B$F{a|~2>3;3ypf9*?V_jeAcuMJ- z(xdZ?``A%?EFAO4K<)Y7JXyPM@hrFfVW50~O_UooE_DaE6tc(fFck>atYINPuEDmuvz6a>yh@(0ztf9Y*M z9M7E;asQeCtySvdA7&8t2nBx%;18rgpXxmN!LxTb1w3;nQ9%99rGV${5(;?6Vw`1s zaK%UHBs_P0=p^V9(nwi(YuT-|{h$%Ay<~S)hbm1U{b);$t@Z5-Y4Jlbbx8tKDyqJhk!@|aGD j`_qL=z&wI+bL^>l#JU=lbB;czd;N2CS&_`&`TGA4jbrq( literal 0 HcmV?d00001 From f6b167799a230f3e29f10c76fbd498d3d705d4c7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 22 Aug 2022 17:08:55 +0800 Subject: [PATCH 127/397] =?UTF-8?q?=E5=8E=BB=E6=8E=89type=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java index db2d4d8de5..c821fd007f 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java @@ -20,7 +20,6 @@ public class YearSearchFormDTO implements Serializable { @NotBlank(message = "yearId不能为空",groups = YearSearchForm.class) private String yearId; - @NotBlank(message = "type不能为空",groups = YearSearchForm.class) private String type; private String staffId; From a97c1206b36cc796bb6e1a8163d3ce9f0efda121 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 17:15:34 +0800 Subject: [PATCH 128/397] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9A=84=E5=89=8D3=E5=A4=A9=E6=8F=90?= =?UTF-8?q?=E9=86=92=EF=BC=9A=E6=82=A8=E6=9C=89=E4=B8=80=E4=B8=AA=E6=B4=BB?= =?UTF-8?q?=E5=8A=A83=E5=A4=A9=E5=90=8E=E5=8D=B3=E5=B0=86=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/dao/IcPartyActDao.java | 2 ++ .../service/impl/IcPartyActServiceImpl.java | 19 ++++++++++++++++--- .../mapper/partyOrg/IcPartyActDao.xml | 15 +++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 5426dfc9e4..e8b0f11dfc 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -44,4 +44,6 @@ public interface IcPartyActDao extends BaseDao { int deleteIcPartyAct(@Param("customerId") String customerId, @Param("userId")String userId, @Param("icPartyActId")String icPartyActId); List selectresiPartyActList(IcPartyActListFormDTO formDTO); + + List selectNeedRemindAutoPublishAct(String afterThreeDayDate); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 347f62a79d..a10b817418 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -663,9 +663,22 @@ public class IcPartyActServiceImpl extends BaseServiceImpl list=baseDao.selectNeedRemindAutoPublishAct(dateId); + for(IcPartyActEntity act:list){ + PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); + msg.setCustomerId(act.getCustomerId()); + msg.setIcPartyActId(act.getId()); + msg.setType("remind"); + SendMqMsgUtil.build() + .openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class)) + .sendRocketMqMsg(SystemMessageType.PARTY_MEETING_MESSAGE, msg); + } } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 414f5ca590..7ed122e31a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -205,4 +205,19 @@ where customerId=#{customerId} and id=#{icPartyActId} + + \ No newline at end of file From 3bf1d863e7264100032d04875a01519ed30d7d24 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 17:33:14 +0800 Subject: [PATCH 129/397] no message --- .../com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java | 1 + .../src/main/java/com/epmet/util/dh/DhDeviceUtil.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java index ebf5832ca8..a73d022548 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java @@ -163,6 +163,7 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl Date: Mon, 22 Aug 2022 17:45:20 +0800 Subject: [PATCH 130/397] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=91=E6=8A=A4=E7=85=A7=E6=AD=A3=E5=88=99=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/utils/IdCardRegexUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java index bc56e52604..d44e9bb3fb 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java @@ -25,7 +25,7 @@ public class IdCardRegexUtils { /** * 9位护照 */ - private static final Pattern PATTERN_9_PASSPORT = Pattern.compile("^\\w{2}\\d{7}$|^\\w{1}\\d{8}$"); + private static final Pattern PATTERN_9_PASSPORT = Pattern.compile("^[a-zA-Z]{2}\\d{7}$|^[a-zA-Z]{1}\\d{8}$"); private String inputText; From 8a278fc79ec5e7417c2c6abd5f781c3ca104b23c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 17:55:01 +0800 Subject: [PATCH 131/397] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/task/AutoPublishIcPartyActTask.java | 14 +++++++++- .../feign/ResiPartyMemberOpenFeignClient.java | 13 +++++++++- ...esiPartyMemberOpenFeignClientFallback.java | 7 ++++- .../controller/IcPartyActController.java | 16 +++++++++--- .../modules/partyOrg/dao/IcPartyActDao.java | 4 ++- .../partyOrg/service/IcPartyActService.java | 10 ++++++- .../service/impl/IcPartyActServiceImpl.java | 26 ++++++++++++++++++- .../mapper/partyOrg/IcPartyActDao.xml | 17 ++++++++---- 8 files changed, 93 insertions(+), 14 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java index 531f41ebeb..d1a9c7a250 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java @@ -1,5 +1,9 @@ package com.epmet.task; +import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** @@ -7,8 +11,11 @@ import org.springframework.stereotype.Component; * @Author yzm * @Date 2022/8/22 15:13 */ +@Slf4j @Component("autoPublishIcPartyActTask") public class AutoPublishIcPartyActTask implements ITask { + @Autowired + private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient; /** * 活动时间2022-08-15 10:30 选择的是提前3天自动发布 * 本任务是自动发布活动 @@ -18,7 +25,12 @@ public class AutoPublishIcPartyActTask implements ITask { */ @Override public void run(String params) { - + Result result=resiPartyMemberOpenFeignClient.autoPublishIcPartyAct(); + if(result.success()){ + log.info("autoPublishIcPartyActTask执行成功"); + }else{ + log.info("autoPublishIcPartyActTask执行失败"); + } } } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index cae69c38a0..a1b68eaff8 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -145,6 +145,17 @@ public interface ResiPartyMemberOpenFeignClient { @PostMapping("/resi/partymember/icPartyOrg/getPartyOrgList") Result> getPartyOrgList(); - @PostMapping("/resi/partymember/icPartyAct/noticePartyActAutoPublishTask") + /** + * 您有一个活动3天后即将自动发布 + * @return + */ + @PostMapping("/resi/partymember/icPartyAct/noticePartyActAutoPublish") Result noticePartyActAutoPublishTask(); + + /** + * 自动发布党组织活动 + * @return + */ + @PostMapping("/resi/partymember/icPartyAct/autoPublishIcPartyAct") + Result autoPublishIcPartyAct(); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index 585e531797..a8d8240645 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -117,6 +117,11 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp @Override public Result noticePartyActAutoPublishTask() { - return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "noticePartyActAutoPublishTask"); + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "noticePartyActAutoPublish"); + } + + @Override + public Result autoPublishIcPartyAct() { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "autoPublishIcPartyAct"); } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 1ed8b5f813..2daee1b686 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -299,9 +299,19 @@ public class IcPartyActController { * 通知：您有一个活动3天后即将自动发布 * @return */ - @PostMapping("noticePartyActAutoPublishTask") - public Result noticePartyActAutoPublishTask(){ - icPartyActService.noticePartyActAutoPublishTask(); + @PostMapping("noticePartyActAutoPublish") + public Result noticePartyActAutoPublish(){ + icPartyActService.noticePartyActAutoPublish(); + return new Result(); + } + + /** + * 自动发布活动 + * @return + */ + @PostMapping("autoPublishIcPartyAct") + public Result autoPublishIcPartyAct(){ + icPartyActService.autoPublishIcPartyAct(); return new Result(); } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index e8b0f11dfc..5ab4ed61e3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -45,5 +45,7 @@ public interface IcPartyActDao extends BaseDao { List selectresiPartyActList(IcPartyActListFormDTO formDTO); - List selectNeedRemindAutoPublishAct(String afterThreeDayDate); + List selectNeedRemindAutoPublishAct(String dateId); + + List selectNoPublishList(String dateId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index a8e150b79a..e1aeee4a8a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -110,5 +110,13 @@ public interface IcPartyActService extends BaseService { PageData list(IcPartyActListFormDTO formDTO); - void noticePartyActAutoPublishTask(); + /** + * 通知：您有一个活动3天后即将自动发布 + */ + void noticePartyActAutoPublish(); + + /** + * 自动发布活动 + */ + void autoPublishIcPartyAct(); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index a10b817418..7b29fc8cc5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -661,8 +661,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } + /** + * 通知：您有一个活动3天后即将自动发布 + */ @Override - public void noticePartyActAutoPublishTask() { + public void noticePartyActAutoPublish() { Date nowDate=new Date(); Date afterThreeDayDate=DateUtils.calDateBaseDay(nowDate,3); // log.info("现在时间:"+DateUtils.format(nowDate,"yyyy-MM-dd HH:mm:ss")+";3天后="+DateUtils.format(afterThreeDayDate,"yyyy-MM-dd HH:mm:ss")); @@ -681,4 +684,25 @@ public class IcPartyActServiceImpl extends BaseServiceImpl list=baseDao.selectNoPublishList(dateId); + for(IcPartyActEntity act:list){ + //置为已发布 + act.setIsPublish(NumConstant.ONE_STR); + baseDao.updateById(act); + PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); + msg.setCustomerId(act.getCustomerId()); + msg.setIcPartyActId(act.getId()); + msg.setType("publish"); + SendMqMsgUtil.build() + .openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class)) + .sendRocketMqMsg(SystemMessageType.PARTY_MEETING_MESSAGE, msg); + } + } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 7ed122e31a..f7d256aa49 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -209,15 +209,22 @@ + \ No newline at end of file From 634ed4de8c5f15e7f7103fdc147b19fd0cc056d7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 18:06:29 +0800 Subject: [PATCH 132/397] pids --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 7b29fc8cc5..2ac398d27a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -12,7 +12,9 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; @@ -173,8 +175,9 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Mon, 22 Aug 2022 18:28:53 +0800 Subject: [PATCH 133/397] =?UTF-8?q?=E5=8E=BB=E6=8E=89agencyid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/util/dh/DhDeviceUtil.java | 2 +- .../src/main/resources/mapper/IcResiCollectVisitorDao.xml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java index 663299fc58..dd6f82f6f1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java @@ -706,7 +706,7 @@ public class DhDeviceUtil { cardFormDTO.setCardType("0"); cardFormDTO.setCategory("0"); cardFormDTO.setCardStatus("ACTIVE"); - cardFormDTO.setStartDate(LocalDate.now().toString()); + cardFormDTO.setStartDate(LocalDate.now().minusDays(1L).toString()); cardFormDTO.setEndDate(LocalDate.now().plusDays(1L).toString()); String pwd; try { diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml index 35189406b9..d2072275f2 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml @@ -148,9 +148,7 @@ AND CREATED_TIME <= #{endTime} - - AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%') - + order by CREATED_TIME desc From 8134ec613d412601292ddca62994d741c1d87a08 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 09:00:47 +0800 Subject: [PATCH 134/397] joinOrgName --- .../epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java index c87e466c3a..d628ccc457 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java @@ -1,13 +1,10 @@ package com.epmet.modules.partyOrg.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 参加活动党组织表 * @@ -36,6 +33,8 @@ public class IcPartyActOrgEntity extends BaseEpmetEntity { */ private String joinOrgId; + private String joinOrgName; + /** * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 */ From a907f2ef57bf7575903bc48a3b02bddc4caaa1df Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 09:17:45 +0800 Subject: [PATCH 135/397] orgIdPath --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 2ac398d27a..4f50089f27 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -7,6 +7,7 @@ import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; 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.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -177,7 +178,12 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Tue, 23 Aug 2022 09:29:42 +0800 Subject: [PATCH 136/397] customer_id --- .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index f7d256aa49..e37644645a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -202,7 +202,7 @@ set del_flag='1', UPDATED_BY=#{userId}, UPDATED_TIME=now() - where customerId=#{customerId} + where customer_id=#{customerId} and id=#{icPartyActId} From 1a425efc2c3205955b9cfb54d720bd5781922daf Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 23 Aug 2022 09:45:50 +0800 Subject: [PATCH 137/397] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/result/YearSearchDetailResultDTO.java | 1 + .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java index 24ff5a1061..ef6c80ed65 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java @@ -17,6 +17,7 @@ public class YearSearchDetailResultDTO implements Serializable { private static final long serialVersionUID = 8961924457475202790L; private String type; + private String typeValue; private String frequency; private List activityList; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 4f50089f27..07c6942eec 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -417,7 +417,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl { if (at.getValue().equals(type)){ - dto.setType(at.getLabel()); + dto.setType(type); + dto.setTypeValue(at.getLabel()); dto.setFrequency(at.getFrequencyDesc()); } }); From d3b2108359325adfc471b290b0939b5ab087b1e1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 09:59:43 +0800 Subject: [PATCH 138/397] =?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/icpartyact/result/IcPartyActPageResultDTO.java | 2 ++ .../partyOrg/controller/IcPartyActController.java | 4 ++-- .../modules/partyOrg/excel/IcPartyActExpoprtExcel.java | 10 +++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java index 1fe0c4254a..f28f8a0083 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java @@ -77,5 +77,7 @@ public class IcPartyActPageResultDTO implements Serializable { private String joinUserTypeName; private List joinOrgList; + //导出用 + private String joinOrgNameStr; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 2daee1b686..eec51412b1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -263,11 +263,11 @@ public class IcPartyActController { List list = null; do { data = icPartyActService.pageList(formDTO); - list = ConvertUtils.sourceToTarget(data.getList(), IcPartyActExpoprtExcel.class); - list.forEach(l->{ + data.getList().forEach(l->{ List orgNameList = l.getJoinOrgList().stream().map(m -> m.getJoinOrgName()).distinct().collect(Collectors.toList()); l.setJoinOrgNameStr(orgNameList.stream().map(String::valueOf).collect(Collectors.joining(","))); }); + list = ConvertUtils.sourceToTarget(data.getList(), IcPartyActExpoprtExcel.class); formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); excelWriter.write(list, writeSheet); } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java index 06dc61ed31..995682ec4e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java @@ -3,11 +3,9 @@ package com.epmet.modules.partyOrg.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO; import lombok.Data; import java.util.Date; -import java.util.List; /** * @Description @@ -19,7 +17,7 @@ public class IcPartyActExpoprtExcel { /** * 活动主题 */ - @ExcelProperty(value = "活动主题") + @ExcelProperty(value = "活动主题11") @ColumnWidth(20) private String topic; @@ -67,13 +65,11 @@ public class IcPartyActExpoprtExcel { private String isPublishName; @ExcelProperty(value = "参加人员") - @ColumnWidth(8) + @ColumnWidth(12) private String joinUserTypeName; @ExcelProperty(value = "参加活动党组织") - @ColumnWidth(40) + @ColumnWidth(80) private String joinOrgNameStr; - - private List joinOrgList; } From 671329c310d7904064823348cd7013cb71d283b0 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 23 Aug 2022 10:06:36 +0800 Subject: [PATCH 139/397] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcNeighborHoodDTO.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/IcNeighborHoodDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java index 67b2af7180..dbf18ee25a 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 @@ -152,6 +152,6 @@ public class IcNeighborHoodDTO implements Serializable { /** * 楼栋名 */ - private Integer buildingName; + private String buildingName; } From 4b3d076a23c6158dfde5e4d1f909bea3134a99f4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 10:06:44 +0800 Subject: [PATCH 140/397] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 8 +++++++- .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 1 + .../main/resources/mapper/partyOrg/IcPartyActOrgDao.xml | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 07c6942eec..7c728bd892 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -84,7 +84,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl{ //删除活动主表和参与活动党组织关系表记录 + //只有本人发布的活动才可以删除 baseDao.deleteIcPartyAct(customerId,userId,icPartyActId); icPartyActOrgDao.updateToDel(userId,icPartyActId); + //删除签到记录 + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(IcPartyActSignInRecordEntity::getIcPartyActId,icPartyActId); + icPartyActSignInRecordDao.delete(queryWrapper); }); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index e37644645a..ea2a3ccb8b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -204,6 +204,7 @@ UPDATED_TIME=now() where customer_id=#{customerId} and id=#{icPartyActId} + and PUBLISH_STAFF_ID=#{userId} + diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index c6136f2202..d340a5bb16 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -157,5 +157,23 @@ ORDER BY temp.sort ASC + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgTreeListDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgTreeListDTO.java index 862d5e6c58..cdf2d7a80d 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgTreeListDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgTreeListDTO.java @@ -23,7 +23,7 @@ public class PartyOrgTreeListDTO implements Serializable { * 客户Id (customer.id) */ private String customerId; - + private String staffId; /** * 党组织pid */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index 73b7b83e0f..0d43188623 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -114,6 +114,7 @@ public class IcPartyOrgController { @PostMapping("getOrgTreeHaveGroup") public Result> getOrgTreeHaveGroup(@LoginUser TokenDto tokenDto,PartyOrgTreeListDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icPartyOrgService.getOrgTreeHaveGroup(formDTO)); } 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 00355dedd4..37bbbb48d0 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 @@ -204,8 +204,10 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl>> groupResult = resiGroupOpenFeignClient.getBranchGroupList(); + if (!groupResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询支部小组错误", "查询支部小组错误"); + } for (String id : ids) { //判断该组织是否有下级党组织 List orgList = baseDao.selectAllByOrgId(id); @@ -217,6 +219,10 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl getOrgTreeHaveGroup(PartyOrgTreeListDTO formDTO) { + if (StringUtils.isBlank(formDTO.getAgencyId())) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + } List list = baseDao.getSearchTreelist(formDTO); Result>> groupResult = resiGroupOpenFeignClient.getBranchGroupList(); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 1a7bbfadb6..c5c56bfef8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -110,7 +110,7 @@ where DEL_FLAG=0 and CUSTOMER_ID=#{customerId} - AND( AGENCY_PIDS LIKE concat('%',#{agencyId}, '%' ) + AND( AGENCY_ID=#{agencyId} OR AGENCY_PIDS LIKE concat('%',#{agencyId}, '%' ) or (PARTY_ORG_TYPE = '5' and AGENCY_ID=#{agencyId})) From b9580f98137a793c333c4bd609a032b3ef8f5bde Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 23 Aug 2022 14:00:54 +0800 Subject: [PATCH 146/397] =?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/dto/form/IcMessageListFormDTO.java | 2 +- .../dto/partyOrg/form/IcPartyActListFormDTO.java | 2 +- .../partymember/dto/partyOrg/form/PartyActSignFormDTO.java | 2 +- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- .../partymember/service/impl/IcPartyMemberServiceImpl.java | 6 +++++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java index b498576824..685fd340ad 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java @@ -11,7 +11,7 @@ public class IcMessageListFormDTO implements Serializable { private Integer pageNo = 1; private Integer pageSize = 20; - private Boolean isPage = false; + private Boolean isPage = true; //token中信息 private String customerId; private String userId; diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java index c78a205625..8897dcf2ec 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java @@ -20,7 +20,7 @@ public class IcPartyActListFormDTO implements Serializable { private Integer pageNo = 1; private Integer pageSize = 20; - private Boolean isPage = false; + private Boolean isPage = true; //token中信息 private String customerId; diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java index 1e647cad6d..45726dab7f 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java @@ -33,7 +33,7 @@ public class PartyActSignFormDTO implements Serializable { private Integer pageNo = 1; private Integer pageSize = 20; - private Boolean isPage = false; + private Boolean isPage = true; //token中信息 private String customerId; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 7c728bd892..3088fba618 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -580,7 +580,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl result = epmetMessageOpenFeignClient.unReadCount(tokenDto.getUserId()); From 0b262f29fda1057336837451586f2acb778fcef4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 14:12:37 +0800 Subject: [PATCH 147/397] =?UTF-8?q?publishOrgPath=E3=80=81joinOrgPath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/IcPartyActAddOrUpdateFormDTO.java | 3 +- .../dto/partyOrg/result/IcPartyOrgInfo.java | 33 ++++++++++ .../controller/IcPartyActController.java | 6 ++ .../partyOrg/service/IcPartyOrgService.java | 8 +++ .../service/impl/IcPartyActServiceImpl.java | 46 +++++++++----- .../service/impl/IcPartyOrgServiceImpl.java | 62 +++++++++++++++++-- 6 files changed, 139 insertions(+), 19 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgInfo.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index f6b234276b..e9d0c8bedb 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -94,7 +94,8 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { private String longitude; /** - * 活动开始前几天 + * 活动开始前几天,字典接口返回的 + * 0,1,3,5,7天 */ @NotNull(message = "自动发布时间不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) private Integer autoPublicType; diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgInfo.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgInfo.java new file mode 100644 index 0000000000..5aba21de9a --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgInfo.java @@ -0,0 +1,33 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/23 13:10 + */ +@Data +public class IcPartyOrgInfo implements Serializable { + /** + * 党组织ID + */ + private String id; + /** + * 党组织的上级ID,没有上级时为0 + */ + private String orgPid; + /** + * 党组织名称 + */ + private String partyOrgName; + + /** + * 党组织的id全路径（包含自身） + */ + private String partyOrgIdPath; + private String partyOrgNamePath; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index eec51412b1..dc9da8f9a3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -238,6 +238,12 @@ public class IcPartyActController { return new Result>().ok(icPartyActService.yearSearch01(formDTO)); } + /** + * 【党建日历】生成年度活动计划查询 + * @param tokenDto + * @param formDTO + * @return + */ @PostMapping("yearSearch") public Result> yearSearch(@LoginUser TokenDto tokenDto, @RequestBody YearSearchFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, YearSearchFormDTO.YearSearchForm.class); 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 defd146e01..3bd50cf946 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 @@ -10,6 +10,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; import com.epmet.resi.partymember.dto.partyOrg.result.DefaultPartyOrgResDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgInfo; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import java.util.List; @@ -136,4 +137,11 @@ public interface IcPartyOrgService extends BaseService { * @return */ DefaultPartyOrgResDTO defaultPartyOrg(String customerId, String userId); + + /** + * 查询党组织partyOrgIdPath + * @param icPartyOrgId + * @return + */ + IcPartyOrgInfo queryIcPartyOrgInfo(String icPartyOrgId); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 7c728bd892..dc1733f430 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -174,9 +174,15 @@ public class IcPartyActServiceImpl extends BaseServiceImpl addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO) { CustomerStaffInfoCacheResult staffInfo=queryStaffInfo(formDTO.getCustomerId(),formDTO.getPublishStaffId()); IcPartyActEntity icPartyActEntity= ConvertUtils.sourceToTarget(formDTO,IcPartyActEntity.class); + //计算好自动发布的时间 icPartyActEntity.setAutoPublicTime(DateUtils.calDateBaseDay(formDTO.getHoldTime(),formDTO.getAutoPublicType())); icPartyActEntity.setPublishStaffName(staffInfo.getRealName()); icPartyActEntity.setOrgId(staffInfo.getAgencyId()); + + //!!!!!!!不用前端传的了。 我自己查询吧 + IcPartyOrgInfo icPartyOrgInfo=SpringContextUtils.getBean(IcPartyOrgService.class).queryIcPartyOrgInfo(formDTO.getPublishPartyOrgId()); + icPartyActEntity.setPublishOrgPath(icPartyOrgInfo.getPartyOrgIdPath()); + AgencyInfoCache agencyInfoCache= CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId()); icPartyActEntity.setPid(agencyInfoCache.getPid()); if(StringUtils.isBlank(agencyInfoCache.getPid())||NumConstant.ZERO_STR.equals(agencyInfoCache.getPid())){ @@ -194,7 +200,9 @@ public class IcPartyActServiceImpl extends BaseServiceImpl{ joinOrg.setCustomerId(formDTO.getCustomerId()); joinOrg.setIcPartyActId(icPartyActEntity.getId()); + //!!!!!!!不用前端传的了。 我自己查询吧 + IcPartyOrgInfo joinPartyOrgInfo=SpringContextUtils.getBean(IcPartyOrgService.class).queryIcPartyOrgInfo(joinOrg.getId()); + joinOrg.setJoinOrgPath(joinPartyOrgInfo.getPartyOrgIdPath()); icPartyActOrgDao.insert(joinOrg); }); + //批量新增附件 List attachmentEntityList=ConvertUtils.sourceToTarget(formDTO.getAttachmentList(),ResiPartymemberAttachmentEntity.class); int attSort = 1; @@ -227,10 +240,9 @@ public class IcPartyActServiceImpl extends BaseServiceImpl map=new HashMap<>(); - map.put("icPartyActId",icPartyActEntity.getId()); - //已经发布的，编辑需要发消息 - if(sendMsg){ + + //已经发布的活动+且活动未开始的，编辑后需要发消息 + if (sendMsg && icPartyActEntity.getHoldTime().compareTo(new Date()) < 1) { PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); msg.setCustomerId(formDTO.getCustomerId()); msg.setIcPartyActId(icPartyActEntity.getId()); @@ -239,6 +251,9 @@ public class IcPartyActServiceImpl extends BaseServiceImpl map=new HashMap<>(); + map.put("icPartyActId",icPartyActEntity.getId()); return map; } @@ -446,7 +461,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyOrgService { @@ -402,4 +401,59 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl pids=new ArrayList<>(); + pids.add(icPartyOrgId); + + List names=new ArrayList<>(); + names.add(orgEntity.getPartyOrgName()); + + Map map=getPartyOrgIdPath(pids,names,orgEntity.getOrgPid()); + String partyOrgIdPath = map.containsKey("idPath") ? map.get("idPath") : StrConstant.EPMETY_STR; + String partyOrgNamePath = map.containsKey("namePath") ? map.get("namePath") : StrConstant.EPMETY_STR; + orgInfo.setPartyOrgIdPath(partyOrgIdPath); + orgInfo.setPartyOrgNamePath(partyOrgNamePath); + } + return orgInfo; + } + + private Map getPartyOrgIdPath(List pids,List names,String pid) { + Map map=new HashMap<>(); + IcPartyOrgEntity orgEntity=baseDao.selectById(pid); + if(null==orgEntity){ + return map; + } + pids.add(pid); + names.add(orgEntity.getPartyOrgName()); + if(StringUtils.isNotBlank(orgEntity.getOrgPid())&&!NumConstant.ZERO_STR.equals(orgEntity.getOrgPid())){ + return getPartyOrgIdPath(pids,names,orgEntity.getOrgPid()); + } + //倒序排列 + Collections.reverse(pids); + Collections.reverse(names); + + map.put("idPath", StringUtils.join(pids.toArray(),StrConstant.COLON)); + map.put("namePath", StringUtils.join(names.toArray(),StrConstant.HYPHEN)); + return map; + } } From 9be98f2392d000d25ed752b4246056bd714f1910 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 14:14:31 +0800 Subject: [PATCH 148/397] =?UTF-8?q?publishOrgPath=E3=80=81joinOrgPath2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java | 3 ++- .../epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index e9d0c8bedb..12beafec58 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -126,7 +126,8 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { /** * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ - @NotBlank(message = "publishOrgPath不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + // @NotBlank(message = "publishOrgPath不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + // 后端接口内部去赋值，无需前端传入了 private String publishOrgPath; /** diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java index 383cd43417..02e746aca3 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java @@ -40,7 +40,8 @@ public class JoinOrgDTO implements Serializable { /** * PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ - @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class}) + // @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class}) + // 后端接口内部去赋值，无需前端传入了 private String joinOrgPath; //接口内部赋值 From 1db5a91cfc7af2a3f10557d9d6ec0cefa054eac5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 23 Aug 2022 14:15:59 +0800 Subject: [PATCH 149/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constants/ImportTaskConstants.java | 2 + .../dto/result/GridInfoByNameResultDTO.java | 41 +++ .../controller/CustomerAgencyController.java | 12 + .../java/com/epmet/dao/CustomerAgencyDao.java | 3 + .../epmet/service/CustomerAgencyService.java | 9 + .../impl/CustomerAgencyServiceImpl.java | 7 + .../resources/mapper/CustomerAgencyDao.xml | 14 + .../form/GridInfoVaccinePrarmeterFormDTO.java | 31 ++ .../IcVaccinePrarmeterController.java | 54 +++ .../epmet/excel/IcVaccinePrarmeterExcel.java | 6 +- .../excel/IcVaccinePrarmeterImportExcel.java | 95 ++++++ .../com/epmet/feign/GovOrgFeignClient.java | 11 + .../fallback/GovOrgFeignClientFallBack.java | 6 + .../IcPointNucleicMonitoringService.java | 4 +- .../service/IcVaccinePrarmeterService.java | 13 +- .../impl/IcVaccinePrarmeterServiceImpl.java | 323 +++++++++++++++++- 16 files changed, 619 insertions(+), 12 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoByNameResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.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 2108042cd6..3136aea839 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 @@ -23,6 +23,8 @@ public interface ImportTaskConstants { String BIZ_TYPE_IC_ENTERPRISE="ic_enterprise"; String IC_POINT_NUCLEIC_MONITORING = "ic_point_nucleic_monitoring"; String IC_POINT_VACCINES_INOCULATION = "ic_point_vaccines_inoculation"; + // 新冠病毒疫苗接种人员信息台账 + String IC_VACCINE_PRARMETER = "ic_vaccine_prarmeter"; /** * 核酸检测 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoByNameResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoByNameResultDTO.java new file mode 100644 index 0000000000..fd91d086b5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoByNameResultDTO.java @@ -0,0 +1,41 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 网格所属组织基本信息 + * @Author wgf + * @Date 2020/4/26 22:35 + */ +@Data +public class GridInfoByNameResultDTO implements Serializable { + private static final long serialVersionUID = 4360690752084258055L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 网格组织ID + */ + private String deptId; + + /** + * 网格名称 + */ + private String deptName; + + /** + * 网格的上级组织 + */ + private String pid; + + /** + * 网格的所有上级组织 + */ + private String pids; +} + 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 73316bad52..c1aba9bb3c 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 @@ -475,6 +475,18 @@ public class CustomerAgencyController { return customerAgencyService.getCommunityInfo(formDTO); } + /** + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author wgf + * @Description 根据网格名称查询所属组织信息 + * @Date 2022/6/21 22:41 + **/ + @PostMapping("getGridInfoByGridName") + public Result getGridInfoByGridName(@RequestBody GridInfoVaccinePrarmeterFormDTO formDTO) { + return customerAgencyService.getGridInfoByGridName(formDTO); + } + /** * @param userId * @return com.epmet.commons.tools.utils.Result 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 b54b4a28b7..37e8d93c98 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 @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.dto.form.GridInfoVaccinePrarmeterFormDTO; import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.form.OrgTreeByUserAndTypeFormDTO; import com.epmet.dto.result.*; @@ -352,6 +353,8 @@ public interface CustomerAgencyDao extends BaseDao { CommunityInfoResultDTO getCommunityInfo(OrgInfoPointFormDTO formDTO); + GridInfoByNameResultDTO getGridInfoByGridName(GridInfoVaccinePrarmeterFormDTO formDTO); + CommunityInfoResultDTO getCommunityInfoByUserId(@Param("userId") String userId); /** 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 bec4188167..e71189e0ad 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 @@ -327,6 +327,15 @@ public interface CustomerAgencyService extends BaseService **/ Result getCommunityInfo(OrgInfoPointFormDTO formDTO); + /** + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author wgf + * @Description 根据网格名称查询所属组织信息 + * @Date 2022/6/21 22:41 + **/ + Result getGridInfoByGridName(GridInfoVaccinePrarmeterFormDTO formDTO); + /** * @param userId * @return com.epmet.commons.tools.utils.Result 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 f2c0392dc7..760f9690ad 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 @@ -1580,6 +1580,13 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl().ok(communityInfoResultDTO); } + @Override + public Result getGridInfoByGridName(GridInfoVaccinePrarmeterFormDTO formDTO) { + GridInfoByNameResultDTO gridInfoByNameResultDTO = baseDao.getGridInfoByGridName(formDTO); + + return new Result().ok(gridInfoByNameResultDTO); + } + @Override public Result getCommunityInfoByUserId(String userId) { CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfoByUserId(userId); 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 acf894391f..42cb8d69dc 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 @@ -916,6 +916,20 @@ limit 1 + + diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index a1b68eaff8..de72c34234 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -3,6 +3,7 @@ package com.epmet.resi.partymember.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO; @@ -158,4 +159,7 @@ public interface ResiPartyMemberOpenFeignClient { */ @PostMapping("/resi/partymember/icPartyAct/autoPublishIcPartyAct") Result autoPublishIcPartyAct(); + + @PostMapping("/resi/partymember/icPartyAct/act-detail/{icPartyActId}") + Result actDetail(@PathVariable("icPartyActId")String icPartyActId); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index a8d8240645..2a167d2af9 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO; @@ -124,4 +125,9 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp public Result autoPublishIcPartyAct() { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "autoPublishIcPartyAct"); } + + @Override + public Result actDetail(String icPartyActId) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "actDetail"); + } } From bc9858976661d746d5fc319075631995063aff4d Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 23 Aug 2022 14:52:03 +0800 Subject: [PATCH 153/397] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=91=E8=AF=81=E4=BB=B6=E9=94=99=E8=AF=AF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java | 2 +- .../src/main/java/com/epmet/dto/IcFollowUpRecordDTO.java | 2 +- .../src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java | 2 +- .../main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java | 4 ++-- .../src/main/java/com/epmet/dto/form/IcNoticeFormDTO.java | 2 +- .../src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java | 2 +- .../src/main/java/com/epmet/dto/form/PageFollowUpFormDTO.java | 4 ++-- .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 2 +- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java index 3414805602..74dce9f16f 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java @@ -31,7 +31,7 @@ public class SaveOrUpdateParyMemberFormDTO implements Serializable { @NotBlank(message = "姓名不能为空", groups = {AddUserShowGroup.class}) private String name; - @NotBlank(message = "身份证不能为空", groups = {AddUserShowGroup.class}) + @NotBlank(message = "证件号不能为空", groups = {AddUserShowGroup.class}) private String idCard; @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class}) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcFollowUpRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcFollowUpRecordDTO.java index aba428a576..89950e63c0 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcFollowUpRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcFollowUpRecordDTO.java @@ -67,7 +67,7 @@ public class IcFollowUpRecordDTO implements Serializable { */ @ColumnWidth(25) @ExcelProperty("身份证号") - @NotBlank(message = "身份证号不能为空", groups = {AddUserRequired.class}) + @NotBlank(message = "证件号不能为空", groups = {AddUserRequired.class}) private String idCard; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java index 482ef97839..cca2734f9c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java @@ -56,7 +56,7 @@ public class AddIcVaccineFormDTO implements Serializable { /** * 身份证号 */ - @NotBlank(message = "身份证号不能为空", groups = Vaccine.class) + @NotBlank(message = "证件号不能为空", groups = Vaccine.class) private String idCard; /** * 接种时间 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java index bcb62d6b45..083658ffda 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java @@ -71,8 +71,8 @@ public class IcMoveInAddEditFormDTO implements Serializable { /** * 身份证号 */ - @NotBlank(message = "身份证号不能为空", groups = {AddGroup.class}) - @Length(min = 15, max = 18, message = "身份证号位数不正确", groups = AddGroup.class) + @NotBlank(message = "证件号不能为空", groups = {AddGroup.class}) + @Length(min = 9, max = 18, message = "证件号位数不正确", groups = AddGroup.class) private String idCard; /** * 性别（1男2女0未知） diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcNoticeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcNoticeFormDTO.java index 09919051b9..7cc5c08b82 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcNoticeFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcNoticeFormDTO.java @@ -17,6 +17,6 @@ public class IcNoticeFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = 7392894573654015338L; private String customerId; private String noticeId; - @NotBlank(message = "身份证号不能为空", groups = DefaultGroup.class) + @NotBlank(message = "证件号不能为空", groups = DefaultGroup.class) private String idCard; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java index c99a96878c..3ce4110f4c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java @@ -57,7 +57,7 @@ public class InfoSubmitFromDTO implements Serializable { private String name; //@NotBlank(message = "身份证号不能为空") - @Length(max=18,message = "身份证号不能超过18位") + @Length(max=18,message = "证件号不能超过18位") //别的小程序不统一升级，没办法限制必填。 private String idNum; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageFollowUpFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageFollowUpFormDTO.java index ab4a416d9e..1a1de84a5e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageFollowUpFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageFollowUpFormDTO.java @@ -12,10 +12,10 @@ public class PageFollowUpFormDTO extends PageFormDTO { /** * 身份证号 */ - @NotBlank(message = "身份证号不能为空", groups = {AddUserShowGroup.class}) + @NotBlank(message = "证件号不能为空", groups = {AddUserShowGroup.class}) private String idCard; - @NotBlank(message = "身份证号不能为空", groups = {AddUserShowGroup.class}) + @NotBlank(message = "证件号不能为空", groups = {AddUserShowGroup.class}) private String name; /** 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 0b10e9fc61..3976b304fc 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 @@ -225,7 +225,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res private String tableName; - @Excel(name = "身份证号", width = 40) + @Excel(name = "证件号", width = 40) private String idCard; @Excel(name = "姓名", width = 25) 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 3734309c8c..2ec5c5d783 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 @@ -258,7 +258,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl entityList = baseDao.selectList(wrapper); if (CollectionUtils.isNotEmpty(entityList)) { - String errorMsg = "修改居民信息失败，身份证号已存在!"; + String errorMsg = "修改居民信息失败，证件号已存在!"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); } } From 625b966c5a62b952eab34510ee8206cb3bf6e774 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 23 Aug 2022 15:00:18 +0800 Subject: [PATCH 154/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 75264 -> 75264 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls index 23d4778dc4a09ffc912ddcc7cae7fd02e157551b..7fcb45aa57da3802eb9bdb13d72cdb1bf4bb50e8 100644 GIT binary patch delta 1060 zcmZWnZA_C_6h7zeE2Wi|)`7H=25{qth6$wGbTKhYHa<2(rA#&}Vxfa&WL05I7tl1_ z2LX)X>kR6)j7CQ@%8v!S)yC?knb9ST1!c(=63T}eaWl-Z#SC^bDwjb z^E~JLxZV-bJ0cFc#dYaV1`dBsbz(D~XAi`WU%(HjEiVJ-XfV%=T{N6$!MpTpUK*BA ze7>dZ)+yjegXg>-`I{Z}j+s42DoUNz_P1J^U=wIM6c#!foS)evw$*HlUty;_CRfC^ zZ|`dMck& z<^XmwSK*gvHcQpzBQZvPWmC!!Q`xhxJg>$YI%2m9ZKaeLva!GHnF;ho#p}3-(w)h4 zrO`;c4rXDioXt4jL#K>9&LSL=k@uh<3uI)dRMXLlZU1FGEZY@DY?8^#mGzY7w9uBS zEdIWXR=N6i)fqwW;)4gsR#MF3-y9Hx!__P?REX@~8oi(`bORLE0xZ=_P3#+YNU!bp z0OT|QoI1&C581I3my(uu(RF=J*_}7&+-xDXbC<7>1@ELGUG1*XF7yDzJ_V@jl~qss zj_Wn=1^`Y30q(J(zyUo5nLe~#rTIPr@Wi(OmCP3IGim=G<>P+@sQsA>7uo%r!wDEi zSE9RlTt8XFqhqpHj1vK*1=j}`0diviQ4z@yS|IDf^|Olt{dvgGd=Gmz2&S8K zHEQ*_beJOHgvqVGfDShcrX<=wdC2#i9#5mmH>$^0)x1Wsco5!ez#W3>8J(Q@MmAzw zcw-Vq5GTU7l5v+RLkl|j$7q2g-6tTxaQrOC(jStJkz#%3mtKSqF+r|L^_6SkI7Nr= zH;g#HI|?x7ih2TX{Llb!%>I+j|LXK>k^yqdSj+$hn(0pW6`OJQg-y7qUI#(zQy0UJ IGEgNx1|c46CIA2c delta 1047 zcmZWnZAepL6h7zf?$a$RS8M4-7ZrU-6cSMpSmZ~B+9;_ZIh{*ZjJ}~$PYAo@6{0Nz1(x(_j%6qybs*tead^E@{Mj@ z+25}6^K^hegImNQzC0d1RFYu9Pt=%T#$swq5U`ti6QVJNG>Jmylk>oq7Ms1NYR=dW z**>Q4%g(Uxvbu^2VJ=|lI18ou_AAz4+EmtCGtPzz<~V|BJGM<_d&rw8pg`4$k=RDT z#K=tRyYYUHr+X)Q|8=W;KhCbOeLMKS+l$a&c9bdqy-Q2WlLWL<8mni?&FTv(W>rh| zNkZguH8QapL;0&5Q!_fLi*?o0@1#_dh6@Mi2Tr<2)&EwK^a89A9mzM)JV!z&mc-0p zuk=-sg^v)|rL0z~ayA0!fuaLZv@fL7@{C=e1~@I=v>w)DI$7!#QdL$gHnH6-YPZ*r z(YXoj^2u#aWw|9hly!t+>Sj}WwwlgmFT<@ex-x711X@8Ga?f(_kStk7@mS6yWG({r z=Eh>2+%1AJ~^*r3>aJ=eh1Hp)WL-qMG<2SI?a`vA7bvdDVdZ_@R(vp_EaTyJF2NJpC< zmGtPtW>zCQQ(4XFtVU&7=maOcXI?2NKIu=-?UnVxK5$^SgHNzD%Ia3Ec{t)NeV?dL%H+C-Z-7?@jGzB^gs6w^LD9;I9a>meekIttK zM;rDAa>6lAp@=m|?n8mn2u$V_ucpf Date: Tue, 23 Aug 2022 15:15:06 +0800 Subject: [PATCH 155/397] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActServiceImpl.java | 6 +++ .../service/impl/IcPartyOrgServiceImpl.java | 41 ++++++++++--------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 625c1ec995..2429bc8334 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -181,6 +181,9 @@ public class IcPartyActServiceImpl extends BaseServiceImpl pids=new ArrayList<>(); - pids.add(icPartyOrgId); + orgInfo.setOrgPid(orgEntity.getOrgPid()); + orgInfo.setPartyOrgName(orgEntity.getPartyOrgName()); + if(StringUtils.isBlank(orgEntity.getOrgPid())||NumConstant.ZERO_STR.equals(orgEntity.getOrgPid())){ + //一级党组织直接返回 + orgInfo.setPartyOrgIdPath(orgEntity.getId()); + orgInfo.setPartyOrgNamePath(orgEntity.getPartyOrgName()); + return orgInfo; + } + List pids=new ArrayList<>(); + pids.add(icPartyOrgId); - List names=new ArrayList<>(); - names.add(orgEntity.getPartyOrgName()); + List names=new ArrayList<>(); + names.add(orgEntity.getPartyOrgName()); - Map map=getPartyOrgIdPath(pids,names,orgEntity.getOrgPid()); - String partyOrgIdPath = map.containsKey("idPath") ? map.get("idPath") : StrConstant.EPMETY_STR; - String partyOrgNamePath = map.containsKey("namePath") ? map.get("namePath") : StrConstant.EPMETY_STR; - orgInfo.setPartyOrgIdPath(partyOrgIdPath); - orgInfo.setPartyOrgNamePath(partyOrgNamePath); - } + Map map=getPartyOrgIdPath(pids,names,orgEntity.getOrgPid()); + String partyOrgIdPath = map.containsKey("idPath") ? map.get("idPath") : StrConstant.EPMETY_STR; + String partyOrgNamePath = map.containsKey("namePath") ? map.get("namePath") : StrConstant.EPMETY_STR; + orgInfo.setPartyOrgIdPath(partyOrgIdPath); + orgInfo.setPartyOrgNamePath(partyOrgNamePath); return orgInfo; } From 5d4d408f82c4e57f7409e05421b77a33abaad34a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 15:22:06 +0800 Subject: [PATCH 156/397] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 2429bc8334..0a2f051ff4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -182,7 +182,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Tue, 23 Aug 2022 15:22:39 +0800 Subject: [PATCH 157/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 75264 -> 20480 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls index 7fcb45aa57da3802eb9bdb13d72cdb1bf4bb50e8..6f4483c4d05f3d6eab6f6b7dba8e3364e0a79a82 100644 GIT binary patch delta 1981 zcmcJQT})h65XWck-u?cDrLeemv#?Om+CbSYv{HdWYtj-^3pNs!G>t}M)>LDSN~nv8 zO-Qh&5~RxAJiBXKhnOS7;R(HX!fl%l&=5T%PvTwebIAw&Ya)O zoH_T-Irr|!SNceXPi~Ge5s4I9fT#uo;amB9zF?br@IyZJtUj*kT&JvB+AAKBINbHw zor_0!Tu=EjKg7yrr!R9YtesXhq`zVb-bZRlKc)?7YREcdb;0wSx?!EN+pvO07In#X zk3-gAdRWVP>J-Sokqy;rh}m4A5bU0{uL^?r1dayOQ# zEAd{{*ceyd#(=$N)tAj~zFd_Kk+w||*tn0Lq9<@2rDi%#A-b_+y?txJe!P9Xy@lR! zR6)dUwqnU_z}HEqgSckd0UQcLcf2l`d+ zB67@dC;FSjTn?Lv`fPuV`etuki%#5mc<|BbMl`UkUFCBiet;FllDc`E!N>*B0 z6K_KS*2X)?K|ikXJINXPTY!s#bVtx{JXy*2r%^7nPpJVt)2`cGJ(#+T5=hy*3%yAU zk}WYw16fLB0qG^uLDmvk(?B@@=0qDvcGDy~NY0B%4v@1%PLR9}rq2a(m&gs0vtar> zAa9AhAYX}mbZ@tuv6WCioOpj%C;$qUCqS#}g6WVBezce68c! zZsX1fk2y1lnaR`XGsaYeE5j>DMO`?!2+0_~M0lg?^cjq$WsK$s*QWz=S~0z-i}TiV zVP0VwGrq{h_@XY(tCFole9`_7I(@r<|J;Ae{F}P@?p3)#Be{{o#&ndM*k!cFcsqY& zJQw5Ia0*`8fnkX3!YD+J^P9$GjH5|;x@KyjCQ8y)jH3{#Wd6l3QVGoM#F%gT0NmQ5UXeXc;Hbw-jtWlJj}|{`o92ee~3K* literal 75264 zcmeHw2YeO9_W$1W-W#DM5J-Rk34~q}svzNp6cR$HflwrX(gdYM1O@39R6s00w@Gh2%->7A%sFGg)j=?6i5ZMND5IDqAA2sh@}umA)Z14g*p@xDb%G< zk3xM44Jb6EkVGMwLL&-|DWp(nLZK;zR0?Snno(#@p#_C>3N0zLqR^T`28B!tZ78&* zkVT;#h4vIWQ0PdZ6NSzcx=`p!p&Nzn6tXGgQ0PISCxu=VdQ<2_p)ZAtDDebE}<}qLM4UC6sAy^O5supmr za0P|A6j0am=s2Ik0t!_W3Mi$ibY>FW`4l=%)6XErX@25JV+>XIqH~f0@T+M%^k2Ow znWEpM#+#=+|MY&x3LsD}`jpVsr_tS&>-oT4p4lf#^Kuy1$MJN|Mh>5fbm*desMh*W zNzI_zA5Figk2Cqi(Djj$H-*!^KGIJ_L!*x`Y0gZl)yZ^alzo4yg>ibB0GUDcKUJ@9 zmiGKjbKSoWu}=5;Xrl*QNd*Q_EB5o%wuQdo|3Z~R^YhcRgPNE2sLu=Zt7)H67)F}r zt2r{Mk!4T=YojIo`JbM89!5KmhaFVF-5lwfgRmefX&>s1e5scTpVfL$xhL(Q^P~0ONA$Fw(|^0^eU_$uJo#isN0JYqw8whq=yEIc-$wdx z82vi5XY_OasUw+`{xM3kX2EJyyLJtg|FW{eJmCL2PdL&K(A4SM;oWWIBW&LuGIKkaPrKpVWBB0oq! zz(zjOMm}1?8~C&!osQNVjkLoxjp%WhPN6Ziw=NnZ!|2iHMjQCFqXv+m5-+1Zy@H-4 z!);FNK&_^Z=ZUT8T6R}sUIU*Vbej$APp$pRMj{jGdEQ2IjMS1`8Ej6J`_6!Op~s_{ zYrS`sL?bGlM*3NNZjMej@F}4IL^Hma-DQB=T>w10q~}l-b+*3`zFk#btrxSG;|ph# z>bg@g?rS^^h%#08B`4>3cPfe6F4daaV65gCM#D36Ej6QB8b(7jD?W@$yMa$9(#%Bl zDQ+FHJGl#KXI=SZBh%`uGMBI2hpwDd+v&CCz@5+meKf0SKiAOnQG9kJ0e4Vb$A2;y zwd3drRq}Q?QdP;uI6WN>0mykA+U zD$@zJk;i;YPiI49WL$6@-EX3vAJ6M@IfNSW(sePPQ{@M9JQa=>p~5j2)bV#Us+F7s zqrNadRN;w>LEOA;yHWKCqr({LAv=#<6?{ z{kop@-rS}<+vzxE%($;nbiXvs<$Pl9>$>03IY}9!9Ef0C=ntolIkGM<@D?`tX=sz5 z3>*2nHaMr_dB3bbo;a7YXZdrvdE#wtu4|V*->+vn?QPPrD~AMK-ZPy}HtBGC^pt0u zs)hP`()Ll2k$OAz<8l^wk_&g$JEn9FSUYArB6Fx^Yc6>=4s(f&lUB?&(&zhf%SS|_ zC3&V}$V>Sd6`{^&4suK%IsZ92N;qE^G5vl8&idodk8xeIJmvpVYdLT_R1OAixvm+v zNyksV?wOP)%3oD(C}#sVUzd8PLC7(EEcrC!cJiE0oT`^wlB<3_^g(r9l!NuYI33_t zJ#phk`J1l`c_V#EACg?SD?gkL-IuanNY8U1fsgV0mGs}^z8ntHb5U+?J)z?8z)gDY z#p%1{BOIjXA|2$w+U~ggS>BY6rM}EKKSwwnGcJ`|hOD4(d!JOhkRsE*-Y-JdX;t$NK1SR*Au7pLhZj4)nAEm*KX803N! zn7;xGP+-Uu(yQ5Xt4I%-0+yXUOJJ@{$#;h5y>VxIa!>Ql0NcC!get8{K4G48g?e;? zpQy#hAAek&VAP@+GiuR{8MSD}L@n0r5$V~K6IKa~8f()Q?cVqpx@g34w7G38Gw^N0 zIE!F>Y))uMe0Mof9_4JxHIXDvIL#|0ixcGLVN(!|=mc-Fx}Z_=0u3GXk5Lec`;t|+ zF`aPEiKOU>aQD!rEzHfv$H<8h$I<3?nh?v#NlmsYk<+-Hrg|bqPW*8>*Qb`8$Q@NG zo#O7Ova_>AT^lNH#taoVV}^>GF+;_F{P9PT9x}xpmHQg5;*m3zX35m~?mbnR`gNX% zlFONDX33QKZqG+aZQi`uqomC17&eN8B|)Qus2GONCk37zx#xhNbsJlZF5FeY{X+r`=wO5Q&bwa06 zux(9=?8!aLM6yhYRE$$S=1wCg?M#X6$vw+N+M5!=v)}zOYR8S(HU+G?8wJZA1jb2c zkVr>UA{FCQz58jDNhebxdveb*k#Co-UM`v(5@H;TdWKZr{s(n{eB5m5L64A5e z`ms@acs>|8VZRRJq%*i3xK0>}?8!aLemC2cNSn5*M2wu_=(?RWsmshEmcun&v33RX z0=i1FJxSI}DQn!iS*JYD?{$vn_con>>dwOR`h862TkrMs^56Fi&zH;kB0Ar$tYz7L zXCT|(Bx@~~c>!{|aKbV2VC}U%%WDA18ue{WS6yE6wFa85Wi4;de8CyW$d~n6p0aQn zGGtG653orY_h8L~`W|GR&p*fW3(oQULeu%ya#81Bu7e^v-zY2V{d<<{V3Vx%TAs4S zCfQTf!H{#jhf>qEPIV7M&p;N=WJcM@_aK+!Fq7=5@&Ly)BVAcm*00eddoKD}eun4E z_ccb(t6G=jypBD`YgOpi;u)u`U-Grao#VB}o33S@XM5`M1e5Hk^Z?F-M%|t&T{sw? zt}Gl8PgnL*lkBPTJIy3(&F>9fG~BMzYOW7R)UG!Th8zy9#!Krs;^n1uss^cuD*u`r zypqY99;P|kkb6rLEr}dOlC;hvy_a8GQBtbfSj~HqnxBsPHH>DxI~?*0R5&Dt9xeV8uJJg(9dnvW%4ii8WKqxsg`DhOR3AfymM8$f2 zKm%)Oc}LgKq};_dPNCIh%`tA-#YNXvq>uMF#VeRjF}Qq6An6<3E7I|}SMPATS8!M~ zTuX+d<)Njotw|ll=_gsUac3YenG7az!N7S`qHtG;!w!tx?WRl*kR{-ME2d@)EB#H>giJH|e$J2D5P_9jK*p zqyAOVsAKg;{i~}{2a*F6)$N_jZobl^ZoT426dX=9oSaRlZg)&LJbrLtul%kPt`Csw zHlFI%&F9mS$p?n+)4nTeuei@Pbf2}I!AZxG4;eYWTKhs2SyKuS;g7>7xh6pBF%6vv zC(jzXsXuPqJjU*(66mJfd?bkyZi!;MsIto_k7Dz#L&XLTi~5tdKlNqvN#Nq0rk_5&1E z(ixO=ZD$y5yqo8ZqZ5{IJk#UGVPr)&kxXwO)q3NqKD}+NH||b4yY?GbC7o64jdRjt z0^+nWrl&%jelPf08}LTRS`!D@paI@K@N(3&Yn`9v;AnhcTAneXVsb@mdl~pOvW#0Y zhOhuVwMlc<#^Eid>nLEM+AOKl14mC8J-%XEtJ#w)L-z~}dMPO)=it0MFJJv(hcVmI z`jkKZ`or7)qxIU5*kk7%`)>c}gTsfe?(pWPG4HJ(5L%kP!9Vo6iZ@yDRAn#J-V-+V@%Sbt1U_w2~GDcU`h`S8~hpktyG;KX_=*vCwC?PWyRu&*#VN@f|&J z=Oe@K|FwbBJMQ|duYbAxqN`W6`fcOtw9v?kX5alXJ^kbZ+ZxWl)c4z6390+Ne=GXt zj+G4u-1==%^F~#pQ(8S1a__Oq7iTX_nR__D$>&FWPBwk=@xc$ZZxPt&zVA1uIi7i@ zX>`=61(zRuI`4(cn=eibNNd>q-r4o*Iwu7se{t796l-F+Pv(+pz4bCm#FslkeLFJ?MBXyYt-RL!bY4-Qo@>r#^DoCzG};2!5o; zvo*ga&d)f~Gp6NpeusZ~HL-fc)X6iC#*Mgo+T7`(pWgr7&tJDBsmvx{%?KSnIqR8i z%ideNI&hP}bN06UhEF~n^yPqhzbqZ|r-|!3VzI{>yJ4h}3x`MubEXqzie{QOS##_V|~-uQCCAIDyHe0pd?<%<`kyzt_-rFqYFNx$l; zuXgO;^TRFMZ+#`L@5_(pWd1ViAK$&c-|LeNjlX{J+c8~cAMe<2N$~8+|Jm_b=jA7I zqjv7;@Y%~=4Kn*4uXDNIfos;izU0`1wSB+aePYkcANM%2zuo2Wn~N{`?TL^lZ}`Ws zSz{{qJ~uGGdH$lp^lm>dADB7o!SA{!7Y|$2Z^x~pqQCk$^^@+6-dw$W*Z$^rZ{F+Z zpVWGKe2;!l#jf9U{3cYH})h7cATP*+J?cBRwK0Iwv)Fpl=BX;la zGp*y7S1mmn9C+)>jEWK2FZcXM<&?{YJhJAex=9Vcd$Qr)IpvL?O)0$jtzIwRvh!|nDw_-p+)zw#OVP@AN0){aO`=~npMzw3PR`mCLw9(wuNIbp>wUlILX zcG})Z9llw2T&i9Dnsa35%jVR7z5JIgv)bg2I@oCClPh-KdUDaO*$JCMoZq(_ z*=cF-gPo&Byz29>#GfC1=b0DZDV_H6iznYNec-;j<61TF+I@KTQ~4`jTG8W+BjYB` zxuN;Tlb&8v{X?sOw2wL@kIo%;!~R*TC$#h%y!xl#6BmAwbZ5zbiibQ|KfP6p7lb8_-9UGVY3Ne-!|jq7qh%CZkkiN^Y$Iz*6-f5&buoIrIz(>Jo`j! zzl~FWS(Y~7)y3Z=M}Fz};I11U=+QIfiv~^l?<{$}^*cF*4<)ZFn;h(O@U|u&_?6E2 zU{{ZQ-=-Ye?c={McU$INjc!}uyZEiAUOZ8>eq_A|(?1N^*KPSr(NlBBpA1_VHR;Jq znpY)99=q<|wHLKbIad65%;OcmKa_P(&slGLuyE@&KVH`RiG&x2Bx%$0EFTdUDjj-DX9KZkbr{jk{GtHT{&By1t<+pD-x^Yu-!nxM7?=ksG8+tGH*ZTI$1xc}2({}{fs?8C+z-g)7`;?CLoA1ZDcGBEDTi|bGP z{iVexg1zfzYd;)$VcWmz+|(#OAoQQV``bV7@Jt*zt)g9VO9@S8wcfnCSL;plw1a62CN!%1QQe~-+bh^>9bzhuTMBQtK0Sk3wJNR``#u2WwS56X491) zJvH*VL3=lKeIv8(=6+9S+!PhQS-o{f1gEO;dSa37y39d68>_<8xATUs9~e17$oiu>Pf z@b**xIPpF|71cw7DCuFYDw5E>t8agVBScF8XTlhzX0w&O5Z_fuDZ+qS?0hnr9C3zB={6 zpBy)g_~7RF!(T*XH2dnFqOUe~`d6JBDpxhW`(OSk_dVHt<&MW!+!i=0`;K1IhsShy z^@{S8H)p^0_RJGiEi3(tS6$hu`?}ust}i~mb6NBQ`yyUEkpAc`>*}}rH0{HlyEad+ zzTt}aeK$>*Fnw*t;Q4;(^B!rl?nq+M)QA(lefMUhuX_2Bqs?o&9bNw5)Uxr9{V=P` zYe_$L`tkE$Q@?1tdU@MF!si5b3B2XR)T4QW1~|N8$ZN(J8_GpR46+_1(QkI3vfwxY zwLYR*@`qfbwHWduFf`J7QMsAo9KL8ragMHqr++ad!2`tF&cQgDKgeJT1@oY?wlmSx z_=7X+(&*iMrusJJrib(SHU}urS2je>l)J*@QL#HwUuxmzOzE^fMwZi%Cj{;^VDa%t z!!$h@G{9G{2NfBkl%{#t(Nz9V z=Wlgdxl3+m?x*t;6xaRsA?6;;+rCV`Zi3e2F>nJMAB@Z%?OSC|H$mICn|Y3^86)It zmVU^oUU9`|!yQ#J_s)MYH?#DcY4SA_wGTfvxWChx)^beLA`cndE5>)avWU|<`cq>et@w0KhjKF~QL79B zC(zMj@|J?F&O?P}ZawYMP;i4Bk5;r_+jH1f=g}c<{yJJaT4&ODTpu5FI?KsgUrgT@ z903$GZAF%sc2tY-3fHt_y#I&au>(k&?g)@kY*#mC^`2wCG};O4l@ zhZCp#!Fk>kaGWSJO>yuQw`h`J(n!yP;R3*Scd2eEyYqmfT#OImcxe#FFbcRw7%36Q zIyX8gb3TEOq<|w_`5&#)KtaG7@oICN_GFlQ$?KoKJ<1(gF8I40H`w&TUcPBKu!??|c`Di@C_3mW7R@>+YR(H+7kWRh9o)NU;EUg`wGUD5kIGV(ewqV^O`~3!`JalPZlcVCQ$9MC z0OFySF?e)V>v2tsUM&1LkI1jD+V9-E=C)gi%&)kwz(gV)GWkB>{Gbq=uyL=>Uo}F{ zGiqpX;lMn)&D^R)l+?C4+Um$WoI&Y;L^^a!0pr_OROFM~z`3ngkQ|CWr#!7Bql6-l zPDiC?l;o7qNn4#A%2CxM8(H~Q1+l{j>EfK8|Jz(*L-LhTx+V-A`dg_>DF&{YH3%q4 z2aZ2bF?z+7^gN>54RbPyll?UZM^KyXW`4YkQrlL!wCv#UF01wHMpk++KeUv{$jVnn z?OgNfS|YElD9l^D>Lg0|o%tuqT8)@hPUMXvnvC)(^_xK?s={x^Uew^zW$kAEH2=Fi z%EYYv_npU=xzr>5%0Q<}H$N&KQ#N(nx5ZQ=uF5vFv`^itIAuCceOW&-ClSAr3;~B#no$1l#Qn0p=gPKvq#q* zPZH)45VD#d>TUvp3>`mbBpM3|Y#!6T0wkTfc;wQuDGMr=pv4jAM9D+TTsr+?VM00b zOt<#vbX*JyPR$?1xsi0PGXJ$%siSTlrl)9(vM33ZI$9%mKZ}xZ52ZxJRW|6o z8mQ#E*=cszU@Q1uX&LgWy;E;1;!H^;%&{A{)?PN$1rRg4z z(fRw=ExH}|L^o(2xtOA^i{s{7jnI3@jz#-uh%=;!PRBU-=;dQ3QL>@VsS68kjvO{) z1Xb9zRm+^$R?VJMJ$J;MS7y>u%A*x`2Eu6Ry*d^oyPN=wW-`5Bmm|56T{? z|Slq$Z+6YVYcj|Pj6<{!v5jt*@Dt&(jpk7RT?)z4r`BS4#{4>xI-y|{@K_tE1> ze^;eG=X{NY84S605aq}^dX_R`2 zxIQL}W_}RW=<`u-`C!_etV@hL9zv^BX8HOwWJ@#MPXn!oh2K+KNAXGGdh0O`3!FrS zM4I4*;UN$BcwfN)uLvC(s@IMlTl zRgNQE`(5Ad(Rd}kTHmYDLAxBPz6De}EFVf6{o#rZFAP<~D8_g=QMhU~-jXIQ?W_3K zamgkU54qtq>Qao;s7DmqKsEW=V7RMF!-}r=JciAAdv=2s!|`A zbId_8^aLF9qFAtqc~cBiF6Q}AEL6mNDF%IDo*%_%0_KYOQw*BHya0+}K+my2ieb9K zu^@`UtjMuoilOh}SP1Psh@OFCp~S;Ib1aNvZeBRWFttFb;NAU7=^O7lD}iv74yRFv zV(v6(x~fk@m{-@rt4A^D5cBF&tgeVPpcqzynb(kFm=tj=iDGyWm}AKlYbaukD3&B* zjVYEaVks1BBw|e{)>y=vQY=NpQYqF%#L_6%RK%K5ELFssQw%!Hd1*nhW+IkOvF0My zl49<1X+<$ibNRg1v`=KZh-DD3rHEx(&TB)lR)W`-Vy#6ii((lf){bIu6XGkhrx>Q6 z9P2qN0E!Rt)1b|Th=bO*izd|p@L;r%dnUP!6ze5o@f7P#v1;mty{Kil z^L0AZG#h!oCnJR(dXCYzPS*FgMgD2*MzOxGe0bBfC+mCOGS8c0{fIZ;i}%}{Ob>(w zIn47VUVm|(AH^=Fm^VF{ys6(LN$t{}87%^PvUC9LP&+_K2NFM5NC)ZC9S>?@kuK?A zLIx5a_3KUj-egzKLy2;VRKh5hCt~3gbLS_5VuJ)P(h`fZ#G);+7)vbH5{t9M;wk37 zdIH7r#r5h~c!?A%5WKn;UOkEx3SNDR6;bR1y5~3P;nP(c<(TH}TC?kYEtWgNSgK%_mXs zO5sd{js)8)qbq;~3e6tdDx;}lE9D-fG!D8@ynZa8EE_{T9Kpj8UmP(I!w~~895L|1 z5d$t9G0?&h11uadu)+}oDjYG8!ZC!tIEK;}$1wWhm_T0~akn@o(ig|N*glYs_2`Qu z23$Bcpf8RM>5F3$eQ`{tFOH4qizD{k#4&}wI5wd#j!o%{V=8@dOrtN3`VNzHY))Uq zThJHBbo%1hlD;^$(p_1-s1t6j$Fbig@J#yR*oMA1wxutQS@gxR9er_ZPhT86&=<#! z^u-ZY0USHi7soF2#jz`WaqLE49J|vON9-txV-9_B>_Okh9Z~uqORs2sBVp)BwWCnG z+83oyP0|$bxQma}O*ESGr>it=t22$PXrc5=J8zRYXR8x5#x!iCEz|k6XePMlrEZt8iDRhDAs@ut4ch}A?|Hec_mlUq$2XFmd-bCp&2G&FOBRx{^kiI=#q$mpE~MT)fHE*yp)#4 zif<|VZBFP!P5W)`r}I-s-8Fwr#mQ+8&m`l2e#4m?)~=YHI;zEroF%mTIN7{7)5tg) z5$YYsYR5&&OxHoCgLO-krrlLlNWJS7BNIl>l4aCWUpe>9TNX^ww3kMPU-b&zHW#L*y+1d5 z7~QX<=?_R_y z?J7!J#3_A0K4#c}{9(FW@=dMtAYU{ju!y<2&S7OO3YdO5uVld^70fRh!s)!V81W-F z{WKiMPp0#6`2xg-kHqi1S@_*m)K$NOO@k2o_n?34$Fcg=c9##E1N4dc3zp(Ib=34w65S5FLx7x8- zsXf#YYVpk-3&({zeWwhiW|KaCD>VxksA()!HocVGdZxWW4e*I!IL4J%=Jy>+e;qK# zg$`XnvC=Y@?493m|Eh3R#KGH16Y!;%%P4bj0JjvQghiq_tCVHNs}0Ow$oPd%e< z6;N5I3aHL82Z8TgU;TeMFhj&3*lL%F(xouGaawFLPW@b@fI*UzQZZ(s-V`(2WSsgx zez2r3@o;Ax^P^a}i1|}2Lc{_n7AazZ6f@gooEDpmQ~y5^PBVlgF)H9#D8;B>aK*wX zhE~YDaEf67#IXp9QG<8IA}L0lfGZY7F&Yff{3AeHL`4xp^A=<7p=mk9Ipy4=E;Sj{ zFGk;?p~l>U|A2uQdSRj}qRv+!ukYwCVrXi3 zhV3hostN52UT40(XkWVm4(pv0iUsZKte$?boAL*}0oIxNRZ=Nms%d{r|NFEreu^0D zOvdrl?aR1#Yx@e)elR`tFrzCC8AS!o?I(nK^imh!&}Wn#{~wm2&tw62J+bl$ zxv>5^hDe0a@sTt=>=xOPJK^bH@^fEF=73zUuge1#hbR}bGaWaNBD`V)T zWDE}j8N+i?#_)8Mu?SLiKUcXJWdQY;u_y%=t-xXwSgZoWe_6@bh*w|<3apL-OH^QW z6<9q5R$qZNP+$!u%;+aaQ@OfFN9E+CYWKE{pmJamitQna2%(?Qzj4 z$}{H^<09NO$1pA`7cq>B#)ufkMHtUi)8rg&aE$oo3TlitiY(Rq4R_h2eJKvhv=5az zQ+ReVASbGK5L4kEtV4W0LX9dOQ9=%K)RDzIJ(thWN|qrl)bB476+1=df2^;cjQE3g3yELVXIRA5d8mZ!i5 zDX@G6R-nKN653N_6X>X#|hDpROSrci@Sq28E6Z83#9VhT0G6zYR1)B;l|d!|t0 zOre~aLg_MvGGz)S$rQ?uDU=#hC@Zwq?izWTYZ+(VTF-D6i{Tb#u`p6-HTG7baK(xw z&aHN|uFW{?UOL1jaF4!p%0T5QsgzuNl%q2L(>dAYwEDKfF#-<7nueDQyjG{p1iE_! zb2-n$XetbUJtusfOM@w7P*>*k}X%zU^Jd}FeE!41O9hxK}|$!-=w7FdIC%=7gX4&91u%=2Tk z-q1^Jhr>P3kI_2oSe3&)&ySJjv()G)9ky>7b6m{xWeoFt8AC0|80PshhIzh>VV*Bz znCHtF=J_&)dA^Kco-bpVN6HxH`7#zktusn0gGdDyrNE*USd0RTRbX)nEM9>nD6l#T zEKz~gRbcfL7-m#*8DMTDW0+-`F`m1hzC9GC_Yw4BDrUWL^czAk>o@vuG2b6Yd3VqE z$BP)|`x8VA^L<)#bxC5re~E};9b}S-VI71Fo-RqOgG?5&Xo^jt7{(D^RQ~+rghP@+ zMY%ao7c`UtL%;Nls@a=wD=E4Y4wi~qZ3IX}Vm7hHeA^%vX#!3_}H z0Kp9u+(5w%6x<-e4HDcS!3`GNV8IO*+z`PPs~ja+yuczPsQ9if?G#$(PuF?QE=(?W*3Iu zi@9|Lx31u#A7gGk!L28_ZW~d3!L2X2Zo5$f!EGS8Y)e9WYbdx4buR2n^d1h)D~q%Q z2VD8i?rYeW%zY^^%=BdpbAB1a>|e%U2avHQ3JkUZSq@eL8H2q*#$Y*+G1w4f4Aul0 zgIz(!U}2Ck*cxOERtFi&P+*w~tc?O|tH81pSUUyQUV(K`U>y}$Ck577fpt+}T@@HC zAac3D79wM?ikLC0eJM$3d6H-YZktoG;9?7FZgJ2_gEIQ5MuH3NWNu?|ZeziPo-#K@ za8m>q8q3@!g4;xJp}Wj&D!5Gr7h25RRKZOZT<9}%(*!q7aG}}EZ6>(Q1Q$Ba+~$JY zTyUZ7%xxjKEd&>O&)jsuO&46W0Oqz7+?Iliw!qw0g4;@P(JGkRT5wwnF4_lkGXyt7 zaM4njn<==Nf{Ql8+%|&SMsU%3nA=ux+X^n)5p%NyH%oBQqL|xGaN7wk+7@%$3vPSC zMJr=&2f^(ixM*+8?I^e%1s5%kxt#>Jli;EaGPkqfb{1T;M&@=A+%AHPcFEkXg45~-|LJT^zBWWwsDoV8vM@Vr{^zo zCOWZc1mxn%nS*V&u=zyu@k`6DAA|ib%%0s|10|a!m?FUY1!&F(=rp6k;u zjAg39I)(-&FVS3Brox_fp6(!#3M@*2MJuov1s1Eo;uKiC0!vU}brcv(zOq{j481Z2 z^RA4+s4HVI<;oZgxMs{)rs@kN6ff&oU%=s*+a0x(c1v|HQw^mTTHN1Zr0u-?^VfDu zCI5NTGSy`whGnX0B8Fuu^0GHAQ_T=DEK|{Ir7j+pspxH9R}9Nkmx~ydsb*6QQ%Nr> ze;!31{!9hW-`qf@Ylu z1|zPF!E`HQFxbi%%(ODrM1jF1E6c$UD`POf${38UG6qwtjKRPvV=$}A7>ubh1{11` z!Eh>L844^@fwfU!Z53FS0&Azh+AFXQ3aq07>!iS7%9QU7222@)*;2+}tdudBC}j+W zNi$|$PH-X=|+-79A$=GckcAJ9TW?we(q93^6 zu4;8df{D$nW9ZLdSd%fB(_{=rG#P{GOvYd^ld(YxEMI{YD6m2WR;0iNE3je(R-(X$ zD6momHdMl_CSJEW*KN9Wn`zx9**=sC>$cm}>NcyoO{i{jDe8^SKy5LFI${bn!xZX+ zDbxZ}D0`+*;!L5OnL_C@g)(IdCCL=Zk13QIQz$E@P(n8@9F;uOL(a6yQgIA_3NA?mA z3|^VC9P~-X;FT$3@XC}i*nMOSWg%lQ4agY0GG#1+lveJVBNbSb0*h8)F$yeJfyF7X zcmCzpt2gcLcVY60Ui-r2GlF);^Xz#s*^zr=OnYRkvjV#?`ShbL7LE3JVe*M~hDnF4 zJD7gR7$zbzhAD}RVR9m4n5M`WCM+_Bsf&zVn0!XiUQeFoa$)l6N88OBZTW98`Ha^$ zI(N`+xkM!xOR}CmCLszR6P|pY!Mlz;**vRBrl)VjeUD;VfL(mg&tFaanH%6?*lc|M zdRuG#cYGr}H_W@>8)5Q|&^<>;ncXiPpXaT!u&o|^BVON1HlPq~Vpoe;B*hkqSQN#&Qj9$u$lpn)ys18O^}4|J>$%dG{ydLNYCb~7$5sYb zdQQjJR>n`r_}R+%3mJb~nE)XZU@H?SWCCqvf`m+vtxT|x!Bzu(=ak3e>ZeVM8cn z>f6e&e-30C*vhcy4rCfCWw4e%h*nqN)AJ_%i5gsC&*lp=34D6Y&kA7hu8=YKS;!bX zE@TY87c$mFfx#a`mV;-8jKN1k#^9|XV=$}A7(6&+489yP2CohogMWvN!P7&=V0M!+ z7~o{AjRI?{z_JurI|bHWfx)aQUl(Ro8G~6>#$Z;JF_=|l48A5Z2Cowtga3()!4t)d z;kgC<7vrH3P8R$35G_{q1 zzOziKtqk;^WzuYA&>mQ(nXL@k2g@|Kl|g%9nHIJ(Xg@5IZYzWK#4;^yWzfD@rj@M> z+8fKXwv}PCH*_PzR)!7Ykjb=_LHp!uwXu~!du5rnwlZkHER$s`gZ9ia?QCVxzFDTd ztqj^b%XF}nLHlQ!jFZIJTviXtGRCj1`jA1!?J{oVOc`Puq+{CSeB46 zEKA53mL+5i%Mvn%WeFL>vV@Gm%Sy)JZzW^!ypl2aV96M~v1DwJ0?Sum1q!TCffXsR z!3wNcft4t*AquQifelq)WfF#G8uW#AJV&XUkYNux=x+~O8R!$I)6-T4`o%K6Y-ONt zEYsUo2KvV`eQaf*k1W&IRtEaXG8fs(Kwnv=pREk^mu33f%0Qo4=3-kJ=r_y2VxgWt zLf=^?*H#Al&oTpTWzZg227k1oz82aC%jDV0puMonAX^!j`f#3S0jby6FrY7~-%O9y@B{?`W_tfDevv-sE)x z(C7XamT>&^{A)#6womadS8mTzWCA6L|2{-npXLAO)YI<~KZYmif8L`1_;`o@t@VTd z)x`=wt)KMbW`OD6tMKCH=TSXK3wSXDFK(LU;kUKdv_C0~Y;#;Mej1A%{30d{ycqc4 z6CxHn-1~)w&`=A!9j5(4LnNa<^jgNqh0FtkXR0j6o`qH?e|V8&6(FcUK?MmaSWqE?3KdkCpuziFs7haOhKENf(|hS&0z}q!W6WGDd+}M z&px^~)4$l_}IEQ>a0vP;X43wwOX4F@>683iZJhYJn+~JyR%g zrr4x}(qO|8C^ip)Vk6Ln*B`C=guV+?W3!F{!&F$tF!hx&Om$@pQ(GCsR940YDX@G6 zR-nKN6as^}!Tsfhm+dQz&t!P|i%DbeTe#GKG?43gyQX zN{uO$6;mi7rcf^D`ugKH+TAph^*XkJ#yj+Hg2ymo$JD{^UmD@w$KWy%uK65Gqa*#* z?lGQoP{j1{(t`B!wEY_8h~;zXczp=tNDG5IGUgwH8_5FA$Km7HPP3r^Z97dvFnf*A zIS&1NTmv%3xwhMM#}yB9h=eQldiabNJY4WU{%_rI}y z&GfgOezb&P{Ov6M_7>{cH(U*tNBVU;Bz%KKr&Ue1K&~DC8yYbaxP0RTI zExUng9CyKP@ZTTD-Sqv1c65H)(S_%a;U3{fHazpYnohDt8@vGGncvlPTHe)kk|A6p zpSb|-J37W_>Dn0@z|&ouPNdVR?oB6x$SlO4ptG}E*K?h&(Oa(kuKRtzXj*2CrhV+= z_#d@jhihNB+{X-eFO&_IGu-Z85!!S5jMV)1&=JA~%>DP!5#leSFBb2%M@TMUaQBii zEa1o(7Gq=#?p`v6>2t(Y^s|t{)fBLL1dkth(_Bko35BH;uA_iIw)vx`rUqdp(W@w| zHem!``1}n^K+-X|c*%MKM=u$JyPu4~-A~5g?k8h#_meU7mNJI5JQ<5rU{MMzT7ktV zuvi5ar@-PBSb_qpqregs7~HkwdxPVajKPIV#^B5)V{q#-W5&8uUn*C;?Vm`$4qBA; z{JQ^lVW8gVtMxqxLbQRdZ@6#(9AI$({A=xLfUXKT$BsqDjt1d`@csp=-3yR^loIwY z$kV$yj)hPR9UjL*DTc0(V__6qE@I&nTR|~6AF#V&HPwN2FM@E(E(8(eN^E|+fw@>r zhA%zz-IL3%ir`vz9^iA?eGy#io&(Hfmqu`{yA3dx-5kNS?lZvLAdxHU4g<^$7F_Gz z0?Z8&T>wW^v4HI1JP6Esg7hLNe0?b7Ta!Fcu4`43(4(3|-4PY*M5$0NV z3}7z$6Xsg?3ScgJ7Uo)a31BYz80K2{2VgFG8|GSf24F7w9p+m11Yjv`o2GN*%cLB>zn?}W%pEY zt?&4U)0nuoR-nI?n5%8o#+~Kge>c!aS8y3L_m+mss*J&nP{!a;C}VIflrcCN${5@Y zWekpoG6ok!8G|#TjKM8Y#^9hRV{lcJF*q&C7~B_S433O4mZ88h6<8Yu)>eUKDX?}5 zti1y3pujpRuuclBvjT$yrF_3|rIax^RmvFLD`gChmSzl33wBwBmRsNM=QhA@tl(PT z>t`;zwt{PYqo29#?h3B;U4G`W3oN+SxA>V0jpZJ}`u;w1*;N+jTHoAfF1ycyYkg;* zx$II4uJvtw=CYeDxYqadnF}4~Tv^}HXD+mzxz=~{nG3yVuJx^a=As2K*ZMv_bI}%< zYkd=+xo8#4wZ4PTT(l47THn5BE?Nq6t?%747j1^Q);I2%i`K(j>$~>MMLS}y^(}km zqD3*+`hGog(YBateY2jqXl2Z`zEjU!v^VBj-==3SS{`$)@6j_CZIHRvH|Uwm?#$2) z>$~&JWfx~~t#8dUm))MhwZ1RUTy}*9*ZQVBbJ;x_T+hU~s9G<=|W^V{o&TF*w}H7+h~<3{JQ*26tQ;gJZ6Y!9`cb z;H)cSgA`c40xM8pg$k@lfelt*#R{xMfele$r3!4Q0xOd+JU7^l8d_<6JDzoxU8}*h zz8BA2cDDxC`bIo+p-tQht?$A!m)){)uJtW==0d~xTwE6Zg-$Zp`i47mp`FaNzT3`R=qYopZ?!WQ8p~Yk`|Qkx?lRZ< zCOdPX#mu$7!_HjjGjpwPuQL~#&0Ony>&%6YGuQgYI&-1z%(cF&&Rpm{bFFWwGZ!s@ zxz_j7nTxi-T#UD)W`Phs3Zc`llHM|zkgX)amw)de1Y?jBeyqOPo{zk6< zfkOItJKxO58?DCQFdNG=ta&g~W1xjki1<$^w;P!8*16f8#W15{8BA?P#p4S`LTFuY zi=ni)-U^uKr9VK8r9f|rAvetPp_qB|*WP+7VjkX%GA}6hrbn@HUI6jT3yQrh3yQt< zjsk-Rw7-k=rNv+A+!(FZnJz6x=r_Xe)&vEivA;%JYn=1aqGy}Q3jN=0Go_|Bfj-k% zVuX&P%`7psDbF_Jqg9&PgfF!rWBYBKuWCc@nbK3Wp}LX01IC3mbY9v}26b=fLNe&< z;87nq}77w`Ak|PctP~Mx?aSBDRzU1g;4B95u<-`)NT^7Fp8}ev2cprEMl0L z-Xda=6vOuAaHAPP59Ap7%Te8phRinJGARo zN5^;y39dL6pX*Y<=m`bUfI>qGkiGEvzb%14dXa|SxDH?E^&YBRuk+u+H+ruh@$%i% zNgHcOL3WUv7e4>(qkd5+D18o4pzHsEtmyf0;d(1`^9?y}c_y4l>v!>XyAX9qftJ3{xt36`Y-hRKUv3htl|4SS^rDM zU2(1_g7o|FJf1Yp(~p#Ht;ZcTR(Vt0aR7;HC#56TkCCn+Z^S*1R(Yg&06*xW^n>m7 zrTev)gTCOp4RyVx<7uU9N>6WxM*Mg<=8b{c3q8ndua%}DPWwGr;$BkRTZ;QgabGF! zC&m4xcz_hg?7^I$ASoU!#W80$%ZEzwFex4`#o@MMK0i{5M@jK$DIO!mV@+|kTj^DF ziXSKloQUKPs`fY&l^l2jm@Pl170(RVXXut0RR73ON+ydj=mL<9L#2j9>7<`ABaD zB9z`-`oZ~&C}6Dfs4ET(WjKKDK99;^nl_b2hcoH^XV5~)Oe%>=iWgI9Od~1xIH^C4 zy)kH$^Mvw5UA3Vcw4>jaw7GgF*;)`X^kW;^StXMK*HJPZGbq-M{{6KRecRF46`>=A zEaLRl(e^~QqdjrjP-st*S+vB{mSVtrQVM7P@ullbrMsP}O{ROCLU&!L)04H)bjNdO xf1N3$4^xQ-GK0!vDk1JqM=AmH2*%B^r|J-E2`cA2ea`gy=jpN{nZNV({~wGY3&8*Y From 89f0900b2c61aa92157763f1d93a734e84530622 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 23 Aug 2022 15:24:50 +0800 Subject: [PATCH 158/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 20480 -> 19968 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls index 6f4483c4d05f3d6eab6f6b7dba8e3364e0a79a82..3ba69528426c9ac97175297ff040fbdbe0be137d 100644 GIT binary patch delta 1041 zcmbu6O=uHA6vy9eHp!+*noYXKDAuH{%}FQ)QEVIXp~To+l-`7h_yH;fFA9pqL`4u3 zX*(xth!s5anl5-Xo;-Q-pomEHU@0gr-qbehfA))d>cLrN-~8si|9fv{8q2KFWb;#O zsGWPw*go!;Zbo~iX^J^QM5FqGbcHRPkr(CJ(EP`P=U=^e&xZLm`L47)#ed7U*jfFC z|4B5PBDx-r7czwm1=5*0MWZ$RZ|sog&g2!DXh&_%j{ z?<$ScJ<{m@VSaKVDQT1Z(!|lzCn!c_RIF41BO`2t$Oj`~GG}hBc7(zP8lu~*NTj@E zDyh_A1*}b`kU|^ug%a?K$&-_xlmz+EN`!d5v`5phYY&loG)VO35Kk9>^1Zp0nAoy~ ziljolo*S%hQXlph6|H7$l0c$8n|vVAuuU>Z_Q((NdlUc#JPLwP-_a=`aZEc)2ow@j zx61bcMH{v=3<`S`0pZFVUlbJes2|ktQ4ECJb|O^}4(U)F6bHRSgQ|58-{?7_2PC73 zZIu*5bSF+78X~{vk1>hwFJ(ufRxyU=uu>n3 zOrceluj!CUG-mdK2Djo*b)wM*VmGxii`d#blQsVKp=w1JI_VRWC|LgDJ hOc)!c$&1r@z9gr3qncVQ%e*=L%=f5wPA^nD@?V7);>rL3 delta 1345 zcmbu7Pe>GT6vy9hc6N8xUDuu6^>2!6=8_lxL9C=`NF7djNic8I!kiNNTT2kTJ8&?St`>AjiRCGFs$-|+jr-{-yW`^}s8 zo76l@rP=)`+rQHOnz06M7p}>50I;p=I?V&P4`*hCF*Yk+bfw?d`CmT$!0P$9cvFx& z_%HD~yPBD_&lL|;0ZcGi0VM>Eme3~%f*o@ikRN3D$6tYdSyn=%uid5h$zb?fcwHdi z=!T{5$2T*Pz?O$QLtd_wOZ;-c!%IVcdmP^(%!W#LIJ?Nn)#^q=lGr8541_*b2*MHG z+E!Mz6~QPtSU-%y2tHTf5KLq3(@}o5EuluC1VB4X8gOV>GB_nX8!b&{O()uVaBCj4 zQ>+s}$}$Dl955C@A5AZ?<&kvXtMPXi9*?izcy#{lh$Z-~sOKtPTe8D05H&4fy7!HvS~`gS(?kD!BmsI3>Yn?FS7f z)k8k2*bg;iAcel)P-N(^W*jfzAg&DJdprrePs*fYx{TEz6}MeRW6Yp{WJ8HbHYBk? zA`<-{X3UP{D3Ak*T586eNZ50WBqUdXTuAf*rcy0JbQjQ#L^omvJxIj`Dn{}a$cu#c zY$;2SsC#Cf4+;NXi)19~?>d$=jGrHb2z-Nwm@R1Yl;i_RqiU(^4z9HyV-6neXs)Fr zXi_rnG+IwX5=zk%MCF~19%kdum2j(UyquvLcfJR7l55jywvh{~%x`p(h~Baa#j5Eb^6Pd8I{=x5iDPBF#6F zwXQ|n(Ma>wWSBSi$Z8r1vwd`nX!Cgsq%=<5Y4h>C&F59nP5+gjkMCvGy#)Uo-^Opk kk(>K$6qu{DtWN%{Zp+nt;f=j9p6Xq*U0Rbf%F(R&2Ri!{H~;_u From 7865b6b32530993fc3bd6caf442cfc9974f5f840 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 23 Aug 2022 15:44:00 +0800 Subject: [PATCH 159/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/excel/IcVaccinePrarmeterImportExcel.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java index 723741d7ff..4eb027872b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java @@ -13,19 +13,19 @@ import lombok.Data; @Data public class IcVaccinePrarmeterImportExcel { - @Excel(name = "网格名称") + @Excel(name = "所属网格") private String gridName; - @Excel(name = "所属小区名称") + @Excel(name = "所属小区") private String villageName; - @Excel(name = "所属楼宇名称") + @Excel(name = "所属楼宇") private String buildName; - @Excel(name = "单元名") + @Excel(name = "单元") private String unitName; - @Excel(name = "房间名") + @Excel(name = "所属家庭") private String homeName; @Excel(name = "户口性质", replace = {"户籍_0","外来_1"}) From de73b649ed9da2d2d3012abf50881841d559419d Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 23 Aug 2022 16:13:07 +0800 Subject: [PATCH 160/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcVaccinePrarmeterImportErrorModel.java | 75 +++++++++++++++++++ .../impl/IcVaccinePrarmeterServiceImpl.java | 9 ++- 2 files changed, 80 insertions(+), 4 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java new file mode 100644 index 0000000000..86c6ddbca1 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java @@ -0,0 +1,75 @@ +package com.epmet.excel.error; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +/** + * @Author wgf + * @DateTime 2022/6/21 16:57 + * @DESC + */ +@Data +public class IcVaccinePrarmeterImportErrorModel { + + @Excel(name = "行号",width = 10) + private Integer num; + + + @Excel(name = "所属网格",width = 30) + private String gridName; + + @Excel(name = "所属小区",width = 30) + private String villageName; + + @Excel(name = "所属楼宇",width = 30) + private String buildName; + + @Excel(name = "单元",width = 30) + private String unitName; + + @Excel(name = "所属家庭",width = 30) + private String homeName; + + @Excel(name = "户口性质", replace = {"户籍_0","外来_1"},width = 30) + private String householdType; + + @Excel(name = "姓名",width = 30) + private String name; + + @Excel(name = "联系电话",width = 30) + private String mobile; + + @Excel(name = "身份证号",width = 30) + private String idCard; + + @Excel(name = "是否接种", replace = {"否_0","是_1"},width = 30) + private String isVaccination; + + @Excel(name = "第一次接种时间",width = 30) + private String firstVacTime; + + @Excel(name = "第一次接种地点",width = 30) + private String firstVacSite; + + @Excel(name = "第二次接种时间",width = 30) + private String secondVacTime; + + @Excel(name = "第二次接种地点",width = 30) + private String secondVacSite; + + @Excel(name = "第三次接种时间",width = 30) + private String thirdVacTime; + + @Excel(name = "第三次接种地点",width = 30) + private String thirdVacSite; + + @Excel(name = "原因",width = 30) + private String reason; + + @Excel(name = "备注",width = 30) + private String note; + + @Excel(name = "错误信息", width = 200) + private String errorMsg; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 5353e6ea5d..2cd27fef06 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -30,6 +30,7 @@ import com.epmet.entity.IcPointNucleicMonitoringEntity; import com.epmet.entity.IcVaccinePrarmeterEntity; import com.epmet.excel.IcPointNucleicMonitoringImportExcel; import com.epmet.excel.IcVaccinePrarmeterImportExcel; +import com.epmet.excel.error.IcVaccinePrarmeterImportErrorModel; import com.epmet.excel.error.PointNucleicMonitoringErrorModel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; @@ -142,7 +143,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl errorInfo = new ArrayList<>(); + List errorInfo = new ArrayList<>(); try { List list = ExcelPoiUtils.importExcel(inputStream, 0,1, IcVaccinePrarmeterImportExcel.class); @@ -203,7 +204,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl list,List errorInfo,TokenDto tokenDto){ + public void checkInfo(List list, List errorInfo, TokenDto tokenDto){ for (int i = 0; i < list.size(); i++) { list.get(i).setNum(i+1); if (StringUtils.isBlank(list.get(i).getGridName()) && !list.get(i).getAddStatus()){ @@ -392,8 +393,8 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Tue, 23 Aug 2022 16:14:02 +0800 Subject: [PATCH 161/397] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=BF=97=E6=84=BF=E8=80=85=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcUserDemandRecServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 951b7b2e79..564d7b7a10 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -1375,8 +1375,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl> icUserInfoRes = epmetUserOpenFeignClient.getListIcResiUserDTO(new ArrayList<>(icUserIdList)); if (!icUserInfoRes.success() || CollectionUtils.isEmpty(icUserInfoRes.getData())) { - throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常"); + // throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常"); + log.warn("查询居民信息志愿者信息异常:icUserIdList:"+JSON.toJSONString(icUserIdList)); + return icUserInfoMap; } icUserInfoMap = icUserInfoRes.getData().stream().collect(Collectors.toMap(IcResiUserDTO::getId, o -> o, (o1, o2) -> o1)); } @@ -1503,8 +1505,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl icUserInfoMap = getIcVolunteerMap(new HashSet<>(Arrays.asList(resDto.getServerId()))); resDto.setServiceUnitName(StrConstant.EPMETY_STR); - resDto.setServiceUserName(icUserInfoMap.get(resDto.getServerId()).getName()); - resDto.setServiceUserMobile(icUserInfoMap.get(resDto.getServerId()).getMobile()); + resDto.setServiceUserName(MapUtils.isNotEmpty(icUserInfoMap) && icUserInfoMap.containsKey(resDto.getServerId()) ? icUserInfoMap.get(resDto.getServerId()).getName() : StrConstant.EPMETY_STR); + resDto.setServiceUserMobile(MapUtils.isNotEmpty(icUserInfoMap) && icUserInfoMap.containsKey(resDto.getServerId()) ? icUserInfoMap.get(resDto.getServerId()).getMobile() : StrConstant.EPMETY_STR); break; default: log.warn("serviceType 错误"); From 2c5795ba12983ffc7a05f4d57ca5310859748953 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 23 Aug 2022 16:28:49 +0800 Subject: [PATCH 162/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/error/IcVaccinePrarmeterImportErrorModel.java | 4 ++-- .../epmet/service/impl/IcVaccinePrarmeterServiceImpl.java | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java index 86c6ddbca1..f720b878c9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java @@ -30,7 +30,7 @@ public class IcVaccinePrarmeterImportErrorModel { @Excel(name = "所属家庭",width = 30) private String homeName; - @Excel(name = "户口性质", replace = {"户籍_0","外来_1"},width = 30) + @Excel(name = "户口性质", width = 30, replace = {"户籍_0","外来_1"}) private String householdType; @Excel(name = "姓名",width = 30) @@ -42,7 +42,7 @@ public class IcVaccinePrarmeterImportErrorModel { @Excel(name = "身份证号",width = 30) private String idCard; - @Excel(name = "是否接种", replace = {"否_0","是_1"},width = 30) + @Excel(name = "是否接种", width = 30, replace = {"否_0","是_1"}) private String isVaccination; @Excel(name = "第一次接种时间",width = 30) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 2cd27fef06..9b3ad7dc8e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -22,16 +22,11 @@ import com.epmet.dao.IcVaccinePrarmeterDao; import com.epmet.dto.IcVaccinePrarmeterDTO; import com.epmet.dto.form.GridInfoVaccinePrarmeterFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; -import com.epmet.dto.form.OrgInfoPointFormDTO; -import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.GridInfoByNameResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcPointNucleicMonitoringEntity; import com.epmet.entity.IcVaccinePrarmeterEntity; -import com.epmet.excel.IcPointNucleicMonitoringImportExcel; import com.epmet.excel.IcVaccinePrarmeterImportExcel; import com.epmet.excel.error.IcVaccinePrarmeterImportErrorModel; -import com.epmet.excel.error.PointNucleicMonitoringErrorModel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; import com.epmet.feign.OssFeignClient; @@ -187,7 +182,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Tue, 23 Aug 2022 16:46:44 +0800 Subject: [PATCH 163/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97-=E6=9C=8D=E5=8A=A1=E3=80=91=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E6=8F=90=E4=BA=A4-=E6=8F=90=E4=BA=A4=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E4=BB=A3=E7=A0=81=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/WorkdiaryServiceRecordDTO.java | 119 ++++++++++++++++++ .../WorkdiaryServiceRecordController.java | 82 ++++++++++++ .../epmet/dao/WorkdiaryServiceRecordDao.java | 16 +++ .../entity/WorkdiaryServiceRecordEntity.java | 89 +++++++++++++ .../excel/WorkdiaryServiceRecordExcel.java | 78 ++++++++++++ .../redis/WorkdiaryServiceRecordRedis.java | 30 +++++ .../WorkdiaryServiceRecordService.java | 78 ++++++++++++ .../WorkdiaryServiceRecordServiceImpl.java | 87 +++++++++++++ .../db/migration/workdiary_service.sql | 26 ++++ .../mapper/WorkdiaryServiceRecordDao.xml | 30 +++++ 10 files changed, 635 insertions(+) create mode 100755 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceRecordController.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/WorkdiaryServiceRecordDao.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/redis/WorkdiaryServiceRecordRedis.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/WorkdiaryServiceRecordDao.xml diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java new file mode 100755 index 0000000000..4cf60df0d2 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java @@ -0,0 +1,119 @@ +package com.epmet.dto.result; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 工作日志(服务)-记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-23 + */ +@Data +public class WorkdiaryServiceRecordDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * 服务类型 + */ + private String serviceType; + + /** + * 单位ID + */ + private String agencyId; + + /** + * 网格ID + */ + private String gridId; + + /** + * 组织ID path + */ + private String orgIdPath; + + /** + * 申请人ID + */ + private String applicantId; + + /** + * 申请人姓名 + */ + private String applicantName; + + /** + * 申请人住址 + */ + private String applicantAddress; + + /** + * 申请人联系电话 + */ + private String applicantMobile; + + /** + * 服务内容 + */ + private String serviceContent; + + /** + * 服务时间 + */ + private Date serviceTime; + + /** + * 负责人姓名 + */ + private String principalName; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标识 0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceRecordController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceRecordController.java new file mode 100755 index 0000000000..2ca6537d09 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceRecordController.java @@ -0,0 +1,82 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +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.result.WorkdiaryServiceRecordDTO; +import com.epmet.excel.WorkdiaryServiceRecordExcel; +import com.epmet.service.WorkdiaryServiceRecordService; +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 2022-08-23 + */ +@RestController +@RequestMapping("workdiaryServiceRecord") +public class WorkdiaryServiceRecordController { + + @Autowired + private WorkdiaryServiceRecordService workdiaryServiceRecordService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = workdiaryServiceRecordService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WorkdiaryServiceRecordDTO data = workdiaryServiceRecordService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WorkdiaryServiceRecordDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + workdiaryServiceRecordService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WorkdiaryServiceRecordDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + workdiaryServiceRecordService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + workdiaryServiceRecordService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = workdiaryServiceRecordService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WorkdiaryServiceRecordExcel.class); + } + + + +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/WorkdiaryServiceRecordDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/WorkdiaryServiceRecordDao.java new file mode 100755 index 0000000000..5f33762fb8 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/WorkdiaryServiceRecordDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.WorkdiaryServiceRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 工作日志(服务)-记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-23 + */ +@Mapper +public interface WorkdiaryServiceRecordDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java new file mode 100755 index 0000000000..50b5bb7bab --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java @@ -0,0 +1,89 @@ +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 2022-08-23 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("workdiary_service_record") +public class WorkdiaryServiceRecordEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 服务类型 + */ + private String serviceType; + + /** + * 单位ID + */ + private String agencyId; + + /** + * 网格ID + */ + private String gridId; + + /** + * 组织ID path + */ + private String orgIdPath; + + /** + * 申请人ID + */ + private String applicantId; + + /** + * 申请人姓名 + */ + private String applicantName; + + /** + * 申请人住址 + */ + private String applicantAddress; + + /** + * 申请人联系电话 + */ + private String applicantMobile; + + /** + * 服务内容 + */ + private String serviceContent; + + /** + * 服务时间 + */ + private Date serviceTime; + + /** + * 负责人姓名 + */ + private String principalName; + + /** + * 备注 + */ + private String remark; + +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java new file mode 100755 index 0000000000..e0eace7a2a --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java @@ -0,0 +1,78 @@ +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 2022-08-23 + */ +@Data +public class WorkdiaryServiceRecordExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "客户id") + private String customerId; + + @Excel(name = "服务类型") + private String serviceType; + + @Excel(name = "单位ID") + private String agencyId; + + @Excel(name = "网格ID") + private String gridId; + + @Excel(name = "组织ID path") + private String orgIdPath; + + @Excel(name = "申请人ID") + private String applicantId; + + @Excel(name = "申请人姓名") + private String applicantName; + + @Excel(name = "申请人住址") + private String applicantAddress; + + @Excel(name = "申请人联系电话") + private String applicantMobile; + + @Excel(name = "服务内容") + private String serviceContent; + + @Excel(name = "服务时间") + private Date serviceTime; + + @Excel(name = "负责人姓名") + private String principalName; + + @Excel(name = "备注") + private String remark; + + @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-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/redis/WorkdiaryServiceRecordRedis.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/redis/WorkdiaryServiceRecordRedis.java new file mode 100755 index 0000000000..bb15d79a6a --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/redis/WorkdiaryServiceRecordRedis.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 2022-08-23 + */ +@Component +public class WorkdiaryServiceRecordRedis { + @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-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java new file mode 100755 index 0000000000..ee543708a3 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.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.result.WorkdiaryServiceRecordDTO; +import com.epmet.entity.WorkdiaryServiceRecordEntity; + +import java.util.List; +import java.util.Map; + +/** + * 工作日志(服务)-记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-23 + */ +public interface WorkdiaryServiceRecordService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-23 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-23 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WorkdiaryServiceRecordDTO + * @author generator + * @date 2022-08-23 + */ + WorkdiaryServiceRecordDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-23 + */ + void save(WorkdiaryServiceRecordDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-23 + */ + void update(WorkdiaryServiceRecordDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-23 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java new file mode 100755 index 0000000000..3211ae09b1 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java @@ -0,0 +1,87 @@ +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.WorkdiaryServiceRecordDao; +import com.epmet.dto.result.WorkdiaryServiceRecordDTO; +import com.epmet.entity.WorkdiaryServiceRecordEntity; +import com.epmet.redis.WorkdiaryServiceRecordRedis; +import com.epmet.service.WorkdiaryServiceRecordService; +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 2022-08-23 + */ +@Service +public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl implements WorkdiaryServiceRecordService { + + @Autowired + private WorkdiaryServiceRecordRedis workdiaryServiceRecordRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WorkdiaryServiceRecordDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WorkdiaryServiceRecordDTO.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 WorkdiaryServiceRecordDTO get(String id) { + WorkdiaryServiceRecordEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WorkdiaryServiceRecordDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WorkdiaryServiceRecordDTO dto) { + WorkdiaryServiceRecordEntity entity = ConvertUtils.sourceToTarget(dto, WorkdiaryServiceRecordEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WorkdiaryServiceRecordDTO dto) { + WorkdiaryServiceRecordEntity entity = ConvertUtils.sourceToTarget(dto, WorkdiaryServiceRecordEntity.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-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql new file mode 100644 index 0000000000..63869fa0c2 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql @@ -0,0 +1,26 @@ +# 服务记录表 +CREATE TABLE `workdiary_service_record` +( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `SERVICE_TYPE` varchar(32) NOT NULL COMMENT '服务类型', + `AGENCY_ID` varchar(32) NOT NULL COMMENT '单位ID', + `GRID_ID` varchar(32) NOT NULL COMMENT '网格ID', + `ORG_ID_PATH` varchar(255) NOT NULL COMMENT '组织ID path', + `APPLICANT_ID` varchar(32) NOT NULL COMMENT '申请人ID', + `APPLICANT_NAME` varchar(32) NOT NULL COMMENT '申请人姓名', + `APPLICANT_ADDRESS` varchar(32) NOT NULL COMMENT '申请人住址', + `APPLICANT_MOBILE` varchar(20) NOT NULL COMMENT '申请人联系电话', + `SERVICE_CONTENT` varchar(255) NOT NULL COMMENT '服务内容', + `SERVICE_TIME` datetime NOT NULL COMMENT '服务时间', + `PRINCIPAL_NAME` varchar(10) NOT NULL COMMENT '负责人姓名', + `REMARK` 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(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='工作日志(服务)-记录' diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/WorkdiaryServiceRecordDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/WorkdiaryServiceRecordDao.xml new file mode 100755 index 0000000000..5241dbafe1 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/WorkdiaryServiceRecordDao.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From ef33d631ccf7e71624cad06293640e96577b58f9 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 23 Aug 2022 17:01:23 +0800 Subject: [PATCH 164/397] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E6=8E=A8=E9=80=81mq=E5=8F=91=E6=94=BE=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcMessageDao.xml | 1 + .../partyOrg/form/PartyActSignFormDTO.java | 5 ++ .../IcPartyActSignInRecordServiceImpl.java | 57 +++++++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml index 63ed7b1564..aa20ac5071 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -41,6 +41,7 @@ ic_message WHERE del_flag = '0' + AND read_flag = 'unread' AND user_id = #{userId} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java index 45726dab7f..9d6de8fef7 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java @@ -15,6 +15,11 @@ public class PartyActSignFormDTO implements Serializable { */ @NotBlank(message = "活动Id不能为空",groups = {UpdateGroup.class}) private String icPartyActId; + /** + * 网格Id + */ + @NotBlank(message = "网格Id不能为空",groups = {UpdateGroup.class}) + private String gridId; /** * 签到地点 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java index 1ae62b0476..9e940c6f8c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -4,29 +4,46 @@ 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.rocketmq.constants.TopicConstants; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.MqConstant; +import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.SystemMessageType; import com.epmet.dto.IcMessageDTO; +import com.epmet.dto.form.CommonGridIdFormDTO; import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.dto.form.IssueInitiatorFormDTO; +import com.epmet.dto.form.SystemMsgFormDTO; +import com.epmet.dto.result.CommonDataFilterResultDTO; import com.epmet.dto.result.CustomerUserDetailResultDTO; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.modules.partyOrg.dao.IcPartyActSignInRecordDao; +import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; +import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyActSignInRecordService; +import com.epmet.resi.group.constant.TopicConstant; +import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO; import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; 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.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -38,9 +55,14 @@ import java.util.Map; * @since v1.0.0 2022-08-18 */ @Service +@Slf4j public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl implements IcPartyActSignInRecordService { @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + @Autowired + private IcPartyActService icPartyActService; + @Autowired + private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; @Override @@ -121,6 +143,41 @@ public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl pointEventMsgList = new ArrayList<>(); + BasePointEventMsg pointEventMsg = new BasePointEventMsg(); + pointEventMsg.setOpAgencyId(gridInfo.getPid()); + pointEventMsg.setOperatorId(formDTO.getUserId()); + pointEventMsg.setAgencyId(gridInfo.getPid()); + pointEventMsg.setCustomerId(formDTO.getCustomerId()); + pointEventMsg.setGridId(gridInfo.getId()); + pointEventMsg.setUserId(formDTO.getUserId()); + pointEventMsg.setActionFlag(MqConstant.PLUS); + pointEventMsg.setIsCommon(false); + pointEventMsg.setSourceType(actType); + pointEventMsg.setSourceId(formDTO.getIcPartyActId()); + pointEventMsgList.add(pointEventMsg); + + SystemMsgFormDTO msgFormDTO = new SystemMsgFormDTO(); + msgFormDTO.setMessageType(eventTag); + msgFormDTO.setContent(pointEventMsgList); + Result sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(msgFormDTO); + if (!sendMsgResult.success()) { + log.error("党建活动签到发送积分失败,活动Id->" + formDTO.getIcPartyActId() + " 用户->" + formDTO.getUserId()); + } } } \ No newline at end of file From 254c311ece0cd32a5e15e6a2e1e322439d018dc9 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 23 Aug 2022 17:03:34 +0800 Subject: [PATCH 165/397] =?UTF-8?q?=E3=80=90=E5=94=AF=E4=B8=80=E6=95=B4?= =?UTF-8?q?=E4=BB=B6=E5=8F=B7=E3=80=91@MaskResponseAspect#maskIdCard?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9=E6=8A=A4?= =?UTF-8?q?=E7=85=A7=E7=9A=84=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/processor/MaskProcessor.java | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index 1ce0a85c54..586dadec3c 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -2,8 +2,10 @@ package com.epmet.commons.tools.processor; import cn.hutool.core.util.StrUtil; import com.epmet.commons.tools.annotation.MaskResponse; +import com.epmet.commons.tools.enums.IdCardTypeEnum; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.IdCardRegexUtils; import com.epmet.commons.tools.utils.Result; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -13,6 +15,7 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; /** * desc:脱敏处理器 @@ -136,21 +139,29 @@ public class MaskProcessor { } /** + * 唯一整件号打码，可能是身份证号或者是护照号 * 将明文字符串打码变为掩码。保留前6，后面打码 * @param originString * @return */ private String maskIdCard(String originString) { - int clearTextLength = 12; - // 仅将6位之后的全都打码 - int length = originString.length(); - if (length <= clearTextLength) { + + IdCardRegexUtils regexUtil = IdCardRegexUtils.parse(originString); + if (regexUtil.getTypeEnum() == IdCardTypeEnum.SFZH) { + // 身份证号 + // 仅将6位之后的全都打码 + int maskedTextLength = 12; + int length = originString.length(); + String maskStr = StrUtil.repeatByLength("*", length - maskedTextLength); + return originString.replaceAll("^(\\d{10})\\d+([a-zA-Z0-9]{2})$", new StringBuilder("$1").append(maskStr).append("$2").toString()); + } else if (regexUtil.getTypeEnum() == IdCardTypeEnum.PASSPORT) { + // 护照，前两位，后两位为明文，其他* + String maskStr = StrUtil.repeatByLength("*", originString.length() - 4); + return originString.replaceAll("^([a-zA-Z0-9]{2})\\d+(\\d{2})$", new StringBuilder("$1").append(maskStr).append("$2").toString()); + } else { + // 其他情况，不码 return originString; } - - String maskStr = StrUtil.repeatByLength("*", length - clearTextLength); - - return originString.replaceAll("^(\\d{10})\\d+([a-zA-Z0-9]{2})$", new StringBuilder("$1").append(maskStr).append("$2").toString()); } /** From 1395c9a377a91bc32e55ec79de1a2b45f93d89c5 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 23 Aug 2022 17:06:34 +0800 Subject: [PATCH 166/397] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/rocketmq/constants/ConsomerGroupConstants.java | 5 +++++ .../src/main/java/com/epmet/mq/RocketMQConsumerRegister.java | 1 + 2 files changed, 6 insertions(+) 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 babe79da88..6bc618a01b 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 @@ -103,4 +103,9 @@ public interface ConsomerGroupConstants { * 党建小助手监听器分组 */ String PARTY_MEETING_MESSAGE = "party_meeting_message"; + + /** + * 党建积分操作消费组 + */ + String PARTY_BUILDING_GROUP = "party_building_group"; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java index 500f4bb632..bab9146143 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java @@ -22,6 +22,7 @@ public class RocketMQConsumerRegister extends MQAbstractRegister { register(consumerProperties, ConsomerGroupConstants.RESI_GROUP_POINT_OPERATION_GROUP, MessageModel.CLUSTERING, TopicConstants.RESI_GROUP, "*", new PointListener(userPointActionLogService)); register(consumerProperties, ConsomerGroupConstants.EPMET_HEART_POINT_OPERATION_GROUP, MessageModel.CLUSTERING, TopicConstants.EPMET_HEART, "*", new PointListener(userPointActionLogService)); register(consumerProperties, ConsomerGroupConstants.COMMUNITY_SERVICE_POINT_OPERATION_GROUP, MessageModel.CLUSTERING, TopicConstants.COMMUNITY_SERVICE, "*", new PointListener(userPointActionLogService)); + register(consumerProperties, ConsomerGroupConstants.PARTY_BUILDING_GROUP, MessageModel.CLUSTERING, TopicConstants.PARTY_BUILDING, "*", new PointListener(userPointActionLogService)); // ...其他监听器类似 } From a1aa7d169a3b02ea2cda02299d157ee9a3760492 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 17:15:29 +0800 Subject: [PATCH 167/397] null --- .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 0a2f051ff4..5bd4ea3bc8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -236,7 +236,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl attachmentEntityList=ConvertUtils.sourceToTarget(formDTO.getAttachmentList(),ResiPartymemberAttachmentEntity.class); + List attachmentEntityList=CollectionUtils.isNotEmpty(formDTO.getAttachmentList())?ConvertUtils.sourceToTarget(formDTO.getAttachmentList(),ResiPartymemberAttachmentEntity.class):new ArrayList<>(); int attSort = 1; for (ResiPartymemberAttachmentEntity att : attachmentEntityList) { att.setCustomerId(formDTO.getCustomerId()); From 8ba820114d88f4d0870336f324affca29d35bf8a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 23 Aug 2022 17:18:11 +0800 Subject: [PATCH 168/397] =?UTF-8?q?=E3=80=90=E5=94=AF=E4=B8=80=E6=95=B4?= =?UTF-8?q?=E4=BB=B6=E5=8F=B7=E3=80=91@MaskResponseAspect#maskIdCard?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8Cfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/processor/MaskProcessor.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index 586dadec3c..24bce5bff3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -147,6 +147,11 @@ public class MaskProcessor { private String maskIdCard(String originString) { IdCardRegexUtils regexUtil = IdCardRegexUtils.parse(originString); + if (regexUtil == null) { + // 不匹配任何类型，不码 + return originString; + } + if (regexUtil.getTypeEnum() == IdCardTypeEnum.SFZH) { // 身份证号 // 仅将6位之后的全都打码 From 98144e3d0e3143f911ba796e24f9ed3c933fe46f Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Aug 2022 17:21:37 +0800 Subject: [PATCH 169/397] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AC=AC=E4=BA=8C=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/AddSocietyOrgFormDTO.java | 8 +++++--- .../java/com/epmet/dto/form/EditSocietyOrgFormDTO.java | 6 ++++++ .../com/epmet/dto/result/GetListSocietyOrgResultDTO.java | 4 ++++ .../com/epmet/dto/result/SocietyOrgListResultDTO.java | 4 ++++ .../main/java/com/epmet/entity/IcSocietyOrgEntity.java | 5 +++++ .../com/epmet/service/impl/IcSocietyOrgServiceImpl.java | 4 +++- .../src/main/resources/mapper/IcSocietyOrgDao.xml | 1 + 7 files changed, 28 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java index 3473fde8c0..391652762d 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java @@ -24,7 +24,6 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; @@ -78,16 +77,19 @@ public class AddSocietyOrgFormDTO implements Serializable { @NotBlank(message = "负责人电话不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) @Length(max = 11, message = "负责人电话不能超过11个字符",groups = {Add.class}) private String mobile; + /** + * 服务时间 + */ + @NotBlank(message = "服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) + private String serviceTimeStr; /** * 起始服务时间 */ - @NotNull(message = "起始服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date serviceStartTime; /** * 终止服务时间 */ - @NotNull(message = "终止服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date serviceEndTime; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java index 044d8ae3f0..4dfe1df9b2 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java @@ -67,6 +67,12 @@ public class EditSocietyOrgFormDTO implements Serializable { */ @Length(max = 11, message = "负责人电话不能超过11个字符",groups = {Edit.class}) private String mobile; + + /** + * 服务时间 + */ + @NotBlank(message = "服务时间不能为空",groups = {Edit.class}) + private String serviceTimeStr; /** * 起始服务时间 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java index 0edc99c42f..08404eff6d 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java @@ -56,6 +56,10 @@ public class GetListSocietyOrgResultDTO implements Serializable { private String personInCharge; //负责人电话 private String mobile; + /** + * 服务时间 + */ + private String serviceTimeStr; //起始服务时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date serviceStartTime; diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java index b5ed492b5d..2d77374893 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java @@ -47,6 +47,10 @@ public class SocietyOrgListResultDTO implements Serializable { private String personInCharge; //负责人电话 private String mobile; + /** + * 服务时间 + */ + private String serviceTimeStr; //起始服务时间 //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") //private Date serviceStartTime; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java index cc694cd625..20cd08c3b1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java @@ -73,6 +73,11 @@ public class IcSocietyOrgEntity extends BaseEpmetEntity { private String mobile; /** + * 服务时间 + */ + private String serviceTimeStr; + + /** * 起始服务时间 */ private Date serviceStartTime; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index 08725a6a1c..800d2e447c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -131,7 +131,9 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getList(formDTO)); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml index 9ac12b6b1a..4939225de6 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml @@ -12,6 +12,7 @@ service_matters serviceMatters, person_in_charge personInCharge, mobile mobile, + service_time_str, service_start_time serviceStartTime, service_end_time serviceEndTime, admin_staff_id adminStaffId, From c36395eb962c818973b2ac3c47239b7de41a8caf Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 23 Aug 2022 17:24:12 +0800 Subject: [PATCH 170/397] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/form/ActAndScheduleListFormDTO.java | 2 +- .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java index 03e24570ad..46ee2bdaed 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java @@ -17,7 +17,7 @@ public class ActAndScheduleListFormDTO implements Serializable { private String startDate; private String endDate; private String dateId; - private String yearId; + private String yearId = ""; /** * 是否本人创建的活动，1：是；0：否 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index ea2a3ccb8b..2c1b07c313 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -68,6 +68,9 @@ AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') = #{dateId} + + AND DATE_FORMAT(pa.HOLD_TIME,'%Y') = #{yearId} + AND act_type = #{type} From ae2a099d389f9d787ff4f0d77c7bf8bc74dda0b7 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 23 Aug 2022 17:37:46 +0800 Subject: [PATCH 171/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=9E=8B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/WorkdiaryServiceTypeDTO.java | 74 ++++++++++++++++ .../WorkdiaryServiceTypeController.java | 83 ++++++++++++++++++ .../epmet/dao/WorkdiaryServiceTypeDao.java | 16 ++++ .../entity/WorkdiaryServiceTypeEntity.java | 44 ++++++++++ .../entity/WorkdiaryServiceTypeExcel.java | 51 +++++++++++ .../redis/WorkdiaryServiceTypeRedis.java | 30 +++++++ .../service/WorkdiaryServiceTypeService.java | 78 +++++++++++++++++ .../impl/WorkdiaryServiceTypeServiceImpl.java | 87 +++++++++++++++++++ .../db/migration/workdiary_service.sql | 20 +++++ .../mapper/WorkdiaryServiceTypeDao.xml | 21 +++++ 10 files changed, 504 insertions(+) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceTypeController.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/WorkdiaryServiceTypeDao.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceTypeEntity.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceTypeExcel.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/redis/WorkdiaryServiceTypeRedis.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceTypeService.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceTypeServiceImpl.java create mode 100755 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/WorkdiaryServiceTypeDao.xml diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java new file mode 100644 index 0000000000..c392df375b --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java @@ -0,0 +1,74 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 工作日志(服务)-服务类型 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-23 + */ +@Data +public class WorkdiaryServiceTypeDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * 服务类型 + */ + private String serviceType; + + /** + * 服务类型名称 + */ + private String serviceName; + + /** + * 是否启用。0：禁用，1：启用 + */ + private Integer enabled; + + /** + * 删除标识 0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceTypeController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceTypeController.java new file mode 100755 index 0000000000..7ec0167414 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceTypeController.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.ExcelUtils; +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.ActSummaryDTO; +import com.epmet.dto.WorkdiaryServiceTypeDTO; +import com.epmet.entity.WorkdiaryServiceTypeExcel; +import com.epmet.service.WorkdiaryServiceTypeService; +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 2022-08-23 + */ +@RestController +@RequestMapping("workdiaryServiceType") +public class WorkdiaryServiceTypeController { + + @Autowired + private WorkdiaryServiceTypeService workdiaryServiceTypeService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = workdiaryServiceTypeService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WorkdiaryServiceTypeDTO data = workdiaryServiceTypeService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WorkdiaryServiceTypeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + workdiaryServiceTypeService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WorkdiaryServiceTypeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + workdiaryServiceTypeService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + workdiaryServiceTypeService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = workdiaryServiceTypeService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WorkdiaryServiceTypeExcel.class); + } + + + +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/WorkdiaryServiceTypeDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/WorkdiaryServiceTypeDao.java new file mode 100755 index 0000000000..fe37602384 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/WorkdiaryServiceTypeDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.WorkdiaryServiceTypeEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 工作日志(服务)-服务类型 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-23 + */ +@Mapper +public interface WorkdiaryServiceTypeDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceTypeEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceTypeEntity.java new file mode 100755 index 0000000000..3a7464aa7b --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceTypeEntity.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; + +/** + * 工作日志(服务)-服务类型 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-23 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("workdiary_service_type") +public class WorkdiaryServiceTypeEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 服务类型 + */ + private String serviceType; + + /** + * 服务类型名称 + */ + private String serviceName; + + /** + * 是否启用。0：禁用，1：启用 + */ + private Integer enabled; + +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceTypeExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceTypeExcel.java new file mode 100755 index 0000000000..a8c3340c73 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceTypeExcel.java @@ -0,0 +1,51 @@ +package com.epmet.entity; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 工作日志(服务)-服务类型 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-23 + */ +@Data +public class WorkdiaryServiceTypeExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "客户id") + private String customerId; + + @Excel(name = "服务类型") + private String serviceType; + + @Excel(name = "服务类型名称") + private String serviceName; + + @Excel(name = "是否启用。0：禁用，1：启用") + private Integer enabled; + + @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-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/redis/WorkdiaryServiceTypeRedis.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/redis/WorkdiaryServiceTypeRedis.java new file mode 100755 index 0000000000..bf4dc2ffc1 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/redis/WorkdiaryServiceTypeRedis.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 2022-08-23 + */ +@Component +public class WorkdiaryServiceTypeRedis { + @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-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceTypeService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceTypeService.java new file mode 100755 index 0000000000..88318950a4 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceTypeService.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.WorkdiaryServiceTypeDTO; +import com.epmet.entity.WorkdiaryServiceTypeEntity; + +import java.util.List; +import java.util.Map; + +/** + * 工作日志(服务)-服务类型 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-23 + */ +public interface WorkdiaryServiceTypeService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-23 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-23 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WorkdiaryServiceTypeDTO + * @author generator + * @date 2022-08-23 + */ + WorkdiaryServiceTypeDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-23 + */ + void save(WorkdiaryServiceTypeDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-23 + */ + void update(WorkdiaryServiceTypeDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-23 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceTypeServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceTypeServiceImpl.java new file mode 100755 index 0000000000..2058e93c47 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceTypeServiceImpl.java @@ -0,0 +1,87 @@ +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.WorkdiaryServiceTypeDao; +import com.epmet.dto.WorkdiaryServiceTypeDTO; +import com.epmet.entity.WorkdiaryServiceTypeEntity; +import com.epmet.redis.WorkdiaryServiceTypeRedis; +import com.epmet.service.WorkdiaryServiceTypeService; +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 2022-08-23 + */ +@Service +public class WorkdiaryServiceTypeServiceImpl extends BaseServiceImpl implements WorkdiaryServiceTypeService { + + @Autowired + private WorkdiaryServiceTypeRedis workdiaryServiceTypeRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WorkdiaryServiceTypeDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WorkdiaryServiceTypeDTO.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 WorkdiaryServiceTypeDTO get(String id) { + WorkdiaryServiceTypeEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WorkdiaryServiceTypeDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WorkdiaryServiceTypeDTO dto) { + WorkdiaryServiceTypeEntity entity = ConvertUtils.sourceToTarget(dto, WorkdiaryServiceTypeEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WorkdiaryServiceTypeDTO dto) { + WorkdiaryServiceTypeEntity entity = ConvertUtils.sourceToTarget(dto, WorkdiaryServiceTypeEntity.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-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql index 63869fa0c2..809e8078cf 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql @@ -24,3 +24,23 @@ CREATE TABLE `workdiary_service_record` PRIMARY KEY (`ID`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT ='工作日志(服务)-记录' + + +# 工作日志-服务分类 +CREATE TABLE `workdiary_service_type` +( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `SERVICE_TYPE` varchar(32) NOT NULL COMMENT '服务类型', + `SERVICE_NAME` varchar(32) NOT NULL COMMENT '服务类型名称', + `ENABLED` tinyint(1) NOT NULL COMMENT '是否启用。0：禁用，1：启用', + `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`), + unique index cust_service_type(CUSTOMER_ID asc , SERVICE_TYPE asc , DEL_FLAG asc) using btree +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='工作日志(服务)-服务类型' diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/WorkdiaryServiceTypeDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/WorkdiaryServiceTypeDao.xml new file mode 100755 index 0000000000..5679d1cb91 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/WorkdiaryServiceTypeDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From afe36ffe1d928ef03857445443de2d3f9dc9fd90 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 17:43:14 +0800 Subject: [PATCH 172/397] /icPartyOrg/adjustOrgPath --- .../controller/IcPartyOrgController.java | 10 +++++++++ .../partyOrg/service/IcPartyOrgService.java | 5 +++++ .../service/impl/IcPartyOrgServiceImpl.java | 22 +++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index 0d43188623..80b8007b9a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -167,4 +167,14 @@ public class IcPartyOrgController { public Result defaultPartyOrg(@LoginUser TokenDto tokenDto){ return new Result().ok(icPartyOrgService.defaultPartyOrg(tokenDto.getCustomerId(), tokenDto.getUserId())); } + + /** + * 调整历史数据 ORG_PIDS + * @return + */ + @PostMapping("adjustOrgPath") + public Result adjustOrgPath(@RequestBody List customerIds){ + icPartyOrgService.adjustOrgPath(customerIds); + return new Result(); + } } 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 3bd50cf946..4f52b137cb 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 @@ -144,4 +144,9 @@ public interface IcPartyOrgService extends BaseService { * @return */ IcPartyOrgInfo queryIcPartyOrgInfo(String icPartyOrgId); + + /** + * 调整历史数据 ORG_PIDS + */ + void adjustOrgPath(List customerIds); } 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 8ead407a81..39941fc013 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 @@ -457,4 +457,26 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl customerIds) { + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.in(org.apache.commons.collections4.CollectionUtils.isNotEmpty(customerIds),IcPartyOrgEntity::getCustomerId,customerIds); + List list=baseDao.selectList(queryWrapper); + int num=1; + for(IcPartyOrgEntity entity:list){ + List pids=new ArrayList<>(); + List names=new ArrayList<>(); + Map map=getPartyOrgIdPath(pids,names,entity.getOrgPid()); + String partyOrgIdPath = map.containsKey("idPath") ? map.get("idPath") : StrConstant.EPMETY_STR; + String partyOrgNamePath = map.containsKey("namePath") ? map.get("namePath") : StrConstant.EPMETY_STR; + log.info(num+":::"+entity.getId()+entity.getPartyOrgName()+";path="+partyOrgIdPath+";"+partyOrgNamePath); + entity.setOrgPids(partyOrgIdPath); + baseDao.updateById(entity); + num++; + } + } } From 4a96b8e7a859ca64f8bd9aa93a0e75102d0c8e72 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 24 Aug 2022 09:30:26 +0800 Subject: [PATCH 173/397] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/result/IcPartyActListResultDTO.java | 4 ++++ .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java index 29c968ba90..8644aa81c2 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java @@ -22,6 +22,10 @@ public class IcPartyActListResultDTO implements Serializable { * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动； */ private String actType; + /** + * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动； + */ + private String actTypeName; /** * 活动时间 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 5bd4ea3bc8..702ed4ff31 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -694,6 +694,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl list = baseDao.selectresiPartyActList(formDTO); + + //3.封装数据 + List dict = actTypeList(formDTO.getCustomerId()); + list.forEach(u -> dict.stream().filter(r -> u.getActType().equals(r.getValue())).forEach(d -> u.setActTypeName(d.getLabel()))); + PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } From 7694d3e9afd85bd5ce08acc58bab062139ce0c69 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 24 Aug 2022 09:42:56 +0800 Subject: [PATCH 174/397] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcSocietyOrgDTO.java | 39 +++++-------------- .../controller/IcSocietyOrgController.java | 11 ++++++ .../com/epmet/entity/IcSocietyOrgEntity.java | 2 +- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java index f0304874e5..8b1d9f8a57 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java @@ -39,6 +39,11 @@ public class IcSocietyOrgDTO implements Serializable { */ private String id; + /** + * 图片地址 + */ + private String imgUrl; + /** * 客户Id */ @@ -74,6 +79,11 @@ public class IcSocietyOrgDTO implements Serializable { */ private String mobile; + /** + * 服务时间 + */ + private String serviceTimeStr; + /** * 起始服务时间 */ @@ -109,34 +119,5 @@ public class IcSocietyOrgDTO implements Serializable { */ private String remarks; - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index 2b07959e33..831fc62b3c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.IcSocietyOrgDTO; import com.epmet.dto.form.AddSocietyOrgFormDTO; import com.epmet.dto.form.EditSocietyOrgFormDTO; import com.epmet.dto.form.GetListSocietyOrgFormDTO; @@ -87,6 +88,16 @@ public class IcSocietyOrgController { return new Result(); } + /** + * @Author sun + * @Description 删除社会组织 + **/ + @RequestMapping("detail/{id}") + public Result detail(@LoginUser TokenDto tokenDto, @PathVariable(value = "id") String id) { + IcSocietyOrgDTO icSocietyOrgDTO = societyOrgService.get(id); + return new Result().ok(icSocietyOrgDTO); + } + /** * @Author sun * @Description 删除社会组织 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java index 20cd08c3b1..f97113dd58 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java @@ -93,7 +93,7 @@ public class IcSocietyOrgEntity extends BaseEpmetEntity { private String adminStaffId; /** - * 地址 + * 图片地址 */ private String imgUrl; /** From 40bb8cd80227db8780532d369a97805cde56e1b3 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 24 Aug 2022 10:00:26 +0800 Subject: [PATCH 175/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=92=8C=E5=AD=97=E6=AE=B5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/WorkdiaryServiceTypeDTO.java | 6 +- .../WorkdiaryServiceQueryFormDTO.java | 10 ++ .../dto/result/WorkdiaryServiceRecordDTO.java | 2 +- .../WorkdiaryServiceRecordController.java | 129 ++++++++++++++++-- .../WorkdiaryServiceTypeController.java | 43 ------ .../entity/WorkdiaryServiceRecordEntity.java | 2 +- .../entity/WorkdiaryServiceTypeEntity.java | 4 +- .../db/migration/workdiary_service.sql | 6 +- .../mapper/WorkdiaryServiceTypeDao.xml | 2 +- 9 files changed, 136 insertions(+), 68 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/workdiaryservice/WorkdiaryServiceQueryFormDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java index c392df375b..4f8c936bf7 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java @@ -29,17 +29,17 @@ public class WorkdiaryServiceTypeDTO implements Serializable { /** * 服务类型 */ - private String serviceType; + private Short serviceType; /** * 服务类型名称 */ - private String serviceName; + private String serviceTypeName; /** * 是否启用。0：禁用，1：启用 */ - private Integer enabled; + private Short enabled; /** * 删除标识 0.未删除 1.已删除 diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/workdiaryservice/WorkdiaryServiceQueryFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/workdiaryservice/WorkdiaryServiceQueryFormDTO.java new file mode 100644 index 0000000000..28d967b175 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/workdiaryservice/WorkdiaryServiceQueryFormDTO.java @@ -0,0 +1,10 @@ +package com.epmet.dto.form.workdiaryservice; + +import lombok.Data; + +@Data +public class WorkdiaryServiceQueryFormDTO { + + + +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java index 4cf60df0d2..825c4e76e3 100755 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java @@ -29,7 +29,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 服务类型 */ - private String serviceType; + private Short serviceType; /** * 单位ID diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceRecordController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceRecordController.java index 2ca6537d09..fc8fea3b39 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceRecordController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceRecordController.java @@ -9,9 +9,13 @@ 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.WorkdiaryServiceTypeDTO; +import com.epmet.dto.form.workdiaryservice.WorkdiaryServiceQueryFormDTO; import com.epmet.dto.result.WorkdiaryServiceRecordDTO; +import com.epmet.entity.WorkdiaryServiceTypeExcel; import com.epmet.excel.WorkdiaryServiceRecordExcel; import com.epmet.service.WorkdiaryServiceRecordService; +import com.epmet.service.WorkdiaryServiceTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -27,56 +31,153 @@ import java.util.Map; * @since v1.0.0 2022-08-23 */ @RestController -@RequestMapping("workdiaryServiceRecord") +@RequestMapping("workdiaryService") public class WorkdiaryServiceRecordController { @Autowired private WorkdiaryServiceRecordService workdiaryServiceRecordService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = workdiaryServiceRecordService.page(params); + @Autowired + private WorkdiaryServiceTypeService workdiaryServiceTypeService; + + /** + * 记录-分页 + * @param params + * @return + */ + @RequestMapping("/record/page") + public Result> recordPage(@RequestBody WorkdiaryServiceQueryFormDTO input){ + PageData page = workdiaryServiceRecordService.page(null); return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + /** + * 记录-单条 + * @param id + * @return + */ + @RequestMapping(value = "/record/{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result recordGet(@PathVariable("id") String id){ WorkdiaryServiceRecordDTO data = workdiaryServiceRecordService.get(id); return new Result().ok(data); } + /** + * 记录-保存 + * @return + */ @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody WorkdiaryServiceRecordDTO dto){ + @PostMapping("/record/save") + public Result recordSave(@RequestBody WorkdiaryServiceRecordDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); workdiaryServiceRecordService.save(dto); return new Result(); } + /** + * 记录-更新 + * @param + * @return + */ @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody WorkdiaryServiceRecordDTO dto){ + @PostMapping("/record/update") + public Result recordUpdate(@RequestBody WorkdiaryServiceRecordDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); workdiaryServiceRecordService.update(dto); return new Result(); } - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ + /** + * 记录-删除 + * @return + */ + @PostMapping("/record/delete") + public Result recordDelete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); workdiaryServiceRecordService.delete(ids); return new Result(); } - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + /** + * 记录-导出 + * @return + */ + @GetMapping("/record/export") + public void recordExport(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = workdiaryServiceRecordService.list(params); ExcelUtils.exportExcelToTarget(response, null, list, WorkdiaryServiceRecordExcel.class); } + /** + * 服务类型-分页 + * @return + */ + @RequestMapping("/serviceType/page") + public Result> serviceTypePage(@RequestParam Map params){ + PageData page = workdiaryServiceTypeService.page(params); + return new Result>().ok(page); + } + + /** + * 服务类型-单条 + * @return + */ + @RequestMapping(value = "/serviceType/{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result serviceTypeGet(@PathVariable("id") String id){ + WorkdiaryServiceTypeDTO data = workdiaryServiceTypeService.get(id); + return new Result().ok(data); + } + + /** + * 服务类型-保存 + * @return + */ + @NoRepeatSubmit + @PostMapping("/serviceType/save") + public Result serviceTypeSave(@RequestBody WorkdiaryServiceTypeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + workdiaryServiceTypeService.save(dto); + return new Result(); + } + + /** + * 服务类型-更新 + * @return + */ + @NoRepeatSubmit + @PostMapping("/serviceType/update") + public Result serviceTypeUpdate(@RequestBody WorkdiaryServiceTypeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + workdiaryServiceTypeService.update(dto); + return new Result(); + } + + /** + * 服务类型-删除 + * @return + */ + @PostMapping("/serviceType/delete") + public Result serviceTypeDelete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + workdiaryServiceTypeService.delete(ids); + return new Result(); + } + + /** + * 服务类型-导出 + * @return + */ + @GetMapping("/serviceType/export") + public void serviceTypeExport(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = workdiaryServiceTypeService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WorkdiaryServiceTypeExcel.class); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceTypeController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceTypeController.java index 7ec0167414..8d473d494b 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceTypeController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceTypeController.java @@ -31,52 +31,9 @@ import java.util.Map; @RequestMapping("workdiaryServiceType") public class WorkdiaryServiceTypeController { - @Autowired - private WorkdiaryServiceTypeService workdiaryServiceTypeService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = workdiaryServiceTypeService.page(params); - return new Result>().ok(page); - } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - WorkdiaryServiceTypeDTO data = workdiaryServiceTypeService.get(id); - return new Result().ok(data); - } - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody WorkdiaryServiceTypeDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - workdiaryServiceTypeService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody WorkdiaryServiceTypeDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - workdiaryServiceTypeService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - workdiaryServiceTypeService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = workdiaryServiceTypeService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, WorkdiaryServiceTypeExcel.class); - } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java index 50b5bb7bab..35ea3e19dd 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java @@ -29,7 +29,7 @@ public class WorkdiaryServiceRecordEntity extends BaseEpmetEntity { /** * 服务类型 */ - private String serviceType; + private Short serviceType; /** * 单位ID diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceTypeEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceTypeEntity.java index 3a7464aa7b..2f3258503b 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceTypeEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceTypeEntity.java @@ -29,12 +29,12 @@ public class WorkdiaryServiceTypeEntity extends BaseEpmetEntity { /** * 服务类型 */ - private String serviceType; + private Short serviceType; /** * 服务类型名称 */ - private String serviceName; + private String serviceTypeName; /** * 是否启用。0：禁用，1：启用 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql index 809e8078cf..ebb1138369 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql @@ -3,7 +3,7 @@ CREATE TABLE `workdiary_service_record` ( `ID` varchar(64) NOT NULL COMMENT '主键', `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', - `SERVICE_TYPE` varchar(32) NOT NULL COMMENT '服务类型', + `SERVICE_TYPE` tinyint(1) NOT NULL COMMENT '服务类型', `AGENCY_ID` varchar(32) NOT NULL COMMENT '单位ID', `GRID_ID` varchar(32) NOT NULL COMMENT '网格ID', `ORG_ID_PATH` varchar(255) NOT NULL COMMENT '组织ID path', @@ -31,8 +31,8 @@ CREATE TABLE `workdiary_service_type` ( `ID` varchar(64) NOT NULL COMMENT '主键', `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', - `SERVICE_TYPE` varchar(32) NOT NULL COMMENT '服务类型', - `SERVICE_NAME` varchar(32) NOT NULL COMMENT '服务类型名称', + `SERVICE_TYPE` tinyint(1) NOT NULL COMMENT '服务类型', + `SERVICE_TYPE_NAME` varchar(32) NOT NULL COMMENT '服务类型名称', `ENABLED` tinyint(1) NOT NULL COMMENT '是否启用。0：禁用，1：启用', `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', `REVISION` int(11) NOT NULL COMMENT '乐观锁', diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/WorkdiaryServiceTypeDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/WorkdiaryServiceTypeDao.xml index 5679d1cb91..d3fd24730d 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/WorkdiaryServiceTypeDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/WorkdiaryServiceTypeDao.xml @@ -7,7 +7,7 @@ - + From 06fc4b5c76ef5898a1f0b3217bd6e22dc5746c3d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Aug 2022 10:03:19 +0800 Subject: [PATCH 176/397] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF=E3=80=81=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcSocietyOrgController.java | 82 ++++++++++++++++-- .../com/epmet/excel/IcSocietyOrgExcel.java | 27 ++---- .../epmet/excel/IcSocietyOrgExportExcel.java | 42 +++++++++ .../service/impl/IcSocietyOrgServiceImpl.java | 72 ++++++++------- .../templates/societyorg_import_template.xlsx | Bin 0 -> 8953 bytes 5 files changed, 164 insertions(+), 59 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index 2b07959e33..ca877fda19 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -18,13 +18,17 @@ package com.epmet.controller; import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; +import com.alibaba.excel.EasyExcel; +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.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.ExcelPoiUtils; -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.dto.form.AddSocietyOrgFormDTO; import com.epmet.dto.form.EditSocietyOrgFormDTO; @@ -33,18 +37,26 @@ import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.result.GetListSocietyOrgResultDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.excel.IcSocietyOrgExcel; +import com.epmet.excel.IcSocietyOrgExportExcel; import com.epmet.service.IcSocietyOrgService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.IOUtils; 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.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.net.URLEncoder; import java.text.ParseException; import java.util.ArrayList; import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -129,11 +141,46 @@ public class IcSocietyOrgController { **/ @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody GetListSocietyOrgFormDTO formDTO, HttpServletResponse response) throws Exception { + //废弃原来的导出 + // formDTO.setCustomerId(tokenDto.getCustomerId()); + // formDTO.setStaffId(tokenDto.getUserId()); + // formDTO.setIsPage(false); + // GetListSocietyOrgResultDTO list = societyOrgService.getList(formDTO); + // ExcelUtils.exportExcelToTarget(response, null, list.getList(), IcSocietyOrgExportExcel.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); formDTO.setIsPage(false); - GetListSocietyOrgResultDTO list = societyOrgService.getList(formDTO); - ExcelUtils.exportExcelToTarget(response, null, list.getList(), IcSocietyOrgExcel.class); + 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), IcSocietyOrgExportExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + GetListSocietyOrgResultDTO data = null; + List list = null; + do { + data = societyOrgService.getList(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcSocietyOrgExportExcel.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(); + } + } } /** @@ -168,4 +215,29 @@ public class IcSocietyOrgController { return new Result().ok(str); } + + /** + * 下载社会组织导入模板 + * @param response + * @throws IOException + */ + @RequestMapping(value = "import-template-download", 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.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("社区组织导入模板", "UTF-8") + ".xlsx"); + + InputStream is = this.getClass().getClassLoader().getResourceAsStream("templates/societyorg_import_template.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } + + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java index c4392b5e5a..e48c6cb6d6 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java @@ -34,37 +34,28 @@ import java.io.Serializable; @Data public class IcSocietyOrgExcel extends ExcelVerifyInfo implements Serializable { - @Excel(name = "组织名称") + @Excel(name = "所属组织") @NotBlank(message = "不能为空") private String agencyName; - @Excel(name = "社会组织名称") + @Excel(name = "组织名称") @NotBlank(message = "不能为空") @Length(max=50,message = "不能超过50个字") private String societyName; - @Excel(name = "服务事项") + @Excel(name = "服务内容") @NotBlank(message = "不能为空") @Length(max=1000,message = "不能超过1000个字") private String serviceMatters; - @Excel(name = "负责人") - @NotBlank(message = "不能为空") - @Length(max=20,message = "不能超过20个字") - private String personInCharge; - - @Excel(name = "负责人电话") + @Excel(name = "服务电话") @NotBlank(message = "不能为空") @Length(max=11,message = "不能超过11个字") private String mobile; - @Excel(name = "起始服务时间") + @Excel(name = "服务时间") @NotBlank(message = "不能为空") - private String serviceStartTime; - - @Excel(name = "终止服务时间") - @NotBlank(message = "不能为空") - private String serviceEndTime; + private String serviceTimeStr; @Excel(name = "管理员姓名") private String adminStaffName; @@ -72,10 +63,4 @@ public class IcSocietyOrgExcel extends ExcelVerifyInfo implements Serializable { @Excel(name = "地址") private String address; - @Excel(name = "经度") - private String longitude; - - @Excel(name = "维度") - private String latitude; - } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java new file mode 100644 index 0000000000..bf914d42d6 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java @@ -0,0 +1,42 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2022/8/24 8:41 + */ +@Data +public class IcSocietyOrgExportExcel { + @ExcelProperty(value = "所属组织") + @ColumnWidth(30) + private String agencyName; + + @ExcelProperty(value = "组织名称") + @ColumnWidth(30) + private String societyName; + + @ColumnWidth(50) + @ExcelProperty(value = "服务内容") + private String serviceMatters; + + @ColumnWidth(20) + @ExcelProperty(value = "服务电话") + private String mobile; + + @ColumnWidth(20) + @ExcelProperty(value = "服务时间") + private String serviceTimeStr; + + @ColumnWidth(20) + @ExcelProperty(value = "管理员姓名") + private String adminStaffName; + + @ColumnWidth(30) + @ExcelProperty(value = "地址") + private String address; +} + diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index 800d2e447c..16e1cee8f4 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -43,6 +43,7 @@ import com.epmet.service.IcSocietyOrgService; import com.epmet.service.IcUserDemandRecService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +53,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -232,53 +232,59 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl map=new HashMap<>(); //2.查询绑定的管理员信息 - Set staffNames = list.stream().map(item -> item.getAdminStaffName().trim()).collect(Collectors.toSet()); - GetByRealNamesFormDTO dto = new GetByRealNamesFormDTO(); - dto.setCustomerId(customerId); - dto.setRealNames(staffNames); - Result> staffResult = epmetUserOpenFeignClient.getByRealNames(dto); - if (!staffResult.success()) { - throw new RenException("获取工作人员基础信息失败......"); - } - if (null == staffResult.getData()) { - Iterator iter = list.iterator(); - while (iter.hasNext()) { - IcSocietyOrgExcel obj = iter.next(); - numList.add(obj.getRowNum()); - iterator.remove(); + Set staffNames = list.stream().filter(t -> StringUtils.isNotBlank(t.getAdminStaffName())).map(item -> item.getAdminStaffName().trim()).collect(Collectors.toSet()); + if(!CollectionUtils.isEmpty(staffNames)){ + GetByRealNamesFormDTO dto = new GetByRealNamesFormDTO(); + dto.setCustomerId(customerId); + dto.setRealNames(staffNames); + Result> staffResult = epmetUserOpenFeignClient.getByRealNames(dto); + if (!staffResult.success()) { + throw new RenException("获取工作人员基础信息失败......"); } - return numList; + if (null == staffResult.getData()) { + Iterator iter = list.iterator(); + while (iter.hasNext()) { + IcSocietyOrgExcel obj = iter.next(); + numList.add(obj.getRowNum()); + iterator.remove(); + } + return numList; + } + map= staffResult.getData().stream().collect(Collectors.toMap(CustomerStaffDTO::getRealName, CustomerStaffDTO::getUserId)); } - Map map = staffResult.getData().stream().collect(Collectors.toMap(CustomerStaffDTO::getRealName, CustomerStaffDTO::getUserId)); //3.遍历封装有效数据 List houseEntityList = new ArrayList<>(); Iterator iterator1 = list.iterator(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); while (iterator1.hasNext()) { - IcSocietyOrgExcel icHouseExcel = iterator1.next(); + IcSocietyOrgExcel icSocietyOrgExcel = iterator1.next(); IcSocietyOrgEntity entity = new IcSocietyOrgEntity(); entity.setCustomerId(customerId); entity.setAgencyId(staffInfoCache.getAgencyId()); entity.setPids(staffInfoCache.getAgencyPIds()); - entity.setSocietyName(icHouseExcel.getSocietyName()); - entity.setServiceMatters(icHouseExcel.getServiceMatters()); - entity.setPersonInCharge(icHouseExcel.getPersonInCharge()); - entity.setMobile(icHouseExcel.getMobile()); - entity.setServiceStartTime(sdf.parse(icHouseExcel.getServiceStartTime())); - entity.setServiceEndTime(sdf.parse(icHouseExcel.getServiceEndTime())); - entity.setAdminStaffId(map.containsKey(icHouseExcel.getAdminStaffName().trim()) ? map.get(icHouseExcel.getAdminStaffName().trim()) : ""); - if ("".equals(entity.getAdminStaffId())) { - numList.add(icHouseExcel.getRowNum()); - log.warn(String.format("绑定的管理员不存在,管理员名称->%s,行号->%s", icHouseExcel.getAdminStaffName(), icHouseExcel.getRowNum())); + entity.setSocietyName(icSocietyOrgExcel.getSocietyName()); + entity.setServiceMatters(icSocietyOrgExcel.getServiceMatters()); + //负责人去掉 + // entity.setPersonInCharge(icSocietyOrgExcel.getPersonInCharge()); + entity.setMobile(icSocietyOrgExcel.getMobile()); + //服务时间手动输入 + entity.setServiceTimeStr(icSocietyOrgExcel.getServiceTimeStr()); + // entity.setServiceStartTime(sdf.parse(icHouseExcel.getServiceStartTime())); + // entity.setServiceEndTime(sdf.parse(icHouseExcel.getServiceEndTime())); + entity.setAdminStaffId(MapUtils.isNotEmpty(map)&&map.containsKey(icSocietyOrgExcel.getAdminStaffName().trim()) ? map.get(icSocietyOrgExcel.getAdminStaffName().trim()) : ""); + if (StringUtils.isBlank(entity.getAdminStaffId())) { + numList.add(icSocietyOrgExcel.getRowNum()); + log.warn(String.format("绑定的管理员不存在,管理员名称->%s,行号->%s", icSocietyOrgExcel.getAdminStaffName(), icSocietyOrgExcel.getRowNum())); iterator1.remove(); continue; } - entity.setAddress(icHouseExcel.getAddress()); - entity.setLongitude(icHouseExcel.getLongitude()); - entity.setLatitude(icHouseExcel.getLatitude()); + entity.setAddress(icSocietyOrgExcel.getAddress()); + //经纬度不能导入 + // entity.setLongitude(icHouseExcel.getLongitude()); + // entity.setLatitude(icHouseExcel.getLatitude()); houseEntityList.add(entity); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..5d02dae502b5326319fb9578a340a4d624c0fea2 GIT binary patch literal 8953 zcma)i1z23m(k(E!yAw3H28ZAhJh;0gxC}BtAh-_%g1ZF?4k5TZ!QFxdcXtR6lK-BZ z!++j=ufLBO*i+Tjd-bmBnzc}r1wbQ0JdPlRAHt9C{}~7mznI#YC<5*59a$6~%&;FW z!2dF<=bkBLg@l0MfP#QP|GSxyy*;z5jdf~Ns|vA#R10hrh4)v;2_~sih%-2B4K!-|sC;A?`P zYUpuSPnNe~9Tc)e8|-@d8117O<%DDA@5`*vW2>$T-{5w^LhNqz8wcpcaxAl4?& z6UGUVn=01y^GD5=2KUXC?GemB(OvY)#d-CBuJ!}E7=K6C#13fo2yggD5ruYEbcqY8 z@8rjV<TYtc9%>)dkR4h|z175#I~h{RF2B zR#hOUwN7U#6NFOwLMb+2257(Cbm2uCQZyt{@r{l3MdmadVH6USsm*P8VQ)i^(uHFP zc&!`Rswr9pn@yCxSYQA&>>BkH;*yzCos9Ppzaql!J6nzDG6*DU*57c z8R*VC6$S=a+I2#%eO`(oGAw!Fc0!@@vS4m5w!bbw=%fI`VPVyPv^3rBfbM6pt73e8 zo)5eS=Iq7-11LJIZ;f~jLHc84N@6whT7c&Hv= zrWU~CU#TD~#X8f%A!QPb1>Opbn{(1@2H5ch(H)vH=$_SAI22{;MT~`&*J&;p`V{gZ zj+!^Z_i%-<$#3x?wC6Lg@C^=wxWqJqyk?;_l5g_hG%Au4=lk2IId$(Nvw1#6qAz-m z({Qw$auYcTPOL?B!ad^p?BKyU&8|<=3#?e zVId&!|CjAA7q-WpidECGOJ>D>pI&)yc-5#o%E29=s#jqh&GmWqY=$k!aKi8nf9Bl< z|8z@mLe~Dv4#TDcehvPen+?&A?Bv_2mTRb#sSe_l2JPqA#~jPLEv9=V&LBB$`@LS zuFH`9g2-OYU$D|4uFu{r>TT;Q(R*6;*3+@ibt21%(fsgqyJ51`NbtJ`sdXiObuS=U z=4fGILN~~#_j)zeb`#8;zPOOMjxWDSMJzHNbI&4|-4tuMMpyX`3QmWzWOt>GBWd!1 zwk7XW%KSv&-=^deC8+Ocrog1=}CUB5FIQb6aCDohy`M4haUyqS6&N;u%5|4&$-2 z5?y5w&v(a;P^nK0xypE-f5$03JJ=o@qhTVMs>|yZtCwlE*{X3ly%cIN`N-_5tK;5) zoGVtpeOHpRGV7KO6P>A-V1p&n7*#u7S9NWjh zCvS??P{36Q{-Acj6qgAl{;X#ij{&MBqvNl`=`9!b$+8%c^;vMIorRV1)*m%k;gU#( zxo=|VT>%gOZ5t_pD6%vKXPnef?oN3 zV7^IY2 zSW|kwx(R(tU0I=4%*B8}@%bQ!7P7jU8Vl3V3$$GIx)nqpKnPDuN}uOSLZo1YNWPvW zTMGi4cLx!Oy1ZyZ%Q;Y@qI$V`sdl%a;ZmwPtY9R*2CLIx61MfFd~xA`6R`;Ln-HJJg?8g!QULd@U8%!@ zRlXNesYvbpHQ{^KO;K#72H3UBF2W{#I~(U6Tzx;Fha<{j!T#Ac(}NY;^DQS7JsXbd z`ml+(NQ7)S1=o5d(#k5t4OwheF)cmIPz2evTy5E5Ko=Z@qHrjcv;gnWAvBC)vz~Zw z0@gvKc)99W1_>CvaivH$88{A3gXifr?QTvZpT>|aEj75kyzXQ_I19_m`;e9{c)fOd zv@-TeXrqa-9S|d#yIgqCe0ekXy0JOU^J2SK!?uC-sQLbM#;*DO7HpfK_6zr`voWDG zAYv9gvGF=GJYms9M|VLtZ!VGx~hpYMJgoN@z~(q?PQb5N5k{soC$FhFVCW z+-}=5;di~@kqSm~wK;G3!3VyQ!|d+o{?P&Tj7{=_00g@fnA8`1XdWlI-+R^HF)y+? z%?ZNGQMbJLf?OG0qw8W~J<=erM6cwp!YFVCmS=M*+7~2O*Zm;Xl4yvvHBYl3NHG`* z?wO|llrsV;O~&GgCnEI~Cpr7wf?#%u+QngcxIcJY85wsp`fjXEVFBi*kg9dR?Jtff+k9}??G2-z*S;FgqL zZ$p(POrHMGi7kWeR-Ne7`XQlFY#h`Bkm1g~dDg04H-zh3pOHeHW9E}j!@l3M#@SzV zO)|IzZB+b%Y&TAyhDt!C;e=qJ&!u~DrK8pjRlUOrUmS1yPec3{7m$Q z`59F2n(J4ki1u)i_02a{ZqfAfR#j0=N6hfFbKK-ca&MxiT_VkyVAUc|?+AU@$uc$0 z)iodPAuP?*m;6^-YYSGmw+*2r?QKM{gXmwo72wTG^m-&GE?~45O9p z3fLvb*nphMiY^oprCNXXT)JDMk7Z0)rIb!E(24(b%DnY;$QG_NIJ1kh)Z%BK4mw@vavSdSOt0$lG70`^C+WCA{R`^_mxCB zPER`zaVbZ!i#yJ+GpQ-*jTIYDB8PF6VfKY_y7^5|bPO{Opr*@S6s%U^X;%XkXzQV& z8^Gz=J89YE_~UWWTI1L&&IIa7df?eclkyh!{M0;Y{DMW@8odym8OoHg)};VGq3L3E zCS-Zs4H*)PyY_%9Bmj{R#L;GJ{da;`3Osm}*}Gqz)Squ%H8nJ#w-0^O_G<_Tl;1~& zqm!Gpnd4)}GofqqVNMh0XGDirnQkjwhn#V@n*-=YPBeim1Cx0UE&_t$nsf?*Y=i)h zLgEaLa;6R}E)IfoW|?+~nMRIB27nR1z-;c0U7qhGq`9S*<-BpKHe!COGH<*kad=~sHr;i~X16*L5Z zUE5y=O5dBA5RX^rSx ztet+Xa&u0DPlQ)lSGwojt7tNJlknSCkjGA3)}*nTN4r-h3uzQUf8e`D!(=T> zZ-A&I$Ec)Y@y=O{*RJpI^;fH~RF2WTA%d`xFrD<9xa-8LJ17%Nj=E%`_LjFIlg_~} z>MCm4-oL7~dDkL@B9Tw(Dv~cQOd0&5>Bk&p(04Y0tBJ6;Xoq??EmuK^pwkb%y_dw6+Pcv{%+0{0kZT}paOp%w0KhyCBx>rGS;9$Hi* zW}aMs>(?id3^ZfNhBtO}Y*!xsj6iB1@eNzTzR*?+Z%Z?x4V89RH$SMJ;F&T9Q9#O= ze%=>lMkb_8Eh)X$C4`dYC}I2{=4noDfYi4BoM?JZ?UXnZ%a{P99I~Fp?D`D}VIyH5 zz)?Tbxv{ZP94LdWy}2kc`n*>M(=5kL0~qJ`@P)v78aKoITzeo)IWP~&Btfn=Extd~ zDDt@m7dPrIEl_mPw-m?S<75+pT0^jZ3&YA%>cz!=X!;iwvRnjv+)z6Ulg6SQuoYDFlbOxWqvHK*}l{H4j43M8a#84adHU7g{@FP}t z?)zbi5p>w(@ci5>uk0lVCL=#uL`i#A`@P1NY5|_2PRt_%Dg?BVB{waN@bjY+<_e-W zud}=bm-91|&39@qjETw+YO8${%VTRVFy9VtA*DiXS*e;w;sAQku;us4fu zlfA%|}FN=PHO04k`<$WAQ^2qFJk4)J%Tox3D{nU{&;n?P zuYN6@hJ#y(g1Iht0m4$3ePK#bn7KNeMs?ZRV+~Gu?_c;@vC30Tg%?^821Wt`)eSm0 zXE71%k~-XWM%(WVv=LXsAD84Y<$_wm7pe`HZ5e1eBa5f#__V*FoIwAUvM5vQ({db4 z6mxvIp=Q6NtFkgV5sEH~^Nc7eewTflXuYUCuoAl6m}uEjiKw_D$XRoCji##LIoY&J z4e~V5S~!S<#ODZ%GJJ=NtZe+vKot0carGM8-d790nz78ja6AN#fAMUn=#4CSGur@1Q zk<=$Q{LBjtEXnX>ajW6w#8|_hP-OAnrCoQS3uO!}jxBZR) zmwEUot(~h2rp4;Lw$x%btZ9PiRsQm7(iEjcqeGnJ44=eJvrcjY%`&{Y#t zk$u5zHA8*Ra-=wPF*ThVB?G_7QaHAQp-Rq63g;a;EeT68XxW>xaU3Kr*b(=G$sEWwdbtaZ6)X9Bp^RIP8Sr=Rp~1 z-i5CdN;MVV6VJkNr;6qCkvWs(dq8$0QFP!a1e;+=zr;DM0BNKOdb(d<3JiwLhwO-m z2!x==Bz=NWxIc5fKFwP!y=RSswBsSr6;6p8*)dR=jM>6VPyczhzYFRfqd^-IyxKgC zPp50KgCd2BrL&EkidY#%v)tY~fg5}G!5CqjGXYwzlieo#`EY-*^ithjW#-ro$lztY z&|T-ykl?MiBZj<20u^(of-GSzvuN`=p~cedxD&(JeM-kz>zwz969qX}<}RU)z5 z8V`&q!<2dqk``qk@prF9{&$BS=Q~ssu3_=g(k7S3XhV?mGmC=30|5qgOKQvUM(avf zyQiytUxH{@ggg$M6bhwC=!(90{ao9eX30G^zbL4E>p~Lloa|V9uKp1!gmT0!g#0auYd= z@3&N?iqooqFje)auw$^LlSHzojyBj-T@$++V0X+YXuRCrj#)7IbGj5e(jif_^U8 z|I^`R{mJ6A{!6`e#kh0tt?akGcN8H`bUs7-x4WHVG$FxKD{EEq8IL1&PEVRTBt=13wk}!C!r0O#|QcX4e7N~0|_xKa{%if4rapi~%It6i3 zR(zEXy~CPp9~Z31>>|OFpmBV+G}S^di^Wox=rN-BWsg)QggY* zbWTUCkz!`|=uvGd2VZP*ge^7ny`$GBYR|U_)FK;+f){|zw&+1zdHWu&M^cC%# zExa~-DJJ9#I#Xm{e-CfBdfskGjGTQY*g%hs9Avwgcu)88%bPBtK)7&Sl6UqRQmHvz zi-uEm^dQmxSEeOCGpk;^;x;L_Qj6>NzetQf9Vtj+KJMb76E%9^O&_m5uoI5vMnE%D z6(^vD?b~0Csm-v+qZR<=-5QXo!eh4nf~>F(p+ z$Kwk*%-9N3&ex>#wfZFrl3!ThF;baa1;6nCba(??3=S{$P6kNcvPlj z4F2AzrmhR|nVvI;;TQx$h8e|Gxd^FSZIM#DZB4NBfk6)WJk3C29Gd{0Tn3_G=IB>@ zi+&!YSNHbf@?$sBTPi{J6MG~7RYw)nsqBmHH={AgMHaY&|v6}{`g_W*spNgjlQG2_HS zu`6%t>75{VKTM7FQERWMQACMxybkU|;?;WcqK9cc(L9+xTW&;yud|Y`uw9Q!lhUDw ztLD6~R8ivuz)jV@4Z42&*!afZZ~bM=EHhP@Aiy(fwXp508RYl=+eol!zULg}o zKdwewMcZ%3l3nS~6y;xbF3<wJ1{18>nf0jKF=7q5*{1dXlsoc z(W&f{;`4u=wR2DPqPt@?&P|ZhKni%wR0#TivXTD==h|Tw{@w$Obq{b7KDhqWh^ZT^wA{==@GK+dz0VuW?j6&=X@rp4}EBR_Ma?2>Y#HVPN< z%T`rJIr=n>(|0RWz9Q-`ZE>rLl0wkIaTHN1O-|e1%C-nNYU`ZSo8H`}en;8apbf9*+um(L*}? zCu9B@^l1rt^!Xih_%EMdDf8cgJt_ph$78U^@i%4upYfh*^N+^ABL z0`+vEPb=ADoZl#s693KZf7P|8^E~Z<{>;Pjpill=KlF5lr>x$e8B!lezQ-B<;`sjm z@7)sam+OBNrGGvlPc@}K5u^U@_D5lQy5y(b%%2G~A7rYBCI20^|F-Byx%c;Y++nBR uJN)SUm-ze7l|Pk#AANuCTE_qK{UZh|%EJ6gR*Z-Lrht2}`~K|F@BaWR=w|`| literal 0 HcmV?d00001 From 4c59f444c05099fe04bccaf79d580db7e12383ed Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 24 Aug 2022 10:08:37 +0800 Subject: [PATCH 177/397] .. --- .../resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java index 9d6de8fef7..96c28eda43 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java @@ -18,7 +18,7 @@ public class PartyActSignFormDTO implements Serializable { /** * 网格Id */ - @NotBlank(message = "网格Id不能为空",groups = {UpdateGroup.class}) + @NotBlank(message = "网格Id不能为空",groups = {AddGroup.class}) private String gridId; /** * 签到地点 From 8eee8ed3d7c065f2cb36a4d0546246cf9c4866d1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 24 Aug 2022 10:50:00 +0800 Subject: [PATCH 178/397] =?UTF-8?q?=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml index b5fc4d414b..0a56fd2369 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml @@ -13,7 +13,8 @@ user_real_name, address, latitude, - longitude + longitude, + created_time FROM ic_party_act_sign_in_record WHERE From 2d36e077aae02f484d5c29dd34b8e6917c96c69c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Aug 2022 11:06:06 +0800 Subject: [PATCH 179/397] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9C=AA=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constants/ImportTaskConstants.java | 5 + .../controller/IcSocietyOrgController.java | 76 ++++++++++- .../excel/IcSocietyOrgImportExcelDTO.java | 75 +++++++++++ .../epmet/service/IcSocietyOrgService.java | 10 ++ .../service/impl/IcSocietyOrgServiceImpl.java | 120 +++++++++++++++++- .../templates/societyorg_import_template.xlsx | Bin 8953 -> 8928 bytes 6 files changed, 276 insertions(+), 10 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.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 2108042cd6..705b037699 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 @@ -62,4 +62,9 @@ public interface ImportTaskConstants { * 城市管理 */ String IC_CITY_MANAGEMENT = "ic_city_management"; + + /** + * 社会组织 + */ + String IC_SOCIETY_ORG="ic_society_org"; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index b08541a972..8c30990fc9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -23,22 +23,30 @@ 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.constant.AppClientConstant; 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.security.dto.TokenDto; 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.IcSocietyOrgDTO; import com.epmet.dto.form.AddSocietyOrgFormDTO; import com.epmet.dto.form.EditSocietyOrgFormDTO; import com.epmet.dto.form.GetListSocietyOrgFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.result.GetListSocietyOrgResultDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.excel.IcSocietyOrgExcel; import com.epmet.excel.IcSocietyOrgExportExcel; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcSocietyOrgService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; @@ -50,15 +58,14 @@ 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.text.ParseException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; @@ -71,11 +78,12 @@ import java.util.stream.Collectors; @Slf4j @RestController @RequestMapping("societyorg") -public class IcSocietyOrgController { +public class IcSocietyOrgController implements ResultDataResolver { @Autowired private IcSocietyOrgService societyOrgService; - + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; /** * @Author sun * @Description 新增社会组织 @@ -195,6 +203,7 @@ public class IcSocietyOrgController { } /** + * 废弃此方法用下面的importV2 * @Author sun * @Description 九小场所下组织列表导入 **/ @@ -250,5 +259,60 @@ public class IcSocietyOrgController { } } + /** + * + * @param tokenDto + * @param file + * @return + */ + @PostMapping("importV2") + public Result importExcelV2(@LoginUser TokenDto tokenDto, @RequestPart("file") MultipartFile file) { + String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID); + + // 1.暂存文件 + String originalFilename = file.getOriginalFilename(); + String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); + + Path fileSavePath; + try { + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_society_org", "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("【社会组织】导入method exception", e); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } + + // 2.生成导入任务记录 + ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); + importTaskForm.setOperatorId(userId); + importTaskForm.setBizType(ImportTaskConstants.IC_SOCIETY_ORG); + importTaskForm.setOriginFileName(originalFilename); + + ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm), + ServiceConstant.EPMET_COMMON_SERVICE, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + "excel导入社会组织错误", + "社会组织导入失败"); + + // 3.执行导入 + societyOrgService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId()); + return new Result(); + } + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java new file mode 100644 index 0000000000..284f6d024d --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java @@ -0,0 +1,75 @@ +package com.epmet.excel; + +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 2022/8/24 10:46 + */ +@Data +public class IcSocietyOrgImportExcelDTO { + + @ExcelProperty(value = "组织名称") + @NotBlank(message = "不能为空") + @Length(max=50,message = "不能超过50个字") + private String societyName; + + @ExcelProperty(value = "服务内容") + @NotBlank(message = "不能为空") + @Length(max=1000,message = "不能超过1000个字") + private String serviceMatters; + + @ExcelProperty(value = "服务电话") + @NotBlank(message = "不能为空") + @Length(max=11,message = "不能超过11个字") + private String mobile; + + @ExcelProperty(value = "服务时间") + @NotBlank(message = "不能为空") + private String serviceTimeStr; + + @ExcelProperty(value = "管理员姓名") + private String adminStaffName; + + @ExcelProperty(value = "地址") + private String address; + + @Data + public static class ErrorRow { + + @ColumnWidth(40) + @ExcelProperty(value = "组织名称") + private String societyName; + + @ColumnWidth(50) + @ExcelProperty(value = "服务内容") + private String serviceMatters; + + @ColumnWidth(20) + @ExcelProperty(value = "服务电话") + private String mobile; + + @ColumnWidth(25) + @ExcelProperty(value = "服务时间") + private String serviceTimeStr; + + @ColumnWidth(20) + @ExcelProperty(value = "管理员姓名") + private String adminStaffName; + + @ColumnWidth(50) + @ExcelProperty(value = "地址") + private String address; + + @ColumnWidth(60) + @ExcelProperty("错误信息") + private String errorInfo; + } +} + diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcSocietyOrgService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcSocietyOrgService.java index 747ff6f14b..8685acaeef 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcSocietyOrgService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcSocietyOrgService.java @@ -28,6 +28,7 @@ import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcSocietyOrgEntity; import com.epmet.excel.IcSocietyOrgExcel; +import java.nio.file.Path; import java.text.ParseException; import java.util.List; @@ -79,4 +80,13 @@ public interface IcSocietyOrgService extends BaseService { List queryListById(List socialOrgIds); IcSocietyOrgDTO get(String id); + + /** + * 导入社会组织，之前的废弃了 + * @param fileSavePath + * @param taskId + * @param customerId + * @param userId + */ + void execAsyncExcelImport(Path fileSavePath, String taskId, String customerId, 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/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index 16e1cee8f4..332db0bae7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -17,41 +17,56 @@ package com.epmet.service.impl; +import com.alibaba.excel.EasyExcel; 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.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.UserDemandConstant; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcSocietyOrgDao; import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.IcSocietyOrgDTO; import com.epmet.dto.form.*; import com.epmet.dto.form.demand.ServiceQueryFormDTO; -import com.epmet.dto.result.GetListSocietyOrgResultDTO; -import com.epmet.dto.result.OrgInfoResultDTO; -import com.epmet.dto.result.SocietyOrgListResultDTO; -import com.epmet.dto.result.StaffSinGridResultDTO; +import com.epmet.dto.result.*; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcSocietyOrgEntity; import com.epmet.excel.IcSocietyOrgExcel; +import com.epmet.excel.IcSocietyOrgImportExcelDTO; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.feign.OssFeignClient; import com.epmet.service.IcSocietyOrgService; import com.epmet.service.IcUserDemandRecService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.MapUtils; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileItemFactory; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; +import org.apache.http.entity.ContentType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; 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.text.ParseException; import java.util.*; import java.util.stream.Collectors; @@ -71,6 +86,10 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl errorRows = null;// todo listener.getErrorRows(); + + boolean failed = errorRows.size() > 0; + if (failed) { + // 生成并上传错误文件 + try { + // 文件生成 + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_enterprise", "import", "error_des"); + String fileName = UUID.randomUUID().toString().concat(".xlsx"); + errorDescFile = errorDescDir.resolve(fileName); + + FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile()); + FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName); + OutputStream os = fileItem.getOutputStream(); + + EasyExcel.write(os, IcSocietyOrgImportExcelDTO.ErrorRow.class).sheet("导入失败列表").doWrite(errorRows); + + // 文件上传oss + Result errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + if (errorDesFileUploadResult.success()) { + errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); + } + } finally { + if (Files.exists(errorDescFile)) { + Files.delete(errorDescFile); + } + } + } + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + importFinishTaskForm.setProcessStatus(failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS); + importFinishTaskForm.setOperatorId(userId); + importFinishTaskForm.setResultDesc(""); + importFinishTaskForm.setResultDescFilePath(errorDesFileUrl); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【社会组织】finishImportTask失败"); + } + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【社会组织】出错:{}", 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("【社会组织】导入记录状态修改为'完成'失败"); + } + } finally { + // 删除临时文件 + if (Files.exists(filePath)) { + try { + Files.delete(filePath); + } catch (IOException e) { + log.error("method exception", e); + } + } + } + } + + private CustomerStaffInfoCacheResult queryCurrentStaff(String customerId, String userId) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); + if (null == staffInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询工作人员缓存信息异常", EpmetErrorCode.SERVER_ERROR.getMsg()); + } + return staffInfo; + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx index 5d02dae502b5326319fb9578a340a4d624c0fea2..a5562c9247c0f6f5d763faa99fbefc3f2ccd1f07 100644 GIT binary patch delta 1446 zcmV;X1zGy}Mc_rSlK}+`u`aqvlb8W4e-x;!B$WVlMI|JPKXP`nhmTBqoCIrpc?GnOgAic&#} z8Zc;<9UmpUqP)~_t;-6u&B1t%qzvU%iZ<3(6l23TAejlALpgC(YRRlC^%_@!6Oi7%qQ^?-y4$-Ku`B+FNlzSt2;)8kjA0*1X6BkLvbz1v7Tx z&b-P&oHyCm$Lr_YdxC!}4%FrDI%yz0mxT7Y_sU&-ak-qMEFw|llc^s~mL#Ongc9=5 z4nF8_ll2dBH~yc*h{iEJIU5o8fUL`X_#3jb`U1282~Vz3y@CP&02hFZ{(T1mV>9gMu5TDk$+LRl497fAxPUFqHhT;QIMo-J#+NgFDJx+E*8D=MdO`dg{7nb!C_+TQ3F)iWULb-PwOwRqVOtbh~jC zc+$aklSs^BQ+lEyjp<{wK13AH9paaS+6?x@^5b{NL0CwzRVZm%;HcDd1N@9fVWZmt z8jW07d4V0|c}x!x_LceLj5K>R5%e~O`_A6Mwat?z38eg-+nvgP%fx0eU9#m+RnQ#PeUoo#64a@Yu(Z#HXq31CjGvptOZqjEh9oLQ?vc*7f z_HV>KZ|S(U^y!Mt27(u3df*G-s^9eEcB55Ia8|Jr_=@1yb9{dXxPzvoliruU$cV3a z^YTRNId-0ClstMZSPtYEJiTngO>n^$6D{Jy7!h3~c4Nfk8nGWE?ynIa$B5}Q0tc;$ zcj)P?M+BIYZY+F~Dt>~mT%TlVNDe7Rho!>8Y2Wew$EwOD?5HeGyU!iIxPXZX8G=)# zZ1;nskh!~qJ8TCgvVYRIe*uslvxo<^5DC57<*n`j002dkMi?u9iz1Sw3&9iU0m4k| z1ZG~wc^T223#}j&DhhScF1qTjc3}nSdD7@Dnj#{UF8}}I=fUHho3bF+x<+F`(8E?j ziH6i>2D*Y?oSz*WQ-V%GrV0yM&|8hPBlq_>q9bt&C}{3nb;1~?xh@s9Y^5Q}rL9Zl zVywFit6HlJbFE!pS+JudX|qxppd_^oI6>Q#G+?e8efpOrMZ5O za<=JzZ8hrqr-|=9_}SNP3$Kgs_wjC94L^T|AKMmYlQ8J{=QlrniC4GTkLG@S_usPk z2Dt{aSQ)Mb0xKPpU>y~c9Um$LlNta3li?s1lVKkk0k@NUACm*cz1roi?f?J)MF9W+6aWAK z000000RSKX001A8S|LFJjgy=qIssaf*C93mfs+m*Kmk9KPa-@4c9V=EAskPxQN4l! z000*T000;O0000000031AOHXWq6Cw?1R54lO9ci10000H01*HO1ONcT9smFU0GSPu AtN;K2 delta 1447 zcmV;Y1z7svMfpXrlK}#F}m6d`F zHDJ*!KR!yiro1w6Z7L1M6<`BTQkHU^p^bBzVr=;aB(srsC@-!mBboE1S!2!ke05*!oEG28+}JrL0jDfocYPp0euf@3H_f^rteQH+1Q4ve&aHgw9!DGS$Vztb-6 zm@RlO4(_cj24h{SYZ^Z%Sso<0wV6HNG^CD9`s@vO@%({g? z^Qr)G-sE2&ub*%4DgLc^P?x)>IDrU!658k9D|eHN%jF#92}zQWoQ27BNn)BzDIpK- z;Di1)S^pq+wy|6uvOT+%c*g;ZU#Y?C&r+V$BnhhWuUW;>z%_dD3Yh?t`8Jj7tW?>kpJ z>-*VK{afU5Onb2)K!!i2poHWnqBJ6z(pF4khH#U!&q>!iw>zA zZj89SM7$p(rk9BQ7;$%rz?0lmWSGmWM}%0l?%eq@R_q90m_CZq5D6LPkIlr%(EdpI z7pp2)(u1;io%rhFl@|_Jx+p+!rj+eo@Qml~+um(9N522h*prbO9J6!>xey6=MctP7 z0001ClQtMDe+v~!(uLp&^Z;Qdb_OQNI4>i*>q09Eg^EI5v_e{Pt^Gw{Fn)(|ObCQQtjGT<_M+mYdB#e}27< zH(Nbid=EdG=4TT>=()!iH+>3Mo9sq&H}3woB)o|K0JA?Ct_1-^lkOfs0j!fRA2R{a zlVcx~1>b+B6-Sf%A5;PRlTaW)0aKHaATR;=lfoc20Uwk3AT1krMctP70001C0RR9L z000000000103ZMW056k4AwdnD4FCXmY%g Date: Wed, 24 Aug 2022 11:21:14 +0800 Subject: [PATCH 180/397] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=94=BE=E5=BC=80del?= =?UTF-8?q?=5Fflag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 976ab930d6..9373743976 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 @@ -1205,7 +1205,7 @@ + select ifnull(max(SERVICE_TYPE), 0) max + from workdiary_service_type + where CUSTOMER_ID = #{customerId} + and DEL_FLAG = '0' + \ No newline at end of file From bc731678671b9fe06368a70e4aad600fcb243032 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Aug 2022 13:47:54 +0800 Subject: [PATCH 182/397] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9end?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcSocietyOrgController.java | 1 - .../java/com/epmet/dao/IcSocietyOrgDao.java | 4 + .../excel/IcSocietyOrgImportExcelDTO.java | 13 +- .../IcSocietyOrgExcelImportListener.java | 157 ++++++++++++++++++ .../service/impl/IcSocietyOrgServiceImpl.java | 50 ++++-- .../main/resources/mapper/IcSocietyOrgDao.xml | 9 + .../impl/CustomerStaffServiceImpl.java | 34 ++-- 7 files changed, 231 insertions(+), 37 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcSocietyOrgExcelImportListener.java diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index 8c30990fc9..a5123e155a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -268,7 +268,6 @@ public class IcSocietyOrgController implements ResultDataResolver { @PostMapping("importV2") public Result importExcelV2(@LoginUser TokenDto tokenDto, @RequestPart("file") MultipartFile file) { String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID); - // 1.暂存文件 String originalFilename = file.getOriginalFilename(); String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java index 0e78731571..5580421547 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java @@ -59,4 +59,8 @@ public interface IcSocietyOrgDao extends BaseDao { * @Description 查询当前组织下的社会组织数据 **/ List getByAgencyId(@Param("agencyId") String agencyId); + + List selectListForUniqueName(@Param("agencyId") String agencyId, + @Param("societyName") String societyName, + @Param("id") String id); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java index 284f6d024d..bc14e774a0 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java @@ -16,22 +16,21 @@ import javax.validation.constraints.NotBlank; public class IcSocietyOrgImportExcelDTO { @ExcelProperty(value = "组织名称") - @NotBlank(message = "不能为空") - @Length(max=50,message = "不能超过50个字") + @NotBlank(message = "组织名称不能为空") + @Length(max=50,message = "组织名称不能超过50个字") private String societyName; @ExcelProperty(value = "服务内容") - @NotBlank(message = "不能为空") - @Length(max=1000,message = "不能超过1000个字") + @NotBlank(message = "服务内容不能为空") + @Length(max=1000,message = "服务内容不能超过1000个字") private String serviceMatters; @ExcelProperty(value = "服务电话") - @NotBlank(message = "不能为空") - @Length(max=11,message = "不能超过11个字") + @NotBlank(message = "服务电话不能为空") private String mobile; @ExcelProperty(value = "服务时间") - @NotBlank(message = "不能为空") + @NotBlank(message = "服务时间不能为空") private String serviceTimeStr; @ExcelProperty(value = "管理员姓名") diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcSocietyOrgExcelImportListener.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcSocietyOrgExcelImportListener.java new file mode 100644 index 0000000000..54b23d8fd2 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcSocietyOrgExcelImportListener.java @@ -0,0 +1,157 @@ +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.dto.result.CustomerStaffInfoCacheResult; +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.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.IcSocietyOrgEntity; +import com.epmet.excel.IcSocietyOrgImportExcelDTO; +import com.epmet.service.impl.IcSocietyOrgServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description + * @Author yzm + * @Date 2022/8/24 11:42 + */ +@Slf4j +public class IcSocietyOrgExcelImportListener implements ReadListener { + // 最大条数阈值 + public static final int MAX_THRESHOLD = 2; + private String currentCustomerId; + /** + * 当前操作用户 + */ + private CustomerStaffInfoCacheResult staffInfo; + private IcSocietyOrgServiceImpl icSocietyOrgService; + private List errorRows = new ArrayList<>(); + /** + * 要插入的数据 + */ + private List insertDatas = new ArrayList<>(); + /** + * 根据组织名称更新的数据 + */ + private List updateDatas = new ArrayList<>(); + private Map staffMap=new HashMap<>(); + public IcSocietyOrgExcelImportListener(String customerId, CustomerStaffInfoCacheResult staffInfo, IcSocietyOrgServiceImpl icSocietyOrgService, Map staffMap) { + this.currentCustomerId = customerId; + this.staffInfo = staffInfo; + this.icSocietyOrgService = icSocietyOrgService; + this.staffMap=staffMap; + } + + @Override + public void invoke(IcSocietyOrgImportExcelDTO data, AnalysisContext analysisContext) { + try { + // log.warn("有数据吗？"+JSON.toJSONString(data)); + // 不能为空先校验数据 + ValidatorUtils.validateEntity(data); + // 去除空格 + ObjectUtil.objectToTrim(data); + IcSocietyOrgEntity icSocietyOrgEntity = ConvertUtils.sourceToTarget(data, IcSocietyOrgEntity.class); + icSocietyOrgEntity.setCustomerId(currentCustomerId); + icSocietyOrgEntity.setAgencyId(staffInfo.getAgencyId()); + icSocietyOrgEntity.setPids(staffInfo.getAgencyPIds()); + if(StringUtils.isNotBlank(data.getAdminStaffName())){ + String adminStaffId = null; + for(String key:staffMap.keySet()){ + if (data.getAdminStaffName().equals(staffMap.get(key))) { + adminStaffId=key; + break; + } + } + if (StringUtils.isBlank(adminStaffId)) { + String msg = String.format("当前组织下没有【%s】", data.getAdminStaffName()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } + icSocietyOrgEntity.setAdminStaffId(adminStaffId); + } + //网格id+场所名称 + List originList = icSocietyOrgService.selectForUniqueName(icSocietyOrgEntity.getAgencyId(), icSocietyOrgEntity.getSocietyName(), null); + if(CollectionUtils.isEmpty(originList)){ + insertDatas.add(icSocietyOrgEntity); + }else{ + IcSocietyOrgEntity origin=originList.get(NumConstant.ZERO); + icSocietyOrgEntity.setId(origin.getId()); + updateDatas.add(icSocietyOrgEntity); + } + + + 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).getMsg(); + }else { + errorMsg = "未知错误"; + log.error("【社会组织导入】出错:{}", ExceptionUtils.getErrorStackTrace(e)); + } + IcSocietyOrgImportExcelDTO.ErrorRow errorRow = new IcSocietyOrgImportExcelDTO.ErrorRow(); + errorRow.setSocietyName(data.getSocietyName()); + errorRow.setServiceMatters(data.getServiceMatters()); + errorRow.setMobile(data.getMobile()); + errorRow.setServiceTimeStr(data.getServiceTimeStr()); + errorRow.setAdminStaffName(data.getAdminStaffName()); + errorRow.setAddress(data.getAddress()); + errorRow.setErrorInfo(errorMsg); + errorRows.add(errorRow); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + log.info("☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆"); + // 最后几条达不到阈值，这里必须再调用一次 + execPersist(); + } + + /** + * 执行持久化 + */ + private void execPersist() { + try { + if (CollectionUtils.isNotEmpty(insertDatas)) { + icSocietyOrgService.insertBatch(insertDatas); + } + + if (CollectionUtils.isNotEmpty(updateDatas)) { + icSocietyOrgService.updateBatchById(updateDatas); + } + } finally { + insertDatas.clear(); + updateDatas.clear(); + } + } + + /** + * 获取错误行 + * + * @return + */ + public List getErrorRows() { + return errorRows; + } +} + diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index 332db0bae7..be5ccf565b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -41,6 +41,7 @@ import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcSocietyOrgEntity; import com.epmet.excel.IcSocietyOrgExcel; import com.epmet.excel.IcSocietyOrgImportExcelDTO; +import com.epmet.excel.handler.IcSocietyOrgExcelImportListener; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; @@ -164,14 +165,23 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl pointMap = icUserDemandRecService.getServicePoint(formDTO.getCustomerId(), UserDemandConstant.SOCIAL_ORG); //2.查询被绑定管理员信息 UserIdsFormDTO dto = new UserIdsFormDTO(); - List staffIdList = result.getList().stream().map(SocietyOrgListResultDTO::getAdminStaffId).collect(Collectors.toList()); - staffIdList = staffIdList.stream().distinct().collect(Collectors.toList()); - dto.setUserIds(staffIdList); - Result> listResult = epmetUserOpenFeignClient.getStaffInfoList(dto); - if (!listResult.success()) { - throw new RenException("获取工作人员基本信息失败......"); + List staffIdList = result.getList().stream().filter(u->StringUtils.isNotBlank(u.getAdminStaffId())).map(SocietyOrgListResultDTO::getAdminStaffId).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(staffIdList)){ + staffIdList = staffIdList.stream().distinct().collect(Collectors.toList()); + dto.setUserIds(staffIdList); + Result> listResult = epmetUserOpenFeignClient.getStaffInfoList(dto); + if (!listResult.success()) { + throw new RenException("获取工作人员基本信息失败......"); + } + result.getList().stream().filter(f->StringUtils.isNotBlank(f.getAdminStaffId())).forEach(r -> listResult.getData().stream().filter(u -> r.getAdminStaffId().equals(u.getStaffId())).forEach(u -> r.setAdminStaffName(u.getStaffName()))); + /* result.getList().forEach(dto1->{ + listResult.getData().forEach(staff->{ + if(dto1.getAdminStaffId().equals(staff.getStaffId())){ + dto1.setAdminStaffName(staff.getStaffName()); + } + }); + });*/ } - result.getList().forEach(r -> listResult.getData().stream().filter(u -> r.getAdminStaffId().equals(u.getStaffId())).forEach(u -> r.setAdminStaffName(u.getStaffName()))); //3.查询被绑定管理员信息 OrgInfoFormDTO org = new OrgInfoFormDTO(); @@ -340,14 +350,28 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl> staffIdsRes=govOrgOpenFeignClient.getAgencyStaffs(agencyIdFormDTO); + if (!staffIdsRes.success() || CollectionUtils.isEmpty(staffIdsRes.getData())) { + String msg = "查询当前组织下工作人员列表异常"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } + Result currentAgencyStaffs=epmetUserOpenFeignClient.getCustomerStaffList(staffIdsRes.getData()); + if (!currentAgencyStaffs.success() || null == currentAgencyStaffs.getData() || CollectionUtils.isEmpty(currentAgencyStaffs.getData().getStaffList())) { + String msg = "查询当前组织下工作人员信息异常"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } + List staffList=currentAgencyStaffs.getData().getStaffList(); + Map staffMap=staffList.stream().collect(Collectors.toMap(StaffListResultDTO::getStaffId, StaffListResultDTO::getStaffName)); - // todo - /*IcEnterpriseExcelImportListener listener = new IcEnterpriseExcelImportListener(customerId,staffInfo, this); - EasyExcel.read(filePath.toFile(), IcSocietyOrgImportExcelDTO.class, listener).headRowNumber(1).sheet(0).doRead();*/ + IcSocietyOrgExcelImportListener listener = new IcSocietyOrgExcelImportListener(customerId,staffInfo, this,staffMap); + EasyExcel.read(filePath.toFile(), IcSocietyOrgImportExcelDTO.class, listener).headRowNumber(1).sheet(0).doRead(); Path errorDescFile = null; String errorDesFileUrl = null; - List errorRows = null;// todo listener.getErrorRows(); + List errorRows = listener.getErrorRows(); boolean failed = errorRows.size() > 0; if (failed) { @@ -420,4 +444,8 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl selectForUniqueName(String agencyId, String societyName, String id) { + return baseDao.selectListForUniqueName(agencyId,societyName,id); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml index 4939225de6..9fc03ab87d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml @@ -92,4 +92,13 @@ AND agency_id = #{agencyId} + 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 3f9abd5e70..ecfcade3fd 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 @@ -617,25 +617,23 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl staffInfoList = new ArrayList<>(); userIds.forEach(staffId -> { CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), staffId); - if (staffInfo == null) { - log.error("getStaffInfoList fail customerId:{}, staffId:{} not exist in db", formDTO.getCustomerId(), staffId); - return; + if (null != staffInfo) { + StaffSinGridResultDTO resultDTO = new StaffSinGridResultDTO(); + resultDTO.setStaffId(staffId); + resultDTO.setStaffName(staffInfo.getRealName()); + resultDTO.setHeadPhoto(staffInfo.getHeadPhoto()); + resultDTO.setGender(staffInfo.getGender()); + + List roleInfoList = new ArrayList<>(); + staffInfo.getRoleMap().forEach((key, value) -> { + RoleResultDTO dto = new RoleResultDTO(); + dto.setRoleKey(key); + dto.setRoleName(value); + roleInfoList.add(dto); + }); + resultDTO.setRoleList(roleInfoList); + staffInfoList.add(resultDTO); } - StaffSinGridResultDTO resultDTO = new StaffSinGridResultDTO(); - resultDTO.setStaffId(staffId); - resultDTO.setStaffName(staffInfo.getRealName()); - resultDTO.setHeadPhoto(staffInfo.getHeadPhoto()); - resultDTO.setGender(staffInfo.getGender()); - - List roleInfoList = new ArrayList<>(); - staffInfo.getRoleMap().forEach((key, value) -> { - RoleResultDTO dto = new RoleResultDTO(); - dto.setRoleKey(key); - dto.setRoleName(value); - roleInfoList.add(dto); - }); - resultDTO.setRoleList(roleInfoList); - staffInfoList.add(resultDTO); }); /*List staffInfoList = customerStaffDao.getStaffInfoList(userIds); From 072932fec4377abe68ae894e5f395d5330986df7 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 24 Aug 2022 13:50:02 +0800 Subject: [PATCH 183/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91=E5=A4=84=E7=90=86urlPath=E7=9A=84=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/WorkdiaryServiceController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java index 282f6be973..4b5a574df8 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java @@ -67,7 +67,7 @@ public class WorkdiaryServiceController { * @param id * @return */ - @RequestMapping(value = "/record/{id}",method = {RequestMethod.POST,RequestMethod.GET}) + @RequestMapping(value = "/record/{id}/detail",method = {RequestMethod.POST,RequestMethod.GET}) public Result recordGet(@PathVariable("id") String id){ WorkdiaryServiceRecordDTO data = workdiaryServiceRecordService.get(id); return new Result().ok(data); @@ -136,7 +136,7 @@ public class WorkdiaryServiceController { * 服务类型-单条 * @return */ - @RequestMapping(value = "/serviceType/{id}",method = {RequestMethod.POST,RequestMethod.GET}) + @RequestMapping(value = "/serviceType/{id}/detail",method = {RequestMethod.POST,RequestMethod.GET}) public Result serviceTypeGet(@PathVariable("id") String id){ WorkdiaryServiceTypeDTO data = workdiaryServiceTypeService.get(id); return new Result().ok(data); From 89fbd663dfd75507d55e2335ca856e4340bb01b3 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 24 Aug 2022 14:03:34 +0800 Subject: [PATCH 184/397] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/ChangeDeathExcel.java | 2 +- .../src/main/java/com/epmet/excel/ChangeRelocationExcel.java | 2 +- .../src/main/java/com/epmet/excel/ChangeWelfareExcel.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java index a198ceee2d..5ad2165e88 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java @@ -23,7 +23,7 @@ public class ChangeDeathExcel { @Excel(name = "姓名") private String name; - @Excel(name = "身份证") + @Excel(name = "证件号") private String idCard; @Excel(name = "手机号") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java index 1823d569e2..554d776ac9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java @@ -32,7 +32,7 @@ public class ChangeRelocationExcel { @Excel(name = "手机号") private String mobile; - @Excel(name = "身份证号") + @Excel(name = "证件号号") private String idCard; @Excel(name = "性别") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java index 99437aa726..acb7705b2f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java @@ -24,7 +24,7 @@ public class ChangeWelfareExcel { @Excel(name = "姓名") private String name; - @Excel(name = "身份证") + @Excel(name = "证件号") private String idCard; @Excel(name = "手机号") From 9d12fb20fb7efd29ff9cdcb83860d6f912edd790 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Aug 2022 14:35:06 +0800 Subject: [PATCH 185/397] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9B=B4=E6=96=B0partymember=5Finfo.ID=5FCARD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/ResiPartyMemberOpenFeignClient.java | 9 +++++++++ .../ResiPartyMemberOpenFeignClientFallback.java | 12 ++++++++++++ .../controller/PartymemberInfoController.java | 11 +++++++++++ .../service/PartymemberInfoService.java | 7 +++++++ .../service/impl/PartymemberInfoServiceImpl.java | 15 +++++++++++++++ .../service/impl/UserResiInfoServiceImpl.java | 9 +++++++++ 6 files changed, 63 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index de72c34234..03cac6e6f7 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -162,4 +162,13 @@ public interface ResiPartyMemberOpenFeignClient { @PostMapping("/resi/partymember/icPartyAct/act-detail/{icPartyActId}") Result actDetail(@PathVariable("icPartyActId")String icPartyActId); + + /** + * 更新partymember_info.ID_CARD + * @param userId + * @param idNum + * @return + */ + @PostMapping("/resi/partymember/partymemberinfo/updatePartyMemberIdCard") + Result updatePartyMemberIdCard(@RequestParam("userId") String userId, @RequestParam("idNum")String idNum); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index 2a167d2af9..f6d5c20813 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -130,4 +130,16 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp public Result actDetail(String icPartyActId) { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "actDetail"); } + + /** + * 更新partymember_info.ID_CARD + * + * @param userId + * @param idNum + * @return + */ + @Override + public Result updatePartyMemberIdCard(String userId, String idNum) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "updatePartyMemberIdCard",userId,idNum); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java index 98b56b8475..d5c257c114 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java @@ -168,4 +168,15 @@ public class PartymemberInfoController { public Result> getPartyMemberInfoByCustomerId(@RequestParam("customerId")String customerId){ return new Result>().ok(partymemberInfoService.getPartyMemberInfoByCustomerId(customerId)); } + /** + * 更新partymember_info.ID_CARD + * @param userId + * @param idNum + * @return + */ + @PostMapping("updatePartyMemberIdCard") + public Result updatePartyMemberIdCard(@RequestParam("userId") String userId, @RequestParam("idNum")String idNum){ + partymemberInfoService.updatePartyMemberIdCard(userId,idNum); + return new Result(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java index eed9482da3..8e8d5f295d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java @@ -178,4 +178,11 @@ public interface PartymemberInfoService extends BaseService getPartyMemberInfoByCustomerId(String customerId); + + /** + * 更新partymember_info.ID_CARD + * @param userId + * @param idNum + */ + void updatePartyMemberIdCard(String userId, String idNum); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java index dc592a254d..b85d5a87fb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.modules.partymember.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; @@ -258,4 +259,18 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl getPartyMemberInfoByCustomerId(String customerId) { return baseDao.selectListPartyMemberInfoByCustomerId(customerId); } + + /** + * 更新partymember_info.ID_CARD + * + * @param userId + * @param idNum + */ + @Override + public void updatePartyMemberIdCard(String userId, String idNum) { + LambdaUpdateWrapper updateWrapper=new LambdaUpdateWrapper<>(); + updateWrapper.eq(PartymemberInfoEntity::getUserId,userId); + updateWrapper.set(PartymemberInfoEntity::getIdCard,idNum); + baseDao.update(null,updateWrapper); + } } 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 44cd7c12a3..a0294a4158 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 @@ -53,6 +53,7 @@ import com.epmet.redis.UserBaseInfoRedis; import com.epmet.redis.UserResiInfoRedis; import com.epmet.resi.group.dto.topic.form.SharableTopicAndInviteeFormDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; +import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.service.*; import com.epmet.util.ModuleConstant; import org.apache.commons.collections4.CollectionUtils; @@ -99,6 +100,10 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -423,6 +428,10 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Wed, 24 Aug 2022 14:50:56 +0800 Subject: [PATCH 186/397] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/CollectListMemberExcelResultDTO.java | 2 +- .../src/main/java/com/epmet/excel/ChangeRelocationExcel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java index 89742845fa..f94a7dc803 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java @@ -24,7 +24,7 @@ public class CollectListMemberExcelResultDTO implements Serializable { /** * 成员身份证 */ - @Excel(name = "成员身份证号", width = 30) + @Excel(name = "成员证件号", width = 30) private String memberIdNum; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java index 554d776ac9..3b875fd0cd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java @@ -32,7 +32,7 @@ public class ChangeRelocationExcel { @Excel(name = "手机号") private String mobile; - @Excel(name = "证件号号") + @Excel(name = "证件号") private String idCard; @Excel(name = "性别") From 71020ef0d201163a3efad340eb25f28c370ba658 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 24 Aug 2022 15:01:52 +0800 Subject: [PATCH 187/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6------=E5=AE=A1=E6=A0=B8=E5=89=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/CheckHouseInfoFormDTO.java | 31 +++++++ .../dto/result/CheckHomeInfoResultInfo.java | 38 ++++++++ .../epmet/controller/IcHouseController.java | 20 +++++ .../java/com/epmet/dao/IcBuildingDao.java | 9 ++ .../java/com/epmet/dao/IcBuildingUnitDao.java | 8 ++ .../main/java/com/epmet/dao/IcHouseDao.java | 8 ++ .../java/com/epmet/dao/IcNeighborHoodDao.java | 8 ++ .../com/epmet/service/IcHouseService.java | 9 ++ .../service/impl/IcHouseServiceImpl.java | 59 ++++++++++-- .../main/resources/mapper/IcBuildingDao.xml | 11 +++ .../resources/mapper/IcBuildingUnitDao.xml | 11 +++ .../src/main/resources/mapper/IcHouseDao.xml | 9 ++ .../resources/mapper/IcNeighborHoodDao.xml | 10 +++ .../IcVaccinePrarmeterController.java | 5 +- .../com/epmet/dao/IcVaccinePrarmeterDao.java | 8 ++ .../service/IcVaccinePrarmeterService.java | 7 ++ .../impl/IcVaccinePrarmeterServiceImpl.java | 12 +++ .../mapper/IcVaccinePrarmeterDao.xml | 89 ++++++++++++++++++- 18 files changed, 344 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckHouseInfoFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckHomeInfoResultInfo.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckHouseInfoFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckHouseInfoFormDTO.java new file mode 100644 index 0000000000..106952e90c --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckHouseInfoFormDTO.java @@ -0,0 +1,31 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 根据小区，楼宇，单元名称校验是否存在 + * @Author wgf + * @Date 2022/8/24 9:03 + */ +@Data +public class CheckHouseInfoFormDTO implements Serializable { + private static final long serialVersionUID = 2636608477324780974L; + + private String customerId; + + private String gridId; + private String gridName; + + private String villageId; + private String buildId; + private String unitId; + private String homeId; + + + private String villageName; + private String buildName; + private String unitName; + private String homeName; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckHomeInfoResultInfo.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckHomeInfoResultInfo.java new file mode 100644 index 0000000000..ab4bc4d963 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckHomeInfoResultInfo.java @@ -0,0 +1,38 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 房屋信息 + * + * @author wgf + * @date 2022/8/23 20:58 + */ +@Data +public class CheckHomeInfoResultInfo implements Serializable { + private static final long serialVersionUID = -2797565581047800011L; + + // 0：校验成功；1：校验失败； + private String code; + // 提示信息 + private String msg; + // 是否新增房屋：0：否；1：是 + private String isAdd; + + private String gridId; + private String gridName; + + private String villageId; + private String villageName; + + private String buildId; + private String buildName; + + private String unitId; + private String unitName; + + private String homeId; + private String homeName; +} 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 49e3f15f92..6d828df25a 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 @@ -18,11 +18,16 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO; 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.IcHouseDTO; +import com.epmet.dto.IcVaccinePrarmeterDTO; +import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.HouseFormDTO; +import com.epmet.dto.form.VaccinePrarmeterListFormDTO; import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.HouseListResultDTO; @@ -136,4 +141,19 @@ public class IcHouseController { public Result> getOwnerHouseList(@RequestBody IcHouseDTO formDTO){ return new Result>().ok(icHouseService.getOwnerHouseList(formDTO)); } + + /** + * Desc: 根据小区，楼宇，单元名称校验是否存在 + * @param formDTO + * @param tokenDto + * @author wgf + * @date 2022/8/24 13:57 + */ + @PostMapping("checkHomeInfo") + public Result checkHomeInfo(@RequestBody CheckHouseInfoFormDTO formDTO, @LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return icHouseService.checkHomeInfo(formDTO); + + } } 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 8b0cd3f470..fd53deb80d 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 @@ -20,6 +20,7 @@ package com.epmet.dao; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.ImportGeneralDTO; +import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.IcBuildingListFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.CustomerAgencyEntity; @@ -224,4 +225,12 @@ public interface IcBuildingDao extends BaseDao { IcBuildingEntity selectByCoding(@Param("coding") String coding, @Param("id") String id); + + /** + * 根据楼宇名称查询楼宇信息 + * @param formDTO + * @return + */ + IcBuildingEntity getBuildingInfoByName(CheckHouseInfoFormDTO formDTO); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java index 09c40920ed..ebc8c2f888 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.result.HouseInfoResultDTO; import com.epmet.dto.result.OrganizationCommunityDTO; import com.epmet.entity.IcBuildingUnitEntity; @@ -78,4 +79,11 @@ public interface IcBuildingUnitDao extends BaseDao { * @return com.epmet.dto.result.OrganizationCommunityDTO */ OrganizationCommunityDTO selectCommunityByUnitId(@Param("unitId") String unitId); + + /** + * 根据单元名称查询单元信息 + * @param formDTO + * @return + */ + IcBuildingUnitEntity getbuildingUnitInfoByName(CheckHouseInfoFormDTO 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 3ae10791bf..e8e8157256 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,6 +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.IcHouseListFormDTO; import com.epmet.dto.result.*; @@ -201,4 +202,11 @@ public interface IcHouseDao extends BaseDao { */ IcHouseInfoCollectResultDTO getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO); + /** + * 校验房屋 + * @param formDTO + * @return + */ + IcHouseEntity getHouseInfoByName(CheckHouseInfoFormDTO formDTO); + } 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 a1999a0ee6..8d1e8628f6 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 @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.NeighborHoodAndManagementDTO; +import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.HouseInformationFormDTO; import com.epmet.dto.form.IcNeighborHoodListFormDTO; import com.epmet.dto.result.*; @@ -211,4 +212,11 @@ public interface IcNeighborHoodDao extends BaseDao { * @Date 2022/6/29 16:48 */ List getHouseList(HouseInformationFormDTO formDTO); + + /** + * 根据名称查小区信息 + * @param formDTO + * @return + */ + IcNeighborHoodEntity getNeighborHoodInfoByName(CheckHouseInfoFormDTO formDTO); } 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 522acba117..77a5bdd4ad 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 @@ -3,8 +3,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.security.dto.TokenDto; +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.HouseFormDTO; import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseInfoDTO; @@ -130,4 +132,11 @@ public interface IcHouseService extends BaseService { * @Date 2022/7/19 17:41 */ List getOwnerHouseList(IcHouseDTO formDTO); + + /** + * 根据小区，楼宇，单元名称校验是否存在 + * @param formDTO + * @return + */ + Result checkHomeInfo(CheckHouseInfoFormDTO formDTO); } 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 d31a2cbb54..385f90f60d 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 @@ -20,12 +20,9 @@ import com.epmet.dto.IcHouseDTO; 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.HouseFormDTO; -import com.epmet.dto.result.HouseAgencyInfoResultDTO; -import com.epmet.dto.result.HomeInfoResultDTO; -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.entity.IcBuildingEntity; import com.epmet.entity.IcBuildingUnitEntity; import com.epmet.entity.IcHouseEntity; @@ -339,4 +336,56 @@ public class IcHouseServiceImpl extends BaseServiceImpl icHouseRedis.getHouseInfo(item.getId(), item.getCustomerId())).collect(Collectors.toList()); } + + @Override + public Result checkHomeInfo(CheckHouseInfoFormDTO formDTO) { + CheckHomeInfoResultInfo checkHomeInfoResultInfo = ConvertUtils.sourceToTarget(formDTO, CheckHomeInfoResultInfo.class); + + // 校验小区 + IcNeighborHoodEntity icNeighborHoodEntity = icNeighborHoodDao.getNeighborHoodInfoByName(formDTO); + if(StringUtils.isNotBlank(icNeighborHoodEntity.getId())){ + formDTO.setVillageId(icNeighborHoodEntity.getId()); + checkHomeInfoResultInfo.setVillageId(icNeighborHoodEntity.getId()); + }else{ + checkHomeInfoResultInfo.setCode("1"); + checkHomeInfoResultInfo.setMsg("小区名称未匹配到数据"); + return new Result().ok(checkHomeInfoResultInfo); + } + + // 校验楼宇 + IcBuildingEntity icBuildingEntity = icBuildingDao.getBuildingInfoByName(formDTO); + if(StringUtils.isNotBlank(icBuildingEntity.getId())){ + formDTO.setBuildId(icBuildingEntity.getId()); + checkHomeInfoResultInfo.setBuildId(icBuildingEntity.getId()); + }else{ + checkHomeInfoResultInfo.setCode("1"); + checkHomeInfoResultInfo.setMsg("楼宇名称未匹配到数据"); + return new Result().ok(checkHomeInfoResultInfo); + } + + // 校验单元 + IcBuildingUnitEntity icBuildingUnitEntity = buildingUnitDao.getbuildingUnitInfoByName(formDTO); + if(StringUtils.isNotBlank(icBuildingUnitEntity.getId())){ + formDTO.setUnitId(icBuildingUnitEntity.getId()); + checkHomeInfoResultInfo.setUnitId(icBuildingUnitEntity.getId()); + }else{ + checkHomeInfoResultInfo.setCode("1"); + checkHomeInfoResultInfo.setMsg("单元名称未匹配到数据"); + return new Result().ok(checkHomeInfoResultInfo); + } + + // 校验房屋 + IcHouseEntity icHouseEntity = baseDao.getHouseInfoByName(formDTO); + checkHomeInfoResultInfo.setCode("0"); + if(StringUtils.isNotBlank(icHouseEntity.getId())){ + checkHomeInfoResultInfo.setHomeId(icHouseEntity.getId()); + checkHomeInfoResultInfo.setMsg("该房屋为已存在房屋"); + checkHomeInfoResultInfo.setIsAdd("0"); + }else{ + checkHomeInfoResultInfo.setMsg("该房屋暂不存在"); + checkHomeInfoResultInfo.setIsAdd("1"); + } + + return new Result().ok(checkHomeInfoResultInfo); + } } 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 5f825edc25..2fce8b1cf2 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 @@ -450,4 +450,15 @@ + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml index fe5a0ef73b..c46c387e01 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml @@ -59,5 +59,16 @@ and u.id=#{unitId} + + 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 8b900c90dd..6c8b094f67 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 @@ -549,5 +549,14 @@ and DOOR_NAME = #{doorName} + + 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 2f76bc1b7a..d1c0168b4e 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 @@ -662,6 +662,16 @@ ORDER BY SORT, DOOR_NAME+0 + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 48574b4867..9ef386164e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -63,7 +63,8 @@ public class IcVaccinePrarmeterController { @RequestMapping("page") public Result> page(@RequestParam Map params){ - PageData page = icVaccinePrarmeterService.page(params); +// PageData page = icVaccinePrarmeterService.page(params); + PageData page = icVaccinePrarmeterService.getPhrasePage(params); return new Result>().ok(page); } @@ -174,4 +175,6 @@ public class IcVaccinePrarmeterController { + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java index cbe6c686b4..c5bdfcdbf7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java @@ -8,6 +8,7 @@ import com.epmet.entity.IcVaccinePrarmeterEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; /** * 新冠病毒疫苗接种人员信息台账 @@ -20,4 +21,11 @@ public interface IcVaccinePrarmeterDao extends BaseDao List vaccineExport(VaccinePrarmeterListFormDTO formDTO); + /** + * 条件查询 + * @param params + * @return + */ + List getPhrasePage(Map params); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java index c259ba43c2..a298a3e165 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java @@ -28,6 +28,13 @@ public interface IcVaccinePrarmeterService extends BaseService page(Map params); + /** + * 分页条件查询 + * @param params + * @return + */ + PageData getPhrasePage(Map params); + /** * 默认查询 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 9b3ad7dc8e..2f5cdc2a83 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -83,6 +83,18 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl getPhrasePage(Map params) { + IPage page = getPage(params); + List list = baseDao.getPhrasePage(params); + return new PageData<>(list, page.getTotal()); + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index 68fffc3f4b..b1eb484110 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -82,8 +82,93 @@ and MOBILE like CONCAT('%', #{mobile}, '%') - - and (AGENCY_ID = #{orgId} or PIDS like CONCAT('%',#{orgId},'%')) + + and ID_CARD like CONCAT('%', #{idCard}, '%') + + + and (IS_VACCINATION = #{isVaccination} + + + and (GRID_ID = #{gridId} + + + and (VILLAGE_ID = #{villageId} + + + and (BUILD_ID = #{buildId} + + + and (UNIT_ID = #{unitId} + + + and (HOME_ID = #{homeId} + + order by CREATED_TIME desc + + + From 521345a403e6bf5fce22469083d7d55f8b051d4e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 24 Aug 2022 15:04:48 +0800 Subject: [PATCH 188/397] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=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/dto/form/AddSocietyOrgFormDTO.java | 2 +- .../java/com/epmet/dto/form/EditSocietyOrgFormDTO.java | 2 +- .../main/java/com/epmet/excel/IcSocietyOrgExportExcel.java | 4 ++-- .../com/epmet/service/impl/IcSocietyOrgServiceImpl.java | 7 ------- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java index 391652762d..a78b42a471 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java @@ -68,7 +68,7 @@ public class AddSocietyOrgFormDTO implements Serializable { /** * 负责人 */ - @NotBlank(message = "负责人名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) + //@NotBlank(message = "负责人名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) @Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Add.class}) private String personInCharge; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java index 4dfe1df9b2..1e65306066 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java @@ -60,7 +60,7 @@ public class EditSocietyOrgFormDTO implements Serializable { /** * 负责人 */ - @Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Edit.class}) + //@Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Edit.class}) private String personInCharge; /** * 负责人电话 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java index bf914d42d6..5f0c8bdb79 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java @@ -35,8 +35,8 @@ public class IcSocietyOrgExportExcel { @ExcelProperty(value = "管理员姓名") private String adminStaffName; - @ColumnWidth(30) + /*@ColumnWidth(30) @ExcelProperty(value = "地址") - private String address; + private String address;*/ } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index be5ccf565b..ebbc75615b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -174,13 +174,6 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImplStringUtils.isNotBlank(f.getAdminStaffId())).forEach(r -> listResult.getData().stream().filter(u -> r.getAdminStaffId().equals(u.getStaffId())).forEach(u -> r.setAdminStaffName(u.getStaffName()))); - /* result.getList().forEach(dto1->{ - listResult.getData().forEach(staff->{ - if(dto1.getAdminStaffId().equals(staff.getStaffId())){ - dto1.setAdminStaffName(staff.getStaffName()); - } - }); - });*/ } //3.查询被绑定管理员信息 From 9a57fe475442739c16fb0bb0537ada939798b13a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 24 Aug 2022 15:14:07 +0800 Subject: [PATCH 189/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91=E5=AE=8C=E6=88=90=E5=AF=BC=E5=87=BA=EF=BC=9B?= =?UTF-8?q?=E5=88=A0=E9=99=A4servicetype=E5=A2=9E=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E5=AF=B9record=E7=9A=84=E5=88=A4=E6=96=AD=EF=BC=8C=E6=9C=89rec?= =?UTF-8?q?ord=E4=BA=86=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkdiaryServiceController.java | 23 +++-- .../excel/WorkdiaryServiceRecordExcel.java | 93 ++++++++----------- .../WorkdiaryServiceRecordService.java | 7 ++ .../service/WorkdiaryServiceTypeService.java | 2 +- .../WorkdiaryServiceRecordServiceImpl.java | 57 +++++++++++- .../impl/WorkdiaryServiceTypeServiceImpl.java | 41 ++++++-- 6 files changed, 152 insertions(+), 71 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java index 4b5a574df8..cdd26b8794 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java @@ -2,6 +2,7 @@ package com.epmet.controller; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; @@ -14,7 +15,6 @@ import com.epmet.dto.WorkdiaryServiceTypeDTO; import com.epmet.dto.form.workdiaryservice.WorkdiaryServiceQueryFormDTO; import com.epmet.dto.result.WorkdiaryServiceRecordDTO; import com.epmet.entity.WorkdiaryServiceTypeExcel; -import com.epmet.excel.WorkdiaryServiceRecordExcel; import com.epmet.service.WorkdiaryServiceRecordService; import com.epmet.service.WorkdiaryServiceTypeService; import org.springframework.beans.factory.annotation.Autowired; @@ -116,10 +116,15 @@ public class WorkdiaryServiceController { * 记录-导出 * @return */ - @GetMapping("/record/export") - public void recordExport(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = workdiaryServiceRecordService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, WorkdiaryServiceRecordExcel.class); + @PostMapping("/record/export") + public void recordExport(@RequestBody WorkdiaryServiceQueryFormDTO query, HttpServletResponse response) throws Exception { + String gridId = query.getGridId(); + Short serviceType = query.getServiceType(); + String applicantName = query.getApplicantName(); + String applicantAddress = query.getApplicantAddress(); + String serviceContent = query.getServiceContent(); + String applicantMobile = query.getApplicantMobile(); + workdiaryServiceRecordService.export(gridId, serviceType, applicantName, applicantAddress, serviceContent, applicantMobile, response); } /** @@ -176,8 +181,12 @@ public class WorkdiaryServiceController { public Result serviceTypeDelete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - workdiaryServiceTypeService.delete(ids); - return new Result(); + int failCount = workdiaryServiceTypeService.delete(ids); + if (failCount == 0) { + return new Result(); + } else { + return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "部分条目已经被使用，未完全删除，失败条目:" + failCount); + } } /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java index e0eace7a2a..8a2f2cf454 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java @@ -1,12 +1,12 @@ package com.epmet.excel; -import cn.afterturn.easypoi.excel.annotation.Excel; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.epmet.dto.result.WorkdiaryServiceRecordDTO; import lombok.Data; -import java.util.Date; - /** - * 工作日志(服务)-记录 + * 工作日志(服务)-记录 excel * * @author generator generator@elink-cn.com * @since v1.0.0 2022-08-23 @@ -14,65 +14,52 @@ import java.util.Date; @Data public class WorkdiaryServiceRecordExcel { - @Excel(name = "主键") - private String id; - - @Excel(name = "客户id") - private String customerId; - - @Excel(name = "服务类型") - private String serviceType; - - @Excel(name = "单位ID") - private String agencyId; - - @Excel(name = "网格ID") - private String gridId; + @ColumnWidth(25) + @ExcelProperty(value = "所属网格") + private String gridName; - @Excel(name = "组织ID path") - private String orgIdPath; + @ColumnWidth(15) + @ExcelProperty(value = "服务类型") + private String serviceTypeName; - @Excel(name = "申请人ID") - private String applicantId; - - @Excel(name = "申请人姓名") + @ColumnWidth(10) + @ExcelProperty(value = "申请人") private String applicantName; - @Excel(name = "申请人住址") + @ColumnWidth(25) + @ExcelProperty(value = "住址") private String applicantAddress; - @Excel(name = "申请人联系电话") - private String applicantMobile; - - @Excel(name = "服务内容") + @ColumnWidth(25) + @ExcelProperty(value = "服务内容") private String serviceContent; - @Excel(name = "服务时间") - private Date serviceTime; - - @Excel(name = "负责人姓名") - private String principalName; - - @Excel(name = "备注") - private String remark; - - @Excel(name = "删除标识 0.未删除 1.已删除") - private Integer delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; + @ColumnWidth(15) + @ExcelProperty(value = "联系电话") + private String applicantMobile; - @Excel(name = "更新人") - private String updatedBy; + @ColumnWidth(10) + @ExcelProperty(value = "负责人") + private String principal; - @Excel(name = "更新时间") - private Date updatedTime; + @ColumnWidth(10) + @ExcelProperty(value = "服务时间") + private String serviceTime; + @ColumnWidth(20) + @ExcelProperty(value = "备注") + private String remark; + public WorkdiaryServiceRecordExcel(WorkdiaryServiceRecordDTO dto) { + this.gridName = dto.getGridName(); + this.serviceTypeName = dto.getServiceTypeName(); + this.applicantName = dto.getApplicantName(); + this.applicantAddress = dto.getApplicantAddress(); + this.serviceContent = dto.getServiceContent(); + this.serviceContent = dto.getServiceContent(); + this.principal = dto.getPrincipalName(); + this.principal = dto.getPrincipalName(); + this.serviceTime = dto.getServiceTime(); + this.remark = dto.getRemark(); + } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java index 47671ea202..e6ed7578f4 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java @@ -2,9 +2,11 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.form.workdiaryservice.WorkdiaryServiceQueryFormDTO; import com.epmet.dto.result.WorkdiaryServiceRecordDTO; import com.epmet.entity.WorkdiaryServiceRecordEntity; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -78,4 +80,9 @@ public interface WorkdiaryServiceRecordService extends BaseService page = this.page(gridId, serviceType, applicantName, applicantAddress, serviceContent, applicantMobile, pageNo, pageSize); + List list = page.getList(); + if (CollectionUtils.isEmpty(list)) { + // 空的，导出结束 + break; + } + + List excelObjects = list.stream().map(e -> new WorkdiaryServiceRecordExcel(e)).collect(Collectors.toList()); + writer.write(excelObjects, sheet); + } + } finally { + writer.finish(); + } + } + + @Override + public Integer selectRecordCountOfType(Short serviceType) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(WorkdiaryServiceRecordEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); + query.eq(WorkdiaryServiceRecordEntity::getServiceType, serviceType); + return baseDao.selectCount(query); + } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceTypeServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceTypeServiceImpl.java index e81f8b7c30..8c34a9b93c 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceTypeServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceTypeServiceImpl.java @@ -2,28 +2,31 @@ 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.constant.FieldConstant; +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.page.PageData; -import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.dao.WorkdiaryServiceTypeDao; import com.epmet.dto.WorkdiaryServiceTypeDTO; import com.epmet.entity.WorkdiaryServiceTypeEntity; import com.epmet.redis.WorkdiaryServiceTypeRedis; +import com.epmet.service.WorkdiaryServiceRecordService; import com.epmet.service.WorkdiaryServiceTypeService; 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 org.springframework.web.bind.annotation.RequestBody; -import java.util.Arrays; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -41,6 +44,8 @@ public class WorkdiaryServiceTypeServiceImpl extends BaseServiceImpl page(Integer pageNo, Integer pageSize) { @@ -61,6 +66,7 @@ public class WorkdiaryServiceTypeServiceImpl extends BaseServiceImpl ds = baseDao.selectList(stQuery).stream().map((e) -> { WorkdiaryServiceTypeDTO d = new WorkdiaryServiceTypeDTO(); + d.setId(e.getId()); d.setServiceType(e.getServiceType()); d.setServiceTypeName(e.getServiceTypeName()); d.setEnabled(e.getEnabled()); @@ -115,9 +121,30 @@ public class WorkdiaryServiceTypeServiceImpl extends BaseServiceImpl canDeleteIds = new ArrayList<>(); + int failCount = 0; + for (String id : ids) { + WorkdiaryServiceTypeEntity st = baseDao.selectById(id); + if (st == null) { + continue; + } + WorkdiaryServiceRecordService wsRecordService = SpringContextUtils.getBean(WorkdiaryServiceRecordService.class); + Integer recordCount = wsRecordService.selectRecordCountOfType(st.getServiceType()); + if (recordCount > 0) { + failCount++; + } else { + canDeleteIds.add(id); + } + } + + if (CollectionUtils.isNotEmpty(canDeleteIds)) { + baseDao.deleteBatchIds(canDeleteIds); + } + return failCount; } } \ No newline at end of file From 8aa1a5cf149a9b1fb792c437d5e74776ec2d3a23 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 24 Aug 2022 15:20:02 +0800 Subject: [PATCH 190/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6------=E5=AE=A1=E6=A0=B8=E5=89=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcHouseServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 385f90f60d..76df21476b 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 @@ -343,7 +343,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl Date: Wed, 24 Aug 2022 16:37:00 +0800 Subject: [PATCH 191/397] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E3=80=91fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserServiceImpl.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 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 2ec5c5d783..0f55cab634 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 @@ -631,14 +631,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 24 Aug 2022 17:19:03 +0800 Subject: [PATCH 192/397] -1 --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- .../service/impl/PartymemberInfoServiceImpl.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 702ed4ff31..e9d4cbedca 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -175,7 +175,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl implements PartymemberInfoService { - @Autowired - private PartymemberInfoRedis partymemberInfoRedis; @Autowired private PartymemberInfoDao partyMemberInfoDao; @@ -71,8 +67,6 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( From 71d0176d48492cdbbbc3f2d99c5f3f96dbffae81 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 24 Aug 2022 17:27:53 +0800 Subject: [PATCH 193/397] kehuId --- .../epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java index 290a583e7e..b59d7658ff 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java @@ -134,6 +134,7 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl Date: Wed, 24 Aug 2022 17:45:55 +0800 Subject: [PATCH 194/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6------=E6=B7=BB=E5=8A=A0=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcVaccinePrarmeterDTO.java | 15 ++++++++++++++- .../epmet/entity/IcVaccinePrarmeterEntity.java | 10 ++++++++++ .../com/epmet/excel/IcVaccinePrarmeterExcel.java | 7 +++++++ .../impl/IcVaccinePrarmeterServiceImpl.java | 2 ++ .../resources/mapper/IcVaccinePrarmeterDao.xml | 11 +++++++++-- 5 files changed, 42 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java index 08c5da3ce1..a7d56eeec7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java @@ -90,6 +90,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { * 户口性质：0户籍 1外来 */ private String householdType; + private String householdTypeName; /** * 姓名 @@ -110,6 +111,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { * 是否接种：0否1是 */ private String isVaccination; + private String isVaccinationName; /** * 第一次接种时间 @@ -181,4 +183,15 @@ public class IcVaccinePrarmeterDTO implements Serializable { */ private Date updatedTime; -} \ No newline at end of file + /** + * 审核状态：0待审核 1审核不通过 2审核通过 + */ + private String checkState; + private String checkStateName; + + /** + * 审核理由 + */ + private String checkReason; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java index c5dde0c103..c6b982f80d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java @@ -151,4 +151,14 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { */ private String note; + /** + * 审核状态：0待审核 1审核不通过 2审核通过 + */ + private String checkState; + + /** + * 审核理由 + */ + private String checkReason; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index 02f144d189..01200bb938 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -74,5 +74,12 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "备注") private String note; + @Excel(name = "审核状态", replace = {"待审核_0","审核不通过_1","审核通过_2"}) + private String checkState; + + @Excel(name = "审核理由") + private String checkReason; + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 2f5cdc2a83..44050f3a6e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -190,6 +190,8 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl { // 设置客户ID e.setCustomerId(tokenDto.getCustomerId()); + // 设置审核状态为待审核 + e.setCheckState("0"); }); insertBatch(entities); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index b1eb484110..3441859c38 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -73,7 +73,9 @@ CREATED_BY, CREATED_TIME, UPDATED_BY, - UPDATED_TIME + UPDATED_TIME, + CHECK_STATE, + CHECK_REASON from ic_vaccine_prarmeter where DEL_FLAG = 0 @@ -123,10 +125,12 @@ HOME_ID, HOME_NAME, HOUSEHOLD_TYPE, + (case HOUSEHOLD_TYPE when '0' then '户籍' when '1' then '外来' else '' end) as householdTypeName, NAME, MOBILE, ID_CARD, IS_VACCINATION, + (case IS_VACCINATION when '0' then '否' when '1' then '是' else '' end) as isVaccinationName, FIRST_VAC_TIME, FIRST_VAC_SITE, SECOND_VAC_TIME, @@ -140,7 +144,10 @@ CREATED_BY, CREATED_TIME, UPDATED_BY, - UPDATED_TIME + UPDATED_TIME, + CHECK_STATE, + (case CHECK_STATE when '0' then '待审核' when '1' then '审核不通过' when '2' then '审核通过' else '' end) as checkStateName, + CHECK_REASON from ic_vaccine_prarmeter where DEL_FLAG = 0 From 565e10fa3bd2c3251a796307891fe2fdd05ba98e Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 25 Aug 2022 09:34:47 +0800 Subject: [PATCH 195/397] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/PartyPointRecordResultDTO.java | 21 ++++++++++++++++++ .../epmet/dto/result/PartyPointResultDTO.java | 10 +++++++-- .../epmet/controller/ResiPointController.java | 4 ++-- .../service/UserPointActionLogService.java | 7 ++---- .../impl/UserPointActionLogServiceImpl.java | 22 +++++++++++++++---- .../mapper/UserPointActionLogDao.xml | 3 ++- 6 files changed, 53 insertions(+), 14 deletions(-) create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointRecordResultDTO.java diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointRecordResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointRecordResultDTO.java new file mode 100644 index 0000000000..df87b12e14 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointRecordResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/8/25 9:20 + */ +@Data +public class PartyPointRecordResultDTO implements Serializable { + private static final long serialVersionUID = -1480768520576719171L; + /** + * 日期 yyyy-MM-dd 字符串 + * */ + private String date; + private List dailyList; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java index 3a171175e3..13877d86bf 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java @@ -15,8 +15,14 @@ import java.util.Date; public class PartyPointResultDTO implements Serializable { private static final long serialVersionUID = -3208641116926725011L; private String title; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") - private Date dateTime; + /** + * 日期yyyy-MM-dd + */ + private String date; + /** + * 时间hh:mm + */ + private String time; private String point; private String actId; private String actType; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 60712e7780..e37fb2055e 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -265,9 +265,9 @@ public class ResiPointController { * @Date 2022/8/23 14:12 */ @PostMapping("pagePartyPoint") - public Result> pagePartyPoint(@LoginUser TokenDto tokenDto, @RequestBody PartyPointFormDTO formDTO ){ + public Result> pagePartyPoint(@LoginUser TokenDto tokenDto, @RequestBody PartyPointFormDTO formDTO ){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - return new Result>().ok(pointActionLogService.pagePartyPoint(formDTO)); + return new Result>().ok(pointActionLogService.pagePartyPoint(formDTO)); } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java index a229ae583f..9e6ec53a68 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java @@ -25,10 +25,7 @@ import com.epmet.dto.form.CommonPageUserFormDTO; import com.epmet.dto.form.IcResiPointPageFormDTO; import com.epmet.dto.form.MyPointTaskFormDTO; import com.epmet.dto.form.PartyPointFormDTO; -import com.epmet.dto.result.MyPointTaskResultDTO; -import com.epmet.dto.result.PartyPointResultDTO; -import com.epmet.dto.result.ResiPointLogListResultDTO; -import com.epmet.dto.result.ResiPointPageResDTO; +import com.epmet.dto.result.*; import com.epmet.entity.UserPointActionLogEntity; import dto.form.SendPointFormDTO; @@ -170,5 +167,5 @@ public interface UserPointActionLogService extends BaseService pagePartyPoint(PartyPointFormDTO formDTO); + List pagePartyPoint(PartyPointFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index 7a339c69e5..ae22f32df9 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -616,12 +616,13 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl} + * @Return {@link List< PartyPointRecordResultDTO >} * @Author zhaoqifeng * @Date 2022/8/22 16:04 */ @Override - public PageData pagePartyPoint(PartyPointFormDTO formDTO) { + public List pagePartyPoint(PartyPointFormDTO formDTO) { + List result = new LinkedList<>(); if (StringUtils.isNotBlank(formDTO.getQuarter())) { if (StringUtils.isNotBlank(formDTO.getMonth())) { formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth())); @@ -667,9 +668,22 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl> map = + list.stream().collect(Collectors.groupingBy(PartyPointResultDTO::getDate)); + + Map> sortedMap = Maps.newLinkedHashMap(); + map.entrySet().stream().sorted(Map.Entry.>comparingByKey().reversed()) + .forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue())); + sortedMap.entrySet().forEach(e -> { + PartyPointRecordResultDTO o = new PartyPointRecordResultDTO(); + o.setDate(e.getKey()); + o.setDailyList(e.getValue()); + result.add(o); + }); + } - PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal()); + return result; } /** diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index ec1de753c4..51740cf037 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -166,7 +166,8 @@ WHEN 'plus' THEN concat( '+', POINT ) ELSE POINT END AS point, - CREATED_TIME AS dateTime + DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) AS date, + DATE_FORMAT( CREATED_TIME, '%H:%i' ) AS time FROM USER_POINT_ACTION_LOG WHERE From 4497d1aba9fd0ab5325dfbfabd495fb4ce32f02e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 25 Aug 2022 09:37:47 +0800 Subject: [PATCH 196/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91=E6=96=B0=E5=A2=9E=E7=BC=BA=E5=A4=B1=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WorkdiaryServiceRecordServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java index 290a583e7e..4547aa952a 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java @@ -127,11 +127,15 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl entity.setOrgIdPath(gi.getPids().concat(":").concat(gi.getId()))); + .ifPresent(gi -> { + entity.setOrgIdPath(gi.getPids().concat(":").concat(gi.getId())); + entity.setAgencyId(gi.getPid()); + }); IcResiUserDTO applicant = getResultDataOrThrowsException(userOpenFeignClient.getIcResiUserDTO(dto.getApplicantId()), ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "未找到申请人信息"); + entity.setCustomerId(EpmetRequestHolder.getLoginUserCustomerId()); if (applicant != null) { entity.setApplicantName(applicant.getName()); } From cbbff32fb79887fb132a7f82badb40402e9f1795 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 25 Aug 2022 09:46:26 +0800 Subject: [PATCH 197/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91update=E7=BC=BA=E5=A4=B1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkdiaryServiceRecordServiceImpl.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java index 6e91f95877..ffd71c8489 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java @@ -147,6 +147,26 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl { + entity.setOrgIdPath(gi.getPids().concat(":").concat(gi.getId())); + entity.setAgencyId(gi.getPid()); + }); + } + + if (StringUtils.isNotBlank(dto.getApplicantId())) { + IcResiUserDTO applicant = getResultDataOrThrowsException(userOpenFeignClient.getIcResiUserDTO(dto.getApplicantId()), ServiceConstant.EPMET_USER_SERVER, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "未找到申请人信息"); + + if (applicant != null) { + entity.setApplicantName(applicant.getName()); + entity.setCustomerId(applicant.getCustomerId()); + } + } + updateById(entity); } From ca80c502a4c7a16ca672d5d7be61b5a29be96983 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 25 Aug 2022 10:18:33 +0800 Subject: [PATCH 198/397] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87ID=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index e9d4cbedca..e5ecaf20a4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -463,11 +463,13 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 11:55:49 +0800 Subject: [PATCH 199/397] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BD=93=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index e5ecaf20a4..b7a14504a5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -566,7 +566,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 12:01:26 +0800 Subject: [PATCH 200/397] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82=EF=BC=8C=E6=8C=89=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E6=A8=A1=E7=B3=8A=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java | 2 ++ .../src/main/resources/mapper/IcMessageDao.xml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java index 685fd340ad..db5b351010 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java @@ -9,6 +9,8 @@ import java.io.Serializable; public class IcMessageListFormDTO implements Serializable { private static final long serialVersionUID = 2697079163476964749L; + //检索内容 + private String content; private Integer pageNo = 1; private Integer pageSize = 20; private Boolean isPage = true; diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml index aa20ac5071..ec347f4998 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -21,6 +21,9 @@ del_flag = '0' AND customer_id = #{customerId} AND user_id = #{userId} + + AND message_content like concat('%', #{content}, '%') + From c0c802c8de3b8ad4f3a106c6183cc19b559c04d2 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 25 Aug 2022 13:34:43 +0800 Subject: [PATCH 201/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91flyway=E8=B5=8B=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{workdiary_service.sql => V0.0.28__workdiary_service.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/{workdiary_service.sql => V0.0.28__workdiary_service.sql} (100%) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql similarity index 100% rename from epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql rename to epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql From a26a6ff78eb7b77b0d88bf72c170d234f586d0f5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 25 Aug 2022 13:35:36 +0800 Subject: [PATCH 202/397] sql --- .../db/migration/V0.0.6__party_helper.sql | 122 ++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql new file mode 100644 index 0000000000..984eda6608 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql @@ -0,0 +1,122 @@ +CREATE TABLE `ic_schedule` ( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `ORG_ID` varchar(64) NOT NULL COMMENT '所属行政组织ID：当前工作人员所属组织id', + `PID` varchar(64) NOT NULL COMMENT '组织ID的上级；如果org_id是根组织，那此列=0', + `ORG_ID_PATH` varchar(255) NOT NULL COMMENT 'ORG_ID全路径，包含自身', + `STAFF_ID` varchar(64) NOT NULL COMMENT '当前登录用户userId', + `TITLE` varchar(35) NOT NULL COMMENT '日程标题（35字）', + `REMIND_TIME` datetime NOT NULL COMMENT '提醒时间；其实就是日程所属日期', + `IS_PUBLIC` varchar(10) NOT NULL COMMENT '是否公开，0：仅自己可见；1：组织内其他人可见', + `REMARK` varchar(500) DEFAULT NULL COMMENT '备注（500字）', + `DEL_FLAG` int(11) 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=DYNAMIC COMMENT='日程表'; + + +CREATE TABLE `ic_party_act` ( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `ORG_ID` varchar(64) NOT NULL COMMENT '组织ID：当前工作人员所属组织id', + `PID` varchar(64) NOT NULL COMMENT '组织ID的上级；如果org_id是根组织，那此列=0', + `ORG_ID_PATH` varchar(255) NOT NULL COMMENT 'ORG_ID全路径，包含自身', + `PUBLISH_PARTY_ORG_ID` varchar(64) NOT NULL COMMENT '发布活动党组织', + `PUBLISH_PARTY_ORG_NAME` varchar(20) NOT NULL COMMENT '发布活动党组织名称', + `PUBLISH_ORG_PID` varchar(64) DEFAULT NULL COMMENT '发布活动党组织ID的上级节点', + `PUBLISH_ORG_TYPE` varchar(10) NOT NULL COMMENT '发布活动党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组', + `PUBLISH_ORG_PATH` varchar(255) NOT NULL COMMENT '发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显', + `ACT_TYPE` varchar(10) NOT NULL COMMENT '活动类型，来源于ic_party_act_type_dict', + `HOLD_YEAR_ID` varchar(10) NOT NULL COMMENT '活动举办时间：yyyy', + `HOLD_MONTH_ID` varchar(10) NOT NULL COMMENT '活动举办时间:yyyyMM', + `HOLD_TIME` datetime NOT NULL COMMENT '举办活动时间', + `TOPIC` varchar(255) NOT NULL COMMENT '活动主题', + `ADDRESS` varchar(255) NOT NULL COMMENT '活动地点', + `LATITUDE` varchar(32) DEFAULT NULL COMMENT '活动地点纬度', + `LONGITUDE` varchar(32) DEFAULT NULL COMMENT '活动地点经度', + `AUTO_PUBLIC_TYPE` int(11) NOT NULL COMMENT '活动开始前几天', + `AUTO_PUBLIC_TIME` datetime DEFAULT NULL COMMENT '自动发布时间，保存时算好时间存在这里', + `JOIN_USER_TYPE` varchar(10) DEFAULT NULL COMMENT '参加人员类型，0：全体党员；1：支部委员', + `IS_AUTO_INFORM` varchar(1) DEFAULT NULL COMMENT '是否自动通知参加人员，0否；1是', + `INTRODUCE` varchar(1024) DEFAULT NULL COMMENT '活动介绍', + `IS_PUBLISH` varchar(10) NOT NULL COMMENT '是否发布，0未发布；1已发布；', + `PUBLISH_STAFF_ID` varchar(64) NOT NULL COMMENT '活动发布人', + `PUBLISH_STAFF_NAME` varchar(64) NOT NULL COMMENT '活动发布人姓名', + `DEL_FLAG` int(11) 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=DYNAMIC COMMENT='党建组织活动'; + + +CREATE TABLE `ic_party_act_org` ( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `IC_PARTY_ACT_ID` varchar(64) NOT NULL COMMENT '活动id', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `JOIN_ORG_ID` varchar(64) NOT NULL COMMENT '参加活动党组织ID,groupId', + `JOIN_ORG_NAME` varchar(128) NOT NULL COMMENT '参加党组织名称', + `ORG_TYPE` varchar(10) NOT NULL COMMENT '党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组', + `PID` varchar(64) NOT NULL COMMENT '参加活动党组织ID的上级节点', + `JOIN_ORG_PATH` varchar(255) NOT NULL COMMENT 'PARTY_ORG_ID的全路径，包含自身。方便前端回显', + `DEL_FLAG` int(11) 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=DYNAMIC COMMENT='参加活动党组织表'; + +CREATE TABLE `ic_party_act_sign_in_record` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `IC_PARTY_ACT_ID` varchar(64) NOT NULL COMMENT '活动id', + `ID_CARD` varchar(32) NOT NULL COMMENT '身份证号', + `EPMET_USER_ID` varchar(64) NOT NULL COMMENT '签到用户id', + `USER_REAL_NAME` varchar(64) NOT NULL COMMENT '签到用户姓名', + `ADDRESS` varchar(255) NOT NULL COMMENT '签到地点', + `LATITUDE` varchar(32) NOT NULL COMMENT '签到地点纬度', + `LONGITUDE` varchar(32) NOT NULL COMMENT '签到地点经度', + `DEL_FLAG` int(11) 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=DYNAMIC COMMENT='党组织活动签到记录表'; + + +CREATE TABLE `ic_party_act_type_dict` ( + `ID` varchar(64) NOT NULL, + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `TYPE_KEY` varchar(32) NOT NULL COMMENT '活动类型key', + `TYPE_NAME` varchar(32) NOT NULL COMMENT '活动名称', + `YEAR_COUNT` int(11) NOT NULL COMMENT '每年几次', + `FREQUENCY_UNIT` varchar(32) NOT NULL COMMENT '频次单位', + `FREQUENCY_COUNT` int(11) NOT NULL COMMENT '频次数量', + `FREQUENCY_DESC` varchar(63) NOT NULL COMMENT '频率描述', + `SORT` int(11) NOT NULL COMMENT '排序', + `DEL_FLAG` int(11) 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`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党组织活动类型字典表'; + + +INSERT INTO `epmet_resi_partymember`.`ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', 'default', 'zbdydh', '支部党员大会', 4, 'quarter', 1, '每季度1次', 1, 0, 0, 'APP_USER', '2022-08-18 17:43:46', 'APP_USER', '2022-08-18 17:43:54'); +INSERT INTO `epmet_resi_partymember`.`ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', 'default', 'zbwyh', '支部委员会', 12, 'month', 1, '每月1次', 2, 0, 0, 'APP_USER', '2022-08-18 17:43:46', 'APP_USER', '2022-08-18 17:43:54'); +INSERT INTO `epmet_resi_partymember`.`ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3', 'default', 'dxzh', '党小组会', 12, 'month', 1, '每月一次', 3, 0, 0, 'APP_USER', '2022-08-18 17:43:46', 'APP_USER', '2022-08-18 17:43:54'); +INSERT INTO `epmet_resi_partymember`.`ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4', 'default', 'dangke', '党课', 4, 'quarter', 1, '每季度1次', 4, 0, 0, 'APP_USER', '2022-08-18 17:43:46', 'APP_USER', '2022-08-18 17:43:54'); +INSERT INTO `epmet_resi_partymember`.`ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5', 'default', 'ztdr', '主题党日', 12, 'month', 1, '每月1次', 5, 0, 0, 'APP_USER', '2022-08-18 17:43:46', 'APP_USER', '2022-08-18 17:43:54'); +INSERT INTO `epmet_resi_partymember`.`ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('6', 'default', 'wmfwhd', '为民服务活动', 12, 'month', 1, '每月1次', 6, 0, 0, 'APP_USER', '2022-08-18 17:43:46', 'APP_USER', '2022-08-18 17:43:54'); From cfe04406b33232dcfe50880cc3057c6aaca57163 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 25 Aug 2022 13:45:18 +0800 Subject: [PATCH 203/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91flyway=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.28__workdiary_service.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql index d825fba47e..0b42aeac0f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql @@ -23,7 +23,7 @@ CREATE TABLE `workdiary_service_record` `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', PRIMARY KEY (`ID`) ) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='工作日志(服务)-记录' + DEFAULT CHARSET = utf8mb4 COMMENT ='工作日志(服务)-记录'; # 工作日志-服务分类 From f87604fbb3393e4ea9fd1f9f770be10f95f966eb Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 25 Aug 2022 13:50:30 +0800 Subject: [PATCH 204/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6------=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcVaccinePrarmeterDTO.java | 6 +- .../epmet/dto/form/IcVaccineCheckFormDTO.java | 79 ++++++ .../IcVaccinePrarmeterController.java | 19 +- .../entity/IcVaccinePrarmeterEntity.java | 6 +- .../epmet/excel/IcVaccinePrarmeterExcel.java | 12 +- .../excel/IcVaccinePrarmeterImportExcel.java | 18 +- .../IcVaccinePrarmeterImportErrorModel.java | 14 +- .../service/IcVaccinePrarmeterService.java | 9 + .../impl/IcVaccinePrarmeterServiceImpl.java | 237 +++++++++++++++++- 9 files changed, 365 insertions(+), 35 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java index a7d56eeec7..55991fe87d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java @@ -116,7 +116,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第一次接种时间 */ - private String firstVacTime; + private Date firstVacTime; /** * 第一次接种地点 @@ -126,7 +126,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第二次接种时间 */ - private String secondVacTime; + private Date secondVacTime; /** * 第二次接种地点 @@ -136,7 +136,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第三次接种时间 */ - private String thirdVacTime; + private Date thirdVacTime; /** * 第三次接种地点 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java new file mode 100644 index 0000000000..8edf20194d --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java @@ -0,0 +1,79 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +/** + * 新冠病毒疫苗接种人员信息台账-审核入参 + * + * @author wgf + * @since v1.0.0 2022-08-25 + */ +@Data +public class IcVaccineCheckFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @NotBlank(message = "Id不能为空") + private String id; + + /** + * 审核状态：0待审核 1未通过 2已通过 + */ + @NotBlank(message = "审核状态不能为空") + private String checkState; + + /** + * 审核原因 + */ + private String checkReason; + + /** + * 所属小区ID； + */ + private String villageId; + + /** + * 所属楼宇Id + */ + private String buildId; + + /** + * 单元号 + */ + private String unitId; + + /** + * 房间ID + */ + private String homeId; + + /** + * 房间号 + */ + private String doorName; + + /** + * 客户ID(审核人) + */ + private String customerId; + + /** + * 员工ID(审核人) + */ + private String userId; + + /** + * 员工姓名(审核人) + */ + private String realName; + + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 9ef386164e..6627be1966 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -19,9 +19,7 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcVaccinePrarmeterDao; import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.IcVaccinePrarmeterDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; -import com.epmet.dto.form.PointHSYMFormDTO; -import com.epmet.dto.form.VaccinePrarmeterListFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcPointNucleicMonitoringExcel; import com.epmet.excel.IcVaccinePrarmeterExcel; @@ -173,6 +171,21 @@ public class IcVaccinePrarmeterController { return new Result(); } + /** + * 信息采集-审核 + * @param formDTO + * @param tokenDto + * @return + */ + @PostMapping("vaccineCheck") + public Result vaccineCheck(@RequestBody IcVaccineCheckFormDTO formDTO, @LoginUser TokenDto tokenDto) { + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + icVaccinePrarmeterService.vaccineCheck(formDTO,tokenDto); + + return new Result(); + } + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java index c6b982f80d..e0331229c4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java @@ -114,7 +114,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第一次接种时间 */ - private String firstVacTime; + private Date firstVacTime; /** * 第一次接种地点 @@ -124,7 +124,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第二次接种时间 */ - private String secondVacTime; + private Date secondVacTime; /** * 第二次接种地点 @@ -134,7 +134,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第三次接种时间 */ - private String thirdVacTime; + private Date thirdVacTime; /** * 第三次接种地点 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index 01200bb938..bb6b9c5d15 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -50,20 +50,20 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "是否接种", replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间") - private String firstVacTime; + @Excel(name = "第一次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; - @Excel(name = "第二次接种时间") - private String secondVacTime; + @Excel(name = "第二次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date secondVacTime; @Excel(name = "第二次接种地点") private String secondVacSite; - @Excel(name = "第三次接种时间") - private String thirdVacTime; + @Excel(name = "第三次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date thirdVacTime; @Excel(name = "第三次接种地点") private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java index 4eb027872b..daecc97e0e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java @@ -4,6 +4,8 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.ExcelIgnore; import lombok.Data; +import java.util.Date; + /** * 新冠病毒疫苗接种人员信息台账 * @@ -43,20 +45,20 @@ public class IcVaccinePrarmeterImportExcel { @Excel(name = "是否接种", replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间") - private String firstVacTime; + @Excel(name = "第一次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; - @Excel(name = "第二次接种时间") - private String secondVacTime; + @Excel(name = "第二次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date secondVacTime; @Excel(name = "第二次接种地点") private String secondVacSite; - @Excel(name = "第三次接种时间") - private String thirdVacTime; + @Excel(name = "第三次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date thirdVacTime; @Excel(name = "第三次接种地点") private String thirdVacSite; @@ -80,10 +82,10 @@ public class IcVaccinePrarmeterImportExcel { private String gridId; /** - * 组织ID上级 + * 组织ID */ @ExcelIgnore - private String pid; + private String agencyId; /** * 组织ID所有上级 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java index f720b878c9..04768bb90e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java @@ -3,6 +3,8 @@ package com.epmet.excel.error; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; +import java.util.Date; + /** * @Author wgf * @DateTime 2022/6/21 16:57 @@ -45,20 +47,20 @@ public class IcVaccinePrarmeterImportErrorModel { @Excel(name = "是否接种", width = 30, replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间",width = 30) - private String firstVacTime; + @Excel(name = "第一次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") + private Date firstVacTime; @Excel(name = "第一次接种地点",width = 30) private String firstVacSite; - @Excel(name = "第二次接种时间",width = 30) - private String secondVacTime; + @Excel(name = "第二次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") + private Date secondVacTime; @Excel(name = "第二次接种地点",width = 30) private String secondVacSite; - @Excel(name = "第三次接种时间",width = 30) - private String thirdVacTime; + @Excel(name = "第三次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") + private Date thirdVacTime; @Excel(name = "第三次接种地点",width = 30) private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java index a298a3e165..41137212df 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java @@ -4,6 +4,8 @@ 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.dto.IcVaccinePrarmeterDTO; +import com.epmet.dto.form.IcResiCollectCheckFormDTO; +import com.epmet.dto.form.IcVaccineCheckFormDTO; import com.epmet.entity.IcVaccinePrarmeterEntity; import java.io.InputStream; @@ -93,4 +95,11 @@ public interface IcVaccinePrarmeterService extends BaseService page(Map params) { IPage page = baseDao.selectPage( @@ -279,7 +294,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl userMap = queryOriginUserByHomeId(icResiCollectEntity.getHomeId(),icResiCollectEntity.getCustomerId()); + if(userIdCardEntity != null){ + // 已存在人员 + if(userMap.containsKey(icResiCollectEntity.getIdCard())){ + // 人员房屋一致（只更新人员信息） + updateUserInfo(icResiCollectEntity,false,formDTO,userIdCardEntity); + }else{ + // 人员房屋不一致（更新人员信息和变更记录） + updateUserInfo(icResiCollectEntity,true,formDTO,userIdCardEntity); + } + }else{ + // 不存在人员 + insertUserInfo(icResiCollectEntity,formDTO); + } + } + } + } + + /** + * 更新新冠病毒疫苗接种人员信息台账表房屋ID + * @param icResiCollectEntity + * @param formDTO + * @return + */ + private IcVaccinePrarmeterEntity updateHomeId(IcVaccinePrarmeterEntity icResiCollectEntity,IcVaccineCheckFormDTO formDTO){ + + // fegin获取房屋信息 + GetHouseInfoToCollectFormDTO getHouseInfoToCollectFormDTO = new GetHouseInfoToCollectFormDTO(); + getHouseInfoToCollectFormDTO.setBuildingUnitId(formDTO.getUnitId()); + getHouseInfoToCollectFormDTO.setDoorName(formDTO.getDoorName()); + Result resultDTOResult = govOrgFeignClient.getHouseInfoToCollect(getHouseInfoToCollectFormDTO); + IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = resultDTOResult.getData(); + + // 新增房屋后需要collect更新上房屋ID + // log + icResiCollectEntity.setHomeId(icHouseInfoCollectResultDTO.getId()); + baseDao.updateById(icResiCollectEntity); + return icResiCollectEntity; + + } + + /** + * 更新房屋信息 + * @param icResiCollectEntity + */ + private void updateHouseInfo(IcVaccinePrarmeterEntity icResiCollectEntity){ + CollectHouseFormDTO collectHouseFormDTO = new CollectHouseFormDTO(); + collectHouseFormDTO.setId(icResiCollectEntity.getHomeId()); + + + // fegin获取房屋信息 + GetHouseInfoToCollectFormDTO getHouseInfoToCollectFormDTO = new GetHouseInfoToCollectFormDTO(); + getHouseInfoToCollectFormDTO.setBuildingUnitId(icResiCollectEntity.getUnitId()); + getHouseInfoToCollectFormDTO.setDoorName(icResiCollectEntity.getHomeName()); + Result resultDTOResult = govOrgFeignClient.getHouseInfoToCollect(getHouseInfoToCollectFormDTO); + IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = resultDTOResult.getData(); + + collectHouseFormDTO.setCustomerId(icResiCollectEntity.getCustomerId()); + collectHouseFormDTO.setResiNumber((icHouseInfoCollectResultDTO.getResiNumber() + 1)); + govOrgFeignClient.updateCollect(collectHouseFormDTO); + + } + + /** + * 获取人员信息 + * @param idCard + * @return + */ + private IcResiUserEntity queryOriginUserByIdCard(String idCard,String customerId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcResiUserEntity::getIdCard, idCard); + query.eq(IcResiUserEntity::getCustomerId, customerId); + IcResiUserEntity originUser = icResiUserDao.selectOne(query); + return originUser; + } + + private Map queryOriginUserByHomeId(String homeId,String customerId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcResiUserEntity::getHomeId, homeId); + query.eq(IcResiUserEntity::getCustomerId, customerId); + List originUserList = icResiUserDao.selectList(query); + Map memMap = originUserList.stream().collect(Collectors.toMap(IcResiUserEntity::getIdCard, Function.identity())); + return memMap; + } + + /** + * 更新人员信息 + * @param icResiCollectEntity 登记信息 + * @param isUpdateLog 是否更新记录 + * @param formDTO 入参 + * @param userEntity 根据身份证号查询到的user信息 + */ + private void updateUserInfo(IcVaccinePrarmeterEntity icResiCollectEntity,Boolean isUpdateLog, + IcVaccineCheckFormDTO formDTO,IcResiUserEntity userEntity){ + + userEntity.setPids(icResiCollectEntity.getPids()); // ic_resi_user表的组织的pids 含agencyId本身 + userEntity.setAgencyId(icResiCollectEntity.getAgencyId()); + userEntity.setGridId(icResiCollectEntity.getGridId()); + userEntity.setVillageId(icResiCollectEntity.getVillageId()); + userEntity.setBuildId(icResiCollectEntity.getBuildId()); + userEntity.setUnitId(icResiCollectEntity.getUnitId()); + userEntity.setHomeId(icResiCollectEntity.getHomeId()); + userEntity.setName(icResiCollectEntity.getName()); + userEntity.setMobile(icResiCollectEntity.getMobile()); + userEntity.setIdCard(icResiCollectEntity.getIdCard()); + icResiUserDao.updateById(userEntity); + + // 判断是否需要更新记录 + if(isUpdateLog){ + //变更记录表 + IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity(); + changeRecordEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + changeRecordEntity.setOperatorId(formDTO.getUserId()); + changeRecordEntity.setIcUserId(userEntity.getId()); + changeRecordEntity.setOperatorName(formDTO.getRealName()); + changeRecordEntity.setIcUserName(userEntity.getName()); + changeRecordEntity.setType("update"); + changeRecordEntity.setTypeName("修改"); + changeRecordEntity.setBeforeChangeName("-"); + changeRecordEntity.setAfterChangeName("-"); + changeRecordEntity.setChangeTime(new java.util.Date()); + icUserChangeRecordService.insert(changeRecordEntity); + } + + } + + /** + * 新增人员信息 + * @param icResiCollectEntity + * @param formDTO + */ + private void insertUserInfo(IcVaccinePrarmeterEntity icResiCollectEntity,IcVaccineCheckFormDTO formDTO){ + + // 新增人员 + IcResiUserEntity userEntity = new IcResiUserEntity(); + userEntity.setPids(icResiCollectEntity.getPids()); // ic_resi_user表的组织的pids 含agencyId本身 + userEntity.setAgencyId(icResiCollectEntity.getAgencyId()); + userEntity.setGridId(icResiCollectEntity.getGridId()); + userEntity.setVillageId(icResiCollectEntity.getVillageId()); + userEntity.setBuildId(icResiCollectEntity.getBuildId()); + userEntity.setUnitId(icResiCollectEntity.getUnitId()); + userEntity.setHomeId(icResiCollectEntity.getHomeId()); + userEntity.setName(icResiCollectEntity.getName()); + userEntity.setMobile(icResiCollectEntity.getMobile()); + userEntity.setIdCard(icResiCollectEntity.getIdCard()); + userEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + icResiUserDao.insert(userEntity); + + //变更记录表 + IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity(); + changeRecordEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + changeRecordEntity.setOperatorId(formDTO.getUserId()); + changeRecordEntity.setIcUserId(userEntity.getId()); + changeRecordEntity.setOperatorName(formDTO.getRealName()); + changeRecordEntity.setIcUserName(userEntity.getName()); + changeRecordEntity.setType("add"); + changeRecordEntity.setTypeName("新增"); + changeRecordEntity.setBeforeChangeName("-"); + changeRecordEntity.setAfterChangeName("-"); + changeRecordEntity.setChangeTime(new java.util.Date()); + icUserChangeRecordService.insert(changeRecordEntity); + + } + } From 16a7c51a6e9ecdb628ecf3dd761d376ae2e16664 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 25 Aug 2022 14:12:16 +0800 Subject: [PATCH 205/397] =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=20=E6=9B=B4=E6=96=B0=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=20=E4=B8=8D=E6=8E=A8=E9=80=81=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E5=8A=A0=E7=A7=AF=E5=88=86=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcPartyActSignInRecordServiceImpl.java | 103 ++++++++++-------- 1 file changed, 55 insertions(+), 48 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java index 9e940c6f8c..c6c9bac37d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -2,9 +2,7 @@ package com.epmet.modules.partyOrg.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.rocketmq.constants.TopicConstants; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.MqConstant; import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; @@ -16,12 +14,8 @@ import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.SystemMessageType; -import com.epmet.dto.IcMessageDTO; -import com.epmet.dto.form.CommonGridIdFormDTO; -import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.SystemMsgFormDTO; -import com.epmet.dto.result.CommonDataFilterResultDTO; import com.epmet.dto.result.CustomerUserDetailResultDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; @@ -30,8 +24,6 @@ import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyActSignInRecordService; -import com.epmet.resi.group.constant.TopicConstant; -import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO; import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; import com.github.pagehelper.PageHelper; @@ -41,7 +33,6 @@ 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.web.bind.annotation.RequestBody; import java.util.ArrayList; import java.util.Arrays; @@ -137,46 +128,62 @@ public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcPartyActSignInRecordEntity::getIcPartyActId, formDTO.getIcPartyActId()); + wrapper.eq(IcPartyActSignInRecordEntity::getEpmetUserId, formDTO.getUserId()); + IcPartyActSignInRecordEntity entityOne = baseDao.selectOne(wrapper); + if (null == entityOne) { + IcPartyActSignInRecordEntity entity = ConvertUtils.sourceToTarget(formDTO, IcPartyActSignInRecordEntity.class); + entity.setEpmetUserId(formDTO.getUserId()); + entity.setIdCard(result.getData().getIdNum()); + entity.setUserRealName(result.getData().getName()); + insert(entity); + } else { + entityOne.setAddress(formDTO.getAddress()); + entityOne.setLatitude(formDTO.getLatitude()); + entityOne.setLongitude(formDTO.getLongitude()); + baseDao.updateById(entityOne); + bl = false; } - List pointEventMsgList = new ArrayList<>(); - BasePointEventMsg pointEventMsg = new BasePointEventMsg(); - pointEventMsg.setOpAgencyId(gridInfo.getPid()); - pointEventMsg.setOperatorId(formDTO.getUserId()); - pointEventMsg.setAgencyId(gridInfo.getPid()); - pointEventMsg.setCustomerId(formDTO.getCustomerId()); - pointEventMsg.setGridId(gridInfo.getId()); - pointEventMsg.setUserId(formDTO.getUserId()); - pointEventMsg.setActionFlag(MqConstant.PLUS); - pointEventMsg.setIsCommon(false); - pointEventMsg.setSourceType(actType); - pointEventMsg.setSourceId(formDTO.getIcPartyActId()); - pointEventMsgList.add(pointEventMsg); - - SystemMsgFormDTO msgFormDTO = new SystemMsgFormDTO(); - msgFormDTO.setMessageType(eventTag); - msgFormDTO.setContent(pointEventMsgList); - Result sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(msgFormDTO); - if (!sendMsgResult.success()) { - log.error("党建活动签到发送积分失败,活动Id->" + formDTO.getIcPartyActId() + " 用户->" + formDTO.getUserId()); + + //3.推送mq加积分 + if (bl) { + IcPartyActEntity actEntity = icPartyActService.selectById(formDTO.getIcPartyActId()); + String actType = actEntity.getActType(); + String eventTag = ("dangke".equals(actType) ? SystemMessageType.DANGKE : ("dxzh".equals(actType) ? SystemMessageType.DXZH : ( + "wmfwhd".equals(actType) ? SystemMessageType.WMFWHD : ("zbdydh".equals(actType) ? SystemMessageType.ZBDYDH : ( + "zbwyh".equals(actType) ? SystemMessageType.ZBWYH : ("ztdr".equals(actType) ? SystemMessageType.ZTDR : "") + )) + ))); + //网格缓存信息 + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getGridId()); + if (null == gridInfo) { + throw new EpmetException(String.format("未查询到网格{%s}信息", formDTO.getGridId())); + } + List pointEventMsgList = new ArrayList<>(); + BasePointEventMsg pointEventMsg = new BasePointEventMsg(); + pointEventMsg.setOpAgencyId(gridInfo.getPid()); + pointEventMsg.setOperatorId(formDTO.getUserId()); + pointEventMsg.setAgencyId(gridInfo.getPid()); + pointEventMsg.setCustomerId(formDTO.getCustomerId()); + pointEventMsg.setGridId(gridInfo.getId()); + pointEventMsg.setUserId(formDTO.getUserId()); + pointEventMsg.setActionFlag(MqConstant.PLUS); + pointEventMsg.setIsCommon(false); + pointEventMsg.setSourceType(actType); + pointEventMsg.setSourceId(formDTO.getIcPartyActId()); + pointEventMsgList.add(pointEventMsg); + + SystemMsgFormDTO msgFormDTO = new SystemMsgFormDTO(); + msgFormDTO.setMessageType(eventTag); + msgFormDTO.setContent(pointEventMsgList); + Result sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(msgFormDTO); + if (!sendMsgResult.success()) { + log.error("党建活动签到发送积分失败,活动Id->" + formDTO.getIcPartyActId() + " 用户->" + formDTO.getUserId()); + } } } From 104e4b97b9cdf104e27f83ecff0fc93dcfde2ee5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 25 Aug 2022 14:19:05 +0800 Subject: [PATCH 206/397] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/feign/ResiGroupOpenFeignClient.java | 6 +++ .../ResiGroupOpenFeignClientFallback.java | 5 ++ .../group/controller/ResiGroupController.java | 11 +++++ .../group/service/ResiGroupService.java | 2 + .../service/impl/ResiGroupServiceImpl.java | 13 +++++ .../partyOrg/form/PartyActStatisFormDTO.java | 37 +++++++++++++++ .../result/PartyActStatisResultDTO.java | 45 ++++++++++++++++++ .../controller/IcPartyActController.java | 18 +++++-- .../modules/partyOrg/dao/IcPartyActDao.java | 4 ++ .../modules/partyOrg/dao/IcPartyOrgDao.java | 3 ++ .../partyOrg/service/IcPartyActService.java | 8 ++-- .../service/impl/IcPartyActServiceImpl.java | 47 +++++++++++++++++-- .../mapper/partyOrg/IcPartyActDao.xml | 28 +++++++++++ .../mapper/partyOrg/IcPartyOrgDao.xml | 15 ++++++ 14 files changed, 230 insertions(+), 12 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyActStatisResultDTO.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index b7a4f54672..2adf4c9ddc 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -342,4 +342,10 @@ public interface ResiGroupOpenFeignClient { @PostMapping("/resi/group/member/groupmemberlist") Result> groupMemberList(@RequestBody List groupIdList); + /** + * @Author sun + * @Description 查询支部下党小组列表 + **/ + @PostMapping("/resi/group/group/partygrouplist/{partyOrgId}") + Result> partyGroupList(@PathVariable String partyOrgId); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index d3bff53996..e3c6b08c47 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -248,4 +248,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "groupMemberList", groupIdList); } + @Override + public Result> partyGroupList(String partyOrgId) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "partyGroupList", partyOrgId); + } + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index 5e60d0f535..94da912a7b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -664,4 +664,15 @@ public class ResiGroupController { public Result>> getBranchGroupList(@LoginUser TokenDto tokenDto) { return new Result>>().ok(resiGroupService.getBranchGroupList(tokenDto.getCustomerId())); } + + /** + * @Author sun + * @Description 查询支部下党小组列表 + **/ + @PostMapping("partygrouplist/{partyOrgId}") + Result> partyGroupList(@PathVariable String partyOrgId){ + return new Result>().ok(resiGroupService.partyGroupList(partyOrgId)); + } + + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index d3176758d5..e03178d06b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java @@ -481,4 +481,6 @@ public interface ResiGroupService extends BaseService { * @Date 2022/8/15 16:49 */ Map> getBranchGroupList(String customerId); + + List partyGroupList(String partyOrgId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 939eb61d39..e21ce83878 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1955,4 +1955,17 @@ public class ResiGroupServiceImpl extends BaseServiceImpl partyGroupList(String partyOrgId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ResiGroupEntity::getPartyOrgId, partyOrgId); + wrapper.eq(ResiGroupEntity::getDelFlag, NumConstant.ZERO_STR); + List entityList = baseDao.selectList(wrapper); + if (CollectionUtils.isEmpty(entityList)) { + return new ArrayList<>(); + } + return ConvertUtils.sourceToTarget(entityList, ResiGroupDTO.class); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java new file mode 100644 index 0000000000..f0e8cedeed --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java @@ -0,0 +1,37 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +@Data +public class PartyActStatisFormDTO implements Serializable { + + /** + * 参加活动党组织ID,groupId + */ + @NotBlank(message = "党组织Id不能为空", groups = AddGroup.class) + private String joinOrgId; + /** + * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + @NotBlank(message = "党组织类型不能为空", groups = AddGroup.class) + private String joinOrgType; + + /** + * 活动开始时间 【yyyy-MM-dd】 + */ + private String startTime; + + /** + * 活动结束时间 【yyyy-MM-dd】 + */ + private String endTime; + + //党组织Id集合 + private List partyOrgIdList; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyActStatisResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyActStatisResultDTO.java new file mode 100644 index 0000000000..5f87fa3fb7 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyActStatisResultDTO.java @@ -0,0 +1,45 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@NoArgsConstructor +@Data +public class PartyActStatisResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 党组织Id + */ + private String joinOrgId = ""; + /** + * 党组织名称 + */ + private String joinOrgName = ""; + /** + * 支部党员大会次数 + */ + private Integer dydhNum = 0; + /** + * 支部委员会次数 + */ + private Integer wyhNum = 0; + /** + * 党小组会次数 + */ + private Integer dxzhNum = 0; + /** + * 党课次数 + */ + private Integer dkNum = 0; + /** + * 主题党日次数 + */ + private Integer ztdrNum = 0; + /** + * 为民服务活动次数 + */ + private Integer wmfwNum = 0; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index dc9da8f9a3..bbf56110d6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -18,6 +18,7 @@ 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.commons.tools.validator.group.AddGroup; import com.epmet.modules.partyOrg.excel.IcPartyActExpoprtExcel; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.resi.partymember.dto.icpartyact.form.BatchAddPartyActFormDTO; @@ -26,10 +27,7 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.*; import com.epmet.resi.partymember.dto.partyOrg.result.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -41,6 +39,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.Date; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -320,4 +319,15 @@ public class IcPartyActController { icPartyActService.autoPublishIcPartyAct(); return new Result(); } + + /** + * Desc: 统计各党组织参与各种党活动的次数 + */ + @RequestMapping("patryactstatis") + public Result> patryActStatis(@RequestBody PartyActStatisFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + return new Result>().ok(icPartyActService.patryActStatis(formDTO)); + } + + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 5ab4ed61e3..d3bdd9d957 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -7,8 +7,10 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActStatisFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyActListResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.PartyActStatisResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -48,4 +50,6 @@ public interface IcPartyActDao extends BaseDao { List selectNeedRemindAutoPublishAct(String dateId); List selectNoPublishList(String dateId); + + List getPartActStatis(PartyActStatisFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index af7a6340aa..7391328894 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -2,6 +2,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; @@ -111,4 +112,6 @@ public interface IcPartyOrgDao extends BaseDao { IcPartyOrgEntity selectDefaultPartyOrg(@Param("agencyId") String agencyId, @Param("level") String level); List getUserIdByPartyOrgIds(@Param("partyOrgIdList") List partyOrgIdList); + + List getSelfAndSub(@Param("joinOrgId") String joinOrgId); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index e1aeee4a8a..dbfde1274e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -9,12 +9,10 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.*; import com.epmet.resi.partymember.dto.partyOrg.result.*; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -119,4 +117,6 @@ public interface IcPartyActService extends BaseService { * 自动发布活动 */ void autoPublishIcPartyAct(); + + LinkedList patryActStatis(PartyActStatisFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index b7a14504a5..fe57e096da 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -28,6 +28,7 @@ import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.*; import com.epmet.modules.partyOrg.service.*; import com.epmet.modules.partymember.dao.IcPartyMemberDao; +import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; @@ -37,10 +38,7 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.*; import com.epmet.resi.partymember.dto.partyOrg.result.*; import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO; import com.epmet.send.SendMqMsgUtil; @@ -752,4 +750,45 @@ public class IcPartyActServiceImpl extends BaseServiceImpl patryActStatis(PartyActStatisFormDTO formDTO) { + LinkedList resultList = new LinkedList<>(); + //1.查询当前党组织及直属下级基础数据 + List orgDTOList = partyOrgDao.getSelfAndSub(formDTO.getJoinOrgId()); + if (CollectionUtils.isEmpty(orgDTOList)) { + return resultList; + } + List partyOrgIdList = orgDTOList.stream().map(IcPartyOrgDTO::getId).collect(Collectors.toList()); + //如果党组织是支部类型，则直属下级是党小组 + if ("6".equals(formDTO.getJoinOrgType())) { + Result> result = resiGroupOpenFeignClient.partyGroupList(formDTO.getJoinOrgId()); + if (!result.success()) { + throw new RenException("获取党支部下党小组列表失败：" + result.getInternalMsg()); + } + List groupIdList = result.getData().stream().map(ResiGroupDTO::getId).collect(Collectors.toList()); + partyOrgIdList.addAll(groupIdList); + } + formDTO.setPartyOrgIdList(partyOrgIdList); + + //2.按党组织统计查询各类型活动参与次数 + List partActStatis = baseDao.getPartActStatis(formDTO); + Map map = partActStatis.stream().collect(Collectors.toMap(PartyActStatisResultDTO::getJoinOrgId, m -> m, (k1, k2) -> k1)); + + //3.封装数据并返回 + orgDTOList.forEach(org -> { + PartyActStatisResultDTO dto = new PartyActStatisResultDTO(); + if (map.containsKey(org.getId())) { + dto = ConvertUtils.sourceToTarget(map.get(org.getId()), PartyActStatisResultDTO.class); + } + dto.setJoinOrgName(org.getPartyOrgName()); + resultList.add(dto); + }); + return resultList; + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 2c1b07c313..df43a30473 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -231,4 +231,32 @@ AND a.IS_PUBLISH = '0' AND DATE_FORMAT(a.AUTO_PUBLIC_TIME,'%Y%m%d%H%i') = #{dateId} + + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index c5c56bfef8..1553753bd4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -201,4 +201,19 @@ ORDER BY ipo.id + + From be350ccf6f2d077d17a375d8522d1b300ebfa2da Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 25 Aug 2022 14:19:49 +0800 Subject: [PATCH 207/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=911.=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E8=87=AA=E5=B7=B1=E7=9C=8B=E8=87=AA=E5=B7=B1=E7=9A=84?= =?UTF-8?q?=E3=80=822.=E4=BF=AE=E5=A4=8D=EF=BC=9Aflyway=20serviceTime?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BAvarchar?= =?UTF-8?q?=E3=80=823.=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/WorkdiaryServiceTypeDTO.java | 8 ++++++++ .../dto/result/WorkdiaryServiceRecordDTO.java | 15 +++++++++++++++ .../controller/WorkdiaryServiceController.java | 8 ++++---- .../impl/WorkdiaryServiceRecordServiceImpl.java | 1 + .../db/migration/V0.0.28__workdiary_service.sql | 2 +- 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java index 4f8c936bf7..1f9d7abc3e 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java @@ -1,7 +1,10 @@ package com.epmet.dto; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.epmet.dto.result.WorkdiaryServiceRecordDTO; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; @@ -16,9 +19,13 @@ public class WorkdiaryServiceTypeDTO implements Serializable { private static final long serialVersionUID = 1L; + public interface Save extends CustomerClientShowGroup {} + public interface Update extends CustomerClientShowGroup {} + /** * 主键 */ + @NotBlank(message = "未选中任何数据", groups = { Update.class }) private String id; /** @@ -34,6 +41,7 @@ public class WorkdiaryServiceTypeDTO implements Serializable { /** * 服务类型名称 */ + @NotBlank(message = "服务类型名称必填", groups = { Save.class, Update.class }) private String serviceTypeName; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java index 95fcdcc88a..7a440ec79e 100755 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java @@ -2,8 +2,12 @@ package com.epmet.dto.result; import java.io.Serializable; import java.util.Date; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 工作日志(服务)-记录 @@ -16,9 +20,13 @@ public class WorkdiaryServiceRecordDTO implements Serializable { private static final long serialVersionUID = 1L; + public interface Save extends CustomerClientShowGroup {} + public interface Update extends CustomerClientShowGroup {} + /** * 主键 */ + @NotBlank(message = "未选中任何数据", groups = { Update.class }) private String id; /** @@ -29,6 +37,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 服务类型 */ + @NotBlank(message = "服务类型为必填项", groups = { Save.class, Update.class }) private Short serviceType; private String serviceTypeName; @@ -40,6 +49,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 网格ID */ + @NotBlank(message = "网格为必填项", groups = { Save.class, Update.class }) private String gridId; private String gridName; @@ -51,6 +61,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 申请人ID */ + @NotBlank(message = "申请人为必填项", groups = { Save.class, Update.class }) private String applicantId; /** @@ -61,21 +72,25 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 申请人住址 */ + @NotBlank(message = "住址为必填项", groups = { Save.class, Update.class }) private String applicantAddress; /** * 申请人联系电话 */ + @NotBlank(message = "联系电话为必填项", groups = { Save.class, Update.class }) private String applicantMobile; /** * 服务内容 */ + @NotBlank(message = "服务内容为必填项", groups = { Save.class, Update.class }) private String serviceContent; /** * 服务时间 */ + @NotBlank(message = "服务时间为必填项", groups = { Save.class, Update.class }) private String serviceTime; /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java index cdd26b8794..03893f9955 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java @@ -81,7 +81,7 @@ public class WorkdiaryServiceController { @PostMapping("/record/save") public Result recordSave(@RequestBody WorkdiaryServiceRecordDTO dto){ //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + ValidatorUtils.validateEntity(dto, WorkdiaryServiceRecordDTO.Save.class); workdiaryServiceRecordService.save(dto); return new Result(); } @@ -95,7 +95,7 @@ public class WorkdiaryServiceController { @PostMapping("/record/update") public Result recordUpdate(@RequestBody WorkdiaryServiceRecordDTO dto){ //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + ValidatorUtils.validateEntity(dto, WorkdiaryServiceRecordDTO.Update.class); workdiaryServiceRecordService.update(dto); return new Result(); } @@ -155,7 +155,7 @@ public class WorkdiaryServiceController { @PostMapping("/serviceType/save") public Result serviceTypeSave(@RequestBody WorkdiaryServiceTypeDTO dto){ //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + ValidatorUtils.validateEntity(dto, WorkdiaryServiceTypeDTO.Save.class); workdiaryServiceTypeService.save(dto); return new Result(); } @@ -168,7 +168,7 @@ public class WorkdiaryServiceController { @PostMapping("/serviceType/update") public Result serviceTypeUpdate(@RequestBody WorkdiaryServiceTypeDTO dto){ //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + ValidatorUtils.validateEntity(dto, WorkdiaryServiceTypeDTO.Update.class); workdiaryServiceTypeService.update(dto); return new Result(); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java index ffd71c8489..6603b01f4d 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java @@ -80,6 +80,7 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl query = new LambdaQueryWrapper<>(); query.eq(StringUtils.isNotBlank(gridId), WorkdiaryServiceRecordEntity::getGridId, gridId); query.eq(serviceType != null, WorkdiaryServiceRecordEntity::getServiceType, serviceType); + query.eq(WorkdiaryServiceRecordEntity::getCreatedBy, EpmetRequestHolder.getLoginUserId()); query.like(StringUtils.isNotBlank(applicantName), WorkdiaryServiceRecordEntity::getApplicantName, applicantName); query.like(StringUtils.isNotBlank(applicantAddress), WorkdiaryServiceRecordEntity::getApplicantAddress, applicantAddress); query.like(StringUtils.isNotBlank(serviceContent), WorkdiaryServiceRecordEntity::getServiceContent, serviceContent); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql index 0b42aeac0f..7631087ce3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql @@ -12,7 +12,7 @@ CREATE TABLE `workdiary_service_record` `APPLICANT_ADDRESS` varchar(32) NOT NULL COMMENT '申请人住址', `APPLICANT_MOBILE` varchar(20) NOT NULL COMMENT '申请人联系电话', `SERVICE_CONTENT` varchar(255) NOT NULL COMMENT '服务内容', - `SERVICE_TIME` datetime NOT NULL COMMENT '服务时间', + `SERVICE_TIME` varchar(32) NOT NULL COMMENT '服务时间', `PRINCIPAL_NAME` varchar(10) NOT NULL COMMENT '负责人姓名', `REMARK` varchar(255) NOT NULL COMMENT '备注', `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', From 919324c0da141da4f6f82b3ce9728a2dd2c7292f Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 25 Aug 2022 14:24:31 +0800 Subject: [PATCH 208/397] =?UTF-8?q?=E6=A0=87=E8=AE=B0=E5=80=BC=E9=A2=A0?= =?UTF-8?q?=E5=80=92=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/PointAdditiveRuleServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java index 5bfa8467ef..9606b63ba6 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -212,9 +212,9 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl { if (item.getId().equals(rule.getId()) || item.getPid().equals(rule.getId())) { - item.setEditFlag(NumConstant.ONE_STR); - } else { item.setEditFlag(NumConstant.ZERO_STR); + } else { + item.setEditFlag(NumConstant.ONE_STR); } }); } From 2ac83445ca4e40ef45232d61817a50a37cac87fe Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 25 Aug 2022 14:30:22 +0800 Subject: [PATCH 209/397] =?UTF-8?q?=E7=BB=99=E5=B1=85=E6=B0=91=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index b7a14504a5..ce83d012f2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -215,6 +215,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl0; + if (sendMsg && flag) { PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); msg.setCustomerId(formDTO.getCustomerId()); msg.setIcPartyActId(icPartyActEntity.getId()); @@ -650,7 +653,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl0) { PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); msg.setCustomerId(icPartyActEntity.getCustomerId()); msg.setIcPartyActId(icPartyActEntity.getId()); From 3675bb71c792469d2385e8370637652321303685 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 25 Aug 2022 14:36:32 +0800 Subject: [PATCH 210/397] 1 --- .../java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java index 7a440ec79e..58be0bae12 100755 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java @@ -7,6 +7,7 @@ import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** @@ -37,7 +38,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 服务类型 */ - @NotBlank(message = "服务类型为必填项", groups = { Save.class, Update.class }) + @NotNull(message = "服务类型为必填项", groups = { Save.class, Update.class }) private Short serviceType; private String serviceTypeName; From 77872e57f04729755813ef8336aae0031505d896 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 25 Aug 2022 14:48:01 +0800 Subject: [PATCH 211/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcVaccinePrarmeterDTO.java | 6 +++--- .../com/epmet/entity/IcVaccinePrarmeterEntity.java | 6 +++--- .../com/epmet/excel/IcVaccinePrarmeterExcel.java | 10 +++++----- .../epmet/excel/IcVaccinePrarmeterImportExcel.java | 6 +++--- .../error/IcVaccinePrarmeterImportErrorModel.java | 12 ++++++------ .../service/impl/IcVaccinePrarmeterServiceImpl.java | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java index 55991fe87d..a7d56eeec7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java @@ -116,7 +116,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第一次接种时间 */ - private Date firstVacTime; + private String firstVacTime; /** * 第一次接种地点 @@ -126,7 +126,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第二次接种时间 */ - private Date secondVacTime; + private String secondVacTime; /** * 第二次接种地点 @@ -136,7 +136,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第三次接种时间 */ - private Date thirdVacTime; + private String thirdVacTime; /** * 第三次接种地点 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java index e0331229c4..c6b982f80d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java @@ -114,7 +114,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第一次接种时间 */ - private Date firstVacTime; + private String firstVacTime; /** * 第一次接种地点 @@ -124,7 +124,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第二次接种时间 */ - private Date secondVacTime; + private String secondVacTime; /** * 第二次接种地点 @@ -134,7 +134,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第三次接种时间 */ - private Date thirdVacTime; + private String thirdVacTime; /** * 第三次接种地点 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index bb6b9c5d15..fd95325e80 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -50,20 +50,20 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "是否接种", replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间", format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "第一次接种时间") private Date firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; - @Excel(name = "第二次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date secondVacTime; + @Excel(name = "第二次接种时间") + private String secondVacTime; @Excel(name = "第二次接种地点") private String secondVacSite; - @Excel(name = "第三次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date thirdVacTime; + @Excel(name = "第三次接种时间") + private String thirdVacTime; @Excel(name = "第三次接种地点") private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java index daecc97e0e..893531a4d2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java @@ -46,19 +46,19 @@ public class IcVaccinePrarmeterImportExcel { private String isVaccination; @Excel(name = "第一次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date firstVacTime; + private String firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; @Excel(name = "第二次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date secondVacTime; + private String secondVacTime; @Excel(name = "第二次接种地点") private String secondVacSite; @Excel(name = "第三次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date thirdVacTime; + private String thirdVacTime; @Excel(name = "第三次接种地点") private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java index 04768bb90e..7d34af62aa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java @@ -47,20 +47,20 @@ public class IcVaccinePrarmeterImportErrorModel { @Excel(name = "是否接种", width = 30, replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") - private Date firstVacTime; + @Excel(name = "第一次接种时间",width = 30) + private String firstVacTime; @Excel(name = "第一次接种地点",width = 30) private String firstVacSite; - @Excel(name = "第二次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") - private Date secondVacTime; + @Excel(name = "第二次接种时间",width = 30) + private String secondVacTime; @Excel(name = "第二次接种地点",width = 30) private String secondVacSite; - @Excel(name = "第三次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") - private Date thirdVacTime; + @Excel(name = "第三次接种时间",width = 30) + private String thirdVacTime; @Excel(name = "第三次接种地点",width = 30) private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 28b8c65906..83cb4a4f29 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -294,7 +294,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 14:48:47 +0800 Subject: [PATCH 212/397] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=B6=E5=80=99?= =?UTF-8?q?=E8=BD=ACexcel=E6=96=87=E4=BB=B6=EF=BC=8C=E4=B8=A2=E5=A4=B1mobi?= =?UTF-8?q?le=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java index 8a2f2cf454..7da0010c82 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java @@ -56,8 +56,7 @@ public class WorkdiaryServiceRecordExcel { this.applicantName = dto.getApplicantName(); this.applicantAddress = dto.getApplicantAddress(); this.serviceContent = dto.getServiceContent(); - this.serviceContent = dto.getServiceContent(); - this.principal = dto.getPrincipalName(); + this.applicantMobile = dto.getApplicantMobile(); this.principal = dto.getPrincipalName(); this.serviceTime = dto.getServiceTime(); this.remark = dto.getRemark(); From 6ec18e9fa601f9115f79ea15c92ff56628cf0490 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 25 Aug 2022 14:50:50 +0800 Subject: [PATCH 213/397] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcVaccinePrarmeterServiceImpl.java | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 83cb4a4f29..b7b681f6d1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -6,8 +6,9 @@ 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.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; -import com.epmet.commons.tools.enums.RelationshipEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -17,7 +18,6 @@ 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.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; @@ -28,7 +28,6 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.GridInfoByNameResultDTO; import com.epmet.dto.result.IcHouseInfoCollectResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcResiCollectEntity; import com.epmet.entity.IcResiUserEntity; import com.epmet.entity.IcUserChangeRecordEntity; import com.epmet.entity.IcVaccinePrarmeterEntity; @@ -48,12 +47,12 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; -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.InputStream; import java.io.OutputStream; @@ -71,22 +70,22 @@ import java.util.stream.Collectors; @Slf4j public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl implements IcVaccinePrarmeterService { - @Autowired + @Resource private IcVaccinePrarmeterRedis icVaccinePrarmeterRedis; - @Autowired + @Resource private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; - @Autowired + @Resource private OssFeignClient ossFeignClient; - @Autowired + @Resource private GovOrgFeignClient govOrgFeignClient; - @Autowired + @Resource private IcResiUserDao icResiUserDao; - @Autowired + @Resource private IcUserChangeRecordService icUserChangeRecordService; @Override @@ -135,7 +134,14 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 15:27:26 +0800 Subject: [PATCH 214/397] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartyActController.java | 27 ++++++++++++ .../partyOrg/excel/PartyActStatisExcel.java | 43 +++++++++++++++++++ .../service/impl/IcPartyActServiceImpl.java | 8 ++-- 3 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/PartyActStatisExcel.java diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index bbf56110d6..6b0d27503e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -20,6 +20,7 @@ import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.modules.partyOrg.excel.IcPartyActExpoprtExcel; +import com.epmet.modules.partyOrg.excel.PartyActStatisExcel; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.resi.partymember.dto.icpartyact.form.BatchAddPartyActFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; @@ -329,5 +330,31 @@ public class IcPartyActController { return new Result>().ok(icPartyActService.patryActStatis(formDTO)); } + @PostMapping("export") + public void export(@RequestBody PartyActStatisFormDTO formDTO, HttpServletResponse response) throws IOException { + ExcelWriter excelWriter = null; + try { + String fileName = "党建数据统计" + DateUtils.format(new Date()) + ".xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), PartyActStatisExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + List data = icPartyActService.patryActStatis(formDTO); + List list = ConvertUtils.sourceToTarget(data, PartyActStatisExcel.class); + excelWriter.write(list, writeSheet); + } 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/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/PartyActStatisExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/PartyActStatisExcel.java new file mode 100644 index 0000000000..1614a61c51 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/PartyActStatisExcel.java @@ -0,0 +1,43 @@ +package com.epmet.modules.partyOrg.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.HeadStyle; +import com.alibaba.excel.enums.poi.FillPatternTypeEnum; +import lombok.Data; + +import java.io.Serializable; + +/** + * 党建数据统计 + */ +@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) +@Data +public class PartyActStatisExcel implements Serializable { + + private static final long serialVersionUID = -12110233388005838L; + + @ExcelProperty(value = "党组织名称") + @ColumnWidth(20) + private String joinOrgName; + @ExcelProperty(value = "支部党员大会(次)") + @ColumnWidth(30) + private Integer dydhNum = 0; + @ExcelProperty(value = "支部委员会(次)") + @ColumnWidth(20) + private Integer wyhNum = 0; + @ExcelProperty(value = "党小组会(次)") + @ColumnWidth(20) + private Integer dxzhNum = 0; + @ExcelProperty(value = "党课(次)") + @ColumnWidth(20) + private Integer dkNum = 0; + @ExcelProperty(value = "主题党日(次)") + @ColumnWidth(20) + private Integer ztdrNum = 0; + @ExcelProperty(value = "为民服务活动(次)") + @ColumnWidth(30) + private Integer wmfwNum = 0; + + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index a71096d656..94d52d1418 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -567,7 +567,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 15:37:41 +0800 Subject: [PATCH 215/397] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/commons/tools/enums/EventEnum.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EventEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EventEnum.java index 3cccd74d7a..1f1cb4c4c9 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EventEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EventEnum.java @@ -19,6 +19,12 @@ public enum EventEnum { TOPIC_SHIFTED_TO_PROJECT("topic_to_project","resi_group","话题被转为项目"), LEADER_RESOLVE_TOPIC("leader_resolve_topic","resi_group","组长解决组内话题"), FINISH_USER_DEMAND("finish_user_demand","community_service","服务完成"), + ZBWYH("支部委员会","part_member", "支部委员会活动签到"), + ZBDYDH("支部党员大会","part_member", "支部党员大会活动签到"), + DXZH("党小组会","part_member", "党小组会活动签到"), + DANGKE ("党课","part_member", "党课活动签到"), + ZTDR("主题党日","part_member", "主题党日活动签到"), + WMFWHD("为民服务活动","part_member", "为民服务活动活动签到"), ; private String eventClass; From a3f78c4a83212b2a6aa7d4945ee910b5fdf71aba Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 25 Aug 2022 15:43:14 +0800 Subject: [PATCH 216/397] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcMessageDao.xml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml index ec347f4998..5a6cc50fb5 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -5,16 +5,7 @@ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java index 8897dcf2ec..e9095b546f 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java @@ -14,6 +14,10 @@ public class IcPartyActListFormDTO implements Serializable { * 签到状态[已签到：signIn 未签到：unSignIn] */ private String signIn; + /** + * 标题内容 模糊检索 + */ + private String topic; //参加活动党组织ID,groupId private String joinOrgId; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index df43a30473..9cc9db71b0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -197,6 +197,9 @@ AND ipa.act_type = #{actType} + + AND ipa.topic like concat('%', #{topic}, '%') + ORDER BY ipa.hold_time DESC From 6da1e9fe536aa90d86fa5150d605240e8082440e Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 25 Aug 2022 16:13:12 +0800 Subject: [PATCH 219/397] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcVaccinePrarmeterController.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 6627be1966..5edd0e0749 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -13,18 +13,17 @@ 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.commons.tools.validator.group.UpdateGroup; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcVaccinePrarmeterDao; -import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.IcVaccinePrarmeterDTO; -import com.epmet.dto.form.*; +import com.epmet.dto.form.IcVaccineCheckFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.form.VaccinePrarmeterListFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; -import com.epmet.excel.IcPointNucleicMonitoringExcel; import com.epmet.excel.IcVaccinePrarmeterExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; -import com.epmet.service.IcPointNucleicMonitoringService; import com.epmet.service.IcVaccinePrarmeterService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; @@ -82,7 +81,7 @@ public class IcVaccinePrarmeterController { } @NoRepeatSubmit - @PutMapping("update") + @PostMapping("update") public Result update(@RequestBody IcVaccinePrarmeterDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); From 3c12af0ee8c9078b25435aec40de41858097322e Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 25 Aug 2022 16:26:46 +0800 Subject: [PATCH 220/397] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/grid/controller/ResiMineGridController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java index e39bd2182c..c9a2f9996e 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java @@ -7,6 +7,7 @@ import com.epmet.dto.form.LatestGridInfoFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.modules.grid.service.ResiMineGridService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -63,7 +64,12 @@ public class ResiMineGridController { //formDTO.setAppId(appId); formDTO.setCustomerId(token.getCustomerId()); formDTO.setUserId(token.getUserId()); - return new Result().ok(resiMineGridService.latestGridInfo(formDTO)); + LatestGridInfoResultDTO data = resiMineGridService.latestGridInfo(formDTO); + //todo 兼容 一个老的 等删除这个if就行 + if ((data == null || StringUtils.isBlank(data.getGridId())&&"c2527f3d5cb8958583cc1348c328a784".equals(token.getCustomerId()))){ + return new Result().ok(null); + } + return new Result().ok(data); } /** From 1fb64291c04ba40551d34aeeef28c4e5cf60b315 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 25 Aug 2022 16:27:53 +0800 Subject: [PATCH 221/397] =?UTF-8?q?bugfix=EF=BC=8C=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B7=AF=E7=89=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/IssueDetailResultDTO.java | 2 +- .../src/main/java/com/epmet/service/impl/IssueServiceImpl.java | 2 +- .../src/main/java/com/epmet/dto/form/EditInfoFormDTO.java | 2 +- .../src/main/resources/mapper/UserResiInfoDao.xml | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java index 69ebc4476c..27478b1f63 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java @@ -43,7 +43,7 @@ public class IssueDetailResultDTO implements Serializable { private String belongsGridName; /** - * 议题发起人（山东路168-尹女士） + * 议题发起人（尹女士） */ private String issueInitiator; diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 2156bddd41..2e5a394688 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -106,7 +106,7 @@ public class IssueServiceImpl implements IssueService { //话题发起人 String street = re.getStreet() == null ? "" : re.getStreet() + "-"; String realName = re.getRealName() == null ? "" : re.getRealName(); - issueDetailResult.setIssueInitiator(street + realName); + issueDetailResult.setIssueInitiator(realName); } }); } else { diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java index 6ef7eb715e..5cc4b7ea6a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java @@ -54,7 +54,7 @@ public class EditInfoFormDTO implements Serializable { /** * 路牌号 */ - @NotBlank(message = "路牌号不能为空",groups = AddUserShowGroup.class) +// @NotBlank(message = "路牌号不能为空",groups = AddUserShowGroup.class) private String street; /** * 小区名称 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index d308058d06..999b63af7f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -171,8 +171,6 @@ SELECT CONCAT( - uri.street, - '-', uri.surname, CASE WHEN uw.sex = '1' THEN @@ -154,8 +146,6 @@ END ) AS issueInitiator, CONCAT( - uri.street, - '-', uri.surname, uri.NAME ) AS realUserName @@ -182,8 +172,6 @@ END ) AS issueInitiator, CONCAT( - uri.street, - '-', uri.surname, uri.NAME ) AS realUserName From f056e9d7d22444a669793a0e69b44e45bd73ddae Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 25 Aug 2022 16:50:56 +0800 Subject: [PATCH 224/397] =?UTF-8?q?=E7=A7=AF=E5=88=86mq=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java index c6c9bac37d..08934c0960 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -175,6 +175,7 @@ public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 16:53:30 +0800 Subject: [PATCH 225/397] =?UTF-8?q?=E7=A7=AF=E5=88=86mq=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActSignInRecordServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java index 08934c0960..14e22242e7 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.rocketmq.constants.TopicConstants; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.MqConstant; import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; @@ -176,6 +177,7 @@ public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 16:59:33 +0800 Subject: [PATCH 226/397] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B7=AF=E7=89=8C?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml | 4 ++-- .../src/main/resources/mapper/user/UserDao.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml index 9ba9386fb3..49dad70cf7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml @@ -7,13 +7,13 @@ SELECT - CONCAT( STREET, '-', SURNAME, CASE WHEN GENDER = '1' THEN '先生' WHEN GENDER = '2' THEN '女士' ELSE '先生/女士' END ) AS linkName, + CONCAT( SURNAME, CASE WHEN GENDER = '1' THEN '先生' WHEN GENDER = '2' THEN '女士' ELSE '先生/女士' END ) AS linkName, MOBILE AS linkMobile, USER_ID as topicId FROM From de4cfa69970f64ca01b90dfa9bbb7d1693a57b31 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 25 Aug 2022 17:01:49 +0800 Subject: [PATCH 227/397] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcVaccinePrarmeterServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 3bbc148588..5858b4b9aa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -149,7 +149,12 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 17:14:54 +0800 Subject: [PATCH 228/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcVaccineDao.java | 8 + .../com/epmet/dao/IcVaccineRelationDao.java | 6 +- .../impl/IcVaccinePrarmeterServiceImpl.java | 156 ++++++++++++++++-- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 19968 -> 19968 bytes .../main/resources/mapper/IcVaccineDao.xml | 9 + .../resources/mapper/IcVaccineRelationDao.xml | 7 +- 6 files changed, 172 insertions(+), 14 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java index d4db61ad5b..55b4591be3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java @@ -64,4 +64,12 @@ public interface IcVaccineDao extends BaseDao { IcVaccineDTO getVaccineDTO(@Param("customerId") String customerId, @Param("icVaccineId") String icVaccineId, @Param("idCard") String idCard, @Param("inoculateTime") String inoculateTime); + /** + * 根据身份证号以及接种时间查询接种信息 + * @param idCard + * @param time + * @return + */ + List getVaccineListByIdCard(@Param("idCard") String idCard,@Param("time") String time); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java index 60d80b3f61..6d087a1055 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java @@ -14,4 +14,8 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface IcVaccineRelationDao extends BaseDao { int delRelation(@Param("icVaccineId") String icNatId, @Param("agencyId") String agencyId); -} \ No newline at end of file + + void updateRelationInfoByVaccineId(IcVaccineRelationEntity icVaccineRelationEntity); + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 83cb4a4f29..6c68f85c19 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -22,16 +22,15 @@ import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcResiUserDao; +import com.epmet.dao.IcVaccineDao; import com.epmet.dao.IcVaccinePrarmeterDao; +import com.epmet.dao.IcVaccineRelationDao; import com.epmet.dto.IcVaccinePrarmeterDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.GridInfoByNameResultDTO; import com.epmet.dto.result.IcHouseInfoCollectResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcResiCollectEntity; -import com.epmet.entity.IcResiUserEntity; -import com.epmet.entity.IcUserChangeRecordEntity; -import com.epmet.entity.IcVaccinePrarmeterEntity; +import com.epmet.entity.*; import com.epmet.excel.IcVaccinePrarmeterImportExcel; import com.epmet.excel.error.IcVaccinePrarmeterImportErrorModel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; @@ -40,6 +39,7 @@ import com.epmet.feign.OssFeignClient; import com.epmet.redis.IcVaccinePrarmeterRedis; import com.epmet.service.IcUserChangeRecordService; import com.epmet.service.IcVaccinePrarmeterService; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.fileupload.FileItem; @@ -57,6 +57,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.text.SimpleDateFormat; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -89,6 +90,12 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -447,31 +454,31 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl userMap = queryOriginUserByHomeId(icResiCollectEntity.getHomeId(),icResiCollectEntity.getCustomerId()); if(userIdCardEntity != null){ + icResiUserId = userIdCardEntity.getId(); // 已存在人员 if(userMap.containsKey(icResiCollectEntity.getIdCard())){ // 人员房屋一致（只更新人员信息） @@ -482,12 +489,135 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntityFirstList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(firstDate)); + if(icVaccineEntityFirstList.size() > 0){ + // 更新疫苗接种记录 and 疫苗接种记录关系 + for(IcVaccineEntity entity : icVaccineEntityFirstList){ + updateVaccineInfo(entity,icResiCollectEntity); + + } + + }else{ + // 新增疫苗接种记录 and 疫苗接种记录关系 + insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + + } + + // 查询第二次接种信息 + List icVaccineEntitySecondList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(secondDate)); + if(icVaccineEntitySecondList.size() > 0){ + // 更新疫苗接种记录 and 疫苗接种记录关系 + for(IcVaccineEntity entity : icVaccineEntitySecondList){ + updateVaccineInfo(entity,icResiCollectEntity); + + } + + }else{ + // 新增疫苗接种记录 and 疫苗接种记录关系 + insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + + } + + // 查询第三次接种信息 + List icVaccineEntityThirdList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(thirdDate)); + if(icVaccineEntityThirdList.size() > 0){ + // 更新疫苗接种记录 and 疫苗接种记录关系 + for(IcVaccineEntity entity : icVaccineEntityThirdList){ + updateVaccineInfo(entity,icResiCollectEntity); + + } + + }else{ + // 新增疫苗接种记录 and 疫苗接种记录关系 + insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + + } + } + + /** + * 更新疫苗接种记录 and 疫苗接种记录关系 + * @param entity + * @param icResiCollectEntity + */ + private void updateVaccineInfo(IcVaccineEntity entity,IcVaccinePrarmeterEntity icResiCollectEntity){ + // 更新疫苗接种记录 + entity.setInoculateAddress(icResiCollectEntity.getFirstVacSite()); + entity.setUserType("prarmeter"); + entity.setCustomerId(icResiCollectEntity.getCustomerId()); + icVaccineDao.updateById(entity); + + // 更新疫苗接种记录关系 + IcVaccineRelationEntity icVaccineRelationEntity = new IcVaccineRelationEntity(); + icVaccineRelationEntity.setIcVaccineId(entity.getId()); + icVaccineRelationEntity.setUserType("prarmeter"); + icVaccineRelationEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + icVaccineRelationDao.updateRelationInfoByVaccineId(icVaccineRelationEntity); + + } + + /** + * 新增疫苗接种记录 and 疫苗接种记录关系 + * @param icResiCollectEntity + * @param icResiUserId + * @param time + */ + private void insertVaccineInfo(IcVaccinePrarmeterEntity icResiCollectEntity,String icResiUserId,Date time){ + IcVaccineEntity icVaccineEntity = new IcVaccineEntity(); + icVaccineEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + icVaccineEntity.setName(icResiCollectEntity.getName()); + icVaccineEntity.setMobile(icResiCollectEntity.getMobile()); + icVaccineEntity.setIdCard(icResiCollectEntity.getIdCard()); + icVaccineEntity.setIsResiUser("1"); + icVaccineEntity.setUserType("prarmeter"); + icVaccineEntity.setUserId(icResiUserId); + icVaccineEntity.setInoculateTime(time); + icVaccineEntity.setInoculateAddress(icResiCollectEntity.getFirstVacSite()); + icVaccineDao.insert(icVaccineEntity); + + // 新增关系 + IcVaccineRelationEntity icVaccineRelationEntity = new IcVaccineRelationEntity(); + icVaccineRelationEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + icVaccineRelationEntity.setAgencyId(icResiCollectEntity.getAgencyId()); + icVaccineRelationEntity.setPids(icResiCollectEntity.getPids()); + icVaccineRelationEntity.setIcVaccineId(icVaccineEntity.getId()); + icVaccineRelationEntity.setUserType("prarmeter"); + icVaccineRelationDao.insert(icVaccineRelationEntity); + } + /** * 更新新冠病毒疫苗接种人员信息台账表房屋ID * @param icResiCollectEntity @@ -601,7 +731,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl3ZHAIrZ$6AzHG=Rk;+`?3HuM@5W#2+Px{$$=J9~id`Ia2M_Up{TXiHHMiSp%Kapj zpUDqrau)C)!E!_FTQ!}`$%n-=ap&KxS1=JRL$lOZ^l;fHqR_BM+yA-`|AHPMxS)sf zZa&G1qJclC@T-t=oRcPLLqnt?Ll&vHuzs9PD(A zMn8>9SJ!ABHP4Vw%{LTK3k-$SLPJ#&A9qk%M2bjXSYWj{Ddc3~`c&9Utr*6Yw^N+D zysv8iehGBh@+*tqE!j&q_giDSG^Ia(Jjz=6<<+ttWujiT-`y^k$6d}!uC1*~XYG@N Odv71N5AyW(q4gIUifv{9 delta 777 zcmX|Wq|#7ZM-?lfoO5prN5UMF0mCx|GB*jOckij_qM zMI^-u7IuCtTxsqKOA9MOtSoHwaIq6S}~Tm!7}a@*#9v9Wmf+>ZeKL2 zbB`J{!%=IvhO2z;;20jDg36Np)M&5$zy%b6pes>uf_V`+AVHz|s>$n8PS-hPgIU5o z#gy(ydGN5U&Qc#M7p^TW?yAIKsjfesw6*2m_R#64Hh<<+PYML~km0V-3eS#6lO$V2 z36kWG$dF7-Nm4QtIOm;098ibe&>*MI?gz)Qd1djZz^Ucy_^* zdm5QAQidR%OT>A~K`ye(*V0R!w^E|ogHc9}*t?4n$0)hI(4)fgq!}qp+MpK5zK#y| zp~T-J1+^fS>B=3Uak@6b!=!kH^2Dy7cmtZry0FX5dLbWXQ5+gI&-R-YBbVYoYko8D vR;oHx)i++P@3s8{owPQ8$79&VZpYqQtqoR;9dU;Aa7v6c@ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml index 0ed766fb77..b8113074cf 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml @@ -174,4 +174,13 @@ m.ID_CARD = t.ID_CARD AND m.DEL_FLAG = '0' + + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml index 011c1c7de1..acaf54c95f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml @@ -12,5 +12,10 @@ AND AGENCY_ID = #{agencyId} + + update ic_vaccine_relation + set CUSTOMER_ID = #{customerId},USER_TYPE = #{userType} + where IC_VACCINE_ID = #{icVaccineId} + - \ No newline at end of file + From 14aa8de2daf83adfc9ff82ac843b8a6380321b0b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 25 Aug 2022 17:31:39 +0800 Subject: [PATCH 229/397] =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=8E=A5=E5=88=B0=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 4 ++-- .../main/java/com/epmet/service/impl/IssueServiceImpl.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 48b68b15d5..f7bd3df1be 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -2754,7 +2754,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl{ if(issueResult.getUserId().equals(re.getUserId())){ //话题发起人 - String street = re.getStreet() == null ? "" : re.getStreet() + "-"; String realName = re.getRealName() == null ? "" : re.getRealName(); issueDetailResult.setIssueInitiator(realName); } From 8101b0985bdcbb26eb27d3480086f671a301ca8d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 25 Aug 2022 17:56:04 +0800 Subject: [PATCH 230/397] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/ResiGroupServiceImpl.java | 6 +++--- .../com/epmet/service/impl/UserResiInfoServiceImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 3bb3a435d7..b5aed3822e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -403,7 +403,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 09:17:35 +0800 Subject: [PATCH 231/397] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/UserBaseInfoServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 4cccbd7bf4..7f9b4077d9 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 @@ -197,13 +197,13 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 09:23:25 +0800 Subject: [PATCH 232/397] =?UTF-8?q?=E4=B8=8D=E5=88=A4=E6=96=AD=E8=A1=97?= =?UTF-8?q?=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index f7bd3df1be..21398d37e4 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -2775,8 +2775,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 09:38:58 +0800 Subject: [PATCH 233/397] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=97=B6=20=E6=B3=A8=E5=86=8C=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E8=A1=A8=20=E8=A1=A5=E5=85=85=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/RegisterRelationServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 bf7f42d6f9..d853d884dc 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 @@ -37,10 +37,10 @@ import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.RegisterRelationDTO; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.*; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; -import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.entity.RegisterRelationEntity; import com.epmet.entity.UserCustomerEntity; import com.epmet.feign.GovOrgFeignClient; @@ -212,8 +212,14 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl registerRecordWithDiffCustAndGrid = From 814a52507546de50014f9eb331de3273fb7cd5ce Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 09:58:46 +0800 Subject: [PATCH 234/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index d0aef2f917..c87d9d58ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -349,7 +349,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 10:13:49 +0800 Subject: [PATCH 235/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E5=AE=A1=E6=A0=B8?= 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 6c8b094f67..d08b68a8dc 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 @@ -554,7 +554,7 @@ from ic_house where del_flag = '0' and CUSTOMER_ID = #{customerId} - and BUILDING_UNIT_ID = #{buildingUnitId} + and BUILDING_UNIT_ID = #{unitId} and DOOR_NAME = #{homeName} From 6c0452948e553674056b19d15d0b6bdc9f7f1ce5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 26 Aug 2022 10:30:50 +0800 Subject: [PATCH 236/397] =?UTF-8?q?=E6=B6=88=E6=81=AFsql=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V0.3.19__create_ic_message.sql | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.19__create_ic_message.sql diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.19__create_ic_message.sql b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.19__create_ic_message.sql new file mode 100644 index 0000000000..7c9804fa70 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.19__create_ic_message.sql @@ -0,0 +1,20 @@ +CREATE TABLE `ic_message` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `customer_id` varchar(64) NOT NULL COMMENT '客户id', + `grid_id` varchar(64) NOT NULL DEFAULT '*' COMMENT '暂定 *', + `user_id` varchar(64) NOT NULL COMMENT '被通知的用户id', + `app` varchar(32) NOT NULL COMMENT '消息通知对象：居民端用户resi、政府端工作人员gov、运营端工作人员oper', + `message_type` varchar(32) DEFAULT NULL COMMENT '消息分类 党建小助手:party', + `target_id` varchar(64) DEFAULT NULL COMMENT '消息类型对应的业务Id', + `title` varchar(255) NOT NULL COMMENT '消息标题', + `message_content` varchar(3096) NOT NULL COMMENT '消息通知内容', + `read_flag` varchar(32) NOT NULL DEFAULT 'unread' COMMENT 'read已读、unread未读', + `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 '更新时间', + `REFERER` varchar(20) DEFAULT NULL COMMENT '调用者', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='用户消息表(党建小助手)'; \ No newline at end of file From 87b66611d6e82e137815e16565439524fa10534a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 26 Aug 2022 10:32:29 +0800 Subject: [PATCH 237/397] =?UTF-8?q?=E6=B8=85=E9=99=A4=E8=A1=97=E9=81=93?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/redis/UserBaseInfoRedis.java | 2 +- .../java/com/epmet/service/impl/UserBaseInfoServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 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 435b99f213..83b08d384e 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 @@ -135,7 +135,7 @@ public class UserBaseInfoRedis { && StringUtils.isNotBlank(gridResult.getData().getBelongsGridName())){ String gridFullName = gridResult.getData().getBelongsGridName(); baseInfo.setRegisteredGridName(gridFullName); - StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(baseInfo.getSurname()); + StringBuffer buffer = new StringBuffer(baseInfo.getSurname()); switch (baseInfo.getGender()) { case NumConstant.ONE_STR: buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE); 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 7f9b4077d9..56a5f56400 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 @@ -194,7 +194,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 11:10:31 +0800 Subject: [PATCH 238/397] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/ResiGroupServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index b5aed3822e..8d502c339d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1022,10 +1022,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 13:38:19 +0800 Subject: [PATCH 239/397] __ --- ....23_party_publish_Time.sql => V0.0.23__party_publish_Time.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-admin/epmet-admin-server/src/main/resources/db/migration/{V0.0.23_party_publish_Time.sql => V0.0.23__party_publish_Time.sql} (100%) diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23__party_publish_Time.sql similarity index 100% rename from epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql rename to epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23__party_publish_Time.sql From 88608a91f49a3c65ed46407447654f2818dfd934 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 26 Aug 2022 14:05:09 +0800 Subject: [PATCH 240/397] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7ff2a2b5e8..f6395793e7 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 @@ -176,7 +176,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 14:13:04 +0800 Subject: [PATCH 241/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=AF=BC=E5=85=A5excel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/security/user/LoginUserUtil.java | 1 + .../epmet/constants/ImportTaskConstants.java | 4 + .../WorkdiaryServiceController.java | 102 ++++++- .../entity/WorkdiaryServiceRecordEntity.java | 4 + .../excel/WorkdiaryServiceRecordExcel.java | 9 + .../WorkdiaryServiceImportListener.java | 54 ++++ .../WorkdiaryServiceRecordService.java | 6 + .../WorkdiaryServiceRecordServiceImpl.java | 267 +++++++++++++++++- .../templates/workdiary_service_import.xlsx | Bin 0 -> 8961 bytes .../com/epmet/dto/form/GridOptionFormDTO.java | 4 + .../dto/result/HouseAgencyInfoResultDTO.java | 1 + .../src/main/resources/mapper/IcHouseDao.xml | 1 + .../resi/IcResiPageNonDynamicFormDTO.java | 25 ++ .../resi/IcResiNonDynamicResultDTO.java | 23 ++ .../epmet/feign/EpmetUserOpenFeignClient.java | 11 + .../EpmetUserOpenFeignClientFallback.java | 7 + .../controller/IcResiUserController.java | 21 ++ .../com/epmet/service/IcResiUserService.java | 2 + .../service/impl/IcResiUserServiceImpl.java | 18 ++ 19 files changed, 544 insertions(+), 16 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/workdiary_service_import.xlsx create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/resi/IcResiPageNonDynamicFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/IcResiNonDynamicResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/user/LoginUserUtil.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/user/LoginUserUtil.java index ce92400ae0..220ac403a8 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/user/LoginUserUtil.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/user/LoginUserUtil.java @@ -2,6 +2,7 @@ package com.epmet.commons.tools.security.user; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.utils.EpmetRequestHolder; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.List; 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 2108042cd6..64cceb765a 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 @@ -23,6 +23,10 @@ public interface ImportTaskConstants { String BIZ_TYPE_IC_ENTERPRISE="ic_enterprise"; String IC_POINT_NUCLEIC_MONITORING = "ic_point_nucleic_monitoring"; String IC_POINT_VACCINES_INOCULATION = "ic_point_vaccines_inoculation"; + /** + * 工作日志导入 + */ + String BIZ_TYPE_WORK_DIARY_IMPORT = "work_diary_import"; /** * 核酸检测 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java index 1b73a301a4..31a9b61af6 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java @@ -1,29 +1,52 @@ package com.epmet.controller; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; 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.utils.EpmetRequestHolder; 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.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.commons.tools.validator.group.UpdateGroup; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.WorkdiaryServiceTypeDTO; import com.epmet.dto.form.workdiaryservice.WorkdiaryServiceQueryFormDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.WorkdiaryServiceRecordDTO; import com.epmet.entity.WorkdiaryServiceTypeExcel; import com.epmet.service.WorkdiaryServiceRecordService; import com.epmet.service.WorkdiaryServiceTypeService; +import com.epmet.utils.ImportTaskUtils; +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.http.HttpHeaders; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.validation.constraints.NotNull; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.nio.file.Path; import java.util.List; import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; /** @@ -32,9 +55,10 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2022-08-23 */ +@Slf4j @RestController @RequestMapping("workdiaryService") -public class WorkdiaryServiceController { +public class WorkdiaryServiceController implements ResultDataResolver { @Autowired private WorkdiaryServiceRecordService workdiaryServiceRecordService; @@ -42,6 +66,9 @@ public class WorkdiaryServiceController { @Autowired private WorkdiaryServiceTypeService workdiaryServiceTypeService; + @Autowired + private ExecutorService executorService; + /** * 记录-分页 * @return @@ -127,6 +154,75 @@ public class WorkdiaryServiceController { workdiaryServiceRecordService.export(gridId, serviceType, applicantName, applicantAddress, serviceContent, applicantMobile, response); } + /** + * 下载模板 + * @return + */ + @RequestMapping("downloadTemplate") + public void downloadTemplate(HttpServletResponse response) throws UnsupportedEncodingException { + response.setCharacterEncoding("UTF-8"); + response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); + response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("工作日志导入模板", "UTF-8") + ".xlsx"); + + try (InputStream is = this.getClass().getClassLoader().getResourceAsStream("templates/workdiary_service_import.xlsx"); + ServletOutputStream os = response.getOutputStream()) { + IOUtils.copy(is, os); + } catch (IOException e) { + log.error("【工作日志】下载模板-IO错误：{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + + /** + * 记录导入 + * @param file + */ + @PostMapping("/record/import") + public Result recordImport(MultipartFile file) { + + if (file == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "请选择文件"); + } + + // 格式校验 + // 只接受如下两种格式后缀 + String originFileName = file.getOriginalFilename(); + String suffix = originFileName.substring(originFileName.lastIndexOf(".")); + if (StringUtils.isBlank(suffix) || (!".xlsx".equals(suffix) && !".xls".equals(suffix))) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "只支持.xls和.xlsx两种格式"); + } + + // 创建保存目录 + Path fileSavePath = null; + try { + Path saveDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("workdiary", "import", EpmetRequestHolder.getLoginUserId()); + fileSavePath = saveDir.resolve(System.currentTimeMillis() + suffix); + } catch (IOException e) { + e.printStackTrace(); + } + + // 将文件保存到本地 + try (FileOutputStream fos = new FileOutputStream(fileSavePath.toString()); + InputStream is = file.getInputStream()) { + IOUtils.copy(is, fos); + } catch (Exception e) { + log.error("【书记日志】上传-保存文件到本地失败:{}", ExceptionUtils.getErrorStackTrace(e)); + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode()); + } + + // 创建导入记录 + ImportTaskCommonResultDTO itResult = getResultDataOrThrowsException(ImportTaskUtils.createImportTask(originFileName, ImportTaskConstants.BIZ_TYPE_WORK_DIARY_IMPORT), + ServiceConstant.EPMET_COMMON_SERVICE, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "有导入操作正在进行", "有导入操作正在进行"); + + // 执行异步导入 + Path finalFileSavePath = fileSavePath; + CompletableFuture.runAsync(() -> { + workdiaryServiceRecordService.createImportTaskAndExecuteImport(finalFileSavePath, originFileName, itResult.getTaskId()); + }, executorService); + + return new Result(); + } + /** * 服务类型-分页 * @return diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java index 4b74496fd6..16db6c8bc5 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java @@ -3,8 +3,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import java.util.Date; @@ -17,6 +19,8 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("workdiary_service_record") +@NoArgsConstructor +@AllArgsConstructor public class WorkdiaryServiceRecordEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java index 7da0010c82..631c3ed943 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java @@ -4,6 +4,9 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.epmet.dto.result.WorkdiaryServiceRecordDTO; import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; /** * 工作日志(服务)-记录 excel @@ -12,16 +15,20 @@ import lombok.Data; * @since v1.0.0 2022-08-23 */ @Data +@NoArgsConstructor public class WorkdiaryServiceRecordExcel { + @NotBlank(message = "所属网格必填") @ColumnWidth(25) @ExcelProperty(value = "所属网格") private String gridName; + @NotBlank(message = "服务类型必填") @ColumnWidth(15) @ExcelProperty(value = "服务类型") private String serviceTypeName; + @NotBlank(message = "申请人必填") @ColumnWidth(10) @ExcelProperty(value = "申请人") private String applicantName; @@ -30,6 +37,7 @@ public class WorkdiaryServiceRecordExcel { @ExcelProperty(value = "住址") private String applicantAddress; + @NotBlank(message = "服务内容必填") @ColumnWidth(25) @ExcelProperty(value = "服务内容") private String serviceContent; @@ -42,6 +50,7 @@ public class WorkdiaryServiceRecordExcel { @ExcelProperty(value = "负责人") private String principal; + @NotBlank(message = "服务时间必填") @ColumnWidth(10) @ExcelProperty(value = "服务时间") private String serviceTime; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java new file mode 100644 index 0000000000..bc09d401d0 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java @@ -0,0 +1,54 @@ +package com.epmet.excel.listener; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.excel.WorkdiaryServiceRecordExcel; +import com.epmet.service.WorkdiaryServiceRecordService; +import lombok.extern.slf4j.Slf4j; + +import java.util.ArrayList; +import java.util.List; + +/** + * 工作日志-导入-监听器 + */ +@Slf4j +public class WorkdiaryServiceImportListener implements ReadListener { + + /** + * 200 一批执行导入 + */ + public static final Integer BATCH_SIZE = 2; + + /** + * 数据列表 + */ + private List datas = new ArrayList<>(); + + private WorkdiaryServiceRecordService workdiaryServiceRecordService; + + public WorkdiaryServiceImportListener(WorkdiaryServiceRecordService workdiaryServiceRecordService) { + this.workdiaryServiceRecordService = workdiaryServiceRecordService; + } + + @Override + public void invoke(WorkdiaryServiceRecordExcel data, AnalysisContext context) { + datas.add(data); + if (datas.size() >= BATCH_SIZE) { + // 达到批量阈值，执行一次导入 + try { + workdiaryServiceRecordService.executeBatchImport(datas); + } catch (Exception e) { + log.error("【工作日志】导入-发生未知错误:{}", ExceptionUtils.getErrorStackTrace(e)); + } finally { + datas.clear(); + } + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + workdiaryServiceRecordService.executeBatchImport(datas); + } +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java index e6ed7578f4..4dfc2f3cb5 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java @@ -5,8 +5,10 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.dto.form.workdiaryservice.WorkdiaryServiceQueryFormDTO; import com.epmet.dto.result.WorkdiaryServiceRecordDTO; import com.epmet.entity.WorkdiaryServiceRecordEntity; +import com.epmet.excel.WorkdiaryServiceRecordExcel; import javax.servlet.http.HttpServletResponse; +import java.nio.file.Path; import java.util.List; import java.util.Map; @@ -85,4 +87,8 @@ public interface WorkdiaryServiceRecordService extends BaseService datas); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java index 64505ae54a..ea0966c7a0 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java @@ -1,7 +1,11 @@ package com.epmet.service.impl; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -9,41 +13,61 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.ServiceConstant; +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.ExceptionUtils; +import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.EpmetRequestHolder; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.SpringContextUtils; +import com.epmet.commons.tools.security.user.LoginUserUtil; +import com.epmet.commons.tools.utils.*; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.WorkdiaryServiceRecordDao; import com.epmet.dao.WorkdiaryServiceTypeDao; -import com.epmet.dto.IcResiUserDTO; -import com.epmet.dto.WorkdiaryServiceTypeDTO; -import com.epmet.dto.result.WorkdiaryServiceRecordDTO; +import com.epmet.dto.*; +import com.epmet.dto.form.GridOptionFormDTO; +import com.epmet.dto.form.LoginUserDetailsFormDTO; +import com.epmet.dto.form.resi.IcResiPageNonDynamicFormDTO; +import com.epmet.dto.result.*; +import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.entity.WorkdiaryServiceRecordEntity; import com.epmet.excel.WorkdiaryServiceRecordExcel; +import com.epmet.excel.listener.WorkdiaryServiceImportListener; import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.feign.OssFeignClient; import com.epmet.redis.WorkdiaryServiceRecordRedis; import com.epmet.service.WorkdiaryServiceRecordService; import com.epmet.service.WorkdiaryServiceTypeService; +import com.epmet.utils.ImportTaskUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; 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.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -64,6 +88,34 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl> importResultDescTl = new ThreadLocal<>(); + + /** + * 导入结果描述 + */ + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class ImportResultDesc { + @ColumnWidth(20) + @ExcelProperty(value = "申请人") + private String applicantName; + + @ColumnWidth(30) + @ExcelProperty(value = "服务内容") + private String serviceContent; + + @ColumnWidth(30) + @ExcelProperty(value = "描述") + private String desc; + } + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -77,14 +129,18 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl page(String gridId, Short serviceType, String applicantName, String applicantAddress, String serviceContent, String applicantMobile, Integer pageNo, Integer pageSize) { + LoginUserDetailsResultDTO currentStaff = getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(new LoginUserDetailsFormDTO( + EpmetRequestHolder.getLoginUserApp(), EpmetRequestHolder.getLoginUserClient(), EpmetRequestHolder.getLoginUserId() + )), ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "查询工作人员信息失败", "查询工作人员信息失败"); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(StringUtils.isNotBlank(gridId), WorkdiaryServiceRecordEntity::getGridId, gridId); query.eq(serviceType != null, WorkdiaryServiceRecordEntity::getServiceType, serviceType); - query.eq(WorkdiaryServiceRecordEntity::getCreatedBy, EpmetRequestHolder.getLoginUserId()); query.like(StringUtils.isNotBlank(applicantName), WorkdiaryServiceRecordEntity::getApplicantName, applicantName); query.like(StringUtils.isNotBlank(applicantAddress), WorkdiaryServiceRecordEntity::getApplicantAddress, applicantAddress); query.like(StringUtils.isNotBlank(serviceContent), WorkdiaryServiceRecordEntity::getServiceContent, serviceContent); query.like(StringUtils.isNotBlank(applicantMobile), WorkdiaryServiceRecordEntity::getApplicantMobile, applicantMobile); + query.likeRight(WorkdiaryServiceRecordEntity::getOrgIdPath, currentStaff.getOrgIdPath()); // 查找类型列表 List stList = SpringContextUtils.getBean(WorkdiaryServiceTypeService.class).list(null, 1, 100); @@ -246,4 +302,189 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl()); + WorkdiaryServiceImportListener listener = new WorkdiaryServiceImportListener(this); + EasyExcel.read(fileSavePath.toFile(), WorkdiaryServiceRecordExcel.class,listener).headRowNumber(1).sheet(0).doRead(); + } catch (Exception e) { + logger.error("【工作日志】-导入-未知错误:{}", ExceptionUtils.getErrorStackTrace(e)); + } finally { + // 清理临时文件 + try { + Files.deleteIfExists(fileSavePath); + } catch (IOException e) { + logger.error("【书记日志】-导入-删除导入临时文件失败，staffId:{}, 文件名称:{}, 错误信息:{}", + EpmetRequestHolder.getLoginUserId(), fileSavePath.toString(), ExceptionUtils.getErrorStackTrace(e)); + } + + // 上传错误描述文件 + try { + resultDescFileUtl = buildAndUploadResultDescFile(importResultDescTl.get()); + } catch (IOException e) { + logger.error("【工作日志】导入-生成和上传错误描述文件失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + + // 清理错误结果描述缓存 + importResultDescTl.remove(); + } + + + + // 修改导入记录状态为已完成 + ImportTaskUtils.finishImportTask(taskId, ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS, resultDescFileUtl, ""); + } + + /** + * 生成和上传错误描述文件 + * @return + */ + private String buildAndUploadResultDescFile(List descs) throws IOException { + if(CollectionUtils.isEmpty(descs)) { + return null; + } + //Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("导入失败的数据列表","导入失败的数据列表"), + // ImportResultDesc.class, descs); + + String fileName = System.currentTimeMillis() + "_" + EpmetRequestHolder.getLoginUserId() + ".xlsx"; + + FileItem fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, FileUtils.getAndCreateDirUnderEpmetFilesDir("workdiary", "result_desc").toFile()) + .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName); + + // 为了自动关闭流 + try (OutputStream os = fileItem.getOutputStream()) { + EasyExcel.write(os, ImportResultDesc.class).sheet("失败列表").doWrite(descs); + } + + UploadImgResultDTO result = getResultDataOrThrowsException(ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)), + ServiceConstant.EPMET_OSS_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "上传结果描述文件失败", "上传结果描述文件失败"); + + if (!fileItem.isInMemory()) { + fileItem.delete(); + } + return result.getUrl(); + } + + /** + * 执行批量插入 + * @param datas + */ + @Override + public void executeBatchImport(List datas) { + if (CollectionUtils.isEmpty(datas)) { + return; + } + + // 当前登录人 + LoginUserDetailsResultDTO currentStaff = getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails( + new LoginUserDetailsFormDTO(EpmetRequestHolder.getLoginUserApp(), EpmetRequestHolder.getLoginUserClient(), EpmetRequestHolder.getLoginUserId())), + ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【工作日志】-导入-没有找到当前登录人信息", "【工作日志】-导入-没有找到当前登录人信息"); + + // 服务类型字典。key:养老 value:object + List serviceTypes = SpringContextUtils.getBean(WorkdiaryServiceTypeService.class).page(null, 1, 100).getList(); + Map serviceTypeMap = serviceTypes.stream().collect(Collectors.toMap(WorkdiaryServiceTypeDTO::getServiceTypeName, Function.identity())); + + ArrayList diaryRecordList = new ArrayList<>(); + + // 循环校验和填充数据 + for (WorkdiaryServiceRecordExcel row : datas) { + + String gridName = row.getGridName(); + String serviceTypeName = row.getServiceTypeName(); + String applicantName = row.getApplicantName(); + + try { + // 校验必填 + ValidatorUtils.validateEntity(row); + + // 检查服务类型 + WorkdiaryServiceTypeDTO serviceType = serviceTypeMap.get(serviceTypeName); + if (serviceType == null || serviceType.getEnabled().shortValue() == 0) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所选服务类型不存在或已禁用", "所选服务类型不存在或已禁用"); + } + + // 检查网格 + OptionResultDTO grid = findGrid(currentStaff.getAgencyId(), gridName); + if (grid == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "网格不存在，或不在您所属的组织下", "网格不存在，或不在您所属的组织下"); + } + + // 查找居民 + IcResiNonDynamicResultDTO resi = findResi(grid.getValue(), row.getApplicantName(), row.getApplicantMobile()); + + if (StringUtils.isBlank(row.getApplicantMobile())) { + row.setApplicantMobile(resi.getMobile()); + } + + // 没填写住址的，到系统查询 + if (StringUtils.isBlank(row.getApplicantAddress())) { + + HouseAgencyInfoResultDTO house = getResultDataOrThrowsException(govOrgOpenFeignClient.getHouseAgencyInfo(resi.getHomeId()), + ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "查询房屋失败", "查询房屋失败"); + + if (house == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民住址未找到", "居民未找到"); + } + + row.setApplicantAddress(house.getFullName()); + } + // 填充到entity + WorkdiaryServiceRecordEntity record = new WorkdiaryServiceRecordEntity(EpmetRequestHolder.getLoginUserCustomerId(), serviceType.getServiceType(), currentStaff.getAgencyId(), + grid.getValue(), currentStaff.getOrgIdPath().concat(":").concat(grid.getValue()), resi.getId(), row.getApplicantName(), + row.getApplicantAddress(), row.getApplicantMobile(), row.getServiceContent(), row.getServiceTime(), row.getPrincipal(), row.getRemark()); + + diaryRecordList.add(record); + } catch (ValidateException ve) { + importResultDescTl.get().add(new ImportResultDesc(applicantName, row.getServiceContent(), ve.getMsg())); + } catch (EpmetException ee) { + importResultDescTl.get().add(new ImportResultDesc(applicantName, row.getServiceContent(), ee.getMsg())); + } catch (Throwable t) { + logger.error(ExceptionUtils.getThrowableErrorStackTrace(t)); + importResultDescTl.get().add(new ImportResultDesc(applicantName, row.getServiceContent(), "未知错误")); + } + } + + // 批量持久化 + insertBatch(diaryRecordList, 50); + } + + private IcResiNonDynamicResultDTO findResi(String gridId, String applicantName, String mobile) { + PageData page = getResultDataOrThrowsException(userOpenFeignClient.listResiNonDynamic(new IcResiPageNonDynamicFormDTO(gridId, applicantName, mobile, false)), + ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民未找到", "居民未找到"); + + List list = page.getList(); + + if (page == null || CollectionUtils.isEmpty(page.getList())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民未找到", "居民未找到"); + } + + return list.get(0); + } + + /** + * 从组织下查找指定的网格名称，得到网格数据 + * @param agencyId + * @param gridName + * @return + */ + private OptionResultDTO findGrid(String agencyId, String gridName) { + List gridOptions = getResultDataOrThrowsException(govOrgOpenFeignClient.getGridOption(new GridOptionFormDTO(agencyId, "saveOrUpdate")), + ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【工作日志】-导入-网格查询失败", "【工作日志】-导入-网格查询失败"); + + for (OptionResultDTO grid : gridOptions) { + if (gridName.equals(grid.getLabel())) { + return grid; + } + } + + return null; + } +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/workdiary_service_import.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/workdiary_service_import.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..06bf284e8b4126ca92f7360d17ab57001bbc1e49 GIT binary patch literal 8961 zcmaJ{1yo$ivc(}d1a}`?g9j%BcXtR7d~hcOcY*{Du0euJaCdhJ?k>S0@Q38xn;YK! zuh%+rW}T_(>a)A5x>oIxmx6?X2YVcWva5oR_rJz7&=(`%8+kjRjXje*NDKq?0Pd$) zJ?Cr*GdLL73kWbU)PIT@*w`?-SXrh-wMs&=V7$8Yc|a`(vN4b;veNhj@xp3460!m3 zTBOmVw?=Ll7#&EjV6D%9%6Eut&qqGj+BxeTZZv&|O9Lh)RWAEhQ{~0jiao9SG``2i0i7?Wz#({PZKiKw+ z&ZJP1j;m}p7u?q}$v6;^11{IkZoLV?%=}Z;)za8lK?IXFV+|t&!n=L#;@A$CoLX9} z_3tY?Yxn*YE4%`bvkN-n2foV;Lz?oYe9vw;boq1EHDR{#?B^s)a$0A;b&ief%|V~7 z{&Bp}*NFj&I+V--Be?fmGOssrTtX3)gAO>B4JsRT2N-1tu5J!Y9%u!xhR7 zmYX8dbiZ1=qsDoAZG8g$C%VsVa&;cjT}Q#pC^35Yi76_)`jm~6QNEGUYYFGSh-*xPSgOtbouVcy}{6PMCKHHsBr2d^)Q@d zOOPt9Qv9}Ay@VR|i8p?4@|0k3#PVoeT?4hBai-((vL*r}^|1s6?yw)jC_hv`^MxTw z(k(rYG=_8W_{)yM!m^Fk@agw7q*6tsHocJDe9TqP(NZE6rNwU#lfX%!17KbxEZe4T zT+QRRm_590O&|EA>7NzOma;lDs~EPr&hNsGTmPlMt`n7fbNHnH$HE%3d4cqU8ic%x zc&i^Ik*1pCw+YzJ!7Y9w_?JqV7I5sELR4i)_#!E>Tb+XkPQJ8~)H1!aIsFWzVTxis z7Q;6ROErYV4%#cSKjIUZW*molCc|7{l%emdc6Sl}gm)-hr}_s7)^{L?pZ@``qrC&r z>Zkuk3d#90W4s3e9GH7Krr1W1T?%K3jgrLW49KyRF_oJ0L0|K#G2%HQ(rb!mT5`9% z%z$A=*vlS;4kL%~9{J{=n1*oW^fH|RYN)2p0ygUvIQGi&mxksyOjBWPZZrgN@CWcN zC+`MWobJe!_cGr*k~EeToEucWwY<@_8^z(L$>7WNvt&;D#0ekHN!W06I{TnDi`z8y zb=($L#Jcz0I>L5rybicPa;0_B$LyfP3cOB=FY<9lC_$FbGBAr#X4mc!d~9`cQMXn7 z$J2Dve5;ddOQ^UV00zEp7uU>9yg(^Q#gJ&~&}h?`Y}|IQpp_+`=oR*Zo7z+SN3{Mu zBS3=Cag?SllZEzd^Xa#+(xvbTv$A9Nw}kj%ZTXpuClQrjO8M`iYuQut<&Zj`X*!m zjvUtmqxgpGqA!W-@ol~d*}AK;otyW)O0J4JmZ(j3Y!!rA;C(&9D&l;<8~QC;%VbImRF5@3FS^x(_+l=UW`t6pNj%uZRl| z()e2Nr+|jD&zD0!INb&bnqDk+r&-DkxQ4h4Vs6YMt*P#HY0E|wB9dx5>F1d8wZ4;UmJ-u-}e( zW0&4;rN8r_#QV`C)3@pjnli+4$|sGGYib0*M+vSzi{^QKRfu82 zIi2k6HmMIrW^i74GIjVY-~};i+9sS=NNpOq4~-%3Yd@uqb^LKyG=Gcz6#nVy2O2U!d`{Fx>}@ag{l+MxJ#tnu*lPY&DkpSN$q<6iI_B|c z&R*^K0J^jJK(g)JSN?G>2FA^mm2z#P4jN z4|;F_Gmy8+`{@zHQi%u3v}ErMC>YBS^NuasTzn`zHWVn=x1sK+D$7-hIq05|eLl*e z2Cu21dXBE|<-AfY*Xm5`j|WFhOq=IIh%ajaPr8{Y_0>7dv^x-2*on0bCFe+ig5u@& zmCBDTHK!8g5m^J#4H&I<>+}cs`ZkhJ);rv;FBk#E)A;9`x;uK1`P$v*T0cyhHEzbi zFrZ4uK85a7lr1eDvBMXE_X+TLTxvERB>8jR0ZVKbE%Ln(N`$^X+~B=q-WJASXn@(c z>cVT%1zI`oVd?tXdDtT@6&#-LGJvF5D0du?bgW*~)Q3*SMLx@dm366CAg-*2-;%;m z7SYf#4|yiFk*g^+0@(!%CNCI5A;HHzd<+FG->f6roACT7QnXBYJe@EsZ0lN{WGY}H zEESHc*QmQWm2?J8s-#5k?&_wK?dUu-FYiNY8vo74*~!}YYk{pM`gX{VV!11YN6lBa z^Ky;Nsh*d+y=vAC%qPtcXS2ZOcRMg`{FVxGPc*}4 zmPYR$;9Tv1AYu`_#C3*Q4oK<`IyQ|HJM6t4=vWZio?&;!&QUeLtw5}dsnvFRV>#L& zqd=?Rr$oLpQU_$0)KmBgd2hU8x)2URvw;>WZw|;r9GcfO?egg%t434CWrgZliFsn(2dA$w>0W>HPFY4u-E}VY~jj z)v2u`qqP%vVQRuY?#@8rv=-E(0?+R$ca6 zZ~a=Z#<{BxA!cJGj1fpH=URY0JK5`zoVbV~T?kQdteBPm-Z*zYWUp)E^W;X3Q-rh@ zMVMWM#CFd%5tSjvY9`O*wySA_*_ZkLkD6!7)FJ9PFEryH!aHBtBRLh$2`VYknC_-H z+-*8RN>T}Gbf>i(5b{&uPDIE9v_#2Wt}(?^fmfl_QeFQ0q-a~<)0r`aLc$cAM3fTU zYW+;(f=b1tNm^D2P%9~v(=ZyY(>+3C2NY|)P_Sdt^(>iWDPGY2!&Pn9%E@{JMf9_X zV|-!l&wj89EUj+qu504XW1B36m-Um z4W|%8IZDy{L)l$@C&@ZS7zdHlq%I5AtFbj}>}09yp`aSV(z5navq*6!;$k!=FxDJ# zRg-kW<{ICWwXo%<7PBsBZc?thH{i7xZ|ifm^BpIq*&I$D_YXr~x9)ALO9(IP`mDN%>vWql z%#)2(Y;PD!4lYpecQ36q@f}rgVVs(+oEw|Q<>fwQxLIu#>dg|t0CcvxqSm0`OSeIC z3aE%*;w0OrqQ)x%lNVcd+Bpe_k7mKOZvt~xTAcSUB2mxlC>ymGY0oWdN)9bAU-K1W zBgV#Y?!qEXF4tgO4A#usC@Eof74K9D#cK6&exzG!u*>m~a`pANUx8`5x%u!~_qYq@ z_5=S(u~vv?h^Rr+4ZWV&*#`F8eMl^}OUyW)OUn8viQv8>^o)tY(=g8yB=6fQiybk% zio30kIg6pS!=CtaiC3N>tU1heyz_)5#IPFEBz@~cLl?(Z8`TTYcRLiq3?+Nll3>g} z)D|yHoQ4hL!iK%R-|ax&Ohg@^fP03O8b-QfxUaX^UXZJ78hOC*gIO4|u(#x8rZkD1mp`@wV{IJxQ}WWm-~RPdGhww&Bz zc@+Dl0aFpvS9V0wWF~0Q`uydHZ!Us!m3Yh15F5YDQ)v=#m?dvq%ny}89#qM?m-x=k zYgJ0nk~&rtaL~~VAjaU-2(u_Cst;<~dv%rz$CwwO*BUJ%oj}Wfg-qi?=)27DtNF#FmtZhy#oJ-w|2#n{Q%R`0aUor!7~hSq662Mi_ak4XVU%$WNWq zUTc-K#Y|KVOSKjkv^Ggi14j!5v z5xl*Yy{hkesv){znDsh|5bFR-gy+ZvOPK(se5|uWMndtmy}c-ylj0f=CL2v~J_O;e z*=c!nJeDsM1f|ru(LFId9*nusr47A0pM|`zEuPtje015u($kTL7fj2Xm=lC^r|7Y_ zP#Yr=(ov^M05G^P4k;ig3N-air@;mDP`HG3RNX$`B#fU+!Q}d;O5z+HMJEafafPLVN-47G z=_*`>0GA7bua^yPk;KwmBSl~w6Vot|v93bG5Y8K!$a&2lNE&iw{VsN!wFm|w6z0__ zx#lcbmEnury#z0N;W)Imk>?oMn7OMj07e>O1?IMH?>_Fi83bl#Bjbg5X!b%ycHm~mprrGC9x!k5$b!BLW}G{~Q^ct$^b;VR2r4Zj z262@e=Fq^up>9#WTP{_axY4(W3+Jm2*YiOS7+8SGv+6!QC613LTWK;6uFj`{<0or@ z*uMs2(GSmOrU%Z=lHk_qtO!W1nbR+12uTArFC;fK({>4#wE zW5|f<7Q)SjZ{yq}=9fb1nAibXMntx{JQGfFAH4bgOdbWz1(U|+`K-;=Sg_3k zc%RHFF{+9Z?ZY;QsarE^kaUg2Xp}N>(W<2G&Ysb5y4=~y|0I{J8j+yw6g3?$pcf#&pafhJ9Il!D3iu$ zuYFHH)OL|MWrIu5f7j;V1EBQ>#J&z5?z%kU_i`gP-|W0SdbPSk6PX|{d$|J`|IWln zl-lg_kh0@-r1R2+`gth_nHP!Oa6Ud6dQs(x{P%lT&PO3Q z-T)TTeL1OhK%6MQXlu{=S)5bLAD2sDx!>%{UbdF!h}x0y2oV+TV3xg9$+4t}jh*H+ zg@l^S`63ktHVrA=Wm%y3dI&t=E+4DFZVWvT?HYn0T?^oRmiw0dlh0HY-xl* zRd0?|TpI+JS7)H=e92KDX73CfX6<+Tdd=2@ zb1G%4_JRG);q{>%^-?ICl*w7BZOi&@DT3T}Mp?!w=c+pr zrVjJ@=Xyaa8%-lovmUQr>#c`B>)E5CSJIH64yqgIdL#xwy$yR)13P0QB?mh*>$gA4 zTC2!G$#y{u|4W}ER1+Ye4mCD$X9zF?ixXY;jDn5S8DnA6KO`gwb-PRT74{cR$xK6w zrQDccpurtDX{?1waulHrw>;2H9(I&BQ{O*4m0)ZAk`}ztpa_!8BjpQf9WJ?|9;e7I$&km8TI3G;bAg0xV{*1M(Z!m{ZnUMkGoqd2Oy-yqYv1LM6B;!<>6o z@X0Ov_6i-h+E2!B$;lzGxhH7Y3+Y44#pqT$IJfhauJvD$;UH^RLcn8MbQsB~u3uZ3 z_&YJP7PWbCd8n8Lf6%SQ(!rB}z>5-pSLFCSLtAZb`JF?D=y(IXRGl150vZb+O^Up2 z0@@j&Ex)68sINk!T3$gkIyE1(G$mct%_Q4YWncroCt!#jLhQ94+wkjQWUILW=25p%Q6^TH zzwmiUUqk-?%{WkB8BEX4*z#%P*`3R&;Q{p95~%r%@V5-(qhxXPuw(}_YS$6SNjIBh zoH5a69hk`WWsE%ECrCexP(6>~U&RIQDQ+U+@txYMg|0Rkmq^s^2{|y!G?leED&Xks?aRLve&Pke4RLY;;FiUNDW9 z{Z$^fz#DR3jz(*F>%LR5t~4TfnU|f5v_bCmFt%L&4c9puSeEQGwS&(7#QwhJ4gQhBWKCLqGA&Uq*vPh2}&W~Hnf{<=@YxPWr;&5(+95w z$H%wYTBAm_D*MHG{3tW`9w=D5JJ#b|`Pucv?M@jAo&SF<|I^s~H#j$rGjR?;FxG+K z!~@+y!T(F_vGf0zH~)pMImo5Ej(i(^M?G!F!db*pbi2~0i`~KA(0Q2}!b)i+*QE7i zXrw#DYa^!lH6H=`=NG;nO`uSjzhRa);-*Gqyy2LDX+l0iVM-6OI<5`{M+y@!r8_#R zCZ5rVlbWc6q_KTwlx{$zTSYak52Oi&gxOJMIgfjltBEp2Xcg`jvo*}~R)-7kD$b>j1{xlUc z!B45p1(sb4vV8RT#++FLw#BD_aH>dx=A}(UIXGSEDLBEPv}YyRDD#jDsvVkqVAQZUvM8k{hu!yz*3U3iHrZ#k z-*X!Io@DtsZ92D9ABJZJYYMSou{6Ri__SYzUs5F6oooZB})fg1KK1#Nrc@b@=>#3)pNArm+ci+~0kjclmv&w7rt%ybu0hXnBi4 zc+Rt6XYsr#s=ArJ;d|@%Hyn2`@>1Xs7(Y*`U-b3UodInQ7&sUS=u?{TU-#+P1pm%? zJ*J#rOd>7?Z!oqp`>F4~G6vdrvv~N8w-g z0RL3`4`crnqNg16Z*6~&OaE>3FGl*Q`csbexB5CLW&BqEn{oYLFa1b6{u+-jjSlr6 z67unN|9wlIphWPG1od>GPczx0o&TWpPqqKbYftBSS`Pi5hZaP1{#$YMbcUx5!rwD! zg8GGzGyL5y{9j=G`R)MNpQ?Y6Q-6BMQ+n#RMcIF<{U)oPF8OIW^Lqk45aR_}@;_nw zUyFX^jem{D9cKHr!+)^If3Ex~kNl|nYuEJtOZPXcEH4H9Gg#3;|Ehom$*mJT>ir+- C3}CVV literal 0 HcmV?d00001 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GridOptionFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GridOptionFormDTO.java index e6fae52bc9..434af5aed4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GridOptionFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GridOptionFormDTO.java @@ -1,6 +1,8 @@ package com.epmet.dto.form; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import javax.validation.constraints.NotBlank; import java.io.Serializable; @@ -11,6 +13,8 @@ import java.io.Serializable; * @Date 2021/11/12 10:54 上午 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class GridOptionFormDTO implements Serializable { /** * 部门Id diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseAgencyInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseAgencyInfoResultDTO.java index d5734e2791..eff5a441d8 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseAgencyInfoResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseAgencyInfoResultDTO.java @@ -21,6 +21,7 @@ public class HouseAgencyInfoResultDTO implements Serializable { private String neighborHoodId; private String buildingId; private String buildingUnitId; + private String fullName; public HouseAgencyInfoResultDTO() { this.agencyId = ""; 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 8b900c90dd..6098775330 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 @@ -393,6 +393,7 @@ h.BUILDING_UNIT_ID, nh.AGENCY_ID, nh.GRID_ID, + h.FULL_NAME, nh.AGENCY_PIDS AS pids FROM ic_house h INNER JOIN ic_neighbor_hood nh ON (nh.ID = h.NEIGHBOR_HOOD_ID AND nh.DEL_FLAG = '0') diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/resi/IcResiPageNonDynamicFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/resi/IcResiPageNonDynamicFormDTO.java new file mode 100644 index 0000000000..e5453cda85 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/resi/IcResiPageNonDynamicFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form.resi; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class IcResiPageNonDynamicFormDTO extends PageFormDTO { + + private String gridId; + + private String name; + + private String mobile; + + /** + * 是否模糊。true：模糊，false：精确 + */ + private Boolean fuzzy = false; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/IcResiNonDynamicResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/IcResiNonDynamicResultDTO.java new file mode 100644 index 0000000000..52da33987e --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/IcResiNonDynamicResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result.resi; + +import lombok.Data; + +/** + * 居民基础信息V2 + */ +@Data +public class IcResiNonDynamicResultDTO { + private String id; + private String name; + private String customerId; + private String agencyId; + private String gridId; + private String villageId; + private String buildId; + private String unitId; + private String homeId; + private String mobile; + private String idCard; + private String gender; + private String idCardType; +} 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 e37454ed35..47a67e5fbd 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 @@ -3,12 +3,15 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; +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.*; import com.epmet.dto.form.*; import com.epmet.dto.form.patrol.PatrolQueryFormDTO; +import com.epmet.dto.form.resi.IcResiPageNonDynamicFormDTO; import com.epmet.dto.result.*; +import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.feign.fallback.EpmetUserOpenFeignClientFallbackFactory; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import org.springframework.cloud.openfeign.FeignClient; @@ -871,4 +874,12 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/customerstaff/customerstaff") Result> customerStaff(@RequestBody GridStaffUploadtFormDTO formDTO); + + /** + * 居民列表，非动态 + * @param input + * @return + */ + @PostMapping("/epmetuser/icresiuser/nonDynamic/listResi") + Result> listResiNonDynamic(@RequestBody IcResiPageNonDynamicFormDTO input); } 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 71711e66a8..7c9cc3b2a4 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 @@ -2,13 +2,16 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.form.patrol.PatrolQueryFormDTO; +import com.epmet.dto.form.resi.IcResiPageNonDynamicFormDTO; import com.epmet.dto.result.*; +import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import org.springframework.web.bind.annotation.RequestBody; @@ -671,4 +674,8 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "customerStaff", formDTO); } + @Override + public Result> listResiNonDynamic(IcResiPageNonDynamicFormDTO input) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listResiNonDynamic", input); + } } 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 7604ebc5c7..9b0fe3324c 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 @@ -55,8 +55,10 @@ import com.epmet.constant.SystemMessageType; 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.result.*; import com.epmet.dto.result.demand.OptionDTO; +import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.enums.IcResiUserTableEnum; import com.epmet.excel.PartyMemberAgeExportExcel; import com.epmet.excel.PartyMemberEducationExportExcel; @@ -1371,4 +1373,23 @@ public class IcResiUserController implements ResultDataResolver { return new Result().ok(icResiUserService.icUserMatchGrid(formDTO)); } + /** + * 居民列表分页查询 非动态 + * @param input + * @return + */ + @PostMapping("/nonDynamic/listResi") + public Result> listResiNonDynamic(@RequestBody IcResiPageNonDynamicFormDTO input) { + + String gridId = input.getGridId(); + String name = input.getName(); + Integer pageNo = input.getPageNo(); + Integer pageSize = input.getPageSize(); + Boolean fuzzy = input.getFuzzy(); + String mobile = input.getMobile(); + + PageData page = icResiUserService.listResiNonDynamic(fuzzy, gridId, name, mobile, pageNo, pageSize); + return new Result>().ok(page); + } + } 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 37cf258e14..8975e06443 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 @@ -26,6 +26,7 @@ import com.epmet.dto.IcResiUserDTO; 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.entity.IcResiUserEntity; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; @@ -505,4 +506,5 @@ public interface IcResiUserService extends BaseService { */ IcUserMatchGridResultDTO icUserMatchGrid(IcUserMatchGridFormDTO formDTO); + PageData listResiNonDynamic(Boolean fuzzy, String gridId, String name, String mobile, Integer pageNo, Integer pageSize); } 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 d8f57e4e81..ce30430738 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 @@ -63,6 +63,7 @@ import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; 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.entity.*; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.*; @@ -3312,4 +3313,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl" + customer); return customer; } + + @Override + public PageData listResiNonDynamic(Boolean fuzzy, String gridId, String name, String mobile, Integer pageNo, Integer pageSize) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcResiUserEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); + query.eq(StringUtils.isNotBlank(gridId), IcResiUserEntity::getGridId, gridId); + // 一个模糊一个精确 + query.eq((!fuzzy && StringUtils.isNotBlank(name)), IcResiUserEntity::getName, name); + query.like((fuzzy && StringUtils.isNotBlank(name)), IcResiUserEntity::getName, name); + + query.eq((!fuzzy && StringUtils.isNotBlank(mobile)), IcResiUserEntity::getMobile, mobile); + query.like((fuzzy && StringUtils.isNotBlank(mobile)), IcResiUserEntity::getMobile, mobile); + + PageHelper.startPage(pageNo, pageSize); + List list = baseDao.selectList(query).stream().map((e) -> ConvertUtils.sourceToTarget(e, IcResiNonDynamicResultDTO.class)).collect(Collectors.toList()); + return new PageData(list, new PageInfo<>(list).getTotal(), pageSize); + } } From cde9a8b04390928b50f8487048a5267b88065d30 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 26 Aug 2022 14:18:13 +0800 Subject: [PATCH 242/397] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/PointModifyFormDTO.java | 3 + .../PointAdditiveRuleController.java | 6 + .../service/PointAdditiveRuleService.java | 9 + .../impl/PointAdditiveRuleServiceImpl.java | 158 ++++++++++++++++++ 4 files changed, 176 insertions(+) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java index 71cff835cd..72dc80773c 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; /** * @program: epmet-cloud @@ -59,5 +60,7 @@ public class PointModifyFormDTO implements Serializable { */ private Integer pointValue; + List customerIdList; + } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java index 3f780d3ff9..0a461d1486 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java @@ -185,4 +185,10 @@ public class PointAdditiveRuleController { dto.setCustomerId(tokenDto.getCustomerId()); return pointAdditiveRuleService.modify(dto); } + + @PostMapping("initPartyRole") + public Result initPartyBuilidingRole(@RequestBody PointModifyFormDTO dto) { + pointAdditiveRuleService.initPartyBuilidingRole(dto.getCustomerIdList()); + return new Result(); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java index 4f9995158e..f067064af5 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java @@ -151,4 +151,13 @@ public interface PointAdditiveRuleService extends BaseService customerIdList); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java index 9606b63ba6..6b76e2aff6 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -7,6 +7,7 @@ import com.epmet.common.enu.PointAddRuleEnum; 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; @@ -284,4 +285,161 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl customerIdList) { + customerIdList.forEach(customerId -> { + //党建积分 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "党建积分"); + PointAdditiveRuleEntity djjf = baseDao.selectOne(wrapper); + if (null == djjf) { + djjf = new PointAdditiveRuleEntity(); + djjf.setCustomerId(customerId); + djjf.setType("category"); + djjf.setApplyFlag(NumConstant.ONE_STR); + djjf.setCategoryCode("party_building"); + djjf.setCategoryName("党建积分"); + djjf.setPid(NumConstant.ZERO_STR); + djjf.setPids(""); + baseDao.insert(djjf); + } + //党建活动 + wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "党建活动"); + PointAdditiveRuleEntity djhd = baseDao.selectOne(wrapper); + if (null == djhd) { + djhd = new PointAdditiveRuleEntity(); + djhd.setCustomerId(customerId); + djhd.setType("category"); + djhd.setApplyFlag(NumConstant.ONE_STR); + djhd.setCategoryCode("party_building"); + djhd.setCategoryName("党建活动"); + djhd.setPid(djjf.getId()); + djhd.setPids(djjf.getId()); + baseDao.insert(djhd); + } + //支部委员会 + wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "支部委员会"); + PointAdditiveRuleEntity zbdyh = baseDao.selectOne(wrapper); + if (null == zbdyh) { + zbdyh = new PointAdditiveRuleEntity(); + zbdyh.setCustomerId(customerId); + zbdyh.setType("rule"); + zbdyh.setApplyFlag(NumConstant.ONE_STR); + zbdyh.setCategoryCode("party_building"); + zbdyh.setRuleName("支部委员会"); + zbdyh.setPid(djhd.getId()); + zbdyh.setPids(djhd.getPids().concat(StrConstant.COLON).concat(djhd.getId())); + zbdyh.setPointValue(10); + baseDao.insert(zbdyh); + } + //支部党员大会 + wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "支部党员大会"); + PointAdditiveRuleEntity zbdydh = baseDao.selectOne(wrapper); + if (null == zbdydh) { + zbdydh = new PointAdditiveRuleEntity(); + zbdydh.setCustomerId(customerId); + zbdydh.setType("rule"); + zbdydh.setApplyFlag(NumConstant.ONE_STR); + zbdydh.setCategoryCode("party_building"); + zbdydh.setRuleName("支部党员大会"); + zbdydh.setPid(djhd.getId()); + zbdydh.setPids(djhd.getPids().concat(StrConstant.COLON).concat(djhd.getId())); + zbdydh.setPointValue(20); + baseDao.insert(zbdydh); + } + //党小组会 + wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "党小组会"); + PointAdditiveRuleEntity dxzh = baseDao.selectOne(wrapper); + if (null == dxzh) { + dxzh = new PointAdditiveRuleEntity(); + dxzh.setCustomerId(customerId); + dxzh.setType("rule"); + dxzh.setApplyFlag(NumConstant.ONE_STR); + dxzh.setCategoryCode("party_building"); + dxzh.setRuleName("党小组会"); + dxzh.setPid(djhd.getId()); + dxzh.setPids(djhd.getPids().concat(StrConstant.COLON).concat(djhd.getId())); + dxzh.setPointValue(10); + baseDao.insert(dxzh); + } + //党课 + wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "党课"); + PointAdditiveRuleEntity dk = baseDao.selectOne(wrapper); + if (null == dk) { + dk = new PointAdditiveRuleEntity(); + dk.setCustomerId(customerId); + dk.setType("rule"); + dk.setApplyFlag(NumConstant.ONE_STR); + dk.setCategoryCode("party_building"); + dk.setRuleName("党课"); + dk.setPid(djhd.getId()); + dk.setPids(djhd.getPids().concat(StrConstant.COLON).concat(djhd.getId())); + dk.setPointValue(15); + baseDao.insert(dk); + } + //主题党日 + wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "主题党日"); + PointAdditiveRuleEntity ztdr = baseDao.selectOne(wrapper); + if (null == ztdr) { + ztdr = new PointAdditiveRuleEntity(); + ztdr.setCustomerId(customerId); + ztdr.setType("rule"); + ztdr.setApplyFlag(NumConstant.ONE_STR); + ztdr.setCategoryCode("party_building"); + ztdr.setRuleName("主题党日"); + ztdr.setPid(djhd.getId()); + ztdr.setPids(djhd.getPids().concat(StrConstant.COLON).concat(djhd.getId())); + ztdr.setPointValue(15); + baseDao.insert(ztdr); + } + //为民服务活动 + wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "为民服务活动"); + PointAdditiveRuleEntity wmfwhd = baseDao.selectOne(wrapper); + if (null == wmfwhd) { + wmfwhd = new PointAdditiveRuleEntity(); + wmfwhd.setCustomerId(customerId); + wmfwhd.setType("rule"); + wmfwhd.setApplyFlag(NumConstant.ONE_STR); + wmfwhd.setCategoryCode("party_building"); + wmfwhd.setRuleName("为民服务活动"); + wmfwhd.setPid(djhd.getId()); + wmfwhd.setPids(djhd.getPids().concat(StrConstant.COLON).concat(djhd.getId())); + wmfwhd.setPointValue(15); + baseDao.insert(wmfwhd); + } + }); + } + } From 71ddd6839452a031cbe61e51b606cf445a63d67f Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 26 Aug 2022 14:25:18 +0800 Subject: [PATCH 243/397] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/societyorg_import_template.xlsx | Bin 8928 -> 8977 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx index a5562c9247c0f6f5d763faa99fbefc3f2ccd1f07..9ca4a73e2ff45ff4064c93823d38f0441b04667f 100644 GIT binary patch delta 4982 zcmZ9QWmME%yT)f2U>J0iZfQw@p+h8<8tDcRkS>vMX#Ubj!_eK`k|JHwDbkI!fOH6l z=Y2n%^PGFFeXq6mUi;o_{nqv6x|Ux>%T%JlFs|XHmX}}PUTPG2nbA%T>p?v4!DWgdgT+8|p`Re4 zPK`&_;iU>FhV^ZqT?BQ%W`l&!M-4|kc9^hrd$yT_cRY6*kJ<7t3%p0u2%;P#U?w8_ zeA79k%IrDbq|72+Gti(aqq2$o(w$sQ`V}h`&(Q}U(;5nj2lX%&A|ELU3J|O>(8T za{dT4wXkXz%E`s}o8mJa$Gpk!6MeegnBxAYC6u49%lHfkCN&d12>#OT?}|y}^?Ra1 z#S@}}gkTbZKp-4YkkYEex^{%z(|f)TF+dq`$vFCf`!q z^-iH^sfkjX6ZjTz71d&#MY`@5!i2m1NH@}`4+erpJh=3mL-45@1^i-!Pe?E^IFoj; z8%I`---i<5gxQ(>j8OPPmEPb}vUwM(Z;CR=(i{_a7OMfXG1(8ZH@)Py!{!$|hs?^9ch*jKC(H4B=H`OO2o(IM_&N)W z6_;dEGnVm0kknIbawEJO8byJ&$CP~ZuEk%->mFVW76?QJLRZpL0O1!0qA;tUs=2yY z{6Dg6v)a*W#mN*mfJU!eJ+9@7Ty5~UP`WJt2K)%u=9C1k8=u<#wptw?engLp$)DI- z?pgw^Em&1_56FHpC9=*d?{J_j)6Ce^U-9d;JO`4HM^{#?c9%_iY$tm-*#P#pK$l-L zvfvCmK>ykAHY~xB@_9Ns1eb`x&j5oG>8TUl*A%hO=n+k5K%jb2UAhmo#&npOy`R54 z{p$IZgk%!>ao?4?)Q2THZ>O!3^%sbfLkK1Uf~6OLIfVgbrQtYy@V;AX4qQra7MNiS zmC`YG9$OL%gyV(d=O0MdcvvJuiHTIk(TL})w}%}X!n%P2W&+CZEp8j>A?rc$hXS13lPdre=iaiOpZ{%`B;y;mIu~@f8QHO6?c*sd4J`$iPL$ zeRjfO-`$;Hc=JobL&LlgcaicJFLVQR9@o_);Ad@nqb^?`SO1iB1g%G7Ya>U>aP@ zZ#?x1rKarSmW0ITMib_$ihjy*fNbU~iYm9gWb3(Kt8`oS8eV%|toemRf!6Q6MZ4Jt zytnrC7MyQP25hV_C8oSmbS9hvScsg{AqHeufyy`S(%r9ZdoOpC@|}51tn#qR zCh6(G#iE~iP5P>!y{x>UT5Qe(ZQ1l$oJ3meReQy;P?0v@Y3mu(T@urf=n>b4-_2*I z&BLd%b6rQTse4eK!&mGkskY-cBJD=@`*-r`k@0iq*mWMGajh;u=d|U( zxDaB&XWO;>N1SqLmFLInUBfvFD09TezoXR{Fr9|Aa!)c$S#9fDhr3aVq&3BZ?~W@e zS(}lAAf>;4vlrj%2iwW;!&8&v%3(w|lwuF8sS(f@u?EciI=nCTA{z*@lKLgs<}=AsTNQp4Lv+%Ddn_^!_pU5D`xLS<^R{%}N(;cdIOwm?{2Hp_k< z#l$elG|y;(ifBv7IYlsV%(ma>W-Kezhi0DB#MN2fj=F~i|4uSLb>F}VdIRFDScm3#>S+-k+BK%Z4037lly zuT(Lk6OWkZ49iNYeiC#xI*K37KBq5hj;GUN)Am!%)pKnfCmCQTb$8FThpYZt^jc0~ zE)FdD!0lVLISuh&%?#2PnYEPMg{qyS6H*%Fi@869N+A_+d0QBeKH=0Xu|qP@+ns$S z_1zjxEOyo68_L7jv&Fo+c-~Yasb+{Kva_$giq?g0;*sZXCsf(zDr zw0M34E)9@h;fXD7>tt`NYu?c51kLZvL4&q{}MN zBx6R+rR>lk*XGc{cgg6s2iii`TlrBQznjS*fl(gpZDA_E7Ll=iKe3#Nbm>;btFg~a zG2uhlICsD9oQ;f;~^C=^lWNw&E-ci)|B*!#q zdJ~b_>h01j#ZpxhZ1d85znS;~JqTQ#Tr+Vm5J+RPd4$yGBO zs2wma)eJw&cu)|e@xuJF{<@uR1z8ufQtt+ zO?reM(WMf}G<+%F^p53rxG|IFBxMxR*}AX|`?iLZD9te)PD9d1tE2_JG~X+qa?N3= zHxzQ>QS8BD1tZK2{r50zWX9V3ZOv@r0}n%FN$u1_XVEtuzM{NM?Qz6HpDzeaqJ#KOPqn6!$f@7^LREtE0;(MVV!xEix$NJx zA{NCIj}JzV_gykad9MjcT%O5^9}VSDPH{g|k5Oc>yv8^qbq$^oYPV0xyp0_V-7s*w zTJO6V^9UokCY3P62#S8G@%SCC zKIMLjvyrt zHiy6aBeLj}kqaF4T1*(;zB@aAOrKP^8}|7S`-)M~y5SSh`9X3UpmZu)BMp4;1?&`L zdr>(Nz(lA++tV)lChbN>s^eGD&ZiSRD2;2St{k3Bk*(!LHk>6)(`eWC)6mV{2-h&R zN}uOevI4qmS6t-|YCl1`MbI0`sJ$Z)0G0JE1*b^1IaW;PVnno<|-Q{<` zAtf$`c(yR=19FB=;0za>G9#{RQGZ7%FN1V@2y=Vj+WtKwW9<5}(3b;BkDsxa{&#!j zWbq*1JQfnro=QKzU+_$$jajbkx+ikuKf#yeHy*!r9NY7{y zZ~BW9a=Vw)s_Nr8$mdU{4*A4Hvl!A&1U7C6YOsn}&Z|uXg1-%>oODxZ_tCJ3X9r(S z`~T((Rd-n9Q*z{}TgY7uSsc!)8io!5M@1OQ*x>1?IyE(nk(>7Pa z@wDaq1eXboEezj|Jh8i@`L}896KL<>xVNxe_r~=fE9+{@XlAPJ>}d7g!im$> z&em?ET>-+4hrQgi{M^40m@Du~-n=Q1BkO z8Vo?$(=BE=1f_Jzh(iu(;6M3_d!X7h@L9eP%t`v_ zzte0qS$g~mYwy1W!wwAn>6Vz`uR{~5^AuQ+iTKV>-Uee;emFUo&9ibB9B^FzaS%Nx zk=cqWs0<}-2`W|B`ubbCZ!$iLD}mfh$Z@3b%r0B!SU8%o{mv5cP%>&tCF#kVma~=D ztVb>HzvG-{sZ9EZr#`~nw5T0D6{u`^7YNU?p@kEdm3N3f)P|4;DmU z(sEG#e+B>V6CJc99W(QPj2kWpw4)3H!T-6uum6tpx!?YycV{yV87rpOJ^mLT}jw$}{z!Y=^Jv;UZ^*?9-0~Ib%UH||9 delta 4937 zcmZ8l1yt1EwjLygMmooVp;J`4K|qj3VQ7$2q-%!sC!jP44k0BS(kTojCEeW&DUC=Y z@$}xi{_owl*E)Nxv(MRQueHxUXYKEcRmLclqp%2wD+KCQu|OarR4Nt&Ag|djcvtC6 zWuE1iOa+RnpqMQl8 z|7+#X&+;ja&$$V)1EsVZsnACGn+Wl<{O(5y+^yld^5G1EuM!|o_QtHnahH-l!s>xm zujm}&b-i$rNqs7-c2VXefFSj;xU1glo?_k;26&`wr7$Km<{4k>!&bg_{^2q_*enY! zG-d)NAn_JMM;Mb)-1_3~3bYKDe;}PC?V(%myh!|<9WAn-rjZtWHn|p5QM!{6-9RS* zgdWhsMHdR+l+GHv${E7M))_wWdrmfX<9ygYMc_U{EDtvJ%BPB2%uIFd{Fw6%1b9iu z*Z1w1r4rwrqR)Cw{an$h*?cgaHPjcVMgm*T$UBN(!=y5s&ZrYIH_@B)j?m5r(&CKd zXK#!9{LdLHowe1lai~Bb5I!hGb48AmoV11WPm)PdWY|oAsam@rRqz4s?c*N*eGpB{n95^gqDtKEvH zDe=r+WSs!cuvg`|86m^x+CZAjX#)?i(Iez=xvn$;Cxp~NFt1rc38Ra zVIDaVcYtnzVnY6>n=98kV_i$W`;?!HC@e1tgJm3+zRit4l}#aTp%~Xr{$x9;zr!pD z3kqb+B{N>zC{hhURubRM5}$VbT19rt8>p1)aoHJR3dY^BuOgqk$ezPuh%zzo z4uGtAtCNwR#$T*P3i%3=ABzP49$aj#89;Fm6VrQJ6%k$}O*_gf}bghj<)BG$ijSmOoC-A}_YK zPzllY3!|(e(C!tE>*n0m+0kt36w-ALNRY?i>a1aURgbpQ=u3XcRP?>d?{Y4u&K)w& zTXkQLx55YT0%@&$FhrQbrQ=mZww{KIeg(yOIA+S-4*=H%<>jCj6Pvq3%e;<$Dej0P zKEH~S^5HiiU89p~a%k6ZX{Dj$UumZ!H)Tawb*wQ|Kw0<8$e~@KTf%q1C1J?Tt>Py* zpHNPGejj<>1eTekTidCSaw~`Awzb(U9o}>m_OkC5@M$&-L7MB{h7r&QKFf7D3(Af` zHv~yKfH^9G(OLitb(e{y${Eaz2h`PZB3}}MK-*d%5Xqlc@8xjc-NW0##$CY6(P6^G z@xz<}^-XjKP;Sx+?ohYv@^(c&%tg_w@$$dQr6C~DURO<}SBsVw(@dJ7*3C4=qoF47 z%q%wwvw`ROWnlB+7uw8SKhlsm3j5ZAzJJ;@g^pg>>NphA?LzqNi~kS@hMImX?yNeP zNHTf%I&v~K1T5**oYWVJy^*D>yD@`b?`znXWb>?cpMt;Ao@>IT-8#2x2Fl*pSTRAo z2c!JE!l+)gL6H;JToQFgMNz+h4|d-x1B0W`!!pGp)!vRbH)49Q!os zG0v2hIXRu9VuiyypUQp$&UN6zAJqsiHU_Xv#-G2ho+QGv=;dE$?2UIeL+gIaZ48J8 z$~)8jub-fpeXOFcT9JM`30aetdVUQ)^`@}nZ}*|G*k%Ls@Wx5>{hs#<%0i>c+9f+D zalmfi@MVpCM4Hg(-VlAnNQ80v?}W>wi|ad9uZ8MU7~5N3%1?R%p%3dT(GT7{K|A`k z$dV`(K)vJ(6y;b$A2zSdv4+e)kiM9RcuDrt^fy8b@07eXIH2^!{)pt0Qs}!)%c#xn z$+b)DAH!I|p2K^z`S!GiRKCG`yt9bXo-!QG>#N~+z73`ml?*@aY6&xsE_?gUAj-iu zyxI7c?(Xfn!(RxXfJ<~Qm6A)5lOgSvL3A4_*RDxHNCW*nT_MKzsbgmORl0oqM45&v zrmYx)(&bn=x)6bBVNqLr^j!3mBLDp{X)JYOQ@h!X-w=i-hCXa}vrNyXrY1$V zr&LCpOG=~cJ;oF^x!!QMgrGkkt-~};#;a4Kfe78;d?Kq)fI9kfVt?j~7ixX? zwLjUubS4>(S66fNrY00B3K(gRPtE1oA*%KB#~wrl2UGLw03UOGq{sLcrZ~=Di%8h2 zffIMcEOO6hf&IO>eS2&ZN70nDJlpNyuMWkiIwSoucyyUY=dzoBu0K9av@6so?B=xa zxT|84|C~>J^7+&W$0eU3ZB$W@3qR5!=Q44R<9+qiY(;_$-}mPgh_C%0gK?)5BO2D9 zw$<(uOUPapcMsrfxK+I#Rin7(JxuSD;XVAOH)t^}0H_VT&hA+sjaQ^}F5+|Lc`8XF zDpJ}#z}C;3^pM||M*YQx?Ooo0q_Nv%!PRv>z6@lL3uvf~>XPnhQTs}~$=v+U)E77r zlfw&hPk?L;i2p?p7ooC?pvzuUORcn6@pp`1?D$DIs&$d%#v}V z`0lrcLwMP(N_9fc6jLF-(bG*|hax`)DNI@`D04-7rEA5z7peqnVeie-Ic6`4B>O~I zn2k40lV$elD3|juXR)lYg};xXmWY@auJsZNAL z)ZC;KaLHPK-V-72`>|Xcr=(!seP&qaA4@OfDaWxb`5B3w8+ky2^05AN7t_uHuLn&q zY*vUAM$3hihpCaNZnJQvFn;~9f5F-n60)vIhxR`%Xd=tk3v9%`{n)>Elk(TyXf4yhoING?lN+42ioY35*q)0^C zaN7x2|64alMLoK4Wie}!I~Y1ybd*}lK+6epBCI24|A+1;o|mk}nT9#b3AnKWiBT2? z{mNdtx-5(&CM2FS3Z!(ME^P`83NCKd08YClEc$IQsQk;Hy$CklQS`n(9D%arc*^=N$U29_r^5*%(pG~0GcPu{(bG!o=422^sq z=`zpYl*&;liuS|HN%0mpcbF6BRlRm`ik_O={jv*5@qgXM0BJU$*Po9G>7=2NEB6b~ zSwGd6`5bSm_1f@}MO`zfN4M(9q%}z?yh9OkLMP!k%)CFrmNPieRoyFqylCbxb}5{# zPY{sJ=N^V=e= zPh|$$ZL*VUP0zmeur4YJqY zhlXUX-nx@(z(27GeAiTCKno~*+hDN6%#M5Tj@_nqOlEZqdTi^Oc)MGP$Jr+_d9RD% zTJuin#}OH_1~bhAOOn1n{Z4n-U|tc4s;XA!zsQEL7G{oAR3O~NRlv>q?)kN1t_noZSRqY4QVx>Ix5#R>FOpOJ$=}cKwC8|2 z;~q7|7sbUfwcoy%YeQp8jbsp;(-Ct@`B<4_u!3#?`z!@{tU|dw@8Qw$VLoVJcW^aM zB34<0`$GZXeph}wRfTc7DwZopfgsY0e8A!zKUJ8vtq{e+E5_h#z8s|LqvxWGo{IY| zU(*!1o*^loo3c^GQK=@&XHOmec<|gSsk0Gp#|Fj;_;~*kBq#s!*bJii?B(fJ+6)w` zad3<9IoRJ_y-#5nD{WD(Xu82g(&iCILq8FB%G4tW3ge4c5Crn_<09)!F%FW?UwX7Nvg@Qb*OUc z_*~bZ5*A#cG15Of3?CEPZ~W{_CKtC?X~^hEvo;7?oG=387Wuboa$fwb0K}-meFe{AToK4r>o3iSHtPrsnqdnAO4 zEeol~vVq7G?MEAL@SWFA+bx)gvrl9id8mj(oR*SqxuvRXJ7t5xQ6>;y7r07VZl~aq z#Z)~HQlbBeb!ouN8nCPAn0lqMv~i2|-!QakcD-c(PkX9_a;9SfhUK4PKcK?HG+`hL zry|)Au#Y)Jt(2QsZR)!?wq~8)^do6RCCpSjgq|Y;_1mS07r0yAqnrH6Fj$O6IA0Wh?pNc727g;Bi~L`arYPbO_V4Ku!5PLL#GKkx>z`dx@!Gc{ZC}l`ee-TMdbr{9K%nMJa>-Wg`0% zRy68`H#FhHn_;ps@t2xzU$+29;qBk~VF%LZGgD4PWf2Ewhfc;MvOq9&j>Z-xxOwqI zRMtNXUOV$)_m+vd;C#y^p`n)G6XCt%bFq3uv=aP35Zl_~dE)UNXI6 z*v8`T5#~S7_KpT1FCVBD*4$hHKDv=OehQs>76A;)G@O#79NU+ zg`e@Cy8Uxme@T_U@^5D-%8iAS^Z&!I|6PyzgU0>=W2gsE=D&wy8KDkXMD7HDQL$iZ xloaeP?w@jK=0xehsIg>GFJV$x2viP?h4H_chkr%=PuMIJ2F8ome($gCe*jjMGN}Ln From 5dc6c27747234fdea10b6eef4dd3fd1f4a54569e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 26 Aug 2022 14:26:31 +0800 Subject: [PATCH 244/397] =?UTF-8?q?=E5=85=9A=E5=B0=8F=E7=BB=84=E4=BB=8B?= =?UTF-8?q?=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.27__update_partygroupdesc.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.27__update_partygroupdesc.sql diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.27__update_partygroupdesc.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.27__update_partygroupdesc.sql new file mode 100644 index 0000000000..a8660c417c --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.27__update_partygroupdesc.sql @@ -0,0 +1,6 @@ +update resi_group_setup s +set s.`NAME`='党小组', + s.`DESCRIBE`='党小组是党支部的组成部分，党小组长可以申请创建线上党小组，从而便于组织线上思想学习、工作交流、党小组生活会等各类事项活动。' , + s.UPDATED_TIME=NOW() +where s.DEL_FLAG='0' + and s.`NAME`='支部小组'; \ No newline at end of file From 9df28cdbe9232f58da3105429af8a64aa6af833e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 26 Aug 2022 14:30:14 +0800 Subject: [PATCH 245/397] - --- .../java/com/epmet/controller/WorkdiaryServiceController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java index 31a9b61af6..ab69929616 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java @@ -158,7 +158,7 @@ public class WorkdiaryServiceController implements ResultDataResolver { * 下载模板 * @return */ - @RequestMapping("downloadTemplate") + @RequestMapping("/record/downloadTemplate") public void downloadTemplate(HttpServletResponse response) throws UnsupportedEncodingException { response.setCharacterEncoding("UTF-8"); response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); From d8f8b66ebeb1b3eecb620651c788af079e36cac9 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 26 Aug 2022 14:35:42 +0800 Subject: [PATCH 246/397] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 21398d37e4..244bec4d5d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -1559,9 +1559,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl{ if(topicInfo.getPublishedUser().equals(re.getUserId())){ //话题发起人 - String street = re.getStreet() == null ? "" : re.getStreet() + "-"; +// String street = re.getStreet() == null ? "" : re.getStreet() + "-"; String realName = re.getRealName() == null ? "" : re.getRealName(); - topicInfo.setPublishedUser(street + realName); + topicInfo.setPublishedUser(realName); } }); } else { From 9063b1542f5d5c0d509596e2642cafec3545f7bb Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 26 Aug 2022 14:52:16 +0800 Subject: [PATCH 247/397] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index ebbc75615b..063064f9cd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -120,11 +120,11 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl%s", formDTO.getSocietyId())); } + entity = ConvertUtils.sourceToTarget(formDTO, IcSocietyOrgEntity.class); //图片必填 - if(formDTO.getImageList() != null&& StringUtils.isNotBlank(formDTO.getImageList()[0])){ + if(formDTO.getImageList() != null && StringUtils.isNotBlank(formDTO.getImageList()[0])){ entity.setImgUrl(formDTO.getImageList()[0]); } - entity = ConvertUtils.sourceToTarget(formDTO, IcSocietyOrgEntity.class); entity.setId(formDTO.getSocietyId()); baseDao.updateById(entity); } From c69e69b65c6fe206de0f3dcdc610e53d79ee729f Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 26 Aug 2022 15:27:03 +0800 Subject: [PATCH 248/397] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=20=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcSocietyOrgController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index a5123e155a..1d34519a54 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -50,6 +50,7 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcSocietyOrgService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.util.CollectionUtils; @@ -79,6 +80,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("societyorg") public class IcSocietyOrgController implements ResultDataResolver { + private static final String DEFAULT_NO_IMG = "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220826/38eb186191ab48fe8d3920b642b56e64.png"; @Autowired private IcSocietyOrgService societyOrgService; @@ -115,6 +117,9 @@ public class IcSocietyOrgController implements ResultDataResolver { @RequestMapping("detail/{id}") public Result detail(@LoginUser TokenDto tokenDto, @PathVariable(value = "id") String id) { IcSocietyOrgDTO icSocietyOrgDTO = societyOrgService.get(id); + if (StringUtils.isNotBlank(icSocietyOrgDTO.getImgUrl())){ + icSocietyOrgDTO.setImgUrl(DEFAULT_NO_IMG); + } return new Result().ok(icSocietyOrgDTO); } From ec0a6b1aad5e4c2b10926171af2b36db686dd6cf Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 26 Aug 2022 15:48:30 +0800 Subject: [PATCH 249/397] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=20=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcSocietyOrgController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index 1d34519a54..3267ef36bb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -117,7 +117,7 @@ public class IcSocietyOrgController implements ResultDataResolver { @RequestMapping("detail/{id}") public Result detail(@LoginUser TokenDto tokenDto, @PathVariable(value = "id") String id) { IcSocietyOrgDTO icSocietyOrgDTO = societyOrgService.get(id); - if (StringUtils.isNotBlank(icSocietyOrgDTO.getImgUrl())){ + if (StringUtils.isBlank(icSocietyOrgDTO.getImgUrl())){ icSocietyOrgDTO.setImgUrl(DEFAULT_NO_IMG); } return new Result().ok(icSocietyOrgDTO); From 0b12c589ed852fd31aa941c7e3d2805122606252 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 26 Aug 2022 15:50:05 +0800 Subject: [PATCH 250/397] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=94=AF=E9=83=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/form/PartyOrgListFormDTO.java | 17 +++++++++++++ .../result/PartyOrgListResultDTO.java | 25 +++++++++++++++++++ .../controller/IcPartyOrgController.java | 12 +++++++++ .../modules/partyOrg/dao/IcPartyOrgDao.java | 3 +++ .../partyOrg/service/IcPartyOrgService.java | 7 +++--- .../service/impl/IcPartyOrgServiceImpl.java | 11 ++++++++ .../mapper/partyOrg/IcPartyOrgDao.xml | 14 +++++++++++ 7 files changed, 85 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgListFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgListFormDTO.java new file mode 100644 index 0000000000..4314e566c2 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgListFormDTO.java @@ -0,0 +1,17 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@Data +public class PartyOrgListFormDTO implements Serializable { + /** + * 网格Id + */ + @NotNull(message = "网格Id不能为空", groups = AddGroup.class) + private String gridId; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java new file mode 100644 index 0000000000..b126ff3cc3 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java @@ -0,0 +1,25 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@NoArgsConstructor +@Data +public class PartyOrgListResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 党组织Id + */ + private String partyOrgId = ""; + /** + * 党支部IdPath + */ + private String partyOrgPath = ""; + /** + * 党组织名称 + */ + private Integer partyOrgName = 0; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index 80b8007b9a..60c3327978 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -15,10 +15,12 @@ import com.epmet.modules.partyOrg.excel.IcPartyOrgExcel; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; import com.epmet.resi.partymember.dto.partyOrg.result.DefaultPartyOrgResDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.PartyOrgListResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -177,4 +179,14 @@ public class IcPartyOrgController { icPartyOrgService.adjustOrgPath(customerIds); return new Result(); } + + /** + * 查询当前组织及下级党支部列表，供新增编辑党小组使用 + */ + @PostMapping("partorglist") + public Result> partOrgList(@RequestBody PartyOrgListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + return new Result>().ok(icPartyOrgService.partOrgList(formDTO.getGridId())); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index 7391328894..fe4d17c517 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -7,6 +7,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.PartyOrgListResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -114,4 +115,6 @@ public interface IcPartyOrgDao extends BaseDao { List getUserIdByPartyOrgIds(@Param("partyOrgIdList") List partyOrgIdList); List getSelfAndSub(@Param("joinOrgId") String joinOrgId); + + List partOrgList(@Param("agencyId") String agencyId); } 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 4f52b137cb..22485b8171 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 @@ -8,10 +8,7 @@ import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.DefaultPartyOrgResDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgInfo; -import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.*; import java.util.List; import java.util.Map; @@ -149,4 +146,6 @@ public interface IcPartyOrgService extends BaseService { * 调整历史数据 ORG_PIDS */ void adjustOrgPath(List customerIds); + + List partOrgList(String gridId); } 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 39941fc013..3405183f47 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 @@ -15,6 +15,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -479,4 +480,14 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl partOrgList(String gridId) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(gridId); + if (null == gridInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格缓存信息失败，网格Id->"+gridId, "获取网格缓存信息失败，网格Id->"+gridId); + } + return baseDao.partOrgList(gridInfo.getPid()); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 1553753bd4..e43e4493d0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -216,4 +216,18 @@ party_org_type ASC + + From 9a103d3ea960cfd801963876451ee0c141876dcb Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 26 Aug 2022 15:51:09 +0800 Subject: [PATCH 251/397] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E3=80=90?= =?UTF-8?q?=E4=B9=A6=E8=AE=B0=E6=97=A5=E5=BF=97=E3=80=91=E5=AF=BC=E5=85=A5?= =?UTF-8?q?-=E5=A2=9E=E5=8A=A0=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= =?UTF-8?q?=E3=80=82=E6=9C=8D=E5=8A=A1=E6=97=B6=E9=97=B4=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E4=B8=BAdatetime=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkdiaryServiceQueryFormDTO.java | 12 ++++ .../dto/result/WorkdiaryServiceRecordDTO.java | 10 ++- .../WorkdiaryServiceController.java | 11 ++- .../entity/WorkdiaryServiceRecordEntity.java | 7 +- .../excel/WorkdiaryServiceRecordExcel.java | 35 +++++++--- .../WorkdiaryServiceRecordService.java | 6 +- .../WorkdiaryServiceRecordServiceImpl.java | 64 ++++++++++++++---- .../mapper/WorkdiaryServiceRecordDao.xml | 1 + .../templates/workdiary_service_import.xlsx | Bin 8961 -> 8951 bytes 9 files changed, 116 insertions(+), 30 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/workdiaryservice/WorkdiaryServiceQueryFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/workdiaryservice/WorkdiaryServiceQueryFormDTO.java index 2f5a628916..3d581924a3 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/workdiaryservice/WorkdiaryServiceQueryFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/workdiaryservice/WorkdiaryServiceQueryFormDTO.java @@ -1,7 +1,11 @@ package com.epmet.dto.form.workdiaryservice; 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; /** * 工作日志-服务 @@ -23,4 +27,12 @@ public class WorkdiaryServiceQueryFormDTO extends PageFormDTO { //private Date serviceTime; private String remark; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date serviceTimeStart; + + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date serviceTimeEnd; + } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java index 98d4eacb1e..8e75f55c34 100755 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java @@ -4,7 +4,9 @@ import java.io.Serializable; import java.util.Date; import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -65,6 +67,8 @@ public class WorkdiaryServiceRecordDTO implements Serializable { @NotBlank(message = "申请人为必填项", groups = { Save.class }) private String applicantId; + private String applicantIdCard; + /** * 申请人姓名 */ @@ -91,8 +95,10 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 服务时间 */ - @NotBlank(message = "服务时间为必填项", groups = { Save.class }) - private String serviceTime; + @NotNull(message = "服务时间为必填项", groups = { Save.class }) + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date serviceTime; /** * 负责人姓名 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java index ab69929616..230e3617ee 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java @@ -43,6 +43,7 @@ import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.file.Path; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; @@ -83,9 +84,11 @@ public class WorkdiaryServiceController implements ResultDataResolver { String applicantMobile = query.getApplicantMobile(); Integer pageNo = query.getPageNo(); Integer pageSize = query.getPageSize(); + Date startTime = query.getServiceTimeStart(); + Date endTime = query.getServiceTimeEnd(); PageData page = workdiaryServiceRecordService.page( - gridId, serviceType, applicantName, applicantAddress, serviceContent, applicantMobile, pageNo, pageSize); + gridId, serviceType, applicantName, applicantAddress, serviceContent, applicantMobile, startTime, endTime, pageNo, pageSize); return new Result>().ok(page); } @@ -151,7 +154,11 @@ public class WorkdiaryServiceController implements ResultDataResolver { String applicantAddress = query.getApplicantAddress(); String serviceContent = query.getServiceContent(); String applicantMobile = query.getApplicantMobile(); - workdiaryServiceRecordService.export(gridId, serviceType, applicantName, applicantAddress, serviceContent, applicantMobile, response); + Date serviceTimeStart = query.getServiceTimeStart(); + Date serviceTimeEnd = query.getServiceTimeEnd(); + + workdiaryServiceRecordService.export(gridId, serviceType, applicantName, applicantAddress, serviceContent, + applicantMobile, serviceTimeStart, serviceTimeEnd, response); } /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java index 16db6c8bc5..a72064b8cd 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java @@ -55,6 +55,11 @@ public class WorkdiaryServiceRecordEntity extends BaseEpmetEntity { */ private String applicantId; + /** + * 证件号 + */ + private String applicantIdCard; + /** * 申请人姓名 */ @@ -78,7 +83,7 @@ public class WorkdiaryServiceRecordEntity extends BaseEpmetEntity { /** * 服务时间 */ - private String serviceTime; + private Date serviceTime; /** * 负责人姓名 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java index 631c3ed943..07b2b19797 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java @@ -1,12 +1,18 @@ package com.epmet.excel; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dto.result.WorkdiaryServiceRecordDTO; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; /** * 工作日志(服务)-记录 excel @@ -33,6 +39,10 @@ public class WorkdiaryServiceRecordExcel { @ExcelProperty(value = "申请人") private String applicantName; + @ColumnWidth(10) + @ExcelProperty(value = "证件号") + private String applicantIdCard; + @ColumnWidth(25) @ExcelProperty(value = "住址") private String applicantAddress; @@ -50,24 +60,27 @@ public class WorkdiaryServiceRecordExcel { @ExcelProperty(value = "负责人") private String principal; - @NotBlank(message = "服务时间必填") + @NotNull(message = "服务时间必填") @ColumnWidth(10) @ExcelProperty(value = "服务时间") - private String serviceTime; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date serviceTime; @ColumnWidth(20) @ExcelProperty(value = "备注") private String remark; public WorkdiaryServiceRecordExcel(WorkdiaryServiceRecordDTO dto) { - this.gridName = dto.getGridName(); - this.serviceTypeName = dto.getServiceTypeName(); - this.applicantName = dto.getApplicantName(); - this.applicantAddress = dto.getApplicantAddress(); - this.serviceContent = dto.getServiceContent(); - this.applicantMobile = dto.getApplicantMobile(); - this.principal = dto.getPrincipalName(); - this.serviceTime = dto.getServiceTime(); - this.remark = dto.getRemark(); + BeanUtil.copyProperties(dto, this); + //this.gridName = dto.getGridName(); + //this.serviceTypeName = dto.getServiceTypeName(); + //this.applicantName = dto.getApplicantName(); + //this.applicantAddress = dto.getApplicantAddress(); + //this.serviceContent = dto.getServiceContent(); + //this.applicantMobile = dto.getApplicantMobile(); + //this.principal = dto.getPrincipalName(); + //this.serviceTime = dto.getServiceTime(); + //this.remark = dto.getRemark(); } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java index 4dfc2f3cb5..f574f47f17 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceRecordService.java @@ -9,6 +9,7 @@ import com.epmet.excel.WorkdiaryServiceRecordExcel; import javax.servlet.http.HttpServletResponse; import java.nio.file.Path; +import java.util.Date; import java.util.List; import java.util.Map; @@ -31,7 +32,8 @@ public interface WorkdiaryServiceRecordService extends BaseService page(Map params); PageData page(String gridId, Short serviceType, String applicantName, String applicantAddress, - String serviceContent, String applicantMobile, Integer pageNo, Integer pageSize); + String serviceContent, String applicantMobile, Date serviceTimeStart, Date serviceTimeEnd, + Integer pageNo, Integer pageSize); /** * 默认查询 @@ -84,7 +86,7 @@ public interface WorkdiaryServiceRecordService extends BaseService page(String gridId, Short serviceType, String applicantName, String applicantAddress, - String serviceContent, String applicantMobile, Integer pageNo, Integer pageSize) { + String serviceContent, String applicantMobile, Date serviceTimeStart, Date serviceTimeEnd, + Integer pageNo, Integer pageSize) { LoginUserDetailsResultDTO currentStaff = getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(new LoginUserDetailsFormDTO( EpmetRequestHolder.getLoginUserApp(), EpmetRequestHolder.getLoginUserClient(), EpmetRequestHolder.getLoginUserId() @@ -142,6 +144,13 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl stList = SpringContextUtils.getBean(WorkdiaryServiceTypeService.class).list(null, 1, 100); Map stMap = stList.stream().collect(Collectors.toMap(WorkdiaryServiceTypeDTO::getServiceType, WorkdiaryServiceTypeDTO::getServiceTypeName)); @@ -182,12 +191,28 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl { - entity.setOrgIdPath(gi.getPids().concat(":").concat(gi.getId())); - entity.setAgencyId(gi.getPid()); - }); + LoginUserDetailsResultDTO currentStaff = getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(new LoginUserDetailsFormDTO( + EpmetRequestHolder.getLoginUserApp(), EpmetRequestHolder.getLoginUserClient(), EpmetRequestHolder.getLoginUserId() + )), ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "查询工作人员信息失败", "查询工作人员信息失败"); + + String staffOrgIdPath = currentStaff.getOrgIdPath(); + + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + + if (gridInfo == null) { + // 说明网格是其他组织下的 + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "网格未找到", "网格未找到"); + } + + String gridOrgIdPath = gridInfo.getPids().concat(":").concat(gridInfo.getId()); + + if (!gridOrgIdPath.contains(staffOrgIdPath)) { + // 说明网格是其他组织下的 + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所选网格不在您所属组织下", "所选网格不在您所属组织下"); + } + + entity.setOrgIdPath(gridOrgIdPath); + entity.setAgencyId(gridInfo.getPid()); IcResiUserDTO applicant = getResultDataOrThrowsException(userOpenFeignClient.getIcResiUserDTO(dto.getApplicantId()), ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "未找到申请人信息"); @@ -215,6 +240,7 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl page = this.page(gridId, serviceType, applicantName, applicantAddress, serviceContent, applicantMobile, pageNo, pageSize); + PageData page = this.page(gridId, serviceType, applicantName, applicantAddress, serviceContent, + applicantMobile, serviceTimeStart, serviceTimeEnd, pageNo, pageSize); + List list = page.getList(); if (CollectionUtils.isEmpty(list)) { // 空的，导出结束 @@ -437,9 +465,21 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl + diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/workdiary_service_import.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/workdiary_service_import.xlsx index 06bf284e8b4126ca92f7360d17ab57001bbc1e49..0938c354cfd89f0ea9a8469f8c6c10544e664500 100644 GIT binary patch delta 4212 zcmV-)5R31DM)yUqlK})RS}V7cmjNw*mbs9&J7{*&#KakmHv(@Ru}}hNH~)HRJ8O*| zyaC_$e(!s{Vsq3@@(#|c)|4pE2ui?+Rw`4M=yA7A*C_FU8_Ap2K#5M^(Wbh*D1>FA zb#U)m3oa<|NhBH1ge}n_1j{h?;sBcaEILdS_pQ@B#H*{Z<>HmsfGHs>tRZlJ$pgnd zFtrmAosm*ZNc-lR0U!m21~i!9ah~P)+Z(`X|7XFV%$!<zmycRg_Sgl66W~JF;dblrlnIde)EnzU}y+;|llczr=jWmRF3T7yy&eA{u{{Ra6h@e!;W#4kqA@?!2Nvj0wNnk!mB zt&yW^xaa&y13$x(r?m}0E0SEX6TPQ(ouRD{jUoRSBYF-d+|kD6+}hijx<3l1pd~rh z>YmrXS)r;7rPz;xWU;hwWFg=9`GK-SrNFl(j#;>}>oDm@(NFk1Q&``#ExkY1%n1AQ^lg9Jx@ z8ry7Kr$cBab{Gfip@+jL32Yw0tt+uF2Re+_`2>evcv*)lbhrhKb@0*B|0j0cJ$>b1 zVg*thr5EXY&3(6T0Mlt(qR3_~_}PJj4V8b=eG zytR9RKFtTjhdIKZBJSsiV2aqz5#bc^agKh|hCGGDX0x z@o&b`5#d78?HTW@(2)cEO2mP+(y3_)S@!S}8e8W7Jut+ z+twBTK4AX?pOO#E3B0Y-A><$I8rJ1)588D<< zwxYng7FqUT@wRSQgRV*cnMkoe?O)ir_mY?AN|z6}5=}=yEKxkK-+A0~AJoS6!;z!h zvHY>^xt)r(u2vMw?Rx{;-Ro4ocYmw5)~YDuz;p+uJM}Mz6KJYDbFeXGJr>d)JqdGEe zx3an6PDZ^^Fjo5B#0@$XgI`kEH?I%iqES&8x2`t;RcTuc9+aam)3u3x82zI|J%R3rVcGI~B`QZ~$ZE1MhRx0E}k1M#O5u=}3l`APs` z1YXuC{N~7FcT7)y{qp%kdVklx>5n1$7-7vI*J$j8caCh=^U1|3lfnMqC3i*AD2Z_JE!O6Plx|XV{t$(G)ik&X7*&{Dv zb!HlTnUq_!aQU@FaG*pW)UV!BEtI8sR4IGlz@_>xMHtEQW@DMYOA*%YHtNf@EF%>N zkcIgT`ZjI3)}=xTrY+TPNhz@0A(gfZV`y+}$Kib~jE(Hd=Ei{;1eWji;ALVRID5!j^3SJ&%p_*ZMS8+yB?snm$o%WuT;YaqT^uea)2TQ{^eL4AetqpGL( z;I(2|A=d5K)?%@aY=yz3+bzb{`bF8w<9fB>6N+hGu$eFkkAKqlLel3(oxF+(DP(IC zN<~X+v|6pUQPXHmETB|C^0Zf7mU#GbzZPq2D4!1TML@c<)h?(atvX5;D?+gu$vtjKphr*Vn+t}%KcZwNbP%C;NSflo^*pTM!VYgWn z*2vakQ~BK`w!vg=rY95a&VAAc;N(nUbPhk*8#<&3O>JsEL1 zVNkFoguEgmodvgq8po^kna)|H$Z*jjL6)NyDVAa5mQG$|1j=h8qR3|>BFJeYqR4Aw zMo1=w3a=jqnQ|FTLv0#$y}4zm)>S1}I` zoTKkfM!S~ZqbDz@7WC>C9Z2KPHzEzYztCp+iBaLo${~Np_eit4uKW_Mn`^IogA)ia%`? zn$$QFVe(ocJYjm5U3E(gXARDil?YBWh#{ZD7U3mOvb2R9A*o#oB_XNG8Iy2Mkarh= zYJaTcMUIHry`^o-G$`9qU#4A#ahr5Mv45d1rF1-7g${-qI5~n+FV|>@$~S6(w9@wB zq&bVAgtxK3p#r7&TWp0^+wa2h5U!$L-ol98EsWL>tSLyY7CTgPglvY%%!TQM+$lsH z0GOgvp%F(;-^-T|@~c>ENkq{HXVOp}1AoLRs1~avjCz*=R)h37nF~n_*7D2{Q3SwF zO_?IVAgWzDJPC-GAzF!=A-Je5I!6SEm9^N4fP%KXjXMmMmn;y_gh*Jngs3RZV1Uv~ zm<@sMDLRVvcD2nD3eMU&@~PMiLar`tZ;XH}?QD%q$uC2e8>BbAbc1P935Cc=OMiA@ z!M(U-FID$M>SXBeq!5LqDhZ0H8tLHMUAin3?!u<1SZv8e@QBt~g|P>&rvNGT za?8n>D&Bo(d+}%+UjI_N@XFzE3ES~#nl7xk!1ahf1B-PHaG65KK#D#^u@`+tppnPq z&1kP)+4p?=EyzT4USRPAf$|gIJb$=l9m2LDJKjZ(6Ho*JGjxzaJjTEgR>3qr)Ac@ux2yPVYaCB!7|wjVWNc zQXe30zzt znG?n2wWiGYSATpl{pBxae}6BMN!q}eh@R1(mzfwY;NLJ@NYRP8)aXMZx!C~RAsaF5 z3@Kz11Y$kJh=T(y68|Tf1Ao#(J;cC+J>T=N;o(aUfyAi5Q345@)002HI(ft;i=oG! z^_&M%f@dRu!EyY5|YGZkDVumpCOHb>Eq{ItQdK)GjkrX z++ccMBnBC#UJ^F5e;&{7{x^~gKWKuZl|7Za0P?3N{C+X2;24ce#DB+kXMcJ;eek>K z{d=Z6&19_dO*%g^k8YdQ1zj6!L%@M1lo9J1g(8w z!gC(A%8Fi*3g_d!7ct}rxL&a4t-_=d=%dGrhUf?D2q-de*Xq}#)g%Dm{+_p zh6iKduQKuNPUWXNTg~?NPETKJsavfzqh{6D+V!pNwYt&W+TQN9RbB1A4H-jzDDK*! zW-RwS21#~TjqzP0#saqVh5`oTD0ayM=4z+HZ5Y^eOr_*$oeJ}~tu zT%b0978y|;^B=O?{6A1j0|XQR000O8hfd-^9L>wt3;_TDl#@Xi9DmSHO2a@D2JpS$ z9m4GGL>D45neIG+9$-kuCXmd8%qY5R7b+@Jgg`g8D!OoGD2XjL_BNR$-oo(@2&2pQ z{dn(#hq^~mXdTi-1e`fwy<-E5GM9S+>p5U=cV}%2SV9u!k&rX$fMY5^7q6}$A*7{u znQ(wFWxNfcaD5sP(SPAFWm@)m5)rA#qz6TuP~r)nQW=GC!?rhJL;?mZmme^xdu@P` z2r!bkKJTmPq*-3qcW($vjNoVfV>ego;=Y-dYI12>ljdzUuNDgv+H6pjGc}x>P%VdQ z+&9zut3#chsOMMH+CkdnWs|AvOV1lNKUC0acS%B3=ntmYwdG0ssKPlfEK7 K2HG9~0001T#RkOy delta 4232 zcmZ8kXEdAvv)~mDOuP5P}uGi?+J3(QB|+d85||*6O`Q^iGf>dN0vS$m$}5 z2vM?bzH@)vd%hntbIvp6%sjv5Ie#3cR*wM_-SIBB#$Xp(!G>puBgf0kK4x!gSKE*#B8M3uaf z%EOH>8YSX36;bz@J8MTe`e=B!Cyqz{u5O6CR_ffC5g3?gbVm|$Ak6$%W=Q+Sb`&|t z9~u|Ck=;iq-)*2|h38>+`o?|)LkbK)jfik3@))TNx=mafuC=jqKDYX&_ctR` zY{7qga5fP|@`M=QvcFH!v`G*Lz9mZ#4oxKhfpRecM0^0JHOXQVpyh#iG<~^&gL{KKLC}d)a0$$r^Gqdr56RrIu|T3+i5i zN58-?tU?D<;+u)z25C#3YVmcfqOa=}{f>o&w6Oo~$STr$>$%k-S?3IgZnJyXzu7G2 zCRgn1#sYbTrQ)UK0fZ9?tI_ogzd1~C3W_L;#$3;!7w*ng!LaZ-Rb_mmLtgV&oA|&B zAtG6LjdVc*UEAOB-HF%8i~GWiRwqW^a%DUVmb!*#bYcF|7o$_G4);|ba(1$MuPFP3 zm`eS29e$kClJZltJ;%RWiDXq?eNqx0h~H0mZ3nD!y^sh_XFN*cxjJete^*R=$|Bnl z6Ea?K|0jiT&{7-N`8Cw+K=sJQ`q^$bwLKL+lk1XQrTuB*NFb}%vr9ZQH#~jQyeh=z z1{qZ;ndb0_Jhg9HF(nGUv7US9?mpipNRk@ ze1VgaCtb`A%pz*R;*;I^Asq$lj!?Lk*Sl2-h{iSbVkB8mfjj?1t0-_GmN7O%;sd;m70rT|4AdmTNTaO9F#O-=dCSUq9pR*0shVv&)v= zy+S?9%&{L#`fspfw#gh#TBN)rK$?6fX&E^PM6C}3QG!4ql)ISU^B{L8KT(v2`>d7i z>t%C#KpiJuP#l6$ETvJN_ivGd5&DG_~=915H@3C{KbO0KEGyV?P!TYq&Q=~_K=DPNjma=w1r>ycrfI9dc-UB;As`xJO^mQ3@zgYUi7SHa)z zZFPt4=jsYojJL7rGW(2dT`5z8KvOp9>>Sol;qf+X%$r)s9B(?2UY%?$H#5~|B|(k@E0(}~M+f;359NR)_k zBmF;HR8VRsS;V^_{i-^wzA%7Fsq(Aq#xuxn>_3|bpR|pxm$hSJE4NZt4Gp6^x>nG4 z3gcETjC$s(O2Mi0%x$L-7~gXPY|9ohd|fkpx=P1a8G!}XL+?*JcZx@n4EzWPvZW{? z?QCjNsE_z`e8qsSi7fESzg_rk4_=@sL& zl4F?Jm`TQ#!Q5}b3(E#;ZW}+runOU7V!^SRP@y`&klj?Vgf_FT=3%K79-(C?!ns+j z)yW{UlU6u5+MRPSjE0&^WKQCyrf#Jne%Y19)2*k zMcnll9fgC8em#HqFFK3AImoA7syVZ2swu#jnriZtnrg#s){U|1YH6N$cWIvR#D6iP z#V{W==#t9Pl#Kj39tEYLI11Bl=@c3~x`QL*RO^IpnFjYTom2ky((=k;rTmq2~k zk3V6{Jj-h$?a$GO-X!@U_aW04gRKMuB;vMx9Jf1QYwW+N*w%_+VigRhhobBn8{faD zkQ~>vp~burU6C%S{8{~C|f;$dFmiW4lP=qTHiHf{Z<)Zbi3sjpN86Du(dWI zS1Kr;SyCbkfe!k)nN4#kTbtj_1Yja4(Q!ixqemZx=L^W<q_0d2Fs%iTUx=a#>sbUhkyjZ+6IK%B+Mh;Y6S zq0+5$yy2?wCZ*)ZH?&FhT;btT^YjpkCnp!ar)MarKgj*@mL`}n>;8)Md})E5M89pv z@P%O36Srx9I>Lg8ev(iTrzsU$xQY)l*10__LpDAV6!F2{Z}D0)mtVw~7%o(CN0-Sy z=CJW?qJibYcwV*lV1E@3AOP#fl6UI8`lQ8x*x;rRomR83*Y#|nq*Hk_Ia8*t7{eX^ z$MXetSF)OfB7x-b2`^$1)Z%cj{Cg(gr;-l&Jb8z%l)fBy59Vm0R_W>!{37jpuzgH% zDHTgR8Zkta+{?;XC6eX5D{wFv0k<~i!z}5y7x-0ZqptEi`b$Cq)L(4tH|)kZ?b*gu zYNhyA*cAkLs2j07<6rHpZZ_r3Ze4QCbu_d*g?#V3d2zUG5IhwYcEL+Dtd9=y{vsP4 z3J>^@kP9p1ASx)r+{Ve09NI^9b$m4#(9hT5d>>K$fa#s}gF9nr5>goQR_m~>v2@z; zPJ!-CP~b_-m*Wi}hLJN={O@lV`IFn*R5AHd&oQMU!U}DSZ5@$w$-pIy9Qs zPob+c3L#~Za;p%QN12gAz;CRIAI3 z&2P*v(~P9(m5HQq33m{s5000WV)YIjREx~x_Rs1iY~bL*tuMTS;^Veoo*Ga?Q1k-c zcNV?>Ovh;*&_B@TnnDKSGZ=TM-#J2p51b|})U_VcREZW-W#5S#O_2YH!f#4s2z;i} zyRD%?i%|fm^2r{-@jYUmWISxoaCYpPSTX6MHV#=>KZQo$zZxWzAV%c`IXNbdG z%p--JiG+%9zk9U0FwV8C>kD`E&G|-1AdK_HxXWYyJtNgrmVirUSeAgpbfe70&r@8< zBf$n%)%8yVA5;hSN?wcUt>vu*5j_S@y4T(*L8Jhaw@GoJ^&#~M#y;<7kGdtk&lz~- z^PZx$bb4+2^7yi+1ur5_Ubpx21eAg`g@0K|E5INl(OC7kiT?8=MIe~db-VBC=rL|j zAUV@O?|cvT<(HT!NB&3DP2L`GWc?5&eer|&85fUMcIl{bu1YUNcv<_o?!Bx5vheUC z+Z3QNOA-J5PvB8JQy5Hw`#@iN6PB*3sMn@;bC`UnW`_3oH9q% z9(}_@lQMTG7CSHFOh`0aR;!%|nkUrhcds;39|uQYS1?riPSd_hiT90iH{ddIu_tRv z?THlr%**m%ko!2OxMsy^^OViusm5Ytqb#7B$Xq()p}S{ozX>VTY7#OGvN2S)93}C! z!4am<`I&IaG3rpnn1)H`Gb_7sF8nMeRVW(`2?41s?=6&gdSie^gN=!`A~6r8#LsWO z`g(XFUa1-G<`*$ReK~NH6bar;?ZdJG(DBhy>ikS3w8Z9XjTaOBn+|(ZAn;te zQq3>WYeI4)_}zunAk&GqkJ;<{PY>sD!JZ@M(KfIJ_wG)4n>QP+xfg2*QrgJV1fNfv z`}Gw17ex(4Co;GYN_uPY-)}pWJiHN(sxE`Tkmt^gfi@u#-M@F13>2e>Q#z`CtV0L} zfr9_pf6)Itxz6^!PL9TyM@$qz@|aeS5?$1J_z?}#3)Vq{&DtA>O_DODHr#?raR<_^ z&PK(@$I|Tfn?7c&MQ9Z}xUH3A;=Jsy!Q35PYXh>RqAo`RDNQgVGHj{yyDc7djeolx z7&O0cdDk4xHfeSF(8$Q(ITxs95k~-?)XT#v85a6ChDo5pVr843@Boe;0Z&-`tP5O7 z;i=?@aIVNC-Y#56)r0LK)ucB8W#!K75(M15+1NMMQXC75CP7zf^++P%gflSIe*EwN zd&p<^3oOQ=T~?s{3)dbju7Yt0>tsUtUEem80)*_T<$iVC7>>e||HHW=wy- zb8a(rJ1Yhw30#-86XDsfKusphb;MvD3^At?Q8Nn&gjwTaz}RxKfEO^qoS6TW{}8SL z0uUQ!iR(TXhN0mWVf}Aj|4|D9gSh^AL5w*!jP<|8#sB3Im~3vje^X|;r3v&%F Date: Fri, 26 Aug 2022 16:02:02 +0800 Subject: [PATCH 252/397] - --- .../main/resources/db/migration/V0.0.28__workdiary_service.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql index 7631087ce3..0b42aeac0f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql @@ -12,7 +12,7 @@ CREATE TABLE `workdiary_service_record` `APPLICANT_ADDRESS` varchar(32) NOT NULL COMMENT '申请人住址', `APPLICANT_MOBILE` varchar(20) NOT NULL COMMENT '申请人联系电话', `SERVICE_CONTENT` varchar(255) NOT NULL COMMENT '服务内容', - `SERVICE_TIME` varchar(32) NOT NULL COMMENT '服务时间', + `SERVICE_TIME` datetime NOT NULL COMMENT '服务时间', `PRINCIPAL_NAME` varchar(10) NOT NULL COMMENT '负责人姓名', `REMARK` varchar(255) NOT NULL COMMENT '备注', `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', From 058281d66c172d29d009c90454fbd1ef4db129a1 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 26 Aug 2022 16:10:16 +0800 Subject: [PATCH 253/397] - --- .../main/resources/db/migration/V0.0.28__workdiary_service.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql index 0b42aeac0f..010a22ac54 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql @@ -8,6 +8,7 @@ CREATE TABLE `workdiary_service_record` `GRID_ID` varchar(32) NOT NULL COMMENT '网格ID', `ORG_ID_PATH` varchar(255) NOT NULL COMMENT '组织ID path', `APPLICANT_ID` varchar(32) NOT NULL COMMENT '申请人ID', + `APPLICANT_ID_CARD` varchar(32) NOT NULL COMMENT '申请人证件号', `APPLICANT_NAME` varchar(32) NOT NULL COMMENT '申请人姓名', `APPLICANT_ADDRESS` varchar(32) NOT NULL COMMENT '申请人住址', `APPLICANT_MOBILE` varchar(20) NOT NULL COMMENT '申请人联系电话', From cc4decc8061b2b9bbbd0ee438038955c9aec4944 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 16:21:34 +0800 Subject: [PATCH 254/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java | 2 +- .../com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java index 8edf20194d..7eb317b62e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java @@ -57,7 +57,7 @@ public class IcVaccineCheckFormDTO implements Serializable { /** * 房间号 */ - private String doorName; + private String homeName; /** * 客户ID(审核人) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index c87d9d58ac..61f838ec3a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -645,7 +645,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getHouseInfoToCollect(getHouseInfoToCollectFormDTO); IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = resultDTOResult.getData(); From 7de024c335d27f4eb539c2c7bf076a211b53aa7d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 26 Aug 2022 16:47:19 +0800 Subject: [PATCH 255/397] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/partyOrg/IcPartyActDao.xml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 9cc9db71b0..5ca5f6c2b5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -184,16 +184,19 @@ AND (join_org_id = #{joinOrgId} or #{joinOrgId} LIKE join_org_path) GROUP BY ic_party_act_id ) a ON ipa.id = a.IC_PARTY_ACT_ID + LEFT JOIN ic_party_act_sign_in_record sign ON sign.del_flag = '0' AND ipa.id = sign.ic_party_act_id AND sign.epmet_user_id = #{userId} + WHERE + ipa.del_flag = '0' - - INNER JOIN ic_party_act_sign_in_record sign ON sign.del_flag = '0' AND ipa.id = sign.ic_party_act_id AND sign.epmet_user_id = #{userId} + + AND sign.ic_party_act_id is NOT NULL + + + AND sign.ic_party_act_id is NULL - - LEFT JOIN ic_party_act_sign_in_record sign ON sign.del_flag = '0' AND ipa.id = sign.ic_party_act_id AND sign.epmet_user_id = #{userId} + - WHERE - ipa.del_flag = '0' AND ipa.act_type = #{actType} From c01ad02cbaea18d73aba3af33e910e3fb0d06d0b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 26 Aug 2022 16:57:57 +0800 Subject: [PATCH 256/397] emm --- .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 93228af389..8503ac39bb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -65,7 +65,7 @@ AND DATE_FORMAT(REMIND_TIME,'%Y%m%d') #{endDate} AND ORG_ID_PATH LIKE CONCAT('%',#{agencyId},'%') - AND IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0') + AND (IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0')) order by REMIND_TIME desc \ No newline at end of file From 06a357c2bf30e3288c7e1b546426c5a9585e0eec Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 26 Aug 2022 16:59:46 +0800 Subject: [PATCH 257/397] 1231 --- .../poi/excel/converter/DateConverter.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/DateConverter.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/DateConverter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/DateConverter.java new file mode 100644 index 0000000000..6fae39280d --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/DateConverter.java @@ -0,0 +1,47 @@ +package com.epmet.commons.tools.utils.poi.excel.converter; + +/** + * desc: + * + * @author: LiuJanJun + * @date: 2022/8/26 4:59 下午 + * @version: 1.0 + */ + +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.metadata.property.ExcelContentProperty; + +import java.text.SimpleDateFormat; +import java.util.Date; + +package com.lxj.common.convert; + +/** + * @Author: liujianjun + * @Date: 2022/7/19 + * @Description: yyyy-MM-dd easyExcel 日期转换 + */ +public class DateConverter implements Converter { + + private static final String PATTERN_YYYY_MM_DD = "yyyy-MM-dd"; + + @Override + public Class supportJavaTypeKey() { + return Converter.super.supportJavaTypeKey(); + } + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + return Converter.super.supportExcelTypeKey(); + } + + @Override + public WriteCellData convertToExcelData(Date value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_YYYY_MM_DD); + String dateValue = sdf.format(value); + return new WriteCellData<>(dateValue); + } +} From 81c5c87a6f3700b79039cacc010e2746141ab9e1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 26 Aug 2022 17:07:04 +0800 Subject: [PATCH 258/397] emm --- .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 8503ac39bb..496e62d960 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -27,7 +27,7 @@ AND CUSTOMER_ID = #{customerId} AND DATE_FORMAT(REMIND_TIME,'%Y') = #{yearId} AND ORG_ID_PATH LIKE CONCAT('%',#{agencyId},'%') - AND IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0') + AND (IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0')) GROUP BY DATE_FORMAT(REMIND_TIME,'%Y%m') UNION ALL SELECT From ef161352e58dab2b1d294cbcedb26572594d337e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 26 Aug 2022 17:11:00 +0800 Subject: [PATCH 259/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=BD=AC=E6=8D=A2=E5=99=A8=E3=80=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=94=99=E8=AF=AF=E7=9A=84sql=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...erter.java => EasyExcelDateConverter.java} | 6 ++---- .../excel/WorkdiaryServiceRecordExcel.java | 19 +++---------------- .../WorkdiaryServiceImportListener.java | 2 +- .../migration/V0.0.28__workdiary_service.sql | 6 +++--- 4 files changed, 9 insertions(+), 24 deletions(-) rename epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/{DateConverter.java => EasyExcelDateConverter.java} (93%) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/DateConverter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/EasyExcelDateConverter.java similarity index 93% rename from epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/DateConverter.java rename to epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/EasyExcelDateConverter.java index 6fae39280d..74196eb43f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/DateConverter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/EasyExcelDateConverter.java @@ -17,14 +17,12 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty; import java.text.SimpleDateFormat; import java.util.Date; -package com.lxj.common.convert; - /** * @Author: liujianjun * @Date: 2022/7/19 * @Description: yyyy-MM-dd easyExcel 日期转换 */ -public class DateConverter implements Converter { +public class EasyExcelDateConverter implements Converter { private static final String PATTERN_YYYY_MM_DD = "yyyy-MM-dd"; @@ -44,4 +42,4 @@ public class DateConverter implements Converter { String dateValue = sdf.format(value); return new WriteCellData<>(dateValue); } -} +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java index 07b2b19797..917fa6f2ce 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java @@ -3,12 +3,10 @@ package com.epmet.excel; import cn.hutool.core.bean.BeanUtil; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.poi.excel.converter.EasyExcelDateConverter; import com.epmet.dto.result.WorkdiaryServiceRecordDTO; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -61,10 +59,8 @@ public class WorkdiaryServiceRecordExcel { private String principal; @NotNull(message = "服务时间必填") - @ColumnWidth(10) - @ExcelProperty(value = "服务时间") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ColumnWidth(20) + @ExcelProperty(value = "服务时间", converter = EasyExcelDateConverter.class) private Date serviceTime; @ColumnWidth(20) @@ -73,14 +69,5 @@ public class WorkdiaryServiceRecordExcel { public WorkdiaryServiceRecordExcel(WorkdiaryServiceRecordDTO dto) { BeanUtil.copyProperties(dto, this); - //this.gridName = dto.getGridName(); - //this.serviceTypeName = dto.getServiceTypeName(); - //this.applicantName = dto.getApplicantName(); - //this.applicantAddress = dto.getApplicantAddress(); - //this.serviceContent = dto.getServiceContent(); - //this.applicantMobile = dto.getApplicantMobile(); - //this.principal = dto.getPrincipalName(); - //this.serviceTime = dto.getServiceTime(); - //this.remark = dto.getRemark(); } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java index bc09d401d0..1adb672911 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java @@ -19,7 +19,7 @@ public class WorkdiaryServiceImportListener implements ReadListener Date: Fri, 26 Aug 2022 18:12:14 +0800 Subject: [PATCH 260/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 19968 -> 19968 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls index 903b0091aeef39a3a972f194d0543d61f51e8258..638f6b57bb119a4980f8383bedf910a47422232e 100644 GIT binary patch delta 515 zcmYLFzb`{k6#mY8_qDGS)hZ$uB#1?56Thl{M1){sF^EJIgF(b1k*EZJfIDh1FcVEA zmSQyeI~Z;Z1`FSPtvEN|Ip=-%d*{c^7bIVhyKNQPxeYg_AN8&}bsk2G-|8kUbNXti zspVoAw2&-f3pt)W^y35#=*j4}p~>-gWKai~v{fNwn&};%u#u1oY~F!t6JEo)iL;n1%luh%kmR4O2aDU`1&IpJA3}BwA2We0>%{Ru#?>zqowebhrLZZpn9gS#s_olx zER-arFSE(^8s<%&46H320FBGJO5k!jT*;n^| RYSi<-u9NA<;^b^e{Q?yHPn7@w delta 179 zcmZpe!`Lu~aYGIZ+k}} Date: Fri, 26 Aug 2022 18:21:35 +0800 Subject: [PATCH 261/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91-fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../converter/EasyExcelDateConverter.java | 6 +++++ .../excel/WorkdiaryServiceRecordExcel.java | 12 ++++++--- .../WorkdiaryServiceImportListener.java | 4 +-- .../WorkdiaryServiceRecordServiceImpl.java | 25 +++++++++++++++++-- 4 files changed, 40 insertions(+), 7 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/EasyExcelDateConverter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/EasyExcelDateConverter.java index 74196eb43f..b3c1d207d4 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/EasyExcelDateConverter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/EasyExcelDateConverter.java @@ -42,4 +42,10 @@ public class EasyExcelDateConverter implements Converter { String dateValue = sdf.format(value); return new WriteCellData<>(dateValue); } + + //@Override + //public Date convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + // SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_YYYY_MM_DD); + // return sdf.parse(cellData.getStringValue()); + //} } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java index 917fa6f2ce..13a9afdfdd 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java @@ -2,9 +2,12 @@ package com.epmet.excel; import cn.hutool.core.bean.BeanUtil; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.poi.excel.converter.EasyExcelDateConverter; import com.epmet.dto.result.WorkdiaryServiceRecordDTO; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.NoArgsConstructor; @@ -56,12 +59,14 @@ public class WorkdiaryServiceRecordExcel { @ColumnWidth(10) @ExcelProperty(value = "负责人") - private String principal; + private String principalName; @NotNull(message = "服务时间必填") @ColumnWidth(20) - @ExcelProperty(value = "服务时间", converter = EasyExcelDateConverter.class) - private Date serviceTime; + @ExcelProperty(value = "服务时间") + //@DateTimeFormat("yyyy-MM-dd") + //@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private String serviceTime; @ColumnWidth(20) @ExcelProperty(value = "备注") @@ -69,5 +74,6 @@ public class WorkdiaryServiceRecordExcel { public WorkdiaryServiceRecordExcel(WorkdiaryServiceRecordDTO dto) { BeanUtil.copyProperties(dto, this); + this.serviceTime = DateUtils.format(dto.getServiceTime()); } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java index 1adb672911..0f98babccc 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java @@ -1,7 +1,7 @@ package com.epmet.excel.listener; import com.alibaba.excel.context.AnalysisContext; -import com.alibaba.excel.read.listener.ReadListener; +import com.alibaba.excel.event.AnalysisEventListener; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.excel.WorkdiaryServiceRecordExcel; import com.epmet.service.WorkdiaryServiceRecordService; @@ -14,7 +14,7 @@ import java.util.List; * 工作日志-导入-监听器 */ @Slf4j -public class WorkdiaryServiceImportListener implements ReadListener { +public class WorkdiaryServiceImportListener extends AnalysisEventListener { /** * 200 一批执行导入 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java index 907018fc1f..f44d157e22 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java @@ -61,6 +61,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotNull; import java.io.IOException; import java.io.OutputStream; import java.nio.file.Files; @@ -464,6 +465,26 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 19:19:21 +0800 Subject: [PATCH 262/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IcVaccinePrarmeterDao.xml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index 3441859c38..7b7b6c4d95 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -88,22 +88,22 @@ and ID_CARD like CONCAT('%', #{idCard}, '%') - and (IS_VACCINATION = #{isVaccination} + and IS_VACCINATION = #{isVaccination} - and (GRID_ID = #{gridId} + and GRID_ID = #{gridId} - and (VILLAGE_ID = #{villageId} + and VILLAGE_ID = #{villageId} - and (BUILD_ID = #{buildId} + and BUILD_ID = #{buildId} - and (UNIT_ID = #{unitId} + and UNIT_ID = #{unitId} - and (HOME_ID = #{homeId} + and HOME_ID = #{homeId} order by CREATED_TIME desc @@ -160,22 +160,22 @@ and ID_CARD like CONCAT('%', #{idCard}, '%') - and (IS_VACCINATION = #{isVaccination} + and IS_VACCINATION = #{isVaccination} - and (GRID_ID = #{gridId} + and GRID_ID = #{gridId} - and (VILLAGE_ID = #{villageId} + and VILLAGE_ID = #{villageId} - and (BUILD_ID = #{buildId} + and BUILD_ID = #{buildId} - and (UNIT_ID = #{unitId} + and UNIT_ID = #{unitId} - and (HOME_ID = #{homeId} + and HOME_ID = #{homeId} order by CREATED_TIME desc From c07a650d80fb618fdb6c2e16edc61401096aa1b6 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 19:20:30 +0800 Subject: [PATCH 263/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcVaccinePrarmeterDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index 7b7b6c4d95..fe457a1225 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -177,6 +177,7 @@ and HOME_ID = #{homeId} + order by CREATED_TIME desc From 49ef464dfccb8d7361150c7efaa4aee66078cd0a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 20:10:34 +0800 Subject: [PATCH 264/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index fd95325e80..d98e8c5080 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -44,7 +44,7 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "联系电话") private String mobile; - @Excel(name = "身份证号") + @Excel(name = "证件号") private String idCard; @Excel(name = "是否接种", replace = {"否_0","是_1"}) From 893e078818020de765d4b3fded626d23c1e33c78 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 21:13:13 +0800 Subject: [PATCH 265/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/VaccinePrarmeterListFormDTO.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java index 6f77ae6b3b..4fbc71217b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java @@ -26,7 +26,17 @@ public class VaccinePrarmeterListFormDTO extends PageFormDTO implements Serializ private String name; /** - * user所属组织ID + * 证件号 */ - private String orgId; + private String idCard; + + private String isVaccination; + private String gridId; + private String villageId; + private String buildId; + private String unitId; + private String homeId; + + + } From 0d1097dbb6a1103c52364e3d0ffdb1ac0e22aa00 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 29 Aug 2022 09:04:18 +0800 Subject: [PATCH 266/397] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/dto/partyOrg/result/PartyOrgListResultDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java index b126ff3cc3..cca225416d 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java @@ -20,6 +20,6 @@ public class PartyOrgListResultDTO implements Serializable { /** * 党组织名称 */ - private Integer partyOrgName = 0; + private String partyOrgName = ""; } From 99b9d0b46d82e8b8a132d64113e5b66bfff5043e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 29 Aug 2022 10:49:42 +0800 Subject: [PATCH 267/397] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=91=E6=8A=A4=E7=85=A7=E6=AD=A3=E5=88=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=9A8-9=E4=BD=8D=E5=AD=97=E6=AF=8D=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E7=9A=84=E7=BB=84=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/utils/IdCardRegexUtils.java | 4 ++-- .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java index d44e9bb3fb..96d7d02a62 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java @@ -25,7 +25,7 @@ public class IdCardRegexUtils { /** * 9位护照 */ - private static final Pattern PATTERN_9_PASSPORT = Pattern.compile("^[a-zA-Z]{2}\\d{7}$|^[a-zA-Z]{1}\\d{8}$"); + private static final Pattern PATTERN_9_PASSPORT = Pattern.compile("^[a-zA-Z0-9]{8,9}$"); private String inputText; @@ -86,7 +86,7 @@ public class IdCardRegexUtils { } } - if (input.length() == 9) { + if (input.length() == 9 || input.length() == 8) { Matcher matcher = PATTERN_9_PASSPORT.matcher(input); if (matcher.matches()) { return new IdCardRegexUtils(IdCardTypeEnum.PASSPORT, matcher, input); 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 3976b304fc..2a57869b36 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 @@ -632,7 +632,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res // ================== 数据补充 =================== IdCardRegexUtils regexUtilInstance = IdCardRegexUtils.parse(idCard); if (regexUtilInstance == null) { - String s = "请输入正确的证件号"; + String s = "证件号解析错误，或不支持的证件类型。(请使用身份证号或者护照号)"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); } From afb3679b70cc8ad871fb489b2020c047b3082ee6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 29 Aug 2022 10:51:41 +0800 Subject: [PATCH 268/397] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.7__party_att.sql | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.7__party_att.sql diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.7__party_att.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.7__party_att.sql new file mode 100644 index 0000000000..d31f3050db --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.7__party_att.sql @@ -0,0 +1,21 @@ +CREATE TABLE `resi_partymember_attachment` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `BUSINESS_ID` varchar(64) NOT NULL COMMENT '业务id', + `ATTACH_TO` varchar(32) DEFAULT NULL COMMENT '党组织活动：ic_party_act', + `NAME` varchar(64) DEFAULT NULL COMMENT '附件名', + `FORMAT` varchar(64) DEFAULT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）', + `TYPE` varchar(64) NOT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））', + `URL` varchar(255) NOT NULL COMMENT '附件地址', + `SORT` int(1) NOT NULL COMMENT '排序字段', + `STATUS` varchar(32) NOT NULL DEFAULT 'auto_passed' COMMENT '附件状态（审核中：auditing； \r\nauto_passed: 自动通过；\r\nreview：结果不确定，需要人工审核；\r\nblock: 结果违规；\r\nrejected：人工审核驳回;\r\napproved：人工审核通过）\r\n现在图片是同步审核的，所以图片只有auto_passed一种状态', + `REASON` varchar(255) DEFAULT NULL COMMENT '失败原因', + `DURATION` int(11) 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 '创建人', + `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='本库附件表'; \ No newline at end of file From 70c1645ea19492afda914b0f1d728fd7d174b1c5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 10:52:59 +0800 Subject: [PATCH 269/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcVaccinePrarmeterServiceImpl.java | 182 +++++++++--------- 1 file changed, 92 insertions(+), 90 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 61f838ec3a..60c17c8a0e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -455,17 +455,17 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl userMap = queryOriginUserByHomeId(icResiCollectEntity.getHomeId(),icResiCollectEntity.getCustomerId()); + Map userMap = queryOriginUserByHomeId(icVaccinePrarmeterEntity.getHomeId(),icVaccinePrarmeterEntity.getCustomerId()); if(userIdCardEntity != null){ icResiUserId = userIdCardEntity.getId(); // 已存在人员 - if(userMap.containsKey(icResiCollectEntity.getIdCard())){ + if(userMap.containsKey(icVaccinePrarmeterEntity.getIdCard())){ // 人员房屋一致（只更新人员信息） - updateUserInfo(icResiCollectEntity,false,formDTO,userIdCardEntity); + updateUserInfo(icVaccinePrarmeterEntity,false,formDTO,userIdCardEntity); }else{ // 人员房屋不一致（更新人员信息和变更记录） - updateUserInfo(icResiCollectEntity,true,formDTO,userIdCardEntity); + updateUserInfo(icVaccinePrarmeterEntity,true,formDTO,userIdCardEntity); } }else{ // 不存在人员 - icResiUserId = insertUserInfo(icResiCollectEntity,formDTO); + icResiUserId = insertUserInfo(icVaccinePrarmeterEntity,formDTO); } } // 同步接种记录 and 疫苗接种记录关系 - synchronizationVaccineInfo(icResiCollectEntity,icResiUserId); + synchronizationVaccineInfo(icVaccinePrarmeterEntity,icResiUserId); } @@ -518,68 +518,68 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntityFirstList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(firstDate)); + List icVaccineEntityFirstList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(firstDate)); if(icVaccineEntityFirstList.size() > 0){ // 更新疫苗接种记录 and 疫苗接种记录关系 for(IcVaccineEntity entity : icVaccineEntityFirstList){ - updateVaccineInfo(entity,icResiCollectEntity); + updateVaccineInfo(entity,icVaccinePrarmeterEntity); } }else{ // 新增疫苗接种记录 and 疫苗接种记录关系 - insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + insertVaccineInfo(icVaccinePrarmeterEntity,icResiUserId,firstDate); } // 查询第二次接种信息 - List icVaccineEntitySecondList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(secondDate)); + List icVaccineEntitySecondList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(secondDate)); if(icVaccineEntitySecondList.size() > 0){ // 更新疫苗接种记录 and 疫苗接种记录关系 for(IcVaccineEntity entity : icVaccineEntitySecondList){ - updateVaccineInfo(entity,icResiCollectEntity); + updateVaccineInfo(entity,icVaccinePrarmeterEntity); } }else{ // 新增疫苗接种记录 and 疫苗接种记录关系 - insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + insertVaccineInfo(icVaccinePrarmeterEntity,icResiUserId,firstDate); } // 查询第三次接种信息 - List icVaccineEntityThirdList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(thirdDate)); + List icVaccineEntityThirdList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(thirdDate)); if(icVaccineEntityThirdList.size() > 0){ // 更新疫苗接种记录 and 疫苗接种记录关系 for(IcVaccineEntity entity : icVaccineEntityThirdList){ - updateVaccineInfo(entity,icResiCollectEntity); + updateVaccineInfo(entity,icVaccinePrarmeterEntity); } }else{ // 新增疫苗接种记录 and 疫苗接种记录关系 - insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + insertVaccineInfo(icVaccinePrarmeterEntity,icResiUserId,firstDate); } } @@ -587,48 +587,48 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getHouseInfoToCollect(getHouseInfoToCollectFormDTO); IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = resultDTOResult.getData(); - collectHouseFormDTO.setCustomerId(icResiCollectEntity.getCustomerId()); + collectHouseFormDTO.setCustomerId(icVaccinePrarmeterEntity.getCustomerId()); collectHouseFormDTO.setResiNumber((icHouseInfoCollectResultDTO.getResiNumber() + 1)); + collectHouseFormDTO.setRentFlag(icHouseInfoCollectResultDTO.getRentFlag()); + collectHouseFormDTO.setOwnerName(icHouseInfoCollectResultDTO.getOwnerName()); govOrgFeignClient.updateCollect(collectHouseFormDTO); } @@ -703,31 +705,31 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Mon, 29 Aug 2022 11:20:48 +0800 Subject: [PATCH 270/397] =?UTF-8?q?=E6=97=A5=E5=8E=86=E4=B8=8A=E7=9A=84?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/result/ActAndScheduleListResultDTO.java | 1 + .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java index fe782a2083..218c29a284 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java @@ -42,6 +42,7 @@ public class ActAndScheduleListResultDTO implements Serializable { private String isAutoInform; private String autoInformDay; private String type; + private String actTypeName; private String isPublicValue; private String isPublish; private String joinTypeValue; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 5ca5f6c2b5..437085a29d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -29,6 +29,7 @@ + @@ -51,6 +52,7 @@ if(AUTO_PUBLIC_TYPE != 0,concat('活动开始前',pa.AUTO_PUBLIC_TYPE,'天'),'立即发布') as autoInformDay, DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') AS dateId, pa.ACT_TYPE AS type, + d.TYPE_NAME as actTypeName, (CASE WHEN pa.JOIN_USER_TYPE = '1' THEN '支部委员' WHEN pa.JOIN_USER_TYPE = '0' THEN '全体党员' ELSE '全体党员' END) AS joinTypeValue, @@ -63,6 +65,7 @@ ao.JOIN_ORG_ID AS partyOrgId FROM ic_party_act pa LEFT JOIN ic_party_act_org ao ON (ao.IC_PARTY_ACT_ID = pa.ID AND ao.DEL_FLAG = 0) + left join ic_party_act_type_dict d on(pa.act_type=d.TYPE_KEY and pa.CUSTOMER_ID=d.CUSTOMER_ID) WHERE pa.DEL_FLAG = 0 AND pa.CUSTOMER_ID = #{customerId} From 91cef4d7c2992556891e9d8b4fffa541f98eeb09 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 29 Aug 2022 12:41:01 +0800 Subject: [PATCH 271/397] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=91=E6=8A=A4=E7=85=A7=EF=BC=8C=E6=8E=A9=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/processor/MaskProcessor.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index 24bce5bff3..11b5c5ce4f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -161,12 +161,15 @@ public class MaskProcessor { return originString.replaceAll("^(\\d{10})\\d+([a-zA-Z0-9]{2})$", new StringBuilder("$1").append(maskStr).append("$2").toString()); } else if (regexUtil.getTypeEnum() == IdCardTypeEnum.PASSPORT) { // 护照，前两位，后两位为明文，其他* - String maskStr = StrUtil.repeatByLength("*", originString.length() - 4); - return originString.replaceAll("^([a-zA-Z0-9]{2})\\d+(\\d{2})$", new StringBuilder("$1").append(maskStr).append("$2").toString()); - } else { - // 其他情况，不码 - return originString; + int clearLength = 4; + int maskedLength = 0; + if ((maskedLength = originString.length() - clearLength) > 0) { + String maskStr = StrUtil.repeatByLength("*", maskedLength); + return originString.replaceAll("^([a-zA-Z0-9]{2})[a-zA-Z0-9]+([a-zA-Z0-9]{2})$", new StringBuilder("$1").append(maskStr).append("$2").toString()); + } } + + return originString; } /** From aa016f922247159480e49e851824c73a8d53f051 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 14:26:24 +0800 Subject: [PATCH 272/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/HouseServiceImpl.java | 4 ++- .../impl/IcVaccinePrarmeterServiceImpl.java | 29 +++++++++++++------ 2 files changed, 23 insertions(+), 10 deletions(-) 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 e8de32ecce..933a07daeb 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 @@ -264,8 +264,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { houseChangeRecordCollect(formDTO.getId(), formDTO.getCustomerId(), icHouseDTO); icHouseDao.updateById(entity); + IcHouseDTO houseDTO = icHouseService.get(formDTO.getId()); + //删除房屋缓存 - icHouseRedis.delHouseInfo(formDTO.getId(), entity.getCustomerId()); + icHouseRedis.delHouseInfo(formDTO.getId(), houseDTO.getCustomerId()); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 60c17c8a0e..89dc8a65de 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -523,21 +523,18 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntityFirstList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(firstDate)); if(icVaccineEntityFirstList.size() > 0){ @@ -553,6 +550,13 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntitySecondList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(secondDate)); if(icVaccineEntitySecondList.size() > 0){ @@ -568,6 +572,13 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntityThirdList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(thirdDate)); if(icVaccineEntityThirdList.size() > 0){ From 028105a50cb0719fefd9b54a78200b29e055dbf6 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 14:56:39 +0800 Subject: [PATCH 273/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/IcVaccinePrarmeterController.java | 2 ++ .../src/main/resources/mapper/IcVaccinePrarmeterDao.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 5edd0e0749..674686ca73 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -2,6 +2,7 @@ package com.epmet.controller; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; 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.dto.form.PageFormDTO; import com.epmet.commons.tools.exception.EpmetException; @@ -59,6 +60,7 @@ public class IcVaccinePrarmeterController { private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; @RequestMapping("page") +// @MaskResponse(fieldNames = {"MOBILE", "ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> page(@RequestParam Map params){ // PageData page = icVaccinePrarmeterService.page(params); PageData page = icVaccinePrarmeterService.getPhrasePage(params); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index fe457a1225..b06633761b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -127,8 +127,8 @@ HOUSEHOLD_TYPE, (case HOUSEHOLD_TYPE when '0' then '户籍' when '1' then '外来' else '' end) as householdTypeName, NAME, - MOBILE, - ID_CARD, + CONCAT(LEFT(MOBILE,3),'****',RIGHT(MOBILE ,4)) as MOBILE, + CONCAT(LEFT(ID_CARD,6),'********',RIGHT(ID_CARD ,4)) as ID_CARD, IS_VACCINATION, (case IS_VACCINATION when '0' then '否' when '1' then '是' else '' end) as isVaccinationName, FIRST_VAC_TIME, From 26aab2c2b800575744ad71dcd3a82e7432d12300 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 29 Aug 2022 15:58:41 +0800 Subject: [PATCH 274/397] =?UTF-8?q?=E5=85=A5=E5=8F=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/dto/partyOrg/form/PartyActStatisFormDTO.java | 5 ----- .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java index f0e8cedeed..b2206cf169 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java @@ -15,11 +15,6 @@ public class PartyActStatisFormDTO implements Serializable { */ @NotBlank(message = "党组织Id不能为空", groups = AddGroup.class) private String joinOrgId; - /** - * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 - */ - @NotBlank(message = "党组织类型不能为空", groups = AddGroup.class) - private String joinOrgType; /** * 活动开始时间 【yyyy-MM-dd】 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 94d52d1418..6db82bb81a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -768,7 +768,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl partyOrgIdList = orgDTOList.stream().map(IcPartyOrgDTO::getId).collect(Collectors.toList()); //如果党组织是支部类型，则直属下级是党小组 - if ("6".equals(formDTO.getJoinOrgType())) { + if ("5".equals(orgDTOList.get(0).getPartyOrgType())) { Result> result = resiGroupOpenFeignClient.partyGroupList(formDTO.getJoinOrgId()); if (!result.success()) { throw new RenException("获取党支部下党小组列表失败：" + result.getInternalMsg()); From eb82950ba4eeaaef1c6971144f9ceb2998abca50 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 29 Aug 2022 16:02:15 +0800 Subject: [PATCH 275/397] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=91=E5=B8=83?= =?UTF-8?q?=EF=BC=8C0=E6=9C=AA=E5=8F=91=E5=B8=83=EF=BC=9B1=E5=B7=B2?= =?UTF-8?q?=E5=8F=91=E5=B8=83=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/result/IcPartyActDetailResDTO.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java index f5d88e8b52..37f16e3274 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java @@ -129,6 +129,9 @@ public class IcPartyActDetailResDTO implements Serializable { private Boolean isSignIn; private String publishStaffName; - + /** + * 是否发布，0未发布；1已发布； + */ + private String isPublish; } From ed7abb7ea52c27f502e8420bd367058f04a1be43 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 16:27:20 +0800 Subject: [PATCH 276/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/CustomerAgencyDao.xml | 1 + .../form/GridInfoVaccinePrarmeterFormDTO.java | 5 +++++ .../epmet/excel/IcVaccinePrarmeterExcel.java | 2 +- .../impl/IcVaccinePrarmeterServiceImpl.java | 21 +++++++++++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) 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 42cb8d69dc..8493df5d81 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 @@ -926,6 +926,7 @@ from customer_grid where DEL_FLAG = '0' and GRID_NAME = #{gridName} + and PID = #{agencyId} and CUSTOMER_ID = #{customerId} limit 1 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java index c218212f37..18e124e529 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java @@ -26,6 +26,11 @@ public class GridInfoVaccinePrarmeterFormDTO implements Serializable { */ private String gridName; + /** + * 当前登录人组织ID + */ + private String agencyId; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index d98e8c5080..06cb0b9e15 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -51,7 +51,7 @@ public class IcVaccinePrarmeterExcel { private String isVaccination; @Excel(name = "第一次接种时间") - private Date firstVacTime; + private String firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 89dc8a65de..79a65aa263 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; 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.ServiceConstant; 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.ExceptionUtils; +import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; @@ -30,6 +32,7 @@ import com.epmet.dto.IcVaccinePrarmeterDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.GridInfoByNameResultDTO; import com.epmet.dto.result.IcHouseInfoCollectResultDTO; +import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.*; import com.epmet.entity.IcResiUserEntity; @@ -38,6 +41,7 @@ import com.epmet.entity.IcVaccinePrarmeterEntity; import com.epmet.excel.IcVaccinePrarmeterImportExcel; import com.epmet.excel.error.IcVaccinePrarmeterImportErrorModel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; import com.epmet.feign.OssFeignClient; import com.epmet.redis.IcVaccinePrarmeterRedis; @@ -52,6 +56,7 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -100,6 +105,12 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -252,6 +263,15 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl list, List errorInfo, TokenDto tokenDto){ + LoginUserDetailsFormDTO form = new LoginUserDetailsFormDTO(); + form.setUserId(tokenDto.getUserId()); + form.setClient(tokenDto.getClient()); + form.setApp(tokenDto.getApp()); + LoginUserDetailsResultDTO userDetailsResultDTO = resultDataResolver.getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(form), ServiceConstant.EPMET_USER_SERVER, + EpmetErrorCode.SERVER_ERROR.getCode(), + "获取当前登录人组织id失败", + null); + for (int i = 0; i < list.size(); i++) { list.get(i).setNum(i+1); if (StringUtils.isBlank(list.get(i).getGridName()) && !list.get(i).getAddStatus()){ @@ -353,6 +373,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getGridInfoByGridName(formDTO); GridInfoByNameResultDTO gridInfoByNameResultDTO = resultDTOResult.getData(); if(gridInfoByNameResultDTO == null && !list.get(i).getAddStatus()){ From a7692bf393888db483adca51757acaa072a316bc Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 16:50:53 +0800 Subject: [PATCH 277/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V0.0.67__add_ic_vaccine_prarmeter.sql | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.67__add_ic_vaccine_prarmeter.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.67__add_ic_vaccine_prarmeter.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.67__add_ic_vaccine_prarmeter.sql new file mode 100644 index 0000000000..f009d72b0a --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.67__add_ic_vaccine_prarmeter.sql @@ -0,0 +1,38 @@ +CREATE TABLE `ic_vaccine_prarmeter` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id', + `GRID_ID` varchar(64) DEFAULT NULL COMMENT '网格ID', + `GRID_NAME` varchar(255) DEFAULT NULL COMMENT '网格名称', + `AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '组织Id', + `PIDS` varchar(255) DEFAULT NULL COMMENT '组织的pids', + `VILLAGE_ID` varchar(64) DEFAULT NULL COMMENT '所属小区ID；', + `VILLAGE_NAME` varchar(64) DEFAULT NULL COMMENT '所属小区名称', + `BUILD_ID` varchar(64) DEFAULT NULL COMMENT '所属楼宇Id', + `BUILD_NAME` varchar(64) DEFAULT NULL COMMENT '所属楼宇名称', + `UNIT_ID` varchar(64) DEFAULT NULL COMMENT '单元id', + `UNIT_NAME` varchar(64) DEFAULT NULL COMMENT '单元名', + `HOME_ID` varchar(64) DEFAULT NULL COMMENT '所属家庭Id', + `HOME_NAME` varchar(64) DEFAULT NULL COMMENT '房间名', + `HOUSEHOLD_TYPE` varchar(255) DEFAULT NULL COMMENT '户口性质：0户籍 1外来', + `NAME` varchar(64) NOT NULL COMMENT '姓名', + `MOBILE` varchar(15) DEFAULT NULL COMMENT '联系电话', + `ID_CARD` varchar(18) NOT NULL COMMENT '身份证号', + `IS_VACCINATION` varchar(1) DEFAULT NULL COMMENT '是否接种：0否1是', + `FIRST_VAC_TIME` varchar(64) DEFAULT NULL COMMENT '第一次接种时间', + `FIRST_VAC_SITE` varchar(10) DEFAULT NULL COMMENT '第一次接种地点', + `SECOND_VAC_TIME` varchar(64) DEFAULT NULL COMMENT '第二次接种时间', + `SECOND_VAC_SITE` varchar(10) DEFAULT NULL COMMENT '第二次接种地点', + `THIRD_VAC_TIME` varchar(64) DEFAULT NULL COMMENT '第三次接种时间', + `THIRD_VAC_SITE` varchar(10) DEFAULT NULL COMMENT '第三次接种地点', + `REASON` varchar(255) DEFAULT NULL COMMENT '原因：禁忌症/拒绝接种/其他原因', + `NOTE` varchar(255) DEFAULT NULL COMMENT '备注', + `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + `CHECK_STATE` varchar(1) DEFAULT NULL COMMENT '审核状态：0待审核 1审核不通过 2审核通过', + `CHECK_REASON` varchar(255) DEFAULT NULL COMMENT '审核理由', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='新冠病毒疫苗接种人员信息台账'; From efa3cc002e577d99990539d769bf5b6bc54d64a0 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 16:57:21 +0800 Subject: [PATCH 278/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 19968 -> 20480 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls index 638f6b57bb119a4980f8383bedf910a47422232e..52b29028aec920e29760ecac68f74fe93bb8a511 100644 GIT binary patch delta 430 zcmZpe!`QHZae@t_(nj0kjEt(2S(&N@6&V;9{{8>|AB0taY_-k3O!rBZgK65r);1FIc(; z1u*b4FnsU;DPdsypa7zH7#Ns=6cZ3LLNSOB1I`TGA0&XBMn*>l29EuV0t^BS2N)fI z?Ej1$3>*xTgRR~$7EgAtHfHLzm>l5rX>+=b2@@mJyzW?wKGbaBgB0VqgJ^LIB87Al^Pk{mB>YMJLNT$WFdsZ_bzr z;zbw(WyB>Ib<)E-f+w^FE=@jL$-rP0+!|OGc+C$a1``pB1c?}gTLnWzKt5(<`2U|9 x=l~GS%fJh!`GKLckI@-q_~rnI4a}1jd>;Vu{7o*ltgMrsnY8ZS?BuzR1pukXYM=lB delta 324 zcmZozz}PT{ae@t_;zrx!jEpLiS(&PN|NZ~}AB2?|7#LJHPh`qxoS48ei6w`#U_HB- z$<7;$N|Q@jnwhrQZvMrx)P&J{@&Ze7$$3^l)eLNm!3-G;sX$o5V8qbMAi|(E`GTdZ zoecv&1H%UskP-&A4-!C~ zu{LI^w3vL+>C@(F8xtl*#>pG(yn*B&J8fkFpcZx@76f9T$spDT5E;wh#vsZd1at`F zWH0+XU3LbLN=BesAWL8-$a>CAj6w`7AjMz+att#N?_)Hc?C&5tS=T{v@)LVwMrROj Z^F@aZ%$wY7Sy{g=5jEMl*~xn!3jk(aNZbGb From bb9b4f3ff53f22120f6f6e314b57deb3f219dad5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 17:24:29 +0800 Subject: [PATCH 279/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcVaccinePrarmeterServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 79a65aa263..a5600b7f77 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -79,7 +79,7 @@ import java.util.stream.Collectors; */ @Service @Slf4j -public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl implements IcVaccinePrarmeterService { +public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl implements IcVaccinePrarmeterService,ResultDataResolver { @Resource private IcVaccinePrarmeterRedis icVaccinePrarmeterRedis; @@ -108,8 +108,6 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl page(Map params) { @@ -267,7 +265,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Mon, 29 Aug 2022 18:11:44 +0800 Subject: [PATCH 280/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/IcVaccinePrarmeterImportExcel.java | 2 +- .../IcVaccinePrarmeterImportErrorModel.java | 2 +- .../impl/IcVaccinePrarmeterServiceImpl.java | 2 +- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 20480 -> 19968 bytes 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java index 893531a4d2..3d9ed7a6a7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java @@ -39,7 +39,7 @@ public class IcVaccinePrarmeterImportExcel { @Excel(name = "联系电话") private String mobile; - @Excel(name = "身份证号") + @Excel(name = "证件号") private String idCard; @Excel(name = "是否接种", replace = {"否_0","是_1"}) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java index 7d34af62aa..8cce05d852 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java @@ -41,7 +41,7 @@ public class IcVaccinePrarmeterImportErrorModel { @Excel(name = "联系电话",width = 30) private String mobile; - @Excel(name = "身份证号",width = 30) + @Excel(name = "证件号",width = 30) private String idCard; @Excel(name = "是否接种", width = 30, replace = {"否_0","是_1"}) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index a5600b7f77..08e03f063f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -303,7 +303,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl5TQC;K~yPS$l$WON3zE;{H>eq?Vt+0P++ XlcNXACO2DF7M(vl{hJ-V_p<;1j5p_9f|jrlRLXato)htfe@6od*6(Jl@u8afn3 zawj2!gHBHMErLUIa!n?k9lGdnaTGP4`;0x0^SBZ8Cex*aFt+{x2~9AEC!$Z=5I6rG2SxFbQO{$m3c1 Date: Tue, 30 Aug 2022 09:37:50 +0800 Subject: [PATCH 281/397] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/BuildingResultDTO.java | 4 ++++ .../src/main/resources/mapper/IcBuildingDao.xml | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java index dc2624e160..14e9e05aa0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java @@ -28,4 +28,8 @@ public class BuildingResultDTO implements Serializable { private String label; + private String allParentName; + + private String agencyName; + } 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 8d8cc4535e..0b71b79176 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 @@ -458,15 +458,19 @@ n.id AS neighborhoodId, n.NEIGHBOR_HOOD_NAME AS neighborhoodName, n.GRID_ID, - g.GRID_NAME + g.GRID_NAME, + a.ALL_PARENT_NAME, + a.ORGANIZATION_NAME AS AGENCY_NAME 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} From 7395b9e4d176770fa27a1e48058c9f1cb0d66e46 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 30 Aug 2022 10:32:47 +0800 Subject: [PATCH 282/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcVaccinePrarmeterServiceImpl.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 08e03f063f..6edf94b941 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -345,26 +345,26 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Tue, 30 Aug 2022 10:38:27 +0800 Subject: [PATCH 283/397] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcNeighborHoodServiceImpl.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/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 3ca505d172..046b58156d 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 @@ -191,7 +191,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl Date: Tue, 30 Aug 2022 10:44:35 +0800 Subject: [PATCH 284/397] bug --- .../java/com/epmet/service/impl/IcNeighborHoodServiceImpl.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/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 046b58156d..71f15a0fe4 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 @@ -191,7 +191,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl Date: Tue, 30 Aug 2022 10:58:24 +0800 Subject: [PATCH 285/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91=E6=9C=8D=E5=8A=A1=E6=97=B6=E9=97=B4=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkdiaryServiceRecordServiceImpl.java | 44 +++++++++++++------ 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java index f44d157e22..7534b9a918 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java @@ -70,6 +70,8 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.function.Function; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -98,6 +100,17 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl> importResultDescTl = new ThreadLocal<>(); + /** + * 工作日志-服务时间-正则表达式 + * 支持模式： + * 2022-01-01 + * 2022-1-1 + * 2022/01/01 + * 2022/01-1 + * ... + */ + private static final Pattern WORKDIARY_SERVICE_TIME_REGEX = Pattern.compile("^(\\s*)(?\\d{4})[-/](?\\d{1,2})[-/](?\\d{1,2})(\\s*)$"); + /** * 导入结果描述 */ @@ -466,24 +479,29 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl Date: Tue, 30 Aug 2022 11:02:57 +0800 Subject: [PATCH 286/397] =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcNeighborHoodServiceImpl.java | 18 +++++++++--------- .../main/resources/mapper/IcBuildingDao.xml | 8 +++++--- 2 files changed, 14 insertions(+), 12 deletions(-) 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 71f15a0fe4..66658f83f2 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 @@ -214,15 +214,15 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) { dto.setCustomerId(tokenDto.getCustomerId()); - if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) { - log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区"); - CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); - if (null == result || StringUtils.isBlank(result.getAgencyId())) { - log.error(String.format("staffId:%s,工作人员缓存信息查询异常", tokenDto.getUserId())); - return Collections.emptyList(); - } - dto.setAgencyId(result.getAgencyId()); - } +// if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) { +// log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区"); +// CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); +// if (null == result || StringUtils.isBlank(result.getAgencyId())) { +// log.error(String.format("staffId:%s,工作人员缓存信息查询异常", tokenDto.getUserId())); +// return Collections.emptyList(); +// } +// dto.setAgencyId(result.getAgencyId()); +// } return icBuildingDao.listBuildingInfo(dto); } 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 0b71b79176..a5e3001d28 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 @@ -478,9 +478,11 @@ 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}, '%')) + + AND ( + n.AGENCY_ID = #{agencyId} + OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%')) + From 84a936f3c0cf8ed42362c6405e9e9ba4b9e04156 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 30 Aug 2022 14:27:49 +0800 Subject: [PATCH 287/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/VaccinePrarmeterListFormDTO.java | 9 +++++++++ .../controller/IcVaccinePrarmeterController.java | 16 +++++++++++++--- .../epmet/service/IcVaccinePrarmeterService.java | 2 +- .../impl/IcVaccinePrarmeterServiceImpl.java | 9 ++++++++- .../resources/mapper/IcVaccinePrarmeterDao.xml | 4 ++++ 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java index 4fbc71217b..859a30a01d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java @@ -30,6 +30,15 @@ public class VaccinePrarmeterListFormDTO extends PageFormDTO implements Serializ */ private String idCard; + /** + * 客户ID + */ + private String customerId; + /** + * 部门ID + */ + private String agencyId; + private String isVaccination; private String gridId; private String villageId; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 674686ca73..cddabc98ad 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -5,8 +5,10 @@ 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.dto.form.PageFormDTO; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; 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.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.ExcelUtils; @@ -61,9 +63,9 @@ public class IcVaccinePrarmeterController { @RequestMapping("page") // @MaskResponse(fieldNames = {"MOBILE", "ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params, @LoginUser TokenDto tokenDto){ // PageData page = icVaccinePrarmeterService.page(params); - PageData page = icVaccinePrarmeterService.getPhrasePage(params); + PageData page = icVaccinePrarmeterService.getPhrasePage(params,tokenDto); return new Result>().ok(page); } @@ -75,9 +77,10 @@ public class IcVaccinePrarmeterController { @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody IcVaccinePrarmeterDTO dto){ + public Result save(@RequestBody IcVaccinePrarmeterDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); icVaccinePrarmeterService.save(dto); return new Result(); } @@ -116,6 +119,13 @@ public class IcVaccinePrarmeterController { @PostMapping("vaccine-export") public void vaccineExport(HttpServletResponse response, @RequestBody VaccinePrarmeterListFormDTO formDTO, @LoginUser TokenDto tokenDto) throws Exception { ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + // 获取工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", tokenDto.getUserId())); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); List list = icVaccinePrarmeterDao.vaccineExport(formDTO); ExcelUtils.exportExcelToTarget(response, null, list, IcVaccinePrarmeterExcel.class); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java index 41137212df..edadf0fabf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java @@ -35,7 +35,7 @@ public interface IcVaccinePrarmeterService extends BaseService getPhrasePage(Map params); + PageData getPhrasePage(Map params, TokenDto tokenDto); /** * 默认查询 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 6edf94b941..1f3e85df9e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -124,7 +124,14 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl getPhrasePage(Map params) { + public PageData getPhrasePage(Map params, TokenDto tokenDto) { + params.put("customerId",tokenDto.getCustomerId()); + // 获取工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", tokenDto.getUserId())); + } + params.put("agencyId",staffInfo.getAgencyId()); IPage page = getPage(params); List list = baseDao.getPhrasePage(params); return new PageData<>(list, page.getTotal()); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index b06633761b..ebbebfe289 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -78,6 +78,8 @@ CHECK_REASON from ic_vaccine_prarmeter where DEL_FLAG = 0 + and CUSTOMER_ID = #{customerId} + AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%')) and NAME like CONCAT('%' ,#{name}, '%') @@ -150,6 +152,8 @@ CHECK_REASON from ic_vaccine_prarmeter where DEL_FLAG = 0 + and CUSTOMER_ID = #{customerId} + AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%')) and NAME like CONCAT('%' ,#{name}, '%') From fc34c58b60eef3828f2113122d91d6b86496a1ed Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 30 Aug 2022 14:48:11 +0800 Subject: [PATCH 288/397] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcVaccinePrarmeterController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index cddabc98ad..217c0600cf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -80,7 +80,6 @@ public class IcVaccinePrarmeterController { public Result save(@RequestBody IcVaccinePrarmeterDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - dto.setCustomerId(tokenDto.getCustomerId()); icVaccinePrarmeterService.save(dto); return new Result(); } From e8d3a2aa3db67dd192bdc58dc49825076d617a78 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 30 Aug 2022 15:05:57 +0800 Subject: [PATCH 289/397] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E5=AE=A2=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/result/BuildingResultDTO.java | 2 ++ .../gov-org-server/src/main/resources/mapper/IcBuildingDao.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java index 14e9e05aa0..63b6235605 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java @@ -32,4 +32,6 @@ public class BuildingResultDTO implements Serializable { private String agencyName; + private String customerId; + } 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 a5e3001d28..02f4b8104d 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 @@ -460,7 +460,8 @@ n.GRID_ID, g.GRID_NAME, a.ALL_PARENT_NAME, - a.ORGANIZATION_NAME AS AGENCY_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 From e725886b4210e444bc67ac105f970e09f5d18dd0 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 30 Aug 2022 15:12:44 +0800 Subject: [PATCH 290/397] =?UTF-8?q?=E3=80=90=E9=80=9A=E7=94=A8=E3=80=91?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=E4=B8=AD=E6=96=87=E5=90=8D=E5=AD=97?= =?UTF-8?q?=E7=9A=84=E6=89=93=E7=A0=81=E8=A7=84=E5=88=99=EF=BC=9B=E3=80=90?= =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82=E3=80=91=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E6=B2=BB=E7=90=86=E5=9B=BE=E5=B1=82=E5=88=97=E8=A1=A8=E5=AF=B9?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=90=8D=E5=AD=97=E6=89=93=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/annotation/MaskResponse.java | 1 + .../tools/processor/MaskProcessor.java | 24 +++++++++++++++++++ .../controller/IcResiUserController.java | 3 ++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/MaskResponse.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/MaskResponse.java index bb889a5913..26a0e2d01a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/MaskResponse.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/MaskResponse.java @@ -15,6 +15,7 @@ public @interface MaskResponse { */ String MASK_TYPE_ID_CARD = "ID_CARD"; String MASK_TYPE_MOBILE = "MOBILE"; + String MASK_TYPE_CHINESE_NAME = "CHINESE_NAME"; ///** // * 默认的一些字段，如果没有手动指定，就会使用默认的。如果手动指定了，就不再使用默认的 diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index 11b5c5ce4f..a3169a2ec6 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -133,11 +133,35 @@ public class MaskProcessor { return maskIdCard(originString); } else if (MaskResponse.MASK_TYPE_MOBILE.equals(maskType)) { return maskMobile(originString); + } else if (MaskResponse.MASK_TYPE_CHINESE_NAME.equals(maskType)) { + return maskChineseName(originString); } else { return originString; } } + /** + * 对中文人名进行打码 + * @param originString + * @return + */ + private String maskChineseName(String originString) { + if (StringUtils.isBlank(originString)) { + // 空串，或者只有一个字的，不打码，直接返回 + return originString; + } + + int length = originString.length(); + // 2个字以上的，首位字母明文，中间* + // 中文不能用\\w，要用[\u4e00-\u9fa5] + if (length == 2) { + return originString.replaceAll("^([\\u4e00-\\u9fa5]).*$", "$1*"); + } else { + String maskStr = StrUtil.repeat("*", length - 2); + return originString.replaceAll("^([\\u4e00-\\u9fa5]).*([\\u4e00-\\u9fa5])$", "$1" + maskStr + "$2"); + } + } + /** * 唯一整件号打码，可能是身份证号或者是护照号 * 将明文字符串打码变为掩码。保留前6，后面打码 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 3ef123383f..a62980703a 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 @@ -1365,7 +1365,8 @@ public class IcResiUserController implements ResultDataResolver { * @return */ @PostMapping("listresi-zhzl") - @MaskResponse(fieldNames = {"MOBILE", "ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + @MaskResponse(fieldNames = {"MOBILE", "ID_CARD", "NAME"}, + fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_CHINESE_NAME}) public Result>> listResiZhzl(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO) { pageFormDTO.setCustomerId(tokenDto.getCustomerId()); pageFormDTO.setStaffId(tokenDto.getUserId()); From 51983d4ca2d85d5d52e7c4545304d6f08db26784 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 30 Aug 2022 15:39:21 +0800 Subject: [PATCH 291/397] =?UTF-8?q?/icPartyMember/partyinfo=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=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/partymember/IcPartyMemberDao.xml | 1 + 1 file changed, 1 insertion(+) 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 17ba9f8a12..3cbb077a50 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 @@ -277,6 +277,7 @@ INNER JOIN ic_party_org ipo ON ipo.del_flag = '0' AND ipm.sszb = ipo.id WHERE pi.del_flag = '0' AND pi.user_id = #{userId} + and pi.CONFIRM_RESULT in('approved','auto_confirm_success') From f61830aec138acae89174e9dcf93e0611c9b8d3b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 30 Aug 2022 16:50:25 +0800 Subject: [PATCH 292/397] =?UTF-8?q?=E5=88=B0=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/commons/tools/utils/DateUtils.java | 1 + .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index 34511b68bc..2c0fc380e6 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -55,6 +55,7 @@ public class DateUtils { public final static String DATE_TIME_PATTERN_END_WITH_MINUTE = "yyyy-MM-dd HH:mm"; public static final String DATE_PATTERN_YYYYMMDD = "yyyyMMdd"; + public static final String DATE_PATTERN_YYYYMMDDHHMM = "yyyyMMddHHmm"; public static final String DATE_NAME_PATTERN = "yyyy年MM月dd日"; public static final String MONTH_NAME_PATTERN = "yyyy年MM月"; public static final String DATE_PATTERN_YYYY = "yyyy"; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 6db82bb81a..1383eeea2f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -735,7 +735,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl list=baseDao.selectNoPublishList(dateId); for(IcPartyActEntity act:list){ //置为已发布 From aaa4faefbb36469ed99ac85369024505c45eb503 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 30 Aug 2022 16:51:48 +0800 Subject: [PATCH 293/397] =?UTF-8?q?bug=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/IcMessageServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java index 660ea7f7fd..b50ad37940 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java @@ -100,6 +100,7 @@ public class IcMessageServiceImpl extends BaseServiceImpl Date: Tue, 30 Aug 2022 16:54:15 +0800 Subject: [PATCH 294/397] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91=E6=9C=8D=E5=8A=A1=E6=97=B6=E9=97=B4=E4=BD=BF?= =?UTF-8?q?=E7=94=A8easyexcel=E8=BD=AC=E5=8C=96=E5=99=A8=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?java=E5=92=8Cexcel=E6=95=B0=E6=8D=AE=E7=9A=84=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/WorkdiaryServiceRecordExcel.java | 9 ++- ...orkDiaryServiceEasyExcelDateConverter.java | 59 +++++++++++++++++++ .../WorkdiaryServiceRecordServiceImpl.java | 42 ++++++------- 3 files changed, 84 insertions(+), 26 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/converter/WorkDiaryServiceEasyExcelDateConverter.java diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java index 13a9afdfdd..7aa4089643 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.poi.excel.converter.EasyExcelDateConverter; import com.epmet.dto.result.WorkdiaryServiceRecordDTO; +import com.epmet.excel.converter.WorkDiaryServiceEasyExcelDateConverter; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.NoArgsConstructor; @@ -63,10 +64,8 @@ public class WorkdiaryServiceRecordExcel { @NotNull(message = "服务时间必填") @ColumnWidth(20) - @ExcelProperty(value = "服务时间") - //@DateTimeFormat("yyyy-MM-dd") - //@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private String serviceTime; + @ExcelProperty(value = "服务时间", converter = WorkDiaryServiceEasyExcelDateConverter.class) + private Date serviceTime; @ColumnWidth(20) @ExcelProperty(value = "备注") @@ -74,6 +73,6 @@ public class WorkdiaryServiceRecordExcel { public WorkdiaryServiceRecordExcel(WorkdiaryServiceRecordDTO dto) { BeanUtil.copyProperties(dto, this); - this.serviceTime = DateUtils.format(dto.getServiceTime()); + //this.serviceTime = DateUtils.format(dto.getServiceTime()); } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/converter/WorkDiaryServiceEasyExcelDateConverter.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/converter/WorkDiaryServiceEasyExcelDateConverter.java new file mode 100644 index 0000000000..3c5e99b00c --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/converter/WorkDiaryServiceEasyExcelDateConverter.java @@ -0,0 +1,59 @@ +package com.epmet.excel.converter; + +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.data.ReadCellData; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.metadata.property.ExcelContentProperty; + +import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.temporal.ChronoUnit; +import java.util.Date; + +/** + * 框架：easyexcel + * 目的：工作日志(服务)，对服务时间日期类型的转换 + */ +public class WorkDiaryServiceEasyExcelDateConverter implements Converter { + + private static final String PATTERN_YYYY_MM_DD = "yyyy-MM-dd"; + + /** + * excel内容转化为java时间 + * @param cellData + * @param contentProperty + * @param globalConfiguration + * @return + * @throws Exception + */ + public Date convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + if (cellData.getType() == CellDataTypeEnum.NUMBER) { + // 数字类型，是1900-01-03到excel中数据日期的天数差值 + LocalDateTime localDate = LocalDateTime.of(1900, 1, 1, 0, 0, 0) + // 不知为何，这个日期差值，多了2天，需要减去 + .minus(2L, ChronoUnit.DAYS) + .plus(cellData.getNumberValue().longValue(), ChronoUnit.DAYS); + return Date.from(localDate.atZone(ZoneId.systemDefault()).toInstant()); + } else { + // 字符串，正常格式化 + Date dateData = new SimpleDateFormat(PATTERN_YYYY_MM_DD).parse(cellData.getStringValue()); + return dateData; + } + } + + /** + * java日期转为excel内容 + * @param value + * @param contentProperty + * @param globalConfiguration + * @return + * @throws Exception + */ + public WriteCellData convertToExcelData(Date value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + String dataStr = new SimpleDateFormat(PATTERN_YYYY_MM_DD).format(value); + return new WriteCellData(dataStr); + } +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java index 7534b9a918..6128631c8a 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java @@ -480,26 +480,26 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl Date: Tue, 30 Aug 2022 17:00:59 +0800 Subject: [PATCH 295/397] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActSignInRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java index 14e22242e7..86c1869436 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -154,7 +154,7 @@ public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl Date: Tue, 30 Aug 2022 17:09:23 +0800 Subject: [PATCH 296/397] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/UserPointActionLogDao.xml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index 51740cf037..9797bd676f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -179,14 +179,22 @@ AND SOURCE_TYPE = #{type} - AND DATE_FORMAT(CREATED_TIME,'%Y') = #{startDate} + + AND DATE_FORMAT(CREATED_TIME,'%Y') = #{startDate} + - AND DATE_FORMAT(CREATED_TIME,'%Y%m') = #{startDate} + + AND DATE_FORMAT(CREATED_TIME,'%Y%m') = #{startDate} + - AND DATE_FORMAT(CREATED_TIME,'%Y%m') >= #{startDate} - AND DATE_FORMAT(CREATED_TIME,'%Y%m') <= #{endDate} + + AND DATE_FORMAT(CREATED_TIME,'%Y%m') >= #{startDate} + + + AND DATE_FORMAT(CREATED_TIME,'%Y%m') <= #{endDate} + ORDER BY CREATED_TIME DESC From b33758b65dd42a6254d7e5294075218ff14bc7dd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 30 Aug 2022 17:40:26 +0800 Subject: [PATCH 297/397] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=A4=E5=88=97pat?= =?UTF-8?q?h=E7=94=A8=E4=BA=8E=E5=89=8D=E7=AB=AF=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java | 7 ++++++- .../resi/partymember/dto/icpartyact/form/JoinOrgDTO.java | 8 +++++++- .../dto/icpartyact/result/IcPartyActDetailResDTO.java | 5 +++++ .../epmet/modules/partyOrg/entity/IcPartyActEntity.java | 5 ++++- .../modules/partyOrg/entity/IcPartyActOrgEntity.java | 4 ++++ .../resources/db/migration/V0.0.8__party_act_path.sql | 6 ++++++ 6 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.8__party_act_path.sql diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index 12beafec58..35c0f65d2c 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -126,10 +126,15 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { /** * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ - // @NotBlank(message = "publishOrgPath不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) // 后端接口内部去赋值，无需前端传入了 private String publishOrgPath; + /** + *发布活动党组织路径,前端用此列 + */ + @NotBlank(message = "publishOrgPathShow不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + private String publishOrgPathShow; + /** * 参加人员类型，0：全体党员；1：支部委员 */ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java index 02e746aca3..486e98be14 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java @@ -40,10 +40,15 @@ public class JoinOrgDTO implements Serializable { /** * PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ - // @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class}) // 后端接口内部去赋值，无需前端传入了 private String joinOrgPath; + /** + * PARTY_ORG_ID的全路径,前端用 + */ + @NotBlank(message = "joinOrgPathShow不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class}) + private String joinOrgPathShow; + //接口内部赋值 /** * 活动id @@ -60,5 +65,6 @@ public class JoinOrgDTO implements Serializable { * 详情接口返回 */ private String icPartyActOrgRecId; + } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java index 37f16e3274..564f101fb9 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java @@ -99,6 +99,11 @@ public class IcPartyActDetailResDTO implements Serializable { */ private String publishOrgPath; + /** + *发布活动党组织路径,前端用此列 + */ + private String publishOrgPathShow; + /** * 参加人员类型，0：全体党员；1：支部委员 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java index 23065472fb..3764f8d223 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java @@ -65,7 +65,10 @@ public class IcPartyActEntity extends BaseEpmetEntity { * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ private String publishOrgPath; - + /** + *发布活动党组织路径,前端用此列 + */ + private String publishOrgPathShow; /** * 活动类型，来源于ic_party_act_type_dict */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java index d628ccc457..23c131028a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java @@ -50,4 +50,8 @@ public class IcPartyActOrgEntity extends BaseEpmetEntity { */ private String joinOrgPath; + /** + * PARTY_ORG_ID的全路径,前端用 + */ + private String joinOrgPathShow; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.8__party_act_path.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.8__party_act_path.sql new file mode 100644 index 0000000000..072be997c1 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.8__party_act_path.sql @@ -0,0 +1,6 @@ +ALTER TABLE ic_party_act ADD COLUMN PUBLISH_ORG_PATH_SHOW VARCHAR ( 255 ) COMMENT '发布活动党组织路径,前端用此列' AFTER PUBLISH_ORG_PATH; +ALTER TABLE ic_party_act_org ADD COLUMN JOIN_ORG_PATH_SHOW VARCHAR ( 255 ) COMMENT 'PARTY_ORG_ID的全路径,前端用' AFTER JOIN_ORG_PATH; + +alter table ic_party_act MODIFY COLUMN PUBLISH_ORG_PATH VARCHAR(255) not null COMMENT'发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身'; + +alter table ic_party_act_org MODIFY COLUMN JOIN_ORG_PATH VARCHAR(255) not null COMMENT 'PARTY_ORG_ID的全路径，包含自身'; \ No newline at end of file From 6508faaabf44cd20f44316a1c86ae78a50718ef3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 30 Aug 2022 17:50:04 +0800 Subject: [PATCH 298/397] like --- .../src/main/java/com/epmet/commons/tools/utils/DateUtils.java | 2 +- .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index 2c0fc380e6..ebf9e4dbbb 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -55,7 +55,7 @@ public class DateUtils { public final static String DATE_TIME_PATTERN_END_WITH_MINUTE = "yyyy-MM-dd HH:mm"; public static final String DATE_PATTERN_YYYYMMDD = "yyyyMMdd"; - public static final String DATE_PATTERN_YYYYMMDDHHMM = "yyyyMMddHHmm"; + public static final String DATE_PATTERN_YYYYMMDDHHM = "yyyyMMddHHm"; public static final String DATE_NAME_PATTERN = "yyyy年MM月dd日"; public static final String MONTH_NAME_PATTERN = "yyyy年MM月"; public static final String DATE_PATTERN_YYYY = "yyyy"; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 1383eeea2f..e92a1040d2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -735,7 +735,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl list=baseDao.selectNoPublishList(dateId); for(IcPartyActEntity act:list){ //置为已发布 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 437085a29d..ad19154b21 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -238,7 +238,7 @@ WHERE a.DEL_FLAG = '0' AND a.IS_PUBLISH = '0' - AND DATE_FORMAT(a.AUTO_PUBLIC_TIME,'%Y%m%d%H%i') = #{dateId} + AND DATE_FORMAT(a.AUTO_PUBLIC_TIME,'%Y%m%d%H%i%s') like concat('%', #{dateId},'%') \ No newline at end of file From 51b6a93e996da86077bcfb81eb03489eed1d35af Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 31 Aug 2022 16:18:36 +0800 Subject: [PATCH 309/397] emm --- .../partymember/dto/partyOrg/form/YearSearchFormDTO.java | 6 ++++++ .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java index c821fd007f..5f92c375de 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.partymember.dto.partyOrg.form; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -22,6 +23,11 @@ public class YearSearchFormDTO implements Serializable { private String type; + /** + * 是否本人创建的活动，1：是；0：否 + */ + private String isSelf = NumConstant.ONE_STR; + private String staffId; private String customerId; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index ad19154b21..a1517327d7 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -80,7 +80,7 @@ AND pa.ORG_ID_PATH like concat('%',#{agencyId},'%') - + AND pa.PUBLISH_STAFF_ID = #{staffId} From 3191ab7a0eba3029ceea30fa489577d11d9cdbec Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 1 Sep 2022 09:43:38 +0800 Subject: [PATCH 310/397] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=B7=B2=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index a6eb03c9de..581faffa5f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -306,7 +306,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Thu, 1 Sep 2022 10:21:27 +0800 Subject: [PATCH 311/397] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcMessageDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml index 93a598b5fc..1ce15ca796 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -12,6 +12,7 @@ del_flag = '0' AND customer_id = #{customerId} AND user_id = #{userId} + ORDER BY create_time desc From d2cebe01880ae0317005e1d5197b254234fb3933 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 1 Sep 2022 10:22:22 +0800 Subject: [PATCH 312/397] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/PartyPointResultDTO.java | 1 + .../impl/UserPointActionLogServiceImpl.java | 67 ++++++++++--------- 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java index 13877d86bf..7449b9cc9d 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java @@ -25,6 +25,7 @@ public class PartyPointResultDTO implements Serializable { private String time; private String point; private String actId; + private String actTopic; private String actType; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date actDate; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index ae22f32df9..d8717a5313 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -623,39 +623,43 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl pagePartyPoint(PartyPointFormDTO formDTO) { List result = new LinkedList<>(); - if (StringUtils.isNotBlank(formDTO.getQuarter())) { - if (StringUtils.isNotBlank(formDTO.getMonth())) { + if (StringUtils.isNotBlank(formDTO.getYear())) { + if (StringUtils.isNotBlank(formDTO.getQuarter())) { + if (StringUtils.isNotBlank(formDTO.getMonth())) { + formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth())); + formDTO.setDateType(NumConstant.TWO_STR); + } else { + switch (formDTO.getQuarter()) { + case NumConstant.ONE_STR: + formDTO.setStartDate(formDTO.getYear().concat("01")); + formDTO.setEndDate(formDTO.getYear().concat("03")); + break; + case NumConstant.TWO_STR: + formDTO.setStartDate(formDTO.getYear().concat("04")); + formDTO.setEndDate(formDTO.getYear().concat("06")); + break; + case NumConstant.THREE_STR: + formDTO.setStartDate(formDTO.getYear().concat("07")); + formDTO.setEndDate(formDTO.getYear().concat("09")); + break; + case NumConstant.FOUR_STR: + formDTO.setStartDate(formDTO.getYear().concat("10")); + formDTO.setEndDate(formDTO.getYear().concat("12")); + break; + default: + break; + } + formDTO.setDateType(NumConstant.THREE_STR); + } + } else if (StringUtils.isNotBlank(formDTO.getMonth())) { formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth())); formDTO.setDateType(NumConstant.TWO_STR); } else { - switch (formDTO.getQuarter()) { - case NumConstant.ONE_STR: - formDTO.setStartDate(formDTO.getYear().concat("01")); - formDTO.setEndDate(formDTO.getYear().concat("03")); - break; - case NumConstant.TWO_STR: - formDTO.setStartDate(formDTO.getYear().concat("04")); - formDTO.setEndDate(formDTO.getYear().concat("06")); - break; - case NumConstant.THREE_STR: - formDTO.setStartDate(formDTO.getYear().concat("07")); - formDTO.setEndDate(formDTO.getYear().concat("09")); - break; - case NumConstant.FOUR_STR: - formDTO.setStartDate(formDTO.getYear().concat("10")); - formDTO.setEndDate(formDTO.getYear().concat("12")); - break; - default: - break; - } - formDTO.setDateType(NumConstant.THREE_STR); + formDTO.setStartDate(formDTO.getYear()); + formDTO.setDateType(NumConstant.ONE_STR); } - } else if (StringUtils.isNotBlank(formDTO.getMonth())){ - formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth())); - formDTO.setDateType(NumConstant.TWO_STR); } else { - formDTO.setStartDate(formDTO.getYear()); - formDTO.setDateType(NumConstant.ONE_STR); + formDTO.setDateType(NumConstant.FOUR_STR); } PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); List list =baseDao.getPagePartyPoint(formDTO); @@ -666,6 +670,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl> sortedMap = Maps.newLinkedHashMap(); map.entrySet().stream().sorted(Map.Entry.>comparingByKey().reversed()) .forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue())); - sortedMap.entrySet().forEach(e -> { + sortedMap.forEach((key, value) -> { PartyPointRecordResultDTO o = new PartyPointRecordResultDTO(); - o.setDate(e.getKey()); - o.setDailyList(e.getValue()); + o.setDate(key); + o.setDailyList(value); result.add(o); }); From 0d655142c69965f79d6505d15f78598d922f20b1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 1 Sep 2022 10:30:36 +0800 Subject: [PATCH 313/397] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=88=96=E8=80=85=E6=97=A5=E7=A8=8B=E5=88=A0=E9=99=A4=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E7=94=A8=E5=86=8D=E5=8F=91=E6=B6=88=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 581faffa5f..13998520e9 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -522,14 +522,16 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Thu, 1 Sep 2022 11:11:32 +0800 Subject: [PATCH 314/397] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/form/IcScheduleFormDTO.java | 38 ++++++++++++++++++ .../controller/IcScheduleController.java | 11 +++-- .../modules/partyOrg/dao/IcScheduleDao.java | 3 ++ .../partyOrg/service/IcScheduleService.java | 17 +++----- .../service/impl/IcScheduleServiceImpl.java | 27 ++++++++----- .../mapper/partyOrg/IcScheduleDao.xml | 40 +++++++++++++++++++ 6 files changed, 109 insertions(+), 27 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcScheduleFormDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcScheduleFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcScheduleFormDTO.java new file mode 100644 index 0000000000..859a8634fd --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcScheduleFormDTO.java @@ -0,0 +1,38 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@Data +public class IcScheduleFormDTO implements Serializable { + /** + * 日程标题 + */ + private String title; + /** + * 是否公开，0：仅自己可见；1：组织内其他人可见 + */ + private String isPublic; + /** + * 提醒开始时间 + */ + private String startTime; + /** + * 提醒结束时间 + */ + private String endTime; + + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = true; + private String agencyId; + + //token中信息 + private String customerId; + private String staffId; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index edae364122..6ce63ba706 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -13,6 +13,8 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,10 +35,11 @@ public class IcScheduleController { @Autowired private IcScheduleService icScheduleService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icScheduleService.page(params); - return new Result>().ok(page); + @RequestMapping("list") + public Result> list(@LoginUser TokenDto tokenDto, @RequestParam IcScheduleFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icScheduleService.list(formDTO)); } @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java index 131ef13279..f91dd25d78 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -2,9 +2,11 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.ibatis.annotations.Mapper; @@ -26,4 +28,5 @@ public interface IcScheduleDao extends BaseDao { List getScheduleList(ActAndScheduleListFormDTO formDTO); + List selectScheduleList(IcScheduleFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java index dbfc499d81..c38bb4fece 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java @@ -3,8 +3,11 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; import java.util.List; import java.util.Map; @@ -17,25 +20,15 @@ import java.util.Map; */ public interface IcScheduleService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-08-18 - */ - PageData page(Map params); - /** * 默认查询 * - * @param params + * @param formDTO * @return java.util.List * @author generator * @date 2022-08-18 */ - List list(Map params); + PageData list(IcScheduleFormDTO formDTO); /** * 单条查询 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java index 2d38215d07..55ed864c00 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -18,9 +18,14 @@ import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.modules.partyOrg.service.IcScheduleService; +import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; import com.epmet.send.SendMqMsgUtil; +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.stereotype.Service; @@ -39,20 +44,20 @@ import java.util.Map; @Service public class IcScheduleServiceImpl extends BaseServiceImpl implements IcScheduleService { - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcScheduleDTO.class); - } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public PageData list(IcScheduleFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + //获取工作人员所属组织信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getStaffId())); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); - return ConvertUtils.sourceToTarget(entityList, IcScheduleDTO.class); + List list = baseDao.selectScheduleList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); } private QueryWrapper getWrapper(Map params){ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 496e62d960..5a470bd672 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -68,4 +68,44 @@ AND (IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0')) order by REMIND_TIME desc + + + \ No newline at end of file From 3a3e10bd609bcbe5abb6a71d96ea9a4601c8cde7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 1 Sep 2022 13:48:30 +0800 Subject: [PATCH 315/397] /icSchedule/list --- .../modules/partyOrg/controller/IcScheduleController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index 6ce63ba706..58ed109f1f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -14,12 +14,10 @@ import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; /** @@ -36,7 +34,7 @@ public class IcScheduleController { private IcScheduleService icScheduleService; @RequestMapping("list") - public Result> list(@LoginUser TokenDto tokenDto, @RequestParam IcScheduleFormDTO formDTO){ + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcScheduleFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icScheduleService.list(formDTO)); From de1f04cb89f68598a9c661f56b8dc4c13394c58f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 1 Sep 2022 13:48:44 +0800 Subject: [PATCH 316/397] method --- .../modules/partyOrg/controller/IcScheduleController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index 6ce63ba706..224743080d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -14,12 +14,10 @@ import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; /** @@ -35,7 +33,7 @@ public class IcScheduleController { @Autowired private IcScheduleService icScheduleService; - @RequestMapping("list") + @RequestMapping(value = "list",method = {RequestMethod.POST,RequestMethod.GET}) public Result> list(@LoginUser TokenDto tokenDto, @RequestParam IcScheduleFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); From 0e300994b661e09f0fa02630c206763b6e3fd590 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 1 Sep 2022 13:52:22 +0800 Subject: [PATCH 317/397] method --- .../controller/IcScheduleController.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index 8107ef54dd..224743080d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -1,6 +1,23 @@ package com.epmet.modules.partyOrg.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.AssertUtils; +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.modules.partyOrg.service.IcScheduleService; +import com.epmet.resi.partymember.dto.IcScheduleDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** From 478688d77605a9214d7bfe2da3f487125cef26dc Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 1 Sep 2022 13:53:12 +0800 Subject: [PATCH 318/397] method --- .../epmet/modules/partyOrg/controller/IcScheduleController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index 224743080d..582c331c50 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -34,7 +34,7 @@ public class IcScheduleController { private IcScheduleService icScheduleService; @RequestMapping(value = "list",method = {RequestMethod.POST,RequestMethod.GET}) - public Result> list(@LoginUser TokenDto tokenDto, @RequestParam IcScheduleFormDTO formDTO){ + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcScheduleFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icScheduleService.list(formDTO)); From 77c87d567a9f7993911ccf5a991177ef842eafda Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 1 Sep 2022 15:21:31 +0800 Subject: [PATCH 319/397] CREATED_TIME --- .../src/main/resources/mapper/IcMessageDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml index 1ce15ca796..f8b8e8b286 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -12,7 +12,7 @@ del_flag = '0' AND customer_id = #{customerId} AND user_id = #{userId} - ORDER BY create_time desc + ORDER BY CREATED_TIME desc From 336a54e3c98833d9268a441d52f77403f1a2a63d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 09:22:46 +0800 Subject: [PATCH 320/397] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/service/impl/IcScheduleServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java index 55ed864c00..0893676ed4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -1,7 +1,6 @@ package com.epmet.modules.partyOrg.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.rocketmq.messages.PartyMeetingMessageMQMsg; import com.epmet.commons.tools.constant.FieldConstant; @@ -18,11 +17,9 @@ import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.modules.partyOrg.service.IcScheduleService; -import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -120,7 +117,7 @@ public class IcScheduleServiceImpl extends BaseServiceImpl Date: Fri, 2 Sep 2022 10:17:44 +0800 Subject: [PATCH 321/397] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/result/IcScheduleListDTO.java | 70 +++++++++++++++++++ .../controller/IcScheduleController.java | 61 +++++++++++++++- .../modules/partyOrg/dao/IcScheduleDao.java | 3 +- .../partyOrg/excel/IcScheduleListExcel.java | 26 +++++++ .../partyOrg/service/IcScheduleService.java | 6 +- .../service/impl/IcScheduleServiceImpl.java | 7 +- .../mapper/partyOrg/IcScheduleDao.xml | 5 +- 7 files changed, 167 insertions(+), 11 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcScheduleListExcel.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java new file mode 100644 index 0000000000..b048b49357 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java @@ -0,0 +1,70 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 日程表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Data +public class IcScheduleListDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 当前登录用户userId + */ + private String staffId; + + /** + * 日程标题（35字） + */ + private String title; + + /** + * 提醒时间；其实就是日程所属日期 + */ + private Date remindTime; + + /** + * 提醒时间；其实就是日程所属日期 + */ + private String remindTimeName; + + /** + * 是否公开，0：仅自己可见；1：组织内其他人可见 + */ + private String isPublic; + + /** + * 是否公开，0：是 1：否 + */ + private String isPublicName; + + /** + * 备注（500字） + */ + private String remark; + + /** + * 创建时间 + */ + private Date createdTime; + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index 582c331c50..cc45d2e7bf 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -1,22 +1,41 @@ package com.epmet.modules.partyOrg.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.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +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.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.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.modules.partyOrg.excel.IcScheduleListExcel; import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcScheduleListDTO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; 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; @@ -28,16 +47,17 @@ import java.util.List; */ @RestController @RequestMapping("icSchedule") +@Slf4j public class IcScheduleController { @Autowired private IcScheduleService icScheduleService; @RequestMapping(value = "list",method = {RequestMethod.POST,RequestMethod.GET}) - public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcScheduleFormDTO formDTO){ + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcScheduleFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); - return new Result>().ok(icScheduleService.list(formDTO)); + return new Result>().ok(icScheduleService.list(formDTO)); } @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) @@ -99,5 +119,42 @@ public class IcScheduleController { icScheduleService.delSchedule(scheduleIds); return new Result(); } + + @PostMapping("export") + public void export(@LoginUser TokenDto tokenDto, @RequestBody IcScheduleFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + 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), IcScheduleListExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icScheduleService.list(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcScheduleListExcel.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/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java index f91dd25d78..a433a07392 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -9,6 +9,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcScheduleListDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -28,5 +29,5 @@ public interface IcScheduleDao extends BaseDao { List getScheduleList(ActAndScheduleListFormDTO formDTO); - List selectScheduleList(IcScheduleFormDTO formDTO); + List selectScheduleList(IcScheduleFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcScheduleListExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcScheduleListExcel.java new file mode 100644 index 0000000000..72e0a4002b --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcScheduleListExcel.java @@ -0,0 +1,26 @@ +package com.epmet.modules.partyOrg.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +@Data +public class IcScheduleListExcel { + + @ExcelProperty(value = "日程标题") + @ColumnWidth(20) + private String title; + + @ExcelProperty(value = "提醒时间") + @ColumnWidth(20) + private String remindTimeName; + + @ExcelProperty(value = "是否公开") + @ColumnWidth(20) + private String isPublicName; + + @ExcelProperty(value = "备注") + @ColumnWidth(25) + private String remark; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java index c38bb4fece..ebd7f6f6dd 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java @@ -3,14 +3,12 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; -import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcScheduleListDTO; import java.util.List; -import java.util.Map; /** * 日程表 @@ -28,7 +26,7 @@ public interface IcScheduleService extends BaseService { * @author generator * @date 2022-08-18 */ - PageData list(IcScheduleFormDTO formDTO); + PageData list(IcScheduleFormDTO formDTO); /** * 单条查询 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java index 0893676ed4..96a952c5cd 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -20,6 +20,7 @@ import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcScheduleListDTO; import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -43,7 +44,7 @@ public class IcScheduleServiceImpl extends BaseServiceImpl list(IcScheduleFormDTO formDTO) { + public PageData list(IcScheduleFormDTO formDTO) { PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); //获取工作人员所属组织信息 CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); @@ -52,8 +53,8 @@ public class IcScheduleServiceImpl extends BaseServiceImpl list = baseDao.selectScheduleList(formDTO); - PageInfo pageInfo = new PageInfo<>(list); + List list = baseDao.selectScheduleList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 5a470bd672..8d6c2295a4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -69,14 +69,16 @@ order by REMIND_TIME desc - SELECT id, customer_id, staff_id, title, remind_time, + DATE_FORMAT(remind_time,'%Y-%m-%d %H:%i:%s')remindTimeName, is_public, + IF (is_public = '0', '仅自己可见', '组织内其他人可见') "isPublicName", remark, created_time FROM @@ -108,4 +110,5 @@ order by remind_time desc + \ No newline at end of file From 663f146cddb30aa2796f82c570638f060b4b416e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 2 Sep 2022 14:50:13 +0800 Subject: [PATCH 322/397] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E5=85=9A?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E8=AE=A4=E8=AF=81=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=97=B6=20=E8=87=AA=E5=8A=A8=E6=A0=A1=E9=AA=8C=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=8E=BB=E6=95=B0=E5=AD=97=E5=B9=B3=E5=8F=B0=E5=85=9A?= =?UTF-8?q?=E5=91=98=E5=BA=93=E6=9F=A5=E8=AF=A2=E4=B8=94=E5=8F=AA=E6=8C=89?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E6=A0=A1=E9=AA=8C=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=85=9A=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PartyMemberConfirmServiceImpl.java | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 961197076d..a980778c64 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.modules.partymember.service.impl; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -21,6 +22,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; import com.epmet.modules.feign.ResiGroupFeignClient; +import com.epmet.modules.partymember.dao.IcPartyMemberDao; import com.epmet.modules.partymember.entity.*; import com.epmet.modules.partymember.redis.PartymemberInfoRedis; import com.epmet.modules.partymember.service.*; @@ -86,6 +88,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService private PartymemberAuthRecordService partymemberAuthRecordService; @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + @Autowired + private IcPartyMemberDao icPartyMemberDao; @Override @Transactional(rollbackFor = Exception.class) @@ -191,8 +195,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService } //获取党员基本信息(匹配) - PartymemberConfirmAutoDTO confirmAutoDTO = - partymemberBaseInfoService.getPartyMemberBaseInfo(partyMemberInfoDTO); + //PartymemberConfirmAutoDTO confirmAutoDTO = partymemberBaseInfoService.getPartyMemberBaseInfo(partyMemberInfoDTO); + PartymemberConfirmAutoDTO confirmAutoDTO = partyAuth(partyMemberInfoDTO); //判断是否已注册居民，如果没有则注册居民 isResiRegister(partyMemberInfoDTO); @@ -294,6 +298,30 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService return result; } + /** + * 居民点党员提交认证校验逻辑调整改查数字平台党员信息库， + * 切只按身份证号查询 + */ + public PartymemberConfirmAutoDTO partyAuth(PartymemberInfoDTO dto) { + PartymemberConfirmAutoDTO resultDTO = new PartymemberConfirmAutoDTO(); + if (StringUtils.isBlank(dto.getIdCard())) { + resultDTO.setComparisonResults(false); + return resultDTO; + } + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcPartyMemberEntity::getCustomerId, dto.getCustomerId()); + tWrapper.eq(IcPartyMemberEntity::getIdCard, dto.getIdCard()); + tWrapper.last("limit 1"); + IcPartyMemberEntity entity = icPartyMemberDao.selectOne(tWrapper); + if (null == entity) { + resultDTO.setComparisonResults(false); + return resultDTO; + } + resultDTO.setComparisonResults(true); + resultDTO.setPatryMemberBaseInfoId(entity.getId()); + return resultDTO; + } + @Override @Transactional(rollbackFor = Exception.class) public Result partyMemberInfoExtra(PartymemberInfoDTO infoDTO) { From a70340792b9058ec91efa2a44574568a2e3d5d48 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 2 Sep 2022 14:52:03 +0800 Subject: [PATCH 323/397] getScheduleAndActCount --- .../dto/partyOrg/form/HomeMonthTotalFormDTO.java | 2 +- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 10 +++++----- .../main/resources/mapper/partyOrg/IcScheduleDao.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java index 396ba3611a..cc9f2cdd8d 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java @@ -44,5 +44,5 @@ public class HomeMonthTotalFormDTO implements Serializable { */ private String agencyId; - private String path; + // private String path; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 13998520e9..639d058bf4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -122,11 +122,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl getHomeMonthTotal(HomeMonthTotalFormDTO formDTO) { CustomerStaffInfoCacheResult staffInfo = queryStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); formDTO.setAgencyId(staffInfo.getAgencyId()); - IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId()); - if (null == icPartyOrgDTO){ - throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId()); - } - formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId())); + // IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId()); + // if (null == icPartyOrgDTO){ + // throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId()); + // } + // formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId())); List result = constructMonthData(formDTO.getYearId()); List countList = scheduleDao.getScheduleAndActCount(formDTO); if (CollectionUtils.isNotEmpty(countList)){ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 8d6c2295a4..cb56d450fb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -40,7 +40,7 @@ AND PUBLISH_STAFF_ID = #{staffId} - AND PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') + AND (PUBLISH_PARTY_ORG_ID = #{orgId} or PUBLISH_ORG_PATH LIKE CONCAT('%',#{orgId},'%')) GROUP BY HOLD_MONTH_ID)t GROUP BY t.monthId From 3e140df253f864f9b302ff102b088f0997bc3f60 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 2 Sep 2022 15:08:06 +0800 Subject: [PATCH 324/397] =?UTF-8?q?=E5=90=8C=E4=B8=80=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E4=B8=8B=E6=A5=BC=E6=A0=8B=E4=B8=8D=E9=87=8D=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 1 + .../constant/ImportErrorMsgConstants.java | 1 + .../java/com/epmet/dao/IcBuildingDao.java | 9 +++++ .../model/ImportBuildingInfoListener.java | 6 ++++ .../epmet/model/ImportHouseInfoListener.java | 8 ++++- .../service/impl/BuildingServiceImpl.java | 11 ++++++ .../main/resources/mapper/IcBuildingDao.xml | 35 +++++++++++++++++++ 7 files changed, 70 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 163dee5e2f..405d84d4ae 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -85,6 +85,7 @@ public enum EpmetErrorCode { BUILDING_NAME_EXITED(8215,"楼栋名称已存在"), DOOR_NAME_EXITED(8216,"门牌号已存在"), NEIGHBOOR_NAME_EXITED(8217,"小区名称已存在"), + BUILDING_NAME_EXITED_IN_GRID(8218,"小区下该楼栋已存在于其他网格"), REQUIRE_PERMISSION(8301, "您没有足够的操作权限"), THIRD_PLAT_REQUEST_ERROR(8302, "请求第三方平台错误"), diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java index 85f0d846f7..50d0b7931c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java @@ -25,5 +25,6 @@ public interface ImportErrorMsgConstants { String HOUSE_ERROR_NAME = "导入失败的列表-房屋"; String BUILDING_ERROR_NAME = "导入失败的列表-楼栋"; String NEIGHBORHOOD_ERROR_NAME = "导入失败的列表-小区"; + String BUILDING_NAME_EXITED_IN_GRID = "小区下该楼栋已存在于其他网格"; } 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 4e963af722..46f0041e8d 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 @@ -67,6 +67,15 @@ public interface IcBuildingDao extends BaseDao { List baseInfoFamilyBuilding(@Param("neighborHoodId")String neighborHoodId); Integer checkBuildName(@Param("neighborHoodId") String neighborHoodId,@Param("buildingName")String buildingName, @Param("buildingId")String buildingId); + Integer checkBuildNameV2(@Param("agencyId") String agencyId, + @Param("neighborHoodName") String neighborHoodName, + @Param("buildingName")String buildingName, + @Param("buildingId")String buildingId); + Integer checkBuildNameV3(@Param("agencyId") String agencyId, + @Param("gridId") String gridId, + @Param("neighborHoodName") String neighborHoodName, + @Param("buildingName")String buildingName, + @Param("buildingId")String buildingId); List buildingListByIds(@Param("buildingIdList") List buildingIdList); IPage buildingListByIds(IPage page,@Param("buildingIdList") List buildingIdList); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java index e567bf017d..79009b1039 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java @@ -210,6 +210,12 @@ public class ImportBuildingInfoListener extends AnalysisEventListener 0){ + // 说明数据库已存在此楼栋，不需添加 + nums.add(num); + disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_NAME_EXITED_IN_GRID); + } if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){ List gridIds = new ArrayList<>(); if (orgType.equals(CustomerGridConstant.GRID)){ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index 812792b964..194f39eb54 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -3,12 +3,12 @@ package com.epmet.model; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; 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.constant.CustomerGridConstant; +import com.epmet.constant.ImportErrorMsgConstants; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcBuildingDao; import com.epmet.dto.IcHouseDTO; @@ -489,6 +489,12 @@ public class ImportHouseInfoListener extends AnalysisEventListener 0){ + // 说明数据库已存在此楼栋，不需添加 + nums.add(num); + disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_NAME_EXITED_IN_GRID); + } if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){ List gridIds = new ArrayList<>(); if (orgType.equals(CustomerGridConstant.GRID)){ 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 86e54b4356..36dde00dfe 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 @@ -102,9 +102,15 @@ public class BuildingServiceImpl implements BuildingService { public void addBuilding(String customerId, IcBulidingAddFormDTO formDTO) { //同一小区下不能存在楼栋名字一样的 Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(), formDTO.getBuildingName(), null); + 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); + if (null != count && count > 0) { + throw new EpmetException(EpmetErrorCode.BUILDING_NAME_EXITED_IN_GRID.getCode()); + } //楼栋编码不可重复 if(org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getCoding())){ IcBuildingEntity isHaveCoding = icBuildingDao.selectByCoding(formDTO.getCoding(),null); @@ -475,6 +481,11 @@ 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()); + if (null != count && count > 0) { + throw new EpmetException(EpmetErrorCode.BUILDING_NAME_EXITED_IN_GRID.getCode()); + } IcBuildingDTO icBuilding = icBuildingService.get(formDTO.getBuildingId()); if (!icBuilding.getNeighborHoodId().equals(formDTO.getNeighborHoodId())) { //更新对应房屋小区id 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 8e6b5dd039..1512e7b23e 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 @@ -247,6 +247,41 @@ + + + + From af06a1c8e6be8670b3566a37db56bb6cc63278d0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 15:45:36 +0800 Subject: [PATCH 326/397] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E5=8F=8D=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java index b048b49357..8f6b83bd33 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java @@ -41,6 +41,7 @@ public class IcScheduleListDTO implements Serializable { * 提醒时间；其实就是日程所属日期 */ private Date remindTime; + private Date happenedTime; /** * 提醒时间；其实就是日程所属日期 From cb1fc0712571ca56d92d25ee9485833a6bb09f9c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 15:52:39 +0800 Subject: [PATCH 327/397] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E5=8F=8D=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index eb00869c58..33c4494fb8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -77,8 +77,8 @@ staff_id, title, remind_time, - happened_time, DATE_FORMAT(remind_time,'%Y-%m-%d %H:%i:%s')remindTimeName, + DATE_FORMAT(happened_time,'%Y-%m-%d %H:%i:%s')happenedTime, is_public, IF (is_public = '0', '仅自己可见', '组织内其他人可见') "isPublicName", remark, From 074f292b0711bf77c2a96b5fc11ff31679a07280 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 2 Sep 2022 15:59:30 +0800 Subject: [PATCH 328/397] =?UTF-8?q?=E6=96=B0=E5=A2=9E/=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=A5=E7=A8=8B=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF=EF=BC=9B=E6=94=B9=E4=B8=BA=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8E=BB=E6=A3=80=E7=B4=A2=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E9=86=92=E6=97=A5=E6=9C=9F=3D=E5=BD=93=E5=89=8D=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E7=9A=84=E6=97=A5=E7=A8=8B=EF=BC=8C=E7=BB=9F=E4=B8=80?= =?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 --- .../modules/partyOrg/dao/IcScheduleDao.java | 3 ++- .../service/impl/IcPartyActServiceImpl.java | 14 ++++++++++++- .../service/impl/IcScheduleServiceImpl.java | 20 ++++++++----------- .../mapper/partyOrg/IcScheduleDao.xml | 10 +++++++++- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java index a433a07392..996d46c361 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -2,7 +2,6 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; -import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; @@ -30,4 +29,6 @@ public interface IcScheduleDao extends BaseDao { List getScheduleList(ActAndScheduleListFormDTO formDTO); List selectScheduleList(IcScheduleFormDTO formDTO); + + List selectNeedNotice(String dateId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 639d058bf4..20740c71f1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -84,7 +84,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl scheduleEntityList=icScheduleDao.selectNeedNotice(dateId); + for(IcScheduleEntity icScheduleEntity:scheduleEntityList){ + PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); + msg.setCustomerId(icScheduleEntity.getCustomerId()); + msg.setIcPartyActId(icScheduleEntity.getId()); + msg.setType("notify"); + SendMqMsgUtil.build() + .openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class)) + .sendRocketMqMsg(SystemMessageType.PARTY_MEETING_MESSAGE, msg); + } } /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java index 96a952c5cd..87fe5d0dfa 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -2,7 +2,6 @@ package com.epmet.modules.partyOrg.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; @@ -11,9 +10,6 @@ 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.utils.ConvertUtils; -import com.epmet.commons.tools.utils.SpringContextUtils; -import com.epmet.constant.SystemMessageType; -import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.modules.partyOrg.service.IcScheduleService; @@ -21,7 +17,6 @@ import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcScheduleListDTO; -import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; @@ -120,13 +115,14 @@ public class IcScheduleServiceImpl extends BaseServiceImpl - + \ No newline at end of file From 12407567ca8a5008e18125bd0adb84b5af836de6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 16:17:21 +0800 Subject: [PATCH 329/397] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E5=8F=8D=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/result/ActAndScheduleListResultDTO.java | 1 + .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java index 218c29a284..bc320d7a8c 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java @@ -61,6 +61,7 @@ public class ActAndScheduleListResultDTO implements Serializable { private String scheduleId; private String title; private String remindTime; + private String happenedTime; private String remark; private Boolean isMe = false; private String staffId; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index b51ff2acb1..c33134f176 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -49,7 +49,7 @@ ID AS scheduleId, TITLE, DATE_FORMAT(REMIND_TIME,'%Y-%m-%d %H:%i:%s') AS remindTime, - DATE_FORMAT(happened_time,'%Y-%m-%d %H:%i:%s') AS happenedTime, + DATE_FORMAT(happened_time,'%Y-%m-%d') AS happenedTime, DATE_FORMAT(HAPPENED_TIME,'%Y%m%d') AS dateId, REMARK, STAFF_ID @@ -78,7 +78,7 @@ title, remind_time, DATE_FORMAT(remind_time,'%Y-%m-%d %H:%i:%s')remindTimeName, - DATE_FORMAT(happened_time,'%Y-%m-%d %H:%i:%s')happenedTime, + DATE_FORMAT(happened_time,'%Y-%m-%d')happenedTime, is_public, IF (is_public = '0', '仅自己可见', '组织内其他人可见') "isPublicName", remark, From 8872c4c047078d2080c99b1d3a430d6e78276068 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 16:24:25 +0800 Subject: [PATCH 330/397] time --- .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index c33134f176..5367439c04 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -48,8 +48,8 @@ SELECT ID AS scheduleId, TITLE, - DATE_FORMAT(REMIND_TIME,'%Y-%m-%d %H:%i:%s') AS remindTime, - DATE_FORMAT(happened_time,'%Y-%m-%d') AS happenedTime, + DATE_FORMAT(REMIND_TIME,'%Y-%m-%d') AS remindTime, + DATE_FORMAT(happened_time,'%Y-%m-%d %H:%i:%s') AS happenedTime, DATE_FORMAT(HAPPENED_TIME,'%Y%m%d') AS dateId, REMARK, STAFF_ID @@ -77,8 +77,8 @@ staff_id, title, remind_time, - DATE_FORMAT(remind_time,'%Y-%m-%d %H:%i:%s')remindTimeName, - DATE_FORMAT(happened_time,'%Y-%m-%d')happenedTime, + DATE_FORMAT(remind_time,'%Y-%m-%d')remindTimeName, + DATE_FORMAT(happened_time,'%Y-%m-%d %H:%i:%s')happenedTime, is_public, IF (is_public = '0', '仅自己可见', '组织内其他人可见') "isPublicName", remark, From f87e18a900676f6e326d708342cc02529ecbb23c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 2 Sep 2022 16:41:19 +0800 Subject: [PATCH 331/397] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E6=8E=A8=E6=B6=88?= =?UTF-8?q?=E6=81=AF=20=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 20740c71f1..c4ebf7e8b4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -614,7 +614,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Fri, 2 Sep 2022 17:12:39 +0800 Subject: [PATCH 332/397] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=B8=BB=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index eed66dd07b..bb1b090fe7 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -73,7 +73,7 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { * 活动主题 */ @NotBlank(message = "活动主题不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) - @Length(max = 35, message = "最多输入35个字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + @Length(max = 35, message = "活动主题最多输入35个字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) private String topic; /** From 8fa9cc51ebd7137900732359195f8a70c5cdf9ea Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 5 Sep 2022 09:18:17 +0800 Subject: [PATCH 333/397] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=94=99=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index c4ebf7e8b4..52d1c14c2a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -731,7 +731,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl scheduleEntityList=icScheduleDao.selectNeedNotice(dateId); + String nowDateId=DateUtils.format(new Date(),DateUtils.DATE_PATTERN_YYYYMMDD); + List scheduleEntityList=icScheduleDao.selectNeedNotice(nowDateId); for(IcScheduleEntity icScheduleEntity:scheduleEntityList){ PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); msg.setCustomerId(icScheduleEntity.getCustomerId()); From ac1f033ce4d4d87a8cfc394e886b857541a18a97 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 5 Sep 2022 10:25:49 +0800 Subject: [PATCH 334/397] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index e43e4493d0..69016d493e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -226,7 +226,7 @@ WHERE del_flag = '0' AND party_org_type = '5' - AND agency_pids LIKE CONCAT('%', #{agencyId}, '%') + AND (AGENCY_ID = #{agencyId} OR agency_pids LIKE CONCAT('%', #{agencyId}, '%')) ORDER BY org_pids ASC From 494de9abed22974ff7b284da2a131484ab435a97 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 5 Sep 2022 11:04:36 +0800 Subject: [PATCH 335/397] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/service/impl/PartymemberInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java index 9f2678f246..354236fe49 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java @@ -265,6 +265,7 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl updateWrapper=new LambdaUpdateWrapper<>(); updateWrapper.eq(PartymemberInfoEntity::getUserId,userId); updateWrapper.set(PartymemberInfoEntity::getIdCard,idNum); + updateWrapper.set(PartymemberInfoEntity::getUpdatedTime,new Date()); baseDao.update(null,updateWrapper); } } From c32f7e303b895dfff34b2fe9e5fa47c405f79339 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 5 Sep 2022 13:56:26 +0800 Subject: [PATCH 336/397] =?UTF-8?q?=E5=90=8C=E4=B8=80=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E4=B8=8B=E6=A5=BC=E6=A0=8B=E4=B8=8D=E9=87=8D=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/model/ImportBuildingInfoListener.java | 1 + .../src/main/java/com/epmet/model/ImportHouseInfoListener.java | 1 + 2 files changed, 2 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java index 79009b1039..38f8e3b494 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java @@ -215,6 +215,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener gridIds = new ArrayList<>(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index 194f39eb54..b8f1c41ce2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -494,6 +494,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener gridIds = new ArrayList<>(); From a1203949c40b8eb98f22a78d07c61c6ee8e54240 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 6 Sep 2022 11:02:11 +0800 Subject: [PATCH 337/397] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/dto/group/result/GroupDetailResultDTO.java | 4 ++++ .../modules/group/service/impl/ResiGroupServiceImpl.java | 5 +++++ .../main/resources/mapper/group/GroupEditSubmitRecordDao.xml | 1 + 3 files changed, 10 insertions(+) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java index 7d08176f31..f7444bdc17 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java @@ -26,4 +26,8 @@ public class GroupDetailResultDTO { private String leaderId; /** 当前用户是否是群主 */ private String groupLeaderFlag; + /** + * 所属党组织 + */ + private String partyOrgId; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index e21ce83878..54d83ed951 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1473,10 +1473,15 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Tue, 6 Sep 2022 14:14:24 +0800 Subject: [PATCH 338/397] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/ResiGroupServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 54d83ed951..bbfff94490 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1481,7 +1481,6 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Tue, 6 Sep 2022 15:02:03 +0800 Subject: [PATCH 339/397] =?UTF-8?q?=E4=BD=A0=E5=A5=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcMessageDTO.java | 2 +- .../src/main/java/com/epmet/entity/IcMessageEntity.java | 2 +- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java index 3451d342f3..1c7e9e9785 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java @@ -42,7 +42,7 @@ public class IcMessageDTO implements Serializable { private String app; /** - * 消息分类 党建小助手:party + * 消息分类 党建活动：party_act 党建日程：party_schedule */ private String messageType; diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java index dc937c6639..e13ee49b0a 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java @@ -42,7 +42,7 @@ public class IcMessageEntity extends BaseEpmetEntity { private String app; /** - * 消息分类 党建小助手:party + * 消息分类 党建活动：party_act 党建日程：party_schedule */ private String messageType; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 52d1c14c2a..c5d1d7244b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -572,7 +572,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Tue, 6 Sep 2022 15:39:16 +0800 Subject: [PATCH 340/397] =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.3.20__alter_ic_message.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.20__alter_ic_message.sql diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.20__alter_ic_message.sql b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.20__alter_ic_message.sql new file mode 100644 index 0000000000..d962d2763e --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.20__alter_ic_message.sql @@ -0,0 +1,2 @@ +ALTER TABLE epmet_message.`ic_message` +MODIFY COLUMN `message_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息分类 \r\n党建活动：party_act \r\n党建日程：party_schedule \r\n' AFTER `app`; From 8972a3249db7909310e6934b4be2c276777f3786 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 6 Sep 2022 17:08:00 +0800 Subject: [PATCH 341/397] emm --- .../dto/IcPointNucleicMonitoringDTO.java | 5 ++ .../epmet/dto/result/MapInfoResultDTO.java | 5 ++ .../controller/IcPointAppController.java | 12 +++- .../dao/IcPointNucleicMonitoringDao.java | 8 +++ .../IcPointNucleicMonitoringEntity.java | 8 ++- .../com/epmet/service/IcPointAppService.java | 16 +++--- .../IcPointNucleicMonitoringService.java | 8 +++ .../service/impl/IcPointAppServiceImpl.java | 56 +++++-------------- .../IcPointNucleicMonitoringServiceImpl.java | 17 ++++-- ...ter_ic_point_nucleic_monitoring_enable.sql | 1 + .../mapper/IcPointNucleicMonitoringDao.xml | 10 ++++ 11 files changed, 86 insertions(+), 60 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.68__alter_ic_point_nucleic_monitoring_enable.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java index 3a29fb0afc..08f51a1e5e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java @@ -66,6 +66,11 @@ public class IcPointNucleicMonitoringDTO implements Serializable { */ private String address; + /** + * 未禁用enable,已禁用disabled + */ + private String enableFlag; + /** * 经度 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java index 896d1195fc..12d9cf0db4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java @@ -77,6 +77,11 @@ public class MapInfoResultDTO implements Serializable { */ private String latitude; + /** + * 未禁用enable,已禁用disabled + */ + private String enableFlag; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java index b6f3edb0a7..c5c6ca64c3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java @@ -43,7 +43,17 @@ public class IcPointAppController { return icPointAppService.getMapInfoByPointType(formDTO); } - + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + @PostMapping("enableOrDisabled/{id}") + public Result enableOrDisabled(@PathVariable("id") String id){ + icPointAppService.enableOrDisabled(id); + return new Result(); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java index eae4085362..908cf46e44 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java @@ -49,4 +49,12 @@ public interface IcPointNucleicMonitoringDao extends BaseDao getMapInfoList(MapInfoFormDTO formDTO); + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + void enableOrDisabled(@Param("id") String id); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java index 4a05b5d850..e9e54456cc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java @@ -1,13 +1,10 @@ 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; - /** * 核酸监测点 * @@ -66,6 +63,11 @@ public class IcPointNucleicMonitoringEntity extends BaseEpmetEntity { */ private String address; + /** + * 未禁用enable,已禁用disabled + */ + private String enableFlag; + /** * 经度 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java index 6d6f7626d9..f626bc4e01 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java @@ -1,18 +1,10 @@ package com.epmet.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.commons.tools.utils.Result; -import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.form.MapInfoFormDTO; import com.epmet.dto.result.MapInfoResultDTO; -import com.epmet.entity.IcPointNucleicMonitoringEntity; -import org.springframework.web.bind.annotation.RequestBody; -import java.io.InputStream; import java.util.List; -import java.util.Map; /** * 地图信息 @@ -29,5 +21,11 @@ public interface IcPointAppService { */ Result> getMapInfoByPointType(MapInfoFormDTO formDTO); - + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + void enableOrDisabled(String id); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java index 70d92655a5..3d862dd627 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java @@ -105,4 +105,12 @@ public interface IcPointNucleicMonitoringService extends BaseService getMapInfoList(MapInfoFormDTO formDTO); + + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + void enableOrDisabled(String id); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java index 7927aea977..16d73ed457 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java @@ -1,58 +1,17 @@ package com.epmet.service.impl; -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -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.constant.FieldConstant; -import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; -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.redis.common.bean.AgencyInfoCache; -import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.constants.ImportTaskConstants; -import com.epmet.dao.IcPointVaccinesInoculationDao; -import com.epmet.dto.IcPointVaccinesInoculationDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.MapInfoFormDTO; import com.epmet.dto.result.MapInfoResultDTO; -import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcPointVaccinesInoculationEntity; -import com.epmet.excel.IcPointVaccinesInoculationImportExcel; -import com.epmet.excel.error.PointVaccinesInoculationErrorModel; -import com.epmet.feign.EpmetCommonServiceOpenFeignClient; -import com.epmet.feign.GovOrgFeignClient; -import com.epmet.feign.OssFeignClient; -import com.epmet.redis.IcPointVaccinesInoculationRedis; import com.epmet.service.IcPointAppService; import com.epmet.service.IcPointNucleicMonitoringService; import com.epmet.service.IcPointVaccinesInoculationService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.entity.ContentType; -import org.apache.poi.ss.usermodel.Workbook; 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 java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.List; /** * 地图信息 @@ -85,4 +44,15 @@ public class IcPointAppServiceImpl implements IcPointAppService { } return new Result>().ok(mapInfoResultDTO); } + + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + @Override + public void enableOrDisabled(String id) { + icPointNucleicMonitoringService.enableOrDisabled(id); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java index cb2b516b13..df2214249c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java @@ -5,7 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; 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.constant.NumConstant; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -16,7 +16,6 @@ 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.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; @@ -28,10 +27,8 @@ import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcEpidemicSpecialAttentionEntity; import com.epmet.entity.IcPointNucleicMonitoringEntity; import com.epmet.excel.IcPointNucleicMonitoringImportExcel; -import com.epmet.excel.error.EpidemicSpecialAttentionErrorModel; import com.epmet.excel.error.PointNucleicMonitoringErrorModel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; @@ -373,5 +370,17 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl + + + update ic_point_nucleic_monitoring + set UPDATED_TIME = now(), + ENABLE_FLAG = case when ENABLE_FLAG = 'enable' then 'disabled' else 'enable' end + where id = #{id} + + + + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java index ff71263f95..7d357089f6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java @@ -22,6 +22,14 @@ public class UserChartFormDTO implements Serializable { * 组织、网格、小区类型 agency grid village */ private String orgType; + /** + * 数据类型【居民总数: all 常住: cz 流动: ld】 + */ + private String type; + + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = true; //id集合 private List idList; 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 a62980703a..c25d1ff604 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 @@ -1411,4 +1411,15 @@ public class IcResiUserController implements ResultDataResolver { return new Result>().ok(page); } + /** + * @Author sun + * @Description 【人房概览】居民统计数点击查询列表 + **/ + @PostMapping("icuserstatislist") + public Result> icUserStatisList(@LoginUser TokenDto tokenDto, @RequestBody UserChartFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result>().ok(icResiUserService.icUserStatisList(formDTO)); + } + } 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 1fedc84df4..dd9e97bbae 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 @@ -428,4 +428,6 @@ public interface IcResiUserDao extends BaseDao { * @Date 2022/6/29 17:37 */ List getIcUserCount(IcUserCountFormDTO formDTO); + + List icUserStatisList(UserChartFormDTO formDTO); } 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 8975e06443..a301d44010 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 @@ -507,4 +507,6 @@ public interface IcResiUserService extends BaseService { IcUserMatchGridResultDTO icUserMatchGrid(IcUserMatchGridFormDTO formDTO); PageData listResiNonDynamic(Boolean fuzzy, String gridId, String name, String mobile, Integer pageNo, Integer pageSize); + + PageData icUserStatisList(UserChartFormDTO formDTO); } 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 2f44c543d5..e565f93b35 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 @@ -3351,4 +3351,65 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectList(query).stream().map((e) -> ConvertUtils.sourceToTarget(e, IcResiNonDynamicResultDTO.class)).collect(Collectors.toList()); return new PageData(list, new PageInfo<>(list).getTotal(), pageSize); } + + @Override + public PageData icUserStatisList(UserChartFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + //1.判断入参是否有值，没有值则赋值当前工作人员缓存中所属组织信息 + if (StringUtils.isEmpty(formDTO.getOrgId())) { + //2.获取工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + formDTO.setOrgType("agency"); + } + //获取无效组织网格Id列表 + if("agency".equals(formDTO.getOrgType())){ + //查询组织数据时排除掉当前组织及下级无效组织列表 + Result result = govOrgOpenFeignClient.getDelAgencyGridIdList(formDTO.getOrgId()); + if (!result.success()) { + throw new EpmetException(String.format("获取当前组织及下级已删除组织、网格列表失败，组织Id->%s", formDTO.getUserId())); + } + formDTO.setAgencyIdList(result.getData().getAgencyIdList()); + formDTO.setGridIdList(result.getData().getGridIdList()); + } + + //2.按条件查询业务数据 + List list = baseDao.icUserStatisList(formDTO); + if (CollectionUtils.isEmpty(list)) { + return new PageData(new ArrayList<>(), NumConstant.ZERO); + } + + //3.封装数据 + //查询小区，楼号，网格 + Result> gridResult = govOrgOpenFeignClient.getGridListByGridIds(list.stream().map(SearchByNameResultDTO::getGridId).collect(Collectors.toList())); + if (!gridResult.success()) { + throw new RenException(gridResult.getCode(), gridResult.getMsg()); + } + Map gridMap = gridResult.getData().stream().collect(Collectors.toMap(AllGridsByUserIdResultDTO::getGridId, AllGridsByUserIdResultDTO::getGridName)); + Result> neighborHoodResult = govOrgOpenFeignClient.getListByIds(list.stream().map(SearchByNameResultDTO::getNeighborHoodId).collect(Collectors.toList())); + if (!neighborHoodResult.success()) { + throw new RenException(neighborHoodResult.getCode(), neighborHoodResult.getMsg()); + } + Map neighborHoodMap = neighborHoodResult.getData().stream().collect(Collectors.toMap(IcNeighborHoodDTO::getId, IcNeighborHoodDTO::getNeighborHoodName)); + Result> buildResult = govOrgOpenFeignClient.buildingListByIds(list.stream().map(SearchByNameResultDTO::getBuildId).collect(Collectors.toList())); + if (!buildResult.success()) { + throw new RenException(buildResult.getCode(), buildResult.getMsg()); + } + Map buildMap = buildResult.getData().stream().collect(Collectors.toMap(BuildingResultDTO::getBuildingId, BuildingResultDTO::getBuildingName)); + AtomicInteger i = new AtomicInteger(NumConstant.ONE); + list.forEach(item -> { + item.setGridName(gridMap.get(item.getGridId())); + item.setNeighborHoodName(neighborHoodMap.get(item.getNeighborHoodId())); + item.setBuildNum(buildMap.get(item.getBuildId())); + item.setSort(i.getAndIncrement()); + }); + + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + + } 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 9373743976..a32b2741a6 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 @@ -1289,4 +1289,52 @@ + + + From faa1a9ed502974eafb6d06112eefa8b77b8feb2c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 7 Sep 2022 15:09:24 +0800 Subject: [PATCH 347/397] =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/IcPartyOrgDTO.java | 10 ++++++ .../partyOrg/form/EditPrincipalFormDTO.java | 33 +++++++++++++++++++ .../partyOrg/result/IcPartyOrgTreeDTO.java | 10 ++++++ .../controller/IcPartyOrgController.java | 14 ++++++++ .../modules/partyOrg/dao/IcPartyOrgDao.java | 9 +++++ .../partyOrg/entity/IcPartyOrgEntity.java | 10 ++++++ .../partyOrg/service/IcPartyOrgService.java | 10 ++++++ .../service/impl/IcPartyOrgServiceImpl.java | 13 ++++++++ .../db/migration/V0.0.10__add_principal.sql | 2 ++ .../mapper/partyOrg/IcPartyOrgDao.xml | 26 ++++++++++++--- 10 files changed, 133 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal.sql diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java index b5d26e1ee6..3273372fed 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java @@ -84,6 +84,16 @@ public class IcPartyOrgDTO implements Serializable { */ private String address; + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String principalMobile; + /** * 党组织介绍 */ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java new file mode 100644 index 0000000000..e7cab3e965 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/9/7 15:02 + * @DESC + */ +@Data +public class EditPrincipalFormDTO implements Serializable { + + private static final long serialVersionUID = -1006713792388125512L; + + /** + * 负责人 + */ + @NotBlank(message = "principal不能为空",groups = AddGroup.class) + private String principal; + + @NotBlank(message = "partyOrgId不能为空",groups = AddGroup.class) + private String partyOrgId; + + /** + * 联系电话 + */ + @NotBlank(message = "principalMobile不能为空",groups = AddGroup.class) + private String principalMobile; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java index cb5bf1b927..7888f71899 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java @@ -53,6 +53,16 @@ public class IcPartyOrgTreeDTO implements Serializable { */ private String partyOrgName; + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String principalMobile; + private List children = new ArrayList<>(); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index 60c3327978..2279fd3ca2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -14,6 +14,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.modules.partyOrg.excel.IcPartyOrgExcel; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; @@ -189,4 +190,17 @@ public class IcPartyOrgController { return new Result>().ok(icPartyOrgService.partOrgList(formDTO.getGridId())); } + /** + * Desc: 党组织修改负责人 + * @param formDTO + * @author zxc + * @date 2022/9/7 15:04 + */ + @PostMapping("editPrincipal") + public Result editPrincipal(@RequestBody EditPrincipalFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + icPartyOrgService.editPrincipal(formDTO); + return new Result(); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index fe4d17c517..88fe00f0ad 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; @@ -117,4 +118,12 @@ public interface IcPartyOrgDao extends BaseDao { List getSelfAndSub(@Param("joinOrgId") String joinOrgId); List partOrgList(@Param("agencyId") String agencyId); + + /** + * Desc: 党组织修改负责人 + * @param formDTO + * @author zxc + * @date 2022/9/7 15:04 + */ + void editPrincipal(EditPrincipalFormDTO formDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java index e9ea2f210c..b6404fb481 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java @@ -73,6 +73,16 @@ public class IcPartyOrgEntity extends BaseEpmetEntity { */ private String address; + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String principalMobile; + /** * 党组织介绍 */ 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 22485b8171..aa13fbfec8 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 @@ -6,6 +6,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.*; @@ -148,4 +149,13 @@ public interface IcPartyOrgService extends BaseService { void adjustOrgPath(List customerIds); List partOrgList(String gridId); + + /** + * Desc: 党组织修改负责人 + * @param formDTO + * @author zxc + * @date 2022/9/7 15:04 + */ + void editPrincipal(EditPrincipalFormDTO formDTO); + } 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 3405183f47..8862404285 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 @@ -29,6 +29,7 @@ import com.epmet.modules.partymember.dao.IcPartyMemberDao; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.*; @@ -490,4 +491,16 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl + + + + update ic_party_org + set PRINCIPAL_MOBILE = #{principalMobile}, + PRINCIPAL = #{principal}, + UPDATED_TIME = NOW() + where id = #{partyOrgId} + + + From 304fd62c86037e75ab9202dac8810dc30c3e1079 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 8 Sep 2022 10:46:38 +0800 Subject: [PATCH 349/397] =?UTF-8?q?=E4=BA=BA=E9=98=B2=E6=A6=82=E8=A7=88?= =?UTF-8?q?=E4=B8=8B=E9=92=BB=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcHouseDao.xml | 2 +- .../src/main/resources/mapper/IcResiUserDao.xml | 8 +++++++- 2 files changed, 8 insertions(+), 2 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 8b443733ea..5cfdd0fd4d 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 @@ -629,7 +629,7 @@ ) - GROUP BY + ORDER BY a.sort, CONVERT(c.NEIGHBOR_HOOD_NAME using gbk), CONVERT(b.BUILDING_NAME USING gbk), 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 a32b2741a6..3732fbfd5d 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 @@ -1313,6 +1313,12 @@ del_flag = '0' AND status = '0' AND customer_id = #{customerId} + + AND is_floating = '0' + + + AND (is_floating != '0' or is_floating is null) + AND (agency_id = #{orgId} OR pids LIKE CONCAT('%', #{orgId}, '%')) @@ -1334,7 +1340,7 @@ AND village_id = #{orgId} - GROUP BY `name` ASC + ORDER BY `name` ASC From 2e260ff834ac819beccd99963c50ee164a72e910 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 8 Sep 2022 11:05:47 +0800 Subject: [PATCH 350/397] gov_party_helper --- .../epmet/dto/result/CustomerParaResDTO.java | 21 ++++++++++++++++ .../CustomerParameterController.java | 13 ++++++++++ .../service/CustomerParameterService.java | 9 +++++++ .../impl/CustomerParameterServiceImpl.java | 24 +++++++++++++++++++ .../migration/V0.0.9__party_helper_param.sql | 3 +++ 5 files changed, 70 insertions(+) create mode 100644 epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerParaResDTO.java create mode 100644 epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.9__party_helper_param.sql diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerParaResDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerParaResDTO.java new file mode 100644 index 0000000000..7c7954d9a4 --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerParaResDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/9/8 10:44 + */ +@Data +public class CustomerParaResDTO implements Serializable { + /** + * 开启：open + * 关闭：closed + * 没有数据默认开启 + */ + private String govPartyHelper; +} + diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerParameterController.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerParameterController.java index 006080bd6b..f31cd52346 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerParameterController.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerParameterController.java @@ -1,9 +1,12 @@ 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.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.CrmParameterFormDTO; import com.epmet.dto.result.CrmParameterResultDTO; +import com.epmet.dto.result.CustomerParaResDTO; import com.epmet.service.CustomerParameterService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -50,4 +53,14 @@ public class CustomerParameterController { return new Result(); } + /** + * 查询客户定制化参数 + * 比如党建小助手是否开启 + * @param tokenDto + * @return + */ + @PostMapping("customize") + public Result queryCustomerCustomize(@LoginUser TokenDto tokenDto){ + return new Result().ok(parameterService.queryCustomerCustomize(tokenDto.getCustomerId())); + } } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerParameterService.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerParameterService.java index 4ff8119c79..ba8055f90e 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerParameterService.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerParameterService.java @@ -4,6 +4,7 @@ import com.epmet.dto.form.CrmParameterFormDTO; import com.epmet.dto.form.FootBarPatternFormDTO; import com.epmet.dto.form.FootBarPatternQueryFormDTO; import com.epmet.dto.result.CrmParameterResultDTO; +import com.epmet.dto.result.CustomerParaResDTO; import com.epmet.dto.result.FootBarPatternQueryResultDTO; import java.util.List; @@ -49,4 +50,12 @@ public interface CustomerParameterService { * @date 2021/7/27 17:24 */ void saveFootBarPattern(FootBarPatternFormDTO formDTO); + + /** + * 查询客户定制化参数 + * 比如党建小助手是否开启 + * @param customerId + * @return + */ + CustomerParaResDTO queryCustomerCustomize(String customerId); } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerParameterServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerParameterServiceImpl.java index fc7cd29f80..e00e1b54ac 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerParameterServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerParameterServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.Result; @@ -10,6 +11,7 @@ import com.epmet.dto.form.FootBarPatternFormDTO; import com.epmet.dto.form.FootBarPatternQueryFormDTO; import com.epmet.dto.result.CheckFloatFootBarResultDTO; import com.epmet.dto.result.CrmParameterResultDTO; +import com.epmet.dto.result.CustomerParaResDTO; import com.epmet.dto.result.FootBarPatternQueryResultDTO; import com.epmet.entity.CustomerParameterEntity; import com.epmet.feign.OperCustomizeOpenFeignClient; @@ -146,5 +148,27 @@ public class CustomerParameterServiceImpl implements CustomerParameterService { } } + /** + * 查询客户定制化参数 + * 比如党建小助手是否开启 + * + * @param customerId + * @return + */ + @Override + public CustomerParaResDTO queryCustomerCustomize(String customerId) { + CustomerParaResDTO resDTO = new CustomerParaResDTO(); + resDTO.setGovPartyHelper("open"); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CustomerParameterEntity::getCustomerId, customerId) + .eq(CustomerParameterEntity::getParameterKey, "gov_party_helper") + .last("limit 1"); + CustomerParameterEntity customerParameterEntity = parameterDao.selectOne(queryWrapper); + if (null != customerParameterEntity) { + resDTO.setGovPartyHelper(customerParameterEntity.getParameterValue()); + } + return resDTO; + } + } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.9__party_helper_param.sql b/epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.9__party_helper_param.sql new file mode 100644 index 0000000000..5cc11e5f73 --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.9__party_helper_param.sql @@ -0,0 +1,3 @@ +INSERT INTO `epmet_oper_crm`.`customer_parameter` ( `ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_SWITCH`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME` ) +VALUES + ( '5ce6f22c-2f22-11ed-bb6b-0050568f8cf7', 'default', 'gov_party_helper', '工作端党建小助手是否开启？', 'on', 'open', '开启：open；关闭：closed;不配置，默认是开启', 0, 0, 'APP_USER', '2022-09-08 11:03:35', 'APP_USER', '2022-09-08 11:03:45' ); \ No newline at end of file From eadc1c9bff0a09be64e0b96857656c1d5c1df159 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 8 Sep 2022 13:32:12 +0800 Subject: [PATCH 351/397] =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/group/ResiGroupDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index 957b687fa5..c235a5826a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -1076,7 +1076,7 @@ SELECT CUSTOMER_USER_ID,RESI_GROUP_ID FROM resi_group_member WHERE DEL_FLAG = '0' AND GROUP_LEADER_FLAG = 'leader' - AND `STATUS` = 'approved' + AND RESI_GROUP_ID IN ( #{id} From 6ab99298d737d827bd0c3e080d7b2f6bfdb1d5c5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 8 Sep 2022 15:38:13 +0800 Subject: [PATCH 352/397] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/IcResiCategoryStatsConfigFormDTO.java | 9 ++++++++- .../result/IcResiCategoryStatsConfigResultDTO.java | 14 +++++++++++++- .../entity/IcResiCategoryStatsConfigEntity.java | 8 ++++++++ .../mapper/IcResiCategoryStatsConfigDao.xml | 5 ++++- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java index 7d10474443..c5af9dc2c1 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java @@ -74,5 +74,12 @@ public class IcResiCategoryStatsConfigFormDTO implements Serializable { private Integer level2; private Integer level3; - + /** + * 自动匹配：开启1；不匹配：0 + */ + private String autoMatching; + /** + * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49 + */ + private String ylfnValue; } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java index e161b60f6d..45ee8f8ce3 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java @@ -44,7 +44,10 @@ public class IcResiCategoryStatsConfigResultDTO implements Serializable { */ private String label; - + /** + * 列名 + */ + private String columnName; /** * 管理平台分类图标 @@ -84,4 +87,13 @@ public class IcResiCategoryStatsConfigResultDTO implements Serializable { * 等级3阈值 */ private Integer level3; + + /** + * 自动匹配：开启1；不匹配：0 + */ + private String autoMatching; + /** + * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49 + */ + private String ylfnValue; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java index d0201db93d..4a292260b9 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java @@ -80,4 +80,12 @@ public class IcResiCategoryStatsConfigEntity extends BaseEpmetEntity { */ private Integer sort; + /** + * 自动匹配：开启1；不匹配：0 + */ + private String autoMatching; + /** + * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49 + */ + private String ylfnValue; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml index f138b59d0d..366690ed03 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml @@ -26,6 +26,7 @@ select a.ID as id, a.LABEL as label, + a.COLUMN_NAME as columnName, a.MANAGEMENT_ICON as managementIcon, a.DATA_ICON as dataIcon, a.HOUSE_SHOW_ICON as houseShowIcon, @@ -34,7 +35,9 @@ b.LEVEL_1 as level1, b.LEVEL_2 as level2, b.LEVEL_3 as level3, - b.WARN + b.WARN, + a.AUTO_MATCHING as , + a.YLFN_VALUE as from ic_resi_category_stats_config a left join ic_resi_category_warn_config b on a.TABLE_NAME = b.TABLE_NAME and a.COLUMN_NAME = b.COLUMN_NAME and b.DEL_FLAG =0 and b.CUSTOMER_ID = #{customerId} From bd5706aa6ca7c8b24b37b5d637a7cb04366f3389 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 8 Sep 2022 15:45:27 +0800 Subject: [PATCH 353/397] =?UTF-8?q?ic=5Fresi=5Fcategory=5Fstats=5Fconfig?= =?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/db/migration/V0.0.38__ylfnv.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.38__ylfnv.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.38__ylfnv.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.38__ylfnv.sql new file mode 100644 index 0000000000..4ff1496be2 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.38__ylfnv.sql @@ -0,0 +1,4 @@ +alter table ic_resi_category_stats_config + add COLUMN `AUTO_MATCHING` varchar(1) NOT NULL DEFAULT '0' COMMENT '自动匹配：开启1；不匹配：0' after SORT; + +alter table ic_resi_category_stats_config add COLUMN `YLFN_VALUE` varchar(32) DEFAULT NULL COMMENT '育龄妇女年龄范围，英文逗号隔开的数字例如：18,49' after AUTO_MATCHING; \ No newline at end of file From ecc2d44161973ff85d88c8e7bd3ec907907ebc8f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 8 Sep 2022 15:46:36 +0800 Subject: [PATCH 354/397] buig --- .../main/resources/mapper/IcResiCategoryStatsConfigDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml index 366690ed03..49ec2d3bbd 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml @@ -36,8 +36,8 @@ b.LEVEL_2 as level2, b.LEVEL_3 as level3, b.WARN, - a.AUTO_MATCHING as , - a.YLFN_VALUE as + a.AUTO_MATCHING as autoMatching, + a.YLFN_VALUE as ylfnValue from ic_resi_category_stats_config a left join ic_resi_category_warn_config b on a.TABLE_NAME = b.TABLE_NAME and a.COLUMN_NAME = b.COLUMN_NAME and b.DEL_FLAG =0 and b.CUSTOMER_ID = #{customerId} From 5bd15bb4bb89fb3cb99d1a61483bd2d61b2f9675 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 8 Sep 2022 16:04:26 +0800 Subject: [PATCH 355/397] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB=E5=A2=9E=E5=8A=A0=E5=B9=B4=E9=BE=84=E8=AE=A1?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/IdCardRegexUtils.java | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java index 96d7d02a62..ff1f0b0549 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java @@ -1,10 +1,15 @@ package com.epmet.commons.tools.utils; import com.epmet.commons.tools.enums.IdCardTypeEnum; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.time.DateTimeException; +import java.time.LocalDate; +import java.time.Period; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -50,6 +55,7 @@ public class IdCardRegexUtils { private String birthdayMonth; private String birthdayDay; private String sex; + private Integer age; } /** @@ -116,7 +122,17 @@ public class IdCardRegexUtils { String month = matcher.group("month"); String day = matcher.group("day"); String sex = matcher.group("sex"); - return new ParsedContent(year, month, day, sex); + + // ------- 年龄Start---------- + Integer age; + try { + LocalDate birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); + age = Period.between(birthday, LocalDate.now()).getYears(); + } catch (DateTimeException e) { + throw new EpmetException("身份证号解析年龄失败:" + ExceptionUtils.getErrorStackTrace(e)); + } + // ------- 年龄End---------- + return new ParsedContent(year, month, day, sex, age); } // 其他类型暂时不可解析 @@ -130,4 +146,10 @@ public class IdCardRegexUtils { public IdCardTypeEnum getTypeEnum() { return idCardType; } + + public static void main(String[] args) { + IdCardRegexUtils parse = IdCardRegexUtils.parse("370282198801303017"); + ParsedContent parsedResult = parse.getParsedResult(); + System.out.println(parsedResult); + } } From c14fd6416194b04ca3d1344015b1c38cc7c10203 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 8 Sep 2022 17:29:27 +0800 Subject: [PATCH 356/397] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=82=B2=E9=BE=84=E5=A6=87=E5=A5=B3=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/task/ic/IcUpdateYlfnTask.java | 35 +++++ .../epmet/dto/result/YlfnValueResultDTO.java | 18 +++ .../feign/OperCustomizeOpenFeignClient.java | 3 +- .../OperCustomizeOpenFeignClientFallback.java | 5 + .../IcResiCategoryStatsConfigController.java | 6 + .../IcResiCategoryStatsConfigService.java | 11 ++ .../IcResiCategoryStatsConfigServiceImpl.java | 32 +++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 3 + .../EpmetUserOpenFeignClientFallback.java | 5 + .../controller/IcResiUserController.java | 13 ++ .../com/epmet/service/IcResiUserService.java | 9 ++ .../service/impl/IcResiUserServiceImpl.java | 122 +++++++++++++++++- 12 files changed, 257 insertions(+), 5 deletions(-) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcUpdateYlfnTask.java create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/YlfnValueResultDTO.java diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcUpdateYlfnTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcUpdateYlfnTask.java new file mode 100644 index 0000000000..b7a1ffb6ea --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcUpdateYlfnTask.java @@ -0,0 +1,35 @@ +package com.epmet.task.ic; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.task.ITask; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * desc:定时弥补数据 保证数据的一致性 + */ +@Slf4j +@Component("icUpdateYlfnTask") +public class IcUpdateYlfnTask implements ITask { + + @Resource + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + + /** + * 执行定时任务接口 + * + * @param params 参数，多参数使用JSON数据 + */ + @Override + public void run(String params) { + Result result = epmetUserOpenFeignClient.updateYlfn(); + if (result.success()) { + log.info("icUpdateYlfnTask定时任务正在执行定时任务执行成功"); + } else { + log.warn("icUpdateYlfnTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + } + } +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/YlfnValueResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/YlfnValueResultDTO.java new file mode 100644 index 0000000000..9056944c83 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/YlfnValueResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/9/8 15:43 + */ +@Data +public class YlfnValueResultDTO implements Serializable { + private static final long serialVersionUID = -1416102274320519092L; + private String customerId; + private Integer min; + private Integer max; +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index e93d9badaa..ce2063c361 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -178,5 +178,6 @@ public interface OperCustomizeOpenFeignClient { */ @PostMapping("/oper/customize/icformitemoptions/getItemConditions") Result> getOptionsMap(@RequestBody IcFormOptionsQueryFormDTO input); - + @PostMapping("/oper/customize/icresicategorystatsconfig/getYlfnValue") + Result> getYlfnValue(); } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java index e59af2b818..70debfecf3 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java @@ -142,4 +142,9 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getOptionsMap", input); } + @Override + public Result> getYlfnValue() { + return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getYlfnValue", null); + } + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java index 775001770f..e8dbf8b1af 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java @@ -26,6 +26,7 @@ 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.IcResiCategoryStatsConfigDTO; +import com.epmet.dto.result.YlfnValueResultDTO; import com.epmet.excel.IcResiCategoryStatsConfigExcel; import com.epmet.service.IcResiCategoryStatsConfigService; import org.springframework.beans.factory.annotation.Autowired; @@ -96,4 +97,9 @@ public class IcResiCategoryStatsConfigController { return new Result>().ok(icResiCategoryStatsConfigService.getCategoryList(dto)); } + @PostMapping("getYlfnValue") + public Result> getYlfnValue() { + return new Result>().ok(icResiCategoryStatsConfigService.getYlfnValue()); + } + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcResiCategoryStatsConfigService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcResiCategoryStatsConfigService.java index f9092491aa..6f151130dd 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcResiCategoryStatsConfigService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcResiCategoryStatsConfigService.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.result.CustomerCategoryShowAndWarnListResultDTO; +import com.epmet.dto.result.YlfnValueResultDTO; import com.epmet.entity.IcResiCategoryStatsConfigEntity; import java.util.List; @@ -111,4 +112,14 @@ public interface IcResiCategoryStatsConfigService extends BaseService getCustomerCategoryShowAndWarnList(String customerId); + /** + * 获取育龄妇女配置 + * + * @Param + * @Return {@link List< YlfnValueResultDTO>} + * @Author zhaoqifeng + * @Date 2022/9/8 15:50 + */ + List getYlfnValue(); + } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java index d5bfdbd521..bc6758ec21 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java @@ -22,11 +22,14 @@ 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.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcResiCategoryStatsConfigDao; import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.result.CustomerCategoryShowAndWarnListResultDTO; +import com.epmet.dto.result.YlfnValueResultDTO; import com.epmet.entity.IcResiCategoryStatsConfigEntity; import com.epmet.redis.IcResiCategoryStatsConfigRedis; import com.epmet.service.IcResiCategoryStatsConfigService; @@ -37,6 +40,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; /** * 居民类别配置表 @@ -137,4 +141,32 @@ public class IcResiCategoryStatsConfigServiceImpl extends BaseServiceImpl(); } + /** + * 获取育龄妇女配置 + * + * @Param + * @Return {@link List< YlfnValueResultDTO >} + * @Author zhaoqifeng + * @Date 2022/9/8 15:50 + */ + @Override + public List getYlfnValue() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiCategoryStatsConfigEntity::getAutoMatching, NumConstant.ONE_STR); + wrapper.eq(IcResiCategoryStatsConfigEntity::getColumnName, "IS_YLFN"); + wrapper.isNotNull(IcResiCategoryStatsConfigEntity::getYlfnValue); + List list = baseDao.selectList(wrapper); + if(CollectionUtils.isEmpty(list)) { + return Collections.emptyList(); + } + return list.stream().map(item -> { + YlfnValueResultDTO dto = new YlfnValueResultDTO(); + dto.setCustomerId(item.getCustomerId()); + String[] ages = item.getYlfnValue().split(StrConstant.COMMA); + dto.setMin(Integer.valueOf(ages[0])); + dto.setMax(Integer.valueOf(ages[1])); + return dto; + }).collect(Collectors.toList()); + } + } \ 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 47a67e5fbd..73d770a411 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 @@ -882,4 +882,7 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping("/epmetuser/icresiuser/nonDynamic/listResi") Result> listResiNonDynamic(@RequestBody IcResiPageNonDynamicFormDTO input); + + @PostMapping("/epmetuser/icresiuser/updateYlfn") + Result updateYlfn(); } 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 7c9cc3b2a4..2de7371623 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 @@ -678,4 +678,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result> listResiNonDynamic(IcResiPageNonDynamicFormDTO input) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listResiNonDynamic", input); } + + @Override + public Result updateYlfn() { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "updateYlfn", null); + } } 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 a62980703a..0d5652074c 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 @@ -1411,4 +1411,17 @@ public class IcResiUserController implements ResultDataResolver { return new Result>().ok(page); } + /** + * 更新育龄妇女状态定时任务 + * @Param + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/9/8 17:19 + */ + @PostMapping("updateYlfn") + public Result updateYlfn() { + icResiUserService.updateYlfn(); + return new Result(); + } + } 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 8975e06443..145ea7fc9e 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 @@ -507,4 +507,13 @@ public interface IcResiUserService extends BaseService { IcUserMatchGridResultDTO icUserMatchGrid(IcUserMatchGridFormDTO formDTO); PageData listResiNonDynamic(Boolean fuzzy, String gridId, String name, String mobile, Integer pageNo, Integer pageSize); + + /** + * 更新育龄妇女状态定时任务 + * @Param + * @Return + * @Author zhaoqifeng + * @Date 2022/9/8 15:45 + */ + void updateYlfn(); } 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 2f44c543d5..3c146c3f31 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 @@ -53,10 +53,7 @@ import com.epmet.commons.tools.utils.*; import com.epmet.constant.IcPlatformConstant; import com.epmet.constant.IcResiUserConstant; import com.epmet.constant.UserConstant; -import com.epmet.dao.IcPartyMemberDao; -import com.epmet.dao.IcResiUserDao; -import com.epmet.dao.IcVolunteerDao; -import com.epmet.dao.UserBaseInfoDao; +import com.epmet.dao.*; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; @@ -160,6 +157,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectList(query).stream().map((e) -> ConvertUtils.sourceToTarget(e, IcResiNonDynamicResultDTO.class)).collect(Collectors.toList()); return new PageData(list, new PageInfo<>(list).getTotal(), pageSize); } + + /** + * 更新育龄妇女状态定时任务 + * + * @Param + * @Return + * @Author zhaoqifeng + * @Date 2022/9/8 15:45 + */ + @Override + public void updateYlfn() { + //获取育龄妇女配置 + Result> value = operCustomizeOpenFeignClient.getYlfnValue(); + if(!value.success()) { + throw new EpmetException(value.getCode(), value.getMsg()); + } + value.getData().forEach(item -> { + //查询客户下的非育龄妇女的女性居民 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getCustomerId, item.getCustomerId()); + wrapper.eq(IcResiUserEntity::getGender, NumConstant.TWO_STR); + wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR); + wrapper.eq(IcResiUserEntity::getIdCardType, NumConstant.ONE_STR); + List list = baseDao.selectList(wrapper); + if (CollectionUtils.isNotEmpty(list)) { + list.forEach(user -> { + IdCardRegexUtils pares = IdCardRegexUtils.parse(user.getIdCard()); + if (NumConstant.ONE_STR.equals(pares.getTypeEnum().getType())) { + if (!NumConstant.ONE_STR.equals(user.getIsYlfn())) { + //将不是育龄妇女的变为育龄妇女 + if (pares.getParsedResult().getAge() >= item.getMin() && pares.getParsedResult().getAge() <= item.getMax()) { + //更新育龄妇女状态 + IcResiUserEntity icResiUserEntity = new IcResiUserEntity(); + icResiUserEntity.setId(user.getId()); + icResiUserEntity.setIsYlfn(NumConstant.ONE_STR); + baseDao.updateById(icResiUserEntity); + + //添加居民变更记录 + IcUserChangeRecordEntity record = new IcUserChangeRecordEntity(); + record.setCustomerId(user.getCustomerId()); + record.setOperatorId("APP_USER"); + record.setOperatorName("系统"); + record.setIcUserId(user.getId()); + record.setIcUserName(user.getName()); + record.setType("category"); + record.setTypeName("类别"); + record.setBeforeChangeName("否"); + record.setAfterChangeName("是"); + record.setChangeTime(new Date()); + icUserChangeRecordDao.insert(record); + //添加变更明细 + IcUserChangeDetailedEntity detail = new IcUserChangeDetailedEntity(); + detail.setCustomerId(user.getCustomerId()); + detail.setIcUserChangeRecordId(record.getId()); + detail.setPids(user.getPids()); + detail.setAgencyId(user.getAgencyId()); + detail.setGridId(user.getGridId()); + detail.setNeighborHoodId(user.getVillageId()); + detail.setBuildingId(user.getBuildId()); + detail.setBuildingUnitId(user.getUnitId()); + detail.setHouseId(user.getHomeId()); + detail.setIcUserId(user.getId()); + detail.setType("category"); + detail.setTypeName("类别"); + detail.setFieldName("IS_YLFN"); + detail.setValue(NumConstant.ONE); + icUserChangeDetailedDao.insert(detail); + } + } else { + //将是育龄妇女的变为非育龄妇女 + if (pares.getParsedResult().getAge() < item.getMin() || pares.getParsedResult().getAge() > item.getMax()) { + //更新育龄妇女状态 + IcResiUserEntity icResiUserEntity = new IcResiUserEntity(); + icResiUserEntity.setId(user.getId()); + icResiUserEntity.setIsYlfn(NumConstant.ZERO_STR); + baseDao.updateById(icResiUserEntity); + //添加居民变更记录 + IcUserChangeRecordEntity record = new IcUserChangeRecordEntity(); + record.setCustomerId(user.getCustomerId()); + record.setOperatorId("APP_USER"); + record.setOperatorName("系统"); + record.setIcUserId(user.getId()); + record.setIcUserName(user.getName()); + record.setType("category"); + record.setTypeName("类别"); + record.setBeforeChangeName("是"); + record.setAfterChangeName("否"); + record.setChangeTime(new Date()); + icUserChangeRecordDao.insert(record); + //添加变更明细 + IcUserChangeDetailedEntity detail = new IcUserChangeDetailedEntity(); + detail.setCustomerId(user.getCustomerId()); + detail.setIcUserChangeRecordId(record.getId()); + detail.setPids(user.getPids()); + detail.setAgencyId(user.getAgencyId()); + detail.setGridId(user.getGridId()); + detail.setNeighborHoodId(user.getVillageId()); + detail.setBuildingId(user.getBuildId()); + detail.setBuildingUnitId(user.getUnitId()); + detail.setHouseId(user.getHomeId()); + detail.setIcUserId(user.getId()); + detail.setType("category"); + detail.setTypeName("类别"); + detail.setFieldName("IS_YLFN"); + detail.setValue(NumConstant.ONE_NEG); + icUserChangeDetailedDao.insert(detail); + } + } + } + }); + } + }); + } } From 038b8c47ca8f4fc143d83c7b76c6436697cae0e6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 9 Sep 2022 09:18:57 +0800 Subject: [PATCH 357/397] =?UTF-8?q?=E4=B8=8D=E7=AD=89=E4=BA=8E=E7=A9=BA?= =?UTF-8?q?=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java index bc6758ec21..a00f800733 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java @@ -155,6 +155,7 @@ public class IcResiCategoryStatsConfigServiceImpl extends BaseServiceImpl list = baseDao.selectList(wrapper); if(CollectionUtils.isEmpty(list)) { return Collections.emptyList(); From 06cc5e8ac40c6a17b62903bd36f502908cacd003 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 9 Sep 2022 09:35:13 +0800 Subject: [PATCH 358/397] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=82=B2=E9=BE=84=E5=A6=87=E5=A5=B3=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 3c146c3f31..648d315953 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 @@ -3362,6 +3362,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> value = operCustomizeOpenFeignClient.getYlfnValue(); @@ -3374,12 +3375,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectList(wrapper); if (CollectionUtils.isNotEmpty(list)) { list.forEach(user -> { IdCardRegexUtils pares = IdCardRegexUtils.parse(user.getIdCard()); - if (NumConstant.ONE_STR.equals(pares.getTypeEnum().getType())) { + if (null != pares && NumConstant.ONE_STR.equals(pares.getTypeEnum().getType())) { if (!NumConstant.ONE_STR.equals(user.getIsYlfn())) { //将不是育龄妇女的变为育龄妇女 if (pares.getParsedResult().getAge() >= item.getMin() && pares.getParsedResult().getAge() <= item.getMax()) { From 4b06c587f7d0ceec965ff627628d4c34a4bc42b1 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 9 Sep 2022 11:18:35 +0800 Subject: [PATCH 359/397] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=82=B2=E9=BE=84=E5=A6=87=E5=A5=B3=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcResiUserServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 648d315953..ab854a3fd3 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 @@ -3393,13 +3393,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Fri, 9 Sep 2022 13:44:28 +0800 Subject: [PATCH 360/397] =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java | 5 +++++ .../partymember/dto/partyOrg/form/EditPrincipalFormDTO.java | 3 +++ .../com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java | 5 +++++ .../db/migration/V0.0.10__add_principal_staff_id.sql | 3 +++ .../src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml | 1 + 5 files changed, 17 insertions(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java index 3273372fed..a6ee2e449e 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java @@ -89,6 +89,11 @@ public class IcPartyOrgDTO implements Serializable { */ private String principal; + /** + * 负责人staffId + */ + private String principalStaffId; + /** * 联系电话 */ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java index e7cab3e965..c518b0ef7e 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java @@ -30,4 +30,7 @@ public class EditPrincipalFormDTO implements Serializable { */ @NotBlank(message = "principalMobile不能为空",groups = AddGroup.class) private String principalMobile; + + @NotBlank(message = "principalStaffId不能为空",groups = AddGroup.class) + private String principalStaffId; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java index b6404fb481..bc8be3d038 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java @@ -78,6 +78,11 @@ public class IcPartyOrgEntity extends BaseEpmetEntity { */ private String principal; + /** + * 负责人staffId + */ + private String principalStaffId; + /** * 联系电话 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql new file mode 100644 index 0000000000..6530fb1923 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql @@ -0,0 +1,3 @@ +ALTER TABLE ic_party_org ADD COLUMN PRINCIPAL_STAFF_ID VARCHAR(32) DEFAULT '' COMMENT '负责人staffId' AFTER PRINCIPAL_MOBILE; +alter table ic_party_org modify PRINCIPAL_MOBILE VARCHAR(30) DEFAULT '' COMMENT '联系方式'; +alter table ic_party_org modify PRINCIPAL VARCHAR(30) DEFAULT '' COMMENT '负责人'; \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 5c042f9487..410a074121 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -30,6 +30,7 @@ update ic_party_org set PRINCIPAL_MOBILE = #{principalMobile}, PRINCIPAL = #{principal}, + PRINCIPAL_STAFF_ID = #{principalStaffId}, UPDATED_TIME = NOW() where id = #{partyOrgId} From aef7cfe939032fba8aebc66fe4025ea9bac48c3a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 9 Sep 2022 14:06:44 +0800 Subject: [PATCH 361/397] =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...principal_staff_id.sql => V0.0.11__add_principal_staff_id.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/{V0.0.10__add_principal_staff_id.sql => V0.0.11__add_principal_staff_id.sql} (100%) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.11__add_principal_staff_id.sql similarity index 100% rename from epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql rename to epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.11__add_principal_staff_id.sql From 9924db162a31e3f051cce0e3fb09d7c98e7641dc Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 9 Sep 2022 14:31:38 +0800 Subject: [PATCH 362/397] emm --- .../src/main/java/com/epmet/dto/result/PersonDataResultDTO.java | 2 ++ .../src/main/resources/mapper/IcResiUserDao.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java index 68ad326637..5e739016b3 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java @@ -47,6 +47,8 @@ public class PersonDataResultDTO implements Serializable { * 姓名 */ private String name; + private String mobile; + private String isTenant; /** * 经济状况:包括 月收入：monthlyIncome 和 退休金额：retirementAmount 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 9373743976..b7a36c0456 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 @@ -310,6 +310,8 @@ YSR, TXJE, ID_CARD, + MOBILE, + IS_TENANT, IFNULL(IS_VOLUNTEER,'0') AS isVolunteer, CUSTOMER_ID, GRID_ID From 11a362654f02ca9773a941d6197cfdfe60ba6f27 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 9 Sep 2022 14:45:51 +0800 Subject: [PATCH 363/397] emm --- .../src/main/resources/mapper/IcResiUserDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index b7a36c0456..7cb24ea51e 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 @@ -296,6 +296,8 @@ + + @@ -311,7 +313,7 @@ TXJE, ID_CARD, MOBILE, - IS_TENANT, + IS_TENANT as isTenant, IFNULL(IS_VOLUNTEER,'0') AS isVolunteer, CUSTOMER_ID, GRID_ID From b21ff5592601751510b3c78a88073bd80965a8d9 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 14 Sep 2022 14:11:54 +0800 Subject: [PATCH 364/397] =?UTF-8?q?=E9=A1=BA=E5=BE=B7=E5=B1=85=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiCollectServiceImpl.java | 25 +++++++++++-------- .../impl/IcResiCollectVisitorServiceImpl.java | 7 +++++- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index 0461ce2cba..97c39e04b7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -189,16 +189,21 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl { - if (StringUtils.isNotBlank(item.getFaceImg())) { - VisitVisitorFormDTO visitor = new VisitVisitorFormDTO(); - visitor.setIdCard(item.getIdNum()); - visitor.setMobile(item.getMobile()); - visitor.setName(item.getName()); - visitor.setFaceImg(item.getFaceImg()); - dhDeviceUtil.sendAuth(visitor); - } - }); + try { + formDTO.getMemberList().forEach(item -> { + if (StringUtils.isNotBlank(item.getFaceImg())) { + VisitVisitorFormDTO visitor = new VisitVisitorFormDTO(); + visitor.setIdCard(item.getIdNum()); + visitor.setMobile(item.getMobile()); + visitor.setName(item.getName()); + visitor.setFaceImg(item.getFaceImg()); + dhDeviceUtil.sendAuth(visitor); + } + }); + return new Result().ok("今日您可通过人脸设备便捷出入小区，明天及后续进入请再次登记，谢谢！"); + } catch (Exception e) { + return new Result().ok("访客信息登记成功"); + } } return new Result().ok("提交成功"); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java index a73d022548..34c56f8928 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java @@ -165,7 +165,12 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl Date: Wed, 14 Sep 2022 14:22:10 +0800 Subject: [PATCH 365/397] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=9C=89=E9=80=80?= =?UTF-8?q?=E5=8D=A1=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/PliPowerService.java | 17 -------- .../service/impl/PliPowerServiceImpl.java | 31 -------------- .../com/epmet/task/PliVisitorLogoutTask.java | 41 ------------------- 3 files changed, 89 deletions(-) delete mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java delete mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java delete mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java deleted file mode 100644 index 4fb990d033..0000000000 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.epmet.service; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; - -public interface PliPowerService { - - /** - * 访客登出 - * - * @param formDTO - * @return com.epmet.commons.tools.utils.Result - * @author zhy - * @date 2022/5/30 10:25 - */ - Result visitorLogout(VisitorLogoutFormDTO formDTO); -} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java deleted file mode 100644 index ed54b7e6d9..0000000000 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.epmet.service.impl; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; -import com.epmet.plugin.power.feign.PliPowerFeignClient; -import com.epmet.service.PliPowerService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - - -/** - * @Description - * @ClassName StatsUserServiceImpl - * @Auth wangc - * @Date 2020-06-29 09:41 - */ -@Service -public class PliPowerServiceImpl implements PliPowerService { - - private Logger logger = LoggerFactory.getLogger(getClass()); - - @Autowired - private PliPowerFeignClient pliPowerFeignClient; - - @Override - public Result visitorLogout(VisitorLogoutFormDTO formDTO) { - return pliPowerFeignClient.visitorLogout(formDTO); - } -} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java deleted file mode 100644 index 41ffa19ecc..0000000000 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.epmet.task; - -import com.alibaba.fastjson.JSON; -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; -import com.epmet.service.PliPowerService; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 访客登出 - * - * @author zhy - * @date 2022/5/30 10:23 - */ -@Component("pliVisitorLogoutTask") -public class PliVisitorLogoutTask implements ITask { - - private Logger logger = LoggerFactory.getLogger(getClass()); - - @Autowired - private PliPowerService pliPowerService; - - @Override - public void run(String params) { - logger.info("VisitorLogoutTask定时任务正在执行，参数为：{}", params); - VisitorLogoutFormDTO formDTO = new VisitorLogoutFormDTO(); - if (StringUtils.isNotBlank(params)) { - formDTO = JSON.parseObject(params, VisitorLogoutFormDTO.class); - } - Result result = pliPowerService.visitorLogout(formDTO); - if (result.success()) { - logger.info("VisitorLogoutTask定时任务执行成功"); - } else { - logger.error("VisitorLogoutTask定时任务执行失败:" + result.getMsg()); - } - } -} From 3b0922ef4d53e141f45c3e3a653628115d2e8104 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 14 Sep 2022 14:27:16 +0800 Subject: [PATCH 366/397] =?UTF-8?q?=E6=97=A0=E7=94=A8=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/epmet-job/epmet-job-server/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 0aaf92db4a..1e0d00c9ba 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -43,11 +43,6 @@ epmet-message-client 2.0.0 - - com.epmet - pli-power-base-client - 2.0.0 - org.springframework.boot spring-boot-starter-web From 414b68908c613cf9620fd0640cce29ad36f5397f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 15 Sep 2022 09:08:31 +0800 Subject: [PATCH 367/397] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=9B=BE=E8=B0=B1-?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=AF=A6=E6=83=85=E9=87=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF=E7=94=B1=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=9C=AC=E4=BA=BA=E6=98=AF=E6=88=BF=E4=B8=9C=E7=9A=84?= =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF=E6=94=B9=E4=B8=BA=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=BD=93=E5=89=8D=E4=BA=BA=E5=91=98=E5=B1=85=E4=BD=8F?= =?UTF-8?q?=E7=9A=84=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/PersonDataResultDTO.java | 3 +++ .../service/impl/IcResiUserServiceImpl.java | 16 +++++++++++++++- .../src/main/resources/mapper/IcResiUserDao.xml | 4 +++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java index 5e739016b3..e9873965b7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java @@ -95,4 +95,7 @@ public class PersonDataResultDTO implements Serializable { @JsonIgnore private String gridId; + + @JsonIgnore + private String homeId; } 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 5b1fd7f8f1..ec9bf3043c 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 @@ -1143,11 +1143,25 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard(), formDTO.getCustomerId()); + //2022.9.14 应产品要求之前返的是这个人是房东的房屋信息，现在改成返回这个人当前居住的房屋信息 syc + /*Result> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard(), formDTO.getCustomerId()); if (!listResult.success()) { throw new RenException("查询房屋信息失败"); } personData.setHouseInfo(listResult.getData()); + */ + Set houseIds = new HashSet<>(); + houseIds.add(personData.getHomeId()); + Result> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId()); + if (!houseInfoRes.success()) { + throw new RenException("查询房屋信息失败"); + } + List houseInfo = new ArrayList<>(); + if(null!=houseInfoRes.getData()&& !CollectionUtils.isEmpty(houseInfoRes.getData())){ + houseInfo.add(houseInfoRes.getData().get(0).getAllName()); + } + //2022.9.14 end + personData.setHouseInfo(houseInfo); // 志愿者处理 if (personData.getIsVolunteer().equals(NumConstant.ONE_STR)) { 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 fe17400279..4674e07b37 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 @@ -300,6 +300,7 @@ + @@ -316,7 +317,8 @@ IS_TENANT as isTenant, IFNULL(IS_VOLUNTEER,'0') AS isVolunteer, CUSTOMER_ID, - GRID_ID + GRID_ID, + HOME_ID FROM ic_resi_user WHERE DEL_FLAG = '0' AND ID = #{userId} From 0c8cc30db7d56c18563b12494262d2dbed5b9f71 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 15 Sep 2022 09:24:14 +0800 Subject: [PATCH 368/397] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/result/IcEventResultDTO.java | 1 + .../src/main/resources/mapper/IcEventDao.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java index 0408211603..24f8e387d0 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java @@ -16,4 +16,5 @@ public class IcEventResultDTO { private String reportUserName; private String mobile; private String address; + private String happenTime; } 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 ec9ff0745f..578e1073c0 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 @@ -43,7 +43,8 @@ e.REPORT_USER_ID reportUserId, e.NAME reportUserName, e.MOBILE mobile, - e.STATUS processStatus + e.STATUS processStatus, + e.happen_time happenTime from ic_event e From 6594e67d486b28d07d592edfa6960292456ff2df Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 16 Sep 2022 09:32:18 +0800 Subject: [PATCH 369/397] try --- .../java/com/epmet/controller/IcResiUserController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 c25d1ff604..fb6a0c9f69 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 @@ -584,9 +584,9 @@ public class IcResiUserController implements ResultDataResolver { @RequestMapping(value = "/exportExcelCustomData") public Map exportExcelCustomData(@LoginUser TokenDto tokenDto, @RequestParam("templateId") String templateId, @RequestBody ExportResiUserFormDTO pageFormDTO) throws Exception { - log.warn("templateId=【"+templateId+"】"); log.warn("pageFormDTO入参【"+JSON.toJSONString(pageFormDTO)+"】"); - pageFormDTO.setTemplateId(templateId); + // pageFormDTO.setTemplateId(templateId); + pageFormDTO.setTemplateId(tokenDto.getCustomerId().concat("_").concat(templateId)); if (null == pageFormDTO.getSearchForm()) { IcResiUserPageFormDTO searchForm = new IcResiUserPageFormDTO(); searchForm.setFormCode("resi_base_info"); @@ -613,7 +613,8 @@ public class IcResiUserController implements ResultDataResolver { pageFormDTO.setExportConfig(exportTemplateSaveFormDTO); } //固定通用客户Id - pageFormDTO.setCustomerId("jmreport_resi_default"); + // pageFormDTO.setCustomerId("jmreport_resi_default"); + pageFormDTO.setCustomerId(tokenDto.getCustomerId()); Page> maps = icResiUserExportService.exportIcResiUser(tokenDto, pageFormDTO, null, true); Map result = new HashMap<>(); result.put("total",maps.getPages()); From db54ff9e470630d1c98aad9e311a2104f52dd578 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 16 Sep 2022 10:58:52 +0800 Subject: [PATCH 370/397] =?UTF-8?q?=E5=BA=94=E9=A1=BA=E5=BE=B7=E5=B1=85?= =?UTF-8?q?=E8=A6=81=E6=B1=82=E9=83=A8=E5=88=86=E5=8D=81=E5=85=AB=E7=B1=BB?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E8=A1=A8=E5=8D=95=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E5=BA=94=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=BF=AE=E6=94=B9DISPLAY=E4=B8=BA=E5=B1=95=E7=A4=BA=EF=BC=8Csq?= =?UTF-8?q?l=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcFormDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml index 3fd2eae45e..75cd379f88 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml @@ -80,6 +80,7 @@ i.DEL_FLAG = '0' AND i.PARENT_ITEM_ID = #{itemId} ) + AND g.DYNAMIC = '1' From a14195130666ab87672a15cd4e5bcf6e8d3c4389 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 16 Sep 2022 19:42:11 +0800 Subject: [PATCH 379/397] =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=EF=BC=8C=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E7=96=AB=E8=8B=97-=E6=A0=B8=E9=85=B8=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E9=99=8D=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 1 + 1 file changed, 1 insertion(+) 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 4674e07b37..2590bc1bd7 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 @@ -918,6 +918,7 @@ AND natCount = #{natCount} + order by t.vaccineCount desc, t.natCount desc - + From 7538334560f6dc5c910254bb8f1f8d76d774b694 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 17 Sep 2022 01:30:27 +0800 Subject: [PATCH 381/397] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF-=E6=B0=91=E6=97=8F?= =?UTF-8?q?=E4=BB=8E=E5=AE=B6=E5=BA=AD=E4=BF=A1=E6=81=AF=E6=8C=AA=E5=88=B0?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 74240 -> 74240 bytes 1 file changed, 0 insertions(+), 0 deletions(-) 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 88b2dcd8e1257d5a5d6ef06dcee4e45706845e64..f93667a3bd3c379e37d4ba18c1b1b80b4562736e 100644 GIT binary patch delta 8222 zcmdU!dvsLA8Ng@mKC;>DBiY@&H%}lT@<>8Lc;{Il5Xc6zkdP;dBuK!-hKB}fHXG$2cnPm5*J^ja?bobnu z`OP;ockawL-*;zj*Q@HTSJlV9m(*<6)43q27Uo`Lj19PUbBx$_Ch_j-az`e!vHva~ z9#XZ!$Lc89p|-(swH?N*C&ERQ9qz`wgP7-3+aJ?Jz&yNc8av#p358QC9b_PXrHX;` zSfoZ{^X$;9)be1s8j{W}5NAl|Hdt(!A03XJx;YTa*m1`46Y~?9dQ##C*tsZp)({zO z9+d743wtHul?0{^mZc$Z$q>n{@T4&f;*DBvgj!QHrGKS8Xh*KbED^F(`q&3S~DQUngj!uAn3GCR`U&|M?J@^wN}0cOsNyVm^#tZ zl$sdLe-GR9lV*NeO#>LjtCmzc`yFj7mew~dxpT)h7Q=SelO&jzIxab0D)pDz*~g90 zpC2!kwF57(OXqe%LV=wJ!R&%KY5RVt#=OstLPvpp#+c`*86EGd&uh?h4ZlScJO8>O z<6Z0PUMd|fi(wUT7TbF2ZMceU^<9LJLOVCZ_`YeK2fBN4I@d-aIi3r=YY2`nzz6OOg{%-6)uh}lW@we6-!iCdo7V-17}5^s-h!2 z`X`j@`;j(=;YD$a`;eJW7^lLd4zIxymC8J5+@CXK<=91->uQNyl%8YmKFzWsB_GwKuVuNleY| z!vZ?|C#S9w9L$1Qhk1zgOwW!PhRTPq5caZVhz;1rEZYzpS)5<_coxsnB8KD%tN{8K zKfx2>{3DUDyHuO$U`F;G-i0v}E0hO?OIjo|l9C^aDH={MDjW_SggL^~V|=n$l+oxY zb?l-}9H!KAo$(mPW1R#@bf{NP_SH*Axki>7Fw8)r{}i7z3)9pGrPXXCr6*G{Mf2jt zzA~1Br2J?2O3p;~;u2JnjHVDabyQcLZT;DWGbW(L24xGlOod~83k#P z=+25P2#L&uLOLWgCO!&gYgm{|pdN)5K_N(1K?Wr1veJwZE0SeW$b_;8L1v^OStwE@ z%Dh;Dqeia|_(w69(nvH4qC_JxNJEXpB1H?C-A@*WL^H0m5|0!sC;`bXC=n@6P!du+ zkxL%>WW)p^9D|f7Xe?5apm9jaf>Myi2uej7D`-5@I6-MhDS~c8N|nh)Gd}^5bWnMU ziAZUJCL!G>Xfo2!$fP4p5V8!`#wH5NMA;-kQ~c^>Ax&0fF1&pPml^} zK2oQoM;oR_Vr8y;x~&RrQwu8=CACNk;E*%Ubr)NRxqWCMeu)NZHml+7DmBlQEbK)x zSn^Y?qy+xDb)k4EX$n{31H_@lQ0WxoCL4dP_HoQ+!GB}P5_Ow?WN^qFlW}1<iU!W7!Sw@n_@*u@ zC<)h+muEpiRXF^%E(xr4anMmW5w0Cb8{?~rgFwTe!GReVpjd@*C|VpZzhAC*zVZ$u zmvhMpdHFUu_h9WwUMr_Us^^$faV1hcioHBf&Ofz02rN}GzPjX~h9pV8+&FwlFRzfx z*Djyo%QfMcczL;;yS6$jWI8G{wT>~&sXA&IhcI7GR>$xVz-djfD zxos5oZK1HXp2E*7DRet1+_;{?`!-Vei!ut&9-wfgEN$OF>1=fOj3rc1`1sbpmQ$>% zdr~fuQ1N0l@oDGm8j5$6eOY$Sg^3G4`>~wyMq^C}3GAf}r4)NQT{|gmYku&j6rXmE z-&(SSQa3ttoi@3S_t8U5O6u>cY&9iIYUEq&a#1PE3JRZ*+v=^Cnu#tscFHCGvg4Ng z$ga;y*UG(9)kUtN0*|eHqmklw*Hp;8@At`*deY@`dHW18MAyVm#+1kl8TK&#jmEx%Co1w_f7s z)=StTTpWrU(6ACew_f7s)=T`{dI?)B>IGvx3*?=Rb(M-d1Lipd8Ij5anUIzUG9%qC zC={t&P#BU^kOgTeQXkrgt@y%e!+Nrj!93Z>KwD$5bp!(g_cY!kt!?yNYfP3#!8nD% z)&ArW`}v2aHvPQSjFsNS*td7n41;b(sV95Y7ZP6vsVxbkp!cyeDsZ$FjiFht6hyPU zToBE2l^~ksYESf<+L0&7bU6whUY`Ni);l1*dy=Mxj4Ud84kR|~p>u;ye|R%vleaMT z(1V`c8(P%72L9QRIvR$Z=1ot~f!9f1|RdM*yHvLV&A#kHlcmh|&El>2G6)N5goA!CdxuW|I z(~tt69@wXE|2bou4l{P;*Z3I!@N7BwmgKtIH=ndMUhbP`hVwjppY{V9blOaFyct?_ z$UK_{vwAF^=X)}^r}$TAf<}CxuxC$6N1h$hAMZ*V#P#QoY8^6Nu9Z#6)nhvS8@;$; ze}%F7*JNG#=7kR=z7F0w?ypP5em=C=&xaQK`OsoNA6o3^LyP@!{u>VB4YlCmeOQ;kTY@;9}(mjGqNcRddBXtN0McO1N3<)i$tX>lCx+~-j3mqj$ zxa+Qv4GO*4E|7Q5Do^W+*TY7dd{5o!46eWNCi6Gk*vKtO2ZHE&F)?e-^oAkEzt6t z+;5E+`T6`JKc8RZ=ktrOAA|l*gJ*GcI;D6&Ez-+_l5E(_4EZ1?p}K+uT{CDtvuA-Vddej zugwOWzF_vd0>-xDF(NS!U@3rA0jv&SO#o{HIB1An@(p!E88XvHui+ii2XIIL8v@uE zz@`8;3&zbRJ#nbWP&h1rEdgu|U|Rr(4`V%jQY>(vvhoam(tX{^$H-qFY1Qn&i@pNw z#S4F3$K8``JRygc(4Dx~U5o!VmWandt8tIqh&k=@OKv_DR===rRoPoyPWKqT%Rb|7 zvGLsAQ#KyMt=V`YoP$>;UeoY2cq+?uUk&H5FP@jBeLpZTK;Mue@uJT_#B`!eA9Lsv z4t=0pWQw;CqU%0=C;SQY&#aL^A9&NlNY23GB`9cHbsE0|$ cYQmAOxI658vo;!&TY2x22)>;kj_2xs0Ux9GfdBvi delta 7702 zcmd6sd2m!k9>=@i%p_zolVfsClF0=jA#x-!T)_yFgh(_bL&!i*a*%^N90@22OyYua zhzN}gu0(d#U3Xn@!C}GDGSpTH!tR22ChCHuP*+_MR=`zCV86fjh7M!-$NnXmsp;-d ze}CPtyWg*m_om|wea9R6eb*Je?a1f~q3G_L$nd%0dV*8@NQ1&RRhKz3SvcYUkuNst zT1BD3D$eSx!mb}74(M%Sz1}K9^xsSmsT2D#dHJV0`qKqh8UI?SH0mJl?vdS7IZKFX~SaJ z-p@5PwerZ%sC{2*>gR)4U1Z>_jeQ0^(ar-S<| zjE63KtJ(AJlvsW*pk&U+GyNEEsZN?3IeS&@q|);~G(im~ZQ=G^S zyuYOcQMIG88PN#m)6)?>R`S9c&o_lfl|ftBynMz?OqBMf81-n-P=Ch0DifW(C7uaW zZCrUdQ&bek7w^S72eM#W@ES7$FVq;7TK@Ii+78=c)VCz z5}WBjeb-PQV`i48jtE!$KtUiaKNu+*({6YhV<95c5s@D4)ncIOkgJu6m1S&5QD?f@ zFobbbMkG4?=;z8~BfX_Z!OEaonGmLf=$q+P??jqfqSc)R(%Lf`DU1>7rg=IBqC3?RC`rul*3d|vVg zVQul!AP{+*W*GpoxFi~ZVUhwtv`A{ECbp18NHRmC4ry8ts9y^PMM3L^1;?f5{p1_v zEoDW%6?QJIl4xLmB{3jc7d0)`N3((G?rT~cC{|KD$R;TP6elSW6fY?WltAQChkh_H zQHn!ANs^L5gCz|G4Uv=rN|uxg8Y*cRC`D2lC{@xOAaciR%td#8I516$BS3dZ8VTwj znNgtOQcGux*$7D)&_+ti^eJ~IXq42lKM3PP?n_ep#G+1 zgGNhj0%(k+yWl@#CFMXH=cP=}?goyR;zUrkq)DI&lI)jYjEJ|D~^K&gi z9{E4{g96WQWjS7Z1@701+BIKM;Q6hLjsu#d1vE)g7|1Ru9F!|50+c5y5`<;aTT4_B za5Au)RpIhh(N{Jc&C&~#GtxDWX^p!%2XfUyv`Eco1>P!j82|a~9!UyliX-SZ?Nf+iOOuMAi}na!3jW^|vAfG)-!uY`*IjwD^c&J{0al5k3^@Ls6jq z%UeOE@`BMmS_~+Ax)fu5L>s6~YH=VZs0Y11i4{GE)r-TtrOcnBZ24Bxb-5lkj z)Ob1?!qr_4cW}{+cAb@3J)h2K;M^g2MaoEnwAQIkU_hut=}5T8jT;8I1;xbOe1qsL zj}Q$NjS-4!MY}Vp6nFDFRoz{c?N!a_1E~~u^C_xYQ%rAqrcsT6nf z{c73L>aBsvSRQrAM=W+%&J0Y!l1PkL^i@p_8Ha^{nBs2!As74G!d)I5exiE$y*TJF z_SD)>%P8(^r7&*Ju3Z!_*!-=N;_fZKZ4R%Yl(IFgwWw4}r8tJRQ0mM~3T-6~B@`!= zQ@E|^_-u+#J2q5P{Qml@s@3H+6P;R3u4B$&YqhE_%n7e4Dy>lslb%d>PyuH}fKyYa zmef=apRT3faFo0L+^p%&3az5I))9a4L^^jg2H3Y9JLG2O(VMG zns!M|G^v+6KD%ZmWqa1RHc-5{<uRIsP&{deN$qQEOWP`9OFe~$>J&Bi>t#>v zCcavJbrZ!s4^ybC?NaM@tKn#Mocl@^s`O386f#-SPT{}3nIA7GS8u`|??4_@N95!) zWV38Jg}uLCs`h~<3f<6bmMuFWxI3Av(&(@o{ito0wg0)g`haVo5`x zGP53M%ojb~wZk}0?Ek78>T@V6Ql}rSP&6%yd=5oLK8KiO16Nt-|YtVP3** zZzb+fc7q&Ex?i1QDm4upP-8QUNBWIVVh7(Iv;fg49`Yabp^iG|;Q zC3K704`tJ8?;>2hu}ds%n4+xP?BSm%%585ydDmYbZ#90row0K}8Jn?79pS7e>UDgH z$T%?6Rm5(6B>Kf?zt~V8Cq_SKsncdH`BIzo9`dDjN#sk*CDCkOA&F-D{gP<5KOiX# zw9<2Q`?W#dJD4J@&+ITxevYxJFJMo55kvC5XW#C36xV|&q&;<-umovMVkrI#4G|rA zI38iKLWvkG4gpYxs7g+BXDq0fF(=(FDx`s_D_KKo6f&wf+r zv)>f@>^FtjZ(h6<%h!l+50o|Dd>&VDrE=Ec9d89kvU1ibDG2niq+k#hE7d*dp{Ja! zl@tnEC&>cJ@%-U0W{cZU@2t#{{5!Ut05XXAPAa%W`lmE`s(Hk}}7PYNsT9xDf)F#0Fr=0`D z`CIwSa5UYeA>Q7*bBymZ+l$qaf- zQV?jfq+rnFo{5*Q1S|Ga;^+ri?zws%#qI76Jug=5;iA6B=^kg`T?TtN&IQ6=K3K$6 z7{%^mA?^r2{2_44PvluO2LYhf}(v^69fV2i-~}pXd&W;MPO-NFKw(vhboR8$XK2 zA{@iA-HW2QID}>`;Uc3TWQUcH55Ion2K{HL{+mD-C3a7Z=T?4wf5X#!M+|>J>F{$u z7{k}_o$eoExMPqWX0W>9<`H~Y!m~OcKE*g)FUA|x2Ar!K@J6m3w2U>AQCdh04xd!y u=7(}K+#RuevWbct@FNLBl5C*I`}f>G#PWyy!jN3c4|UqOAOC$k*Z&WiQn>8^ From 21dbf58f63aa4f456b1ab9a88f90357e315b18ae Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 17 Sep 2022 13:51:17 +0800 Subject: [PATCH 382/397] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=B1=BB=E5=88=AB-?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=88=97=E8=A1=A8-=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92?= =?UTF-8?q?=E5=BA=8F+name=E5=8D=87=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 2590bc1bd7..caba921430 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 @@ -374,7 +374,7 @@ and ${columnName}='1' AND `STATUS`='0' - ORDER BY `NAME` + ORDER BY `CREATED_TIME` DESC, `NAME` SELECT a.id, @@ -83,12 +96,19 @@ b.BUILD_ID, b.UNIT_ID, b.HOME_ID, + b.id as userId, IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and a.CUSTOMER_ID = b.CUSTOMER_ID WHERE a.DEL_FLAG = 0 AND concat(a.pids,':',ORG_ID) like concat('%',#{orgId},'%') AND a.ATTENTION_TYPE = #{attentionType} + + AND a.isolatedState = #{isolatedState} + + + AND a.is_history = 1 + AND a.`NAME` LIKE CONCAT('%',#{name},'%') @@ -158,8 +178,30 @@ a.MOBILE, a.ID_CARD, a.REMARK, - a.REASON + a.REASON, + a.ISOLATED_STATE FROM ic_epidemic_special_attention a WHERE a.ID = #{id} + + From cc84e4e3043647c4f07febd071a84a69d078c20d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 19 Sep 2022 16:41:08 +0800 Subject: [PATCH 385/397] a --- .../java/com/epmet/dto/result/VaccinationListResultDTO.java | 1 + .../main/resources/mapper/IcEpidemicSpecialAttentionDao.xml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java index cfb6fbc749..69d37b3e10 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java @@ -57,6 +57,7 @@ public class VaccinationListResultDTO implements Serializable { * 最后一次通知时间 */ private String lastInformTime; + private String lastNatTime; /** * 所属小区ID diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index adacd9675a..f2467a9823 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -97,8 +97,7 @@ b.UNIT_ID, b.HOME_ID, b.id as userId, - IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime - FROM ic_epidemic_special_attention a + IFNULL((SELECT DATE_FORMAT(NAT_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_nat WHERE DEL_FLAG = '0' AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastNatTime FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and a.CUSTOMER_ID = b.CUSTOMER_ID WHERE a.DEL_FLAG = 0 AND concat(a.pids,':',ORG_ID) like concat('%',#{orgId},'%') From e0e69d39769204549d8e1f18c4bcfad45f03d40a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 19 Sep 2022 16:42:37 +0800 Subject: [PATCH 386/397] bug --- .../src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index f2467a9823..8c7db19ae1 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -114,7 +114,7 @@ AND a.MOBILE LIKE CONCAT('%',#{mobile},'%') - + AND a.ID_CARD LIKE CONCAT('%',#{idCard},'%') From 1dcdf6cd1aa91e36400ba2b504c54c1035614281 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 19 Sep 2022 16:57:17 +0800 Subject: [PATCH 387/397] bug --- .../src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 8c7db19ae1..d6d129d6a4 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -97,6 +97,7 @@ b.UNIT_ID, b.HOME_ID, b.id as userId, + a.ISOLATED_STATE, IFNULL((SELECT DATE_FORMAT(NAT_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_nat WHERE DEL_FLAG = '0' AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastNatTime FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and a.CUSTOMER_ID = b.CUSTOMER_ID WHERE a.DEL_FLAG = 0 From 802a723bef0225e03dbdb0db4fbe92955119cf13 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 19 Sep 2022 17:07:07 +0800 Subject: [PATCH 388/397] bug --- .../service/impl/IcEpidemicSpecialAttentionServiceImpl.java | 1 + .../main/resources/mapper/IcEpidemicSpecialAttentionDao.xml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 677a5760ba..1c8f9fab4e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -326,6 +326,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl - AND a.isolatedState = #{isolatedState} + AND a.isolated_state = #{isolatedState} AND a.is_history = 1 From c7a0d10a58345d7830e7452f266687f3e5d69e33 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 19 Sep 2022 17:26:22 +0800 Subject: [PATCH 389/397] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=AA=E7=BD=91?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/VaccinationListResultDTO.java | 2 ++ .../impl/IcEpidemicSpecialAttentionServiceImpl.java | 10 ++++++++++ .../resources/mapper/IcEpidemicSpecialAttentionDao.xml | 1 + 3 files changed, 13 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java index 69d37b3e10..65c0eb51d9 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java @@ -73,6 +73,8 @@ public class VaccinationListResultDTO implements Serializable { * 所属楼宇Id */ private String buildId; + private String gridId; + private String gridName; /** * 所属楼宇名称 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 1c8f9fab4e..2cec386b53 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -15,6 +15,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ExcelPoiUtils; @@ -170,6 +171,15 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(r.getGridId()); + if (null == gridInfo){ + throw new EpmetException("查询网格失败："+r.getGridId()); + } + r.setGridName(gridInfo.getGridNamePath()); + }); + } } if (CollectionUtils.isNotEmpty(result.getList())){ result.getList().forEach(v -> { diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 8a0e29a55f..c475e9cfbe 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -97,6 +97,7 @@ b.UNIT_ID, b.HOME_ID, b.id as userId, + b.grid_id as gridId, a.ISOLATED_STATE, IFNULL((SELECT DATE_FORMAT(NAT_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_nat WHERE DEL_FLAG = '0' AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastNatTime FROM ic_epidemic_special_attention a From 5c6b538bce680a0e5d03f6ee69375f3ae25b391b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 19 Sep 2022 17:36:18 +0800 Subject: [PATCH 390/397] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=AA=E7=BD=91?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcEpidemicSpecialAttentionServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 2cec386b53..d621eb4f92 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -173,11 +173,13 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl { - GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(r.getGridId()); - if (null == gridInfo){ - throw new EpmetException("查询网格失败："+r.getGridId()); + if (StringUtils.isNotBlank(r.getGridId())){ + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(r.getGridId()); + if (null == gridInfo){ + throw new EpmetException("查询网格失败："+r.getGridId()); + } + r.setGridName(gridInfo.getGridNamePath()); } - r.setGridName(gridInfo.getGridNamePath()); }); } } From 7cf0214500958e0eb20e51a5184108cf93716369 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 19 Sep 2022 18:05:47 +0800 Subject: [PATCH 391/397] a --- .../service/impl/IcEpidemicSpecialAttentionServiceImpl.java | 1 + .../main/resources/mapper/IcEpidemicSpecialAttentionDao.xml | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index d621eb4f92..9dc1f79e72 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -162,6 +162,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.natList(formDTO)); result.setList(pageInfo.getList()); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index c475e9cfbe..abcabebdba 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -108,7 +108,10 @@ AND a.isolated_state = #{isolatedState} - + + AND a.IS_ATTENTION = 1 + + AND a.is_history = 1 From 86fc9c41d556adc029f98ec38261b2d8ae03ed1a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 19 Sep 2022 18:07:19 +0800 Subject: [PATCH 392/397] a --- .../main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java index 4ae01cbce1..52a43eedf1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java @@ -63,6 +63,7 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable { /** * 隔离类型,来自字典表 */ + @NotBlank(message = "isolatedState不能为空",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class}) private String isolatedState; /** From f172f7dc60854ba3b644f3870c0c3cd9272cf0d1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 19 Sep 2022 18:45:44 +0800 Subject: [PATCH 393/397] a --- .../dao/IcEpidemicSpecialAttentionDao.java | 1 + ...IcEpidemicSpecialAttentionServiceImpl.java | 4 ++- .../mapper/IcEpidemicSpecialAttentionDao.xml | 34 +++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcEpidemicSpecialAttentionDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcEpidemicSpecialAttentionDao.java index 6a7cb224dc..d57e5b7f94 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcEpidemicSpecialAttentionDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcEpidemicSpecialAttentionDao.java @@ -53,6 +53,7 @@ public interface IcEpidemicSpecialAttentionDao extends BaseDao list,@Param("attentionType")Integer attentionType); void addAttention(@Param("list")List list,@Param("attentionType")Integer attentionType); + void addExistAttention(@Param("list") List list,@Param("attentionType")Integer attentionType); /** * Desc: 查询已经存在的关注 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 9dc1f79e72..520b36bb5e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -283,17 +283,19 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl idCards = entities.stream().map(m -> m.getIdCard()).collect(Collectors.toList()); Integer attentionType = entities.get(NumConstant.ZERO).getAttentionType(); List existList = baseDao.getExistList(attentionType, idCards); + List existsEntities = new ArrayList<>(); if (CollectionUtils.isNotEmpty(existList)){ for (String s : existList) { for (int i = NumConstant.ZERO; i < entities.size(); i++) { if (s.equals(entities.get(i).getIdCard())){ + existsEntities.add(entities.get(i)); entities.remove(i); continue; } } } + baseDao.addAttention(idCards,attentionType); } - baseDao.addAttention(idCards,attentionType); entities.forEach(e -> { e.setIsAttention(NumConstant.ONE); e.setOrgId(agencyInfo.getId()); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index abcabebdba..f814f838fc 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -31,6 +31,40 @@ ) + + UPDATE ic_epidemic_special_attention + + + + when id_card = #{item.idCard} then 1 + + + + + when id_card = #{item.idCard} then #{item.reason} + + + + + when id_card = #{item.idCard} then #{item.remark} + + + + + when id_card = #{item.idCard} then #{item.isolatedState} + + + updated_time = now() + + WHERE del_flag = 0 + AND attention_type = #{attentionType} + AND id_card IN ( + + #{l.idCard} + + ) + +