From 5d323735813f6d47ede068aab9ab2d68d9dca3d6 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 9 Aug 2021 10:17:48 +0800
Subject: [PATCH 001/134] =?UTF-8?q?groupAgencyDaily=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E3=80=81=E6=B7=BB=E5=8A=A0=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dao/stats/FactGroupAgencyDailyDao.java  |  2 +-
 .../impl/FactGroupAgencyDailyServiceImpl.java     | 15 +++++++++++----
 .../mapper/stats/FactGroupAgencyDailyDao.xml      |  1 +
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupAgencyDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupAgencyDailyDao.java
index f5184b653a..2b12a4344e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupAgencyDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupAgencyDailyDao.java
@@ -64,6 +64,6 @@ public interface FactGroupAgencyDailyDao extends BaseDao<FactGroupAgencyDailyEnt
      * @Description 删除当天已存在数据
      * @author zxc
      */
-    void deleteInsertAgencyDailyByDateId(@Param("dateId") String dateId, @Param("customerId") String customerId);
+    Integer deleteInsertAgencyDailyByDateId(@Param("dateId") String dateId, @Param("customerId") String customerId);
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java
index d5030d68de..306849f76e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java
@@ -33,9 +33,11 @@ import com.epmet.dto.group.result.AgencyGroupMonthlyResultDTO;
 import com.epmet.dto.stats.FactGroupAgencyDailyDTO;
 import com.epmet.entity.stats.FactGroupAgencyDailyEntity;
 import com.epmet.service.stats.FactGroupAgencyDailyService;
+import org.apache.commons.collections4.ListUtils;
 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.ArrayList;
 import java.util.Arrays;
@@ -112,11 +114,16 @@ public class FactGroupAgencyDailyServiceImpl extends BaseServiceImpl<FactGroupAg
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGroupAgencyDaily(List<AgencyGroupDailyResultDTO> agencyList,String customerId) {
-        if (agencyList.size() != NumConstant.ZERO){
-            baseDao.deleteInsertAgencyDailyByDateId(agencyList.get(NumConstant.ZERO).getDateId(),customerId);
-            baseDao.insertGroupAgencyDaily(agencyList);
+        if (!CollectionUtils.isEmpty(agencyList)){
+            Integer delNum;
+            do {
+                delNum = baseDao.deleteInsertAgencyDailyByDateId(agencyList.get(NumConstant.ZERO).getDateId(),customerId);
+            }while (delNum > NumConstant.ZERO && delNum == NumConstant.ONE_THOUSAND);
+            List<List<AgencyGroupDailyResultDTO>> partition = ListUtils.partition(agencyList, NumConstant.ONE_HUNDRED);
+            partition.forEach(p -> {
+                baseDao.insertGroupAgencyDaily(p);
+            });
         }
-
     }
 
     /**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupAgencyDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupAgencyDailyDao.xml
index fbdcbe322e..229b7daa24 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupAgencyDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupAgencyDailyDao.xml
@@ -122,6 +122,7 @@
         WHERE
             date_id = #{dateId}
             AND customer_id = #{customerId}
+        LIMIT 1000
     </delete>
 
 </mapper>
\ No newline at end of file

From 4e4ddadd940d11aa5083748754e81be7865a473c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 3 Sep 2021 16:12:12 +0800
Subject: [PATCH 002/134] =?UTF-8?q?=E4=BA=94=E7=A7=8D=E5=85=A5=E7=BB=84?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=9D=87=E9=9C=80=E8=A6=81=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E3=80=81=E5=BE=AE=E4=BF=A1=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/constant/UserMessageConstant.java  |  1 +
 .../service/GroupInvitationService.java        |  9 ++++++++-
 .../impl/GroupInvitationServiceImpl.java       |  5 +++--
 .../impl/GroupMemeberOperationServiceImpl.java | 18 +++++++++++-------
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java
index 86cb1a6ff2..831109fc67 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java
@@ -29,6 +29,7 @@ public interface UserMessageConstant {
      */
     String INVITED_JOIN_GROUP = "您的好友-【%s】通过邀请连接，加入了【%s】";
     String SCANCODE_JOIN_GROUP = "您的好友-【%s】通过扫描二维码，加入了【%s】";
+    String SHARABLELINK_JOIN_GROUP = "您的好友-【%s】通过分享链接，加入了【%s】";
 
     /**
      * 组成员被禁言时会收到消息：您已被禁言，禁言时间2020.03.20 12:20-2020.03.27  12:20
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java
index 4c8897c5f1..8577aa2bd9 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java
@@ -21,7 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.invitation.entity.GroupInvitationEntity;
-import com.epmet.resi.group.dto.UserRoleDTO;
+import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.invitation.GroupInvitationDTO;
 import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO;
 import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO;
@@ -143,4 +143,11 @@ public interface GroupInvitationService extends BaseService<GroupInvitationEntit
      * @Description 邀请链接或扫码进组
      **/
     AcceptInvitationResultDTO accetInvitationV2(AccetInvitationFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 将私有化推送站内信、微信方法改为公共方法
+     **/
+    Result sendMessageToLeader(AccetInvitationFormDTO formDTO, ResiGroupDTO resiGroupDTO, GroupInvitationDTO groupInvitationDTO);
+
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
index 3a59f101a0..563e5a8140 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
@@ -609,7 +609,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	 * @Description 用户通过邀请进群之后，通知群主：您的好友-【认证的居民名字 xxx路-王先生】通过邀请链接，加入了【组名】
 	 * @Date 2020/4/7 14:46
 	 **/
-	private Result sendMessageToLeader(AccetInvitationFormDTO formDTO, ResiGroupDTO resiGroupDTO, GroupInvitationDTO groupInvitationDTO) {
+	@Override
+	public Result sendMessageToLeader(AccetInvitationFormDTO formDTO, ResiGroupDTO resiGroupDTO, GroupInvitationDTO groupInvitationDTO) {
 		//1、根据用户id用户认证注册信息
 		UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
 		userResiInfoFormDTO.setUserId(formDTO.getUserId());
@@ -635,7 +636,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		}
 		//分享链接
 		if(StringUtils.equals(groupInvitationDTO.getInvitationType(),"sharableLink")){
-
+			messageContent = String.format(UserMessageConstant.SHARABLELINK_JOIN_GROUP, userResiInfoDTOResult.getData().getShowName(), resiGroupDTO.getGroupName());
 		}
 		// end
 		userMessage.setMessageContent(messageContent);
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
index 90cf1e3b15..de5c0b5207 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
@@ -22,6 +22,7 @@ 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.EpmetRoleKeyConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
@@ -31,7 +32,6 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 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.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.SendMqMsgUtils;
 import com.epmet.dto.IssueShareLinkRecordDTO;
@@ -43,10 +43,9 @@ import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
-import com.epmet.modules.group.dao.ResiGroupDao;
-import com.epmet.modules.group.entity.ResiGroupEntity;
 import com.epmet.modules.group.redis.ResiGroupRedis;
 import com.epmet.modules.group.service.ResiGroupService;
+import com.epmet.modules.invitation.service.GroupInvitationService;
 import com.epmet.modules.member.dao.GroupMemeberOperationDao;
 import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.member.entity.GroupMemeberOperationEntity;
@@ -67,17 +66,16 @@ import com.epmet.resi.group.constant.MemberStateConstant;
 import com.epmet.resi.group.dto.UserRoleDTO;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO;
+import com.epmet.resi.group.dto.invitation.GroupInvitationDTO;
+import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO;
 import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO;
 import com.epmet.resi.group.dto.member.form.JoinGroupByShareLinkFormDTO;
-import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
 import com.epmet.resi.group.dto.member.result.JoinGroupApplyRealTimeResultDTO;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -120,6 +118,8 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
     private TopicShareLinkVisitRecordDao topicShareLinkVisitRecordDao;
     @Autowired
     private GovOrgFeignClient govOrgFeignClient;
+    @Autowired
+    private GroupInvitationService groupInvitationService;
 
     @Override
     public PageData<GroupMemeberOperationDTO> page(Map<String, Object> params) {
@@ -434,7 +434,11 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
             groupRedis.set(groupCache);
         }
         //发送消息
-        //this.sendMessageToLeader(formDTO, resiGroupDTO,groupInvitationDTO);
+        AccetInvitationFormDTO formDTO = new AccetInvitationFormDTO();
+        formDTO.setUserId(formDTO.getUserId());
+        GroupInvitationDTO groupInvitationDTO = new GroupInvitationDTO();
+        groupInvitationDTO.setInvitationType("sharableLink");
+        groupInvitationService.sendMessageToLeader(formDTO, resiGroupDTO,groupInvitationDTO);
 
         return result;
     }

From 55916816f72ee16f60f131951d49754a204b5f0d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 6 Sep 2021 13:28:57 +0800
Subject: [PATCH 003/134] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=94=9F=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/group/constant/ActConstant.java      | 17 ++++
 .../act/OrganizationalLifeLineChartDTO.java   | 44 ++++++++++
 .../act/form/OrganizationalLifeFormDTO.java   | 22 +++++
 .../result/OrganizationalLifeResultDTO.java   | 47 +++++++++++
 .../controller/GroupActInfoController.java    | 13 +++
 .../modules/act/dao/GroupActInfoDao.java      | 39 ++++++++-
 .../act/service/GroupActInfoService.java      | 10 +++
 .../service/impl/GroupActInfoServiceImpl.java | 84 +++++++++++++++++++
 .../resources/mapper/act/GroupActInfoDao.xml  | 59 +++++++++++++
 9 files changed, 334 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/ActConstant.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/OrganizationalLifeLineChartDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/OrganizationalLifeFormDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/OrganizationalLifeResultDTO.java

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/ActConstant.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/ActConstant.java
new file mode 100644
index 0000000000..30f06ebaf6
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/ActConstant.java
@@ -0,0 +1,17 @@
+package com.epmet.resi.group.constant;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/3 4:39 下午
+ * @DESC
+ */
+public interface ActConstant {
+
+    /**
+     * 类型【组织活动次数：orgAct，应参加活动次数：joinAct，活动签到次数：signAct】
+     */
+    String ORG_ACT = "orgAct";
+    String JOIN_ACT = "joinAct";
+    String SIGN_ACT = "signAct";
+
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/OrganizationalLifeLineChartDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/OrganizationalLifeLineChartDTO.java
new file mode 100644
index 0000000000..ad5dca0bba
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/OrganizationalLifeLineChartDTO.java
@@ -0,0 +1,44 @@
+package com.epmet.resi.group.dto.act;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/3 3:35 下午
+ * @DESC
+ */
+@Data
+public class OrganizationalLifeLineChartDTO implements Serializable {
+
+    private static final long serialVersionUID = -4224453421929580053L;
+
+    /**
+     * 月份
+     */
+    private String month;
+
+    /**
+     * 组织活动次数
+     */
+    private Integer organizationalActCount;
+
+    /**
+     * 应参加活动次数
+     */
+    private Integer shouldJoinActCount;
+
+    /**
+     * 活动签到次数
+     */
+    private Integer actSignCount;
+
+    public OrganizationalLifeLineChartDTO() {
+        this.month = "";
+        this.organizationalActCount = NumConstant.ZERO;
+        this.shouldJoinActCount = NumConstant.ZERO;
+        this.actSignCount = NumConstant.ZERO;
+    }
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/OrganizationalLifeFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/OrganizationalLifeFormDTO.java
new file mode 100644
index 0000000000..3e515c2c75
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/OrganizationalLifeFormDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.resi.group.dto.act.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/3 2:52 下午
+ * @DESC
+ */
+@Data
+public class OrganizationalLifeFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -8611679719504666547L;
+
+    private String yearId;
+
+    private String userId;
+
+    private String customerId;
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/OrganizationalLifeResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/OrganizationalLifeResultDTO.java
new file mode 100644
index 0000000000..e68cbd02be
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/OrganizationalLifeResultDTO.java
@@ -0,0 +1,47 @@
+package com.epmet.resi.group.dto.act.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.resi.group.dto.act.OrganizationalLifeLineChartDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/3 2:35 下午
+ * @DESC
+ */
+@Data
+public class OrganizationalLifeResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 6991638491754890967L;
+
+    /**
+     * 组织活动次数
+     */
+    private Integer organizationalActCount;
+
+    /**
+     * 应参加活动次数
+     */
+    private Integer shouldJoinActCount;
+
+    /**
+     * 活动签到次数
+     */
+    private Integer actSignCount;
+
+    /**
+     * 折线图
+     */
+    private List<OrganizationalLifeLineChartDTO> lineChart;
+
+    public OrganizationalLifeResultDTO() {
+        this.organizationalActCount = NumConstant.ZERO;
+        this.shouldJoinActCount = NumConstant.ZERO;
+        this.actSignCount = NumConstant.ZERO;
+        this.lineChart = new ArrayList<>();
+    }
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
index 4a1a973022..34fc73ec23 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
@@ -27,6 +27,7 @@ import com.epmet.resi.group.dto.act.GroupActIdDTO;
 import com.epmet.resi.group.dto.act.form.*;
 import com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO;
 import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
+import com.epmet.resi.group.dto.act.result.OrganizationalLifeResultDTO;
 import com.epmet.resi.group.dto.notice.result.NoticeReadListResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -153,4 +154,16 @@ public class GroupActInfoController {
         return new Result();
     }
 
+    /**
+     * @Description  组织生活
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/3 2:57 下午
+     */
+    @PostMapping("organizationallife")
+    public Result<OrganizationalLifeResultDTO> organizationalLife(@LoginUser TokenDto tokenDto, @RequestBody OrganizationalLifeFormDTO formDTO){
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<OrganizationalLifeResultDTO>().ok(groupActInfoService.organizationalLife(formDTO));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java
index 85f243e608..c4082b67c9 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java
@@ -19,7 +19,13 @@ package com.epmet.modules.act.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.act.entity.GroupActInfoEntity;
+import com.epmet.resi.group.dto.act.OrganizationalLifeLineChartDTO;
+import com.epmet.resi.group.dto.act.form.OrganizationalLifeFormDTO;
+import com.epmet.resi.group.dto.act.result.OrganizationalLifeResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 组织活动信息
@@ -29,5 +35,36 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface GroupActInfoDao extends BaseDao<GroupActInfoEntity> {
-	
+
+    /**
+     * @Description  根据人查询支部小组，小组审核状态为 approved 的，小组类型为 branch 的，GROUP_LEADER_FLAG 为 leader 的，人员状态为 approved 的
+     * @Param userId
+     * @Param leaderFlag 是否是组长标志
+     * @author zxc
+     * @date 2021/9/3 3:48 下午
+     */
+    List<String> selectBranchGroupByUserId(@Param("userId")String userId,@Param("leaderFlag")Boolean leaderFlag);
+
+    /**
+     * @Description  按照yearId查询组织生活，组织活动次数、应参加活动次数、活动签到次数
+     * @Param formDTO
+     * @Param groupIds
+     * @Param leaderFlag 是否是组长标志
+     * @author zxc
+     * @date 2021/9/3 4:12 下午
+     */
+    OrganizationalLifeResultDTO selectOrgLife(@Param("userId")String userId, @Param("groupIds")List<String> groupIds,
+                                              @Param("leaderFlag")Boolean leaderFlag,@Param("yearId")String yearId);
+
+    /**
+     * @Description  组织生活折线图
+     * @Param leaderGroupIds
+     * @Param memberGroupIds
+     * @Param yearId
+     * @author zxc
+     * @date 2021/9/6 10:24 上午
+     */
+    List<OrganizationalLifeLineChartDTO> selectLineChart(@Param("groupIds") List<String> groupId,@Param("leaderFlag")Boolean leaderFlag,
+                                                         @Param("yearId")String yearId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java
index b815bb7358..9ed4a2b015 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java
@@ -24,6 +24,7 @@ import com.epmet.resi.group.dto.act.GroupActInfoDTO;
 import com.epmet.resi.group.dto.act.form.*;
 import com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO;
 import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
+import com.epmet.resi.group.dto.act.result.OrganizationalLifeResultDTO;
 import com.epmet.resi.group.dto.notice.result.NoticeReadListResultDTO;
 
 /**
@@ -89,4 +90,13 @@ public interface GroupActInfoService extends BaseService<GroupActInfoEntity> {
      * @return
      */
     void closeAct(CloseGroupActFormDTO formDTO);
+
+    /**
+     * @Description  组织生活
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/3 2:57 下午
+     */
+    OrganizationalLifeResultDTO organizationalLife(OrganizationalLifeFormDTO formDTO);
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index 48334bac4e..41e77cee6a 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -58,9 +58,11 @@ import com.epmet.modules.invitation.service.InvitationRecordService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.resi.group.dto.act.GroupActIdDTO;
 import com.epmet.resi.group.dto.act.GroupActInfoDTO;
+import com.epmet.resi.group.dto.act.OrganizationalLifeLineChartDTO;
 import com.epmet.resi.group.dto.act.form.*;
 import com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO;
 import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
+import com.epmet.resi.group.dto.act.result.OrganizationalLifeResultDTO;
 import com.epmet.resi.group.dto.group.GroupMessageDTO;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.invitation.InvitationRecordDTO;
@@ -75,6 +77,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -862,4 +865,85 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         //6、插入或更新
         saveGroupMessage(actInfoEntity);
     }
+
+    /**
+     * @Description  组织生活
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/3 2:57 下午
+     */
+    @Override
+    public OrganizationalLifeResultDTO organizationalLife(OrganizationalLifeFormDTO formDTO) {
+        OrganizationalLifeResultDTO result = new OrganizationalLifeResultDTO();
+        if (StringUtils.isBlank(formDTO.getYearId())){
+            formDTO.setYearId(String.valueOf(LocalDate.now().getYear()));
+        }
+        // 小组审核状态为 approved 的，小组类型为 branch 的，人员状态为 approved 的 小组ID
+        // 查询此人是组长,客户下所有支部小组
+        List<String> leaderGroupIds = baseDao.selectBranchGroupByUserId(formDTO.getUserId(),true);
+        List<OrganizationalLifeLineChartDTO> chartResult = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(leaderGroupIds)){
+            // 按照yearId查询组织生活【我创建的活动】，组织活动次数、应参加活动次数、活动签到次数
+            OrganizationalLifeResultDTO dto = baseDao.selectOrgLife(formDTO.getUserId(), leaderGroupIds,true,formDTO.getYearId());
+            result.setOrganizationalActCount(dto.getOrganizationalActCount());
+            result.setActSignCount(dto.getActSignCount());
+            // 当此人是组长，创建了几个活动就应参加几个活动
+            result.setShouldJoinActCount(dto.getOrganizationalActCount());
+            List<OrganizationalLifeLineChartDTO> chartDTOS = baseDao.selectLineChart(leaderGroupIds, true, formDTO.getYearId());
+            if (!CollectionUtils.isEmpty(chartDTOS)){
+                chartResult.addAll(chartDTOS);
+            }
+        }
+        // 查询此人不是组长,客户下所有支部小组
+        List<String> memberGroupIds = baseDao.selectBranchGroupByUserId(formDTO.getUserId(),false);
+        if (!CollectionUtils.isEmpty(memberGroupIds)){
+            // 按照yearId查询组织生活【我所在支部组的活动】，组织活动次数、应参加活动次数、活动签到次数
+            OrganizationalLifeResultDTO dto = baseDao.selectOrgLife(formDTO.getUserId(), memberGroupIds,false, formDTO.getYearId());
+            result.setActSignCount(result.getActSignCount() + dto.getActSignCount());
+            // 当此人不是组长，支部小组下有几个活动，应参加活动就是几
+            result.setShouldJoinActCount(result.getShouldJoinActCount() + dto.getOrganizationalActCount());
+            // 此人不是组长，我组织的活动这就不加了
+
+            List<OrganizationalLifeLineChartDTO> chartDTOS = baseDao.selectLineChart(memberGroupIds, false, formDTO.getYearId());
+            if (!CollectionUtils.isEmpty(chartDTOS)){
+                chartResult.addAll(chartDTOS);
+            }
+        }
+        // 折线图组装
+        List<OrganizationalLifeLineChartDTO> lineChart = lineChart();
+        if (!CollectionUtils.isEmpty(chartResult)){
+            Map<String, List<OrganizationalLifeLineChartDTO>> groupByMonth = chartResult.stream().collect(Collectors.groupingBy(OrganizationalLifeLineChartDTO::getMonth));
+            groupByMonth.forEach((month,list) -> {
+                lineChart.forEach(l -> {
+                    if (month.equals(l.getMonth())){
+                        l.setOrganizationalActCount(list.stream().collect(Collectors.summingInt(OrganizationalLifeLineChartDTO::getOrganizationalActCount)));
+                        l.setShouldJoinActCount(list.stream().collect(Collectors.summingInt(OrganizationalLifeLineChartDTO::getShouldJoinActCount)));
+                        l.setActSignCount(list.stream().collect(Collectors.summingInt(OrganizationalLifeLineChartDTO::getActSignCount)));
+                    }
+                });
+            });
+        }
+        result.setLineChart(lineChart);
+        return result;
+    }
+
+    /**
+     * @Description  折线图构造
+     * @author zxc
+     * @date 2021/9/6 10:55 上午
+     */
+    public List<OrganizationalLifeLineChartDTO> lineChart(){
+        List<OrganizationalLifeLineChartDTO> lineChart = new ArrayList<>();
+        for (int i = NumConstant.ONE; i <= NumConstant.TWELVE; i++) {
+            OrganizationalLifeLineChartDTO dto = new OrganizationalLifeLineChartDTO();
+            if (i < NumConstant.TEN){
+                dto.setMonth(NumConstant.ZERO + String.valueOf(i) + "月");
+            }else {
+                dto.setMonth(String.valueOf(i) + "月");
+            }
+            lineChart.add(dto);
+        }
+        return lineChart;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActInfoDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActInfoDao.xml
index 70b86b20e5..6ebd2be427 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActInfoDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActInfoDao.xml
@@ -3,6 +3,65 @@
 
 <mapper namespace="com.epmet.modules.act.dao.GroupActInfoDao">
 
+    <!-- 根据人查询支部小组 -->
+    <select id="selectBranchGroupByUserId" resultType="java.lang.String">
+        SELECT
+               rg.ID
+        FROM resi_group rg
+        INNER JOIN resi_group_member rgm ON (rgm.RESI_GROUP_ID = rg.ID AND rgm.DEL_FLAG = '0')
+        WHERE rg.DEL_FLAG = '0'
+          AND rg.STATE = 'approved'
+          AND rg.GROUP_TYPE = 'branch'
+          <if test="leaderFlag == true">
+              AND rgm.GROUP_LEADER_FLAG = 'leader'
+          </if>
+          <if test="leaderFlag == false">
+              AND rgm.GROUP_LEADER_FLAG != 'leader'
+          </if>
+          AND rgm.`STATUS` = 'approved'
+          AND rgm.CUSTOMER_USER_ID = #{userId}
+    </select>
 
+    <!-- 按照yearId查询组织生活 -->
+    <select id="selectOrgLife" resultType="com.epmet.resi.group.dto.act.result.OrganizationalLifeResultDTO">
+        SELECT
+            count(ID) AS organizationalActCount,
+            IFNULL(sum(SIGNED_IN_NUM),0) actSignCount
+        FROM group_act_info
+        WHERE DEL_FLAG = '0'
+          <if test="leaderFlag == true">
+              AND PUBLISH_USER_ID = #{userId}
+          </if>
+          AND `STATUS` != 'canceled'
+          AND GROUP_ID IN (
+              <foreach collection="groupIds" item="groupId" separator=",">
+                  #{groupId}
+              </foreach>
+            )
+          AND DATE_FORMAT(CREATED_TIME,'%Y') = #{yearId}
+    </select>
 
+    <!-- 组织生活折线图 -->
+    <select id="selectLineChart" resultType="com.epmet.resi.group.dto.act.OrganizationalLifeLineChartDTO">
+        SELECT
+            <if test="leaderFlag == true">
+                count( ID ) AS organizationalActCount,
+            </if>
+            <if test="leaderFlag == false">
+                0 AS organizationalActCount,
+            </if>
+            count( ID ) AS shouldJoinActCount,
+            IFNULL( sum( SIGNED_IN_NUM ), 0 ) AS actSignCount,
+            CONCAT(DATE_FORMAT( CREATED_TIME, '%m' ),'月') AS month
+        FROM group_act_info
+        WHERE
+            DEL_FLAG = '0'
+          AND `STATUS` != 'canceled'
+          AND GROUP_ID IN (
+              <foreach collection="groupIds" item="g" separator=",">
+                  #{g}
+              </foreach>)
+          AND DATE_FORMAT( CREATED_TIME, '%Y' ) = #{yearId}
+        GROUP BY month
+    </select>
 </mapper>
\ No newline at end of file

From 29256d2d77c1dd4bb7955806c8ea520e38fa1c9a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 6 Sep 2021 14:09:00 +0800
Subject: [PATCH 004/134] =?UTF-8?q?=E7=BE=A4=E7=BB=84=E4=BB=8B=E7=BB=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/dto/group/result/AllGroupListResultDTO.java    | 4 ++++
 .../group/dto/group/result/RecommendGroupResultDTO.java  | 5 +++++
 .../group/dto/group/result/RecommendedListResultDTO.java | 5 +++++
 .../src/main/resources/mapper/group/ResiGroupDao.xml     | 9 ++++++---
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AllGroupListResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AllGroupListResultDTO.java
index d31e01cab8..3ddbd344d2 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AllGroupListResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AllGroupListResultDTO.java
@@ -47,4 +47,8 @@ public class AllGroupListResultDTO implements Serializable {
 	 */
 	private String groupType;
 
+	/**
+	 * 群介绍
+	 */
+	private String groupIntroduction = "";
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendGroupResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendGroupResultDTO.java
index 72de523d2a..ff080a5864 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendGroupResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendGroupResultDTO.java
@@ -48,4 +48,9 @@ public class RecommendGroupResultDTO implements Serializable {
 	 */
 	private String groupType;
 
+	/**
+	 * 群介绍
+	 */
+	private String groupIntroduction = "";
+
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendedListResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendedListResultDTO.java
index 47fbf7d9be..4e9834470a 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendedListResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendedListResultDTO.java
@@ -37,4 +37,9 @@ public class RecommendedListResultDTO implements Serializable {
 	 * 组长名
 	 */
 	private String leaderName;
+
+	/**
+	 * 群介绍
+	 */
+	private String groupIntroduction = "";
 }
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 82d1531781..bf17a2004e 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
@@ -157,7 +157,8 @@
             rg.GROUP_NAME AS groupName,
             rg.GROUP_TYPE AS groupType,
             rgs.TOTAL_MEMBERS AS totalMember,
-            rgs.TOTAL_PARTY_MEMBERS AS totalPartyMember
+            rgs.TOTAL_PARTY_MEMBERS AS totalPartyMember,
+            rg.GROUP_INTRODUCTION
         FROM
             resi_group rg
             LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )
@@ -452,7 +453,8 @@
             rg.GROUP_HEAD_PHOTO AS groupHeadPhoto,
             rg.GROUP_NAME AS groupName,
             rgs.TOTAL_MEMBERS AS totalMember,
-            rgs.TOTAL_PARTY_MEMBERS AS totalPartyMember
+            rgs.TOTAL_PARTY_MEMBERS AS totalPartyMember,
+            rg.GROUP_INTRODUCTION
         FROM
             resi_group rg
                 LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )
@@ -647,7 +649,8 @@
             rg.group_name AS groupName,
             rg.group_type AS groupType,
             rgs.total_members AS totalMember,
-            rgs.total_party_members AS totalPartyMember
+            rgs.total_party_members AS totalPartyMember,
+            rg.GROUP_INTRODUCTION
         FROM
             resi_group rg
         LEFT JOIN resi_group_statistical rgs ON (rg.id = rgs.resi_group_id)

From da4abdd281b268f87edb0ed75b013d2138220090 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 6 Sep 2021 16:08:42 +0800
Subject: [PATCH 005/134] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=B8=8B=E5=85=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/ResiPartyMemberOpenFeignClient.java         | 10 ++++++++++
 .../ResiPartyMemberOpenFeignClientFallback.java       |  5 +++++
 .../controller/PartymemberInfoController.java         | 11 +++++++++++
 .../modules/partymember/dao/PartymemberInfoDao.java   |  8 ++++++++
 .../partymember/service/PartymemberInfoService.java   |  8 ++++++++
 .../service/impl/PartymemberInfoServiceImpl.java      | 11 +++++++++++
 .../mapper/partymember/PartymemberInfoDao.xml         | 11 +++++++++++
 7 files changed, 64 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 0eb5f2f018..0f320cf9be 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
@@ -95,4 +95,14 @@ public interface ResiPartyMemberOpenFeignClient {
      **/
     @PostMapping(value = "/resi/partymember/partymemberinfo/getPartymemberInfoByGridId", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result<List<PartymemberInfoDTO>> getPartymemberInfoByGridId(@RequestBody List<String> gridIdList);
+
+    /**
+     * @Description  根据客户ID查询党员
+     * @Param customerId
+     * @author zxc
+     * @date 2021/9/6 3:54 下午
+     */
+    @PostMapping(value = "/resi/partymember/partymemberinfo/getpartymemberinfobycustomerid")
+    Result<List<PartymemberInfoDTO>> getPartyMemberInfoByCustomerId(@RequestParam("customerId")String customerId);
+
 }
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 9591f35234..953d5ca326 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
@@ -64,4 +64,9 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp
     public Result<List<PartymemberInfoDTO>> getPartymemberInfoByGridId(List<String> gridIdList) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartymemberInfoByGridId", gridIdList);
     }
+
+    @Override
+    public Result<List<PartymemberInfoDTO>> getPartyMemberInfoByCustomerId(String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartyMemberInfoByCustomerId", customerId);
+    }
 }
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 5d7d081e13..98b56b8475 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
@@ -157,4 +157,15 @@ public class PartymemberInfoController {
         List<PartymemberInfoDTO> list = partymemberInfoService.listPartymemberInfoByGridId(gridIdList);
         return new Result<List<PartymemberInfoDTO>>().ok(list);
     }
+
+    /**
+     * @Description  根据客户ID查询党员
+     * @Param customerId
+     * @author zxc
+     * @date 2021/9/6 3:54 下午
+     */
+    @PostMapping("getpartymemberinfobycustomerid")
+    public Result<List<PartymemberInfoDTO>> getPartyMemberInfoByCustomerId(@RequestParam("customerId")String customerId){
+        return new Result<List<PartymemberInfoDTO>>().ok(partymemberInfoService.getPartyMemberInfoByCustomerId(customerId));
+    }
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java
index f395beac8b..c363cd42a0 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java
@@ -95,4 +95,12 @@ public interface PartymemberInfoDao extends BaseDao<PartymemberInfoEntity> {
 	 * @Date 2020/7/22 12:14
 	 **/
 	List<PartymemberInfoDTO> selectListPartymemberInfoByGridId(@Param("gridIdList") List<String> gridIdList);
+
+	/**
+	 * @Description  根据客户ID查询党员
+	 * @Param customerId
+	 * @author zxc
+	 * @date 2021/9/6 3:54 下午
+	 */
+	List<PartymemberInfoDTO> selectListPartyMemberInfoByCustomerId(@Param("customerId") String customerId);
 }
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 4a25939dad..eed9482da3 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
@@ -170,4 +170,12 @@ public interface PartymemberInfoService extends BaseService<PartymemberInfoEntit
      * @return
      */
     PartymemberInfoDTO getPartyMemberInfoByUser(String customerId, String userId);
+
+    /**
+     * @Description  根据客户ID查询党员
+     * @Param customerId
+     * @author zxc
+     * @date 2021/9/6 3:54 下午
+     */
+    List<PartymemberInfoDTO> getPartyMemberInfoByCustomerId(String customerId);
 }
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 57e6a2922c..dfb4c42f71 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
@@ -248,4 +248,15 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		PartymemberInfoEntity entity = baseDao.selectOne(wrapper);
 		return ConvertUtils.sourceToTarget(entity, PartymemberInfoDTO.class);
 	}
+
+	/**
+	 * @Description  根据客户ID查询党员
+	 * @Param customerId
+	 * @author zxc
+	 * @date 2021/9/6 3:54 下午
+	 */
+	@Override
+	public List<PartymemberInfoDTO> getPartyMemberInfoByCustomerId(String customerId) {
+		return baseDao.selectListPartyMemberInfoByCustomerId(customerId);
+	}
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml
index 876e1102f0..d6585f8dfb 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml
@@ -169,4 +169,15 @@
                 </foreach>
             </if>
     </select>
+
+    <!-- 根据客户ID查询党员 -->
+    <select id="selectListPartyMemberInfoByCustomerId" resultType="com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO">
+        SELECT
+            *
+        FROM partymember_info
+        WHERE
+            DEL_FLAG = 0
+          AND ( CONFIRM_RESULT = 'auto_confirm_success' OR CONFIRM_RESULT = 'approved' )
+          AND CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>

From 05f3762f414f759d0f8ba707bb5b20d83b39bf57 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 6 Sep 2021 17:10:12 +0800
Subject: [PATCH 006/134] =?UTF-8?q?8=E3=80=81=E6=B4=BB=E5=8A=A8/=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5/=E8=AF=9D=E9=A2=98=E8=AF=84=E8=AE=BA=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E6=9C=89=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/act/ActCommentAttachmentDTO.java      | 126 ++++++++++++++++++
 .../group/dto/act/form/CommentFormDTO.java    |   6 +
 .../dto/act/result/CommentResultDTO.java      |  10 ++
 .../comment/result/ResiCommentResultDTO.java  |   8 ++
 .../dto/group/result/CommentFileDTO.java      |  26 ++++
 .../notice/NoticeCommentAttachmentDTO.java    | 126 ++++++++++++++++++
 .../dto/notice/form/NoticeCommentFormDTO.java |   6 +
 .../result/NoticeCommentListResultDTO.java    |   9 +-
 .../topic/ResiTopicCommentAttachmentDTO.java  | 126 ++++++++++++++++++
 .../topic/form/ResiPublishCommentFormDTO.java |   7 +
 .../ActCommentAttachmentController.java       |  85 ++++++++++++
 .../act/dao/ActCommentAttachmentDao.java      |  43 ++++++
 .../entity/ActCommentAttachmentEntity.java    |  93 +++++++++++++
 .../service/ActCommentAttachmentService.java  | 103 ++++++++++++++
 .../impl/ActCommentAttachmentServiceImpl.java | 110 +++++++++++++++
 .../service/impl/ActCommentServiceImpl.java   |  58 +++++++-
 .../NoticeCommentAttachmentController.java    |  85 ++++++++++++
 .../dao/NoticeCommentAttachmentDao.java       |  43 ++++++
 .../entity/NoticeCommentAttachmentEntity.java |  93 +++++++++++++
 .../NoticeCommentAttachmentService.java       | 103 ++++++++++++++
 .../notice/service/NoticeCommentService.java  |   7 +
 .../NoticeCommentAttachmentServiceImpl.java   | 110 +++++++++++++++
 .../impl/NoticeCommentServiceImpl.java        | 103 +++++++++++++-
 .../service/impl/NoticeServiceImpl.java       |   2 +-
 .../ResiTopicCommentAttachmentController.java |  85 ++++++++++++
 .../dao/ResiTopicCommentAttachmentDao.java    |  43 ++++++
 .../ResiTopicCommentAttachmentEntity.java     |  93 +++++++++++++
 .../ResiTopicCommentAttachmentService.java    | 102 ++++++++++++++
 ...ResiTopicCommentAttachmentServiceImpl.java | 110 +++++++++++++++
 .../impl/ResiTopicCommentServiceImpl.java     |  68 ++++++++--
 .../mapper/act/ActCommentAttachmentDao.xml    |  25 ++++
 .../notice/NoticeCommentAttachmentDao.xml     |  25 ++++
 .../topic/ResiTopicCommentAttachmentDao.xml   |  25 ++++
 33 files changed, 2049 insertions(+), 15 deletions(-)
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentAttachmentDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CommentFileDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentAttachmentDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicCommentAttachmentDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCommentAttachmentController.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCommentAttachmentDao.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActCommentAttachmentEntity.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActCommentAttachmentService.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentAttachmentServiceImpl.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeCommentAttachmentController.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/dao/NoticeCommentAttachmentDao.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeCommentAttachmentEntity.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeCommentAttachmentService.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentAttachmentServiceImpl.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicCommentAttachmentController.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicCommentAttachmentDao.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicCommentAttachmentEntity.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentAttachmentService.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentAttachmentServiceImpl.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCommentAttachmentDao.xml
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeCommentAttachmentDao.xml
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentAttachmentDao.xml

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentAttachmentDTO.java
new file mode 100644
index 0000000000..5326d3783d
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentAttachmentDTO.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.act;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 活动评论附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Data
+public class ActCommentAttachmentDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 活动Id[group_act_info.id]
+     */
+	private String groupActId;
+
+    /**
+     * 评论Id
+     */
+	private String actCommentId;
+
+    /**
+     * 文件名
+     */
+	private String fileName;
+
+    /**
+     * 附件名（uuid随机生成）
+     */
+	private String attachmentName;
+
+    /**
+     * 文件大小，单位b
+     */
+	private Integer attachmentSize;
+
+    /**
+     * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）
+     */
+	private String attachmentFormat;
+
+    /**
+     * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
+     */
+	private String attachmentType;
+
+    /**
+     * 附件地址
+     */
+	private String attachmentUrl;
+
+    /**
+     * 排序字段
+     */
+	private Integer sort;
+
+    /**
+     * 语音或视频时长，秒
+     */
+	private Integer duration;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentFormDTO.java
index 92fce732ae..8d3cbbcbe1 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentFormDTO.java
@@ -1,11 +1,13 @@
 package com.epmet.resi.group.dto.act.form;
 
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import com.epmet.resi.group.dto.notice.form.NoticeFileDTO;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 005、评论活动
@@ -27,6 +29,10 @@ public class CommentFormDTO implements Serializable {
     @NotBlank(message = "评论内容不能为空", groups = AddUserShowGroup.class)
     @Length(max = 500, message = "评论内容最多输入500字", groups = AddUserShowGroup.class)
     private String commentContent;
+    /**
+     * 图片附件集合
+     */
+    private List<NoticeFileDTO> imageList;
 
     /**
      * 当前用户id
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/CommentResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/CommentResultDTO.java
index efb8066f28..a6053ffc39 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/CommentResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/CommentResultDTO.java
@@ -1,10 +1,13 @@
 package com.epmet.resi.group.dto.act.result;
 
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 006、活动评论列表查询
@@ -27,4 +30,11 @@ public class CommentResultDTO implements Serializable {
     private Date commentTime;
 
     private String commentUserId;
+
+    /**
+     * 图片附件集合
+     */
+    private List<CommentFileDTO> imageList = new ArrayList<>();
+
+
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/ResiCommentResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/ResiCommentResultDTO.java
index c28985e054..57ae73c471 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/ResiCommentResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/ResiCommentResultDTO.java
@@ -1,11 +1,14 @@
 package com.epmet.resi.group.dto.comment.result;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description
@@ -54,4 +57,9 @@ public class ResiCommentResultDTO implements Serializable {
      * 评论状态
      * */
     private String commentStatus;
+
+    /**
+     * 图片附件集合
+     */
+    private List<CommentFileDTO> imageList = new ArrayList<>();
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CommentFileDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CommentFileDTO.java
new file mode 100644
index 0000000000..f101a0a657
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CommentFileDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.resi.group.dto.group.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 话题、通知、活动评论附件
+ */
+@NoArgsConstructor
+@Data
+public class CommentFileDTO implements Serializable {
+
+	private static final long serialVersionUID = -3930520724652521552L;
+	private String name;
+	private String url;
+	private String type;
+	private String format;
+	private Integer size;
+	private Integer duration;
+	@JsonIgnore
+	private String userId;
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentAttachmentDTO.java
new file mode 100644
index 0000000000..6e7c7e336f
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentAttachmentDTO.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.notice;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 通知评论附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Data
+public class NoticeCommentAttachmentDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 通知Id
+     */
+	private String noticeId;
+
+    /**
+     * 评论Id
+     */
+	private String noticeCommentId;
+
+    /**
+     * 文件名
+     */
+	private String fileName;
+
+    /**
+     * 附件名（uuid随机生成）
+     */
+	private String attachmentName;
+
+    /**
+     * 文件大小，单位b
+     */
+	private Integer attachmentSize;
+
+    /**
+     * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）
+     */
+	private String attachmentFormat;
+
+    /**
+     * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
+     */
+	private String attachmentType;
+
+    /**
+     * 附件地址
+     */
+	private String attachmentUrl;
+
+    /**
+     * 排序字段
+     */
+	private Integer sort;
+
+    /**
+     * 语音或视频时长，秒
+     */
+	private Integer duration;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java
index c543bf7222..1044128fcf 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java
@@ -5,6 +5,7 @@ import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 /**
  * @Author sun
@@ -30,6 +31,11 @@ public class NoticeCommentFormDTO {
      */
     private String userId;
 
+    /**
+     * 图片附件集合
+     */
+    private List<NoticeFileDTO> imageList;
+
     public interface Comment{}
     public interface UserShow extends CustomerClientShowGroup {}
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeCommentListResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeCommentListResultDTO.java
index 726289e144..45a9c9f694 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeCommentListResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeCommentListResultDTO.java
@@ -1,11 +1,13 @@
 package com.epmet.resi.group.dto.notice.result;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author sun
@@ -42,4 +44,9 @@ public class NoticeCommentListResultDTO implements Serializable {
      * */
     private String userId;
 
+    /**
+     * 图片附件集合
+     */
+    private List<CommentFileDTO> imageList = new ArrayList<>();
+
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicCommentAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicCommentAttachmentDTO.java
new file mode 100644
index 0000000000..acd1c4e381
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicCommentAttachmentDTO.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.topic;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 话题评论附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Data
+public class ResiTopicCommentAttachmentDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 话题Id
+     */
+	private String topicId;
+
+    /**
+     * 评论Id
+     */
+	private String topicCommentId;
+
+    /**
+     * 文件名
+     */
+	private String fileName;
+
+    /**
+     * 附件名（uuid随机生成）
+     */
+	private String attachmentName;
+
+    /**
+     * 文件大小，单位b
+     */
+	private Integer attachmentSize;
+
+    /**
+     * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）
+     */
+	private String attachmentFormat;
+
+    /**
+     * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
+     */
+	private String attachmentType;
+
+    /**
+     * 附件地址
+     */
+	private String attachmentUrl;
+
+    /**
+     * 排序字段
+     */
+	private Integer sort;
+
+    /**
+     * 语音或视频时长，秒
+     */
+	private Integer duration;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java
index 894364fe16..9e8b7338cd 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java
@@ -1,9 +1,11 @@
 package com.epmet.resi.group.dto.topic.form;
 
+import com.epmet.resi.group.dto.notice.form.NoticeFileDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description
@@ -21,4 +23,9 @@ public class ResiPublishCommentFormDTO implements Serializable {
 
    @NotBlank(message = "评论内容不能为空")
    private String commentContent;
+
+   /**
+    * 图片附件集合
+    */
+   private List<NoticeFileDTO> imageList;
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCommentAttachmentController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCommentAttachmentController.java
new file mode 100644
index 0000000000..e84a321e4b
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCommentAttachmentController.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.controller;
+
+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.act.service.ActCommentAttachmentService;
+import com.epmet.resi.group.dto.act.ActCommentAttachmentDTO;
+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 2021-09-06
+ */
+@RestController
+@RequestMapping("actcommentattachment")
+public class ActCommentAttachmentController {
+    
+    @Autowired
+    private ActCommentAttachmentService actCommentAttachmentService;
+
+    @GetMapping("page")
+    public Result<PageData<ActCommentAttachmentDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<ActCommentAttachmentDTO> page = actCommentAttachmentService.page(params);
+        return new Result<PageData<ActCommentAttachmentDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ActCommentAttachmentDTO> get(@PathVariable("id") String id){
+        ActCommentAttachmentDTO data = actCommentAttachmentService.get(id);
+        return new Result<ActCommentAttachmentDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ActCommentAttachmentDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        actCommentAttachmentService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ActCommentAttachmentDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        actCommentAttachmentService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        actCommentAttachmentService.delete(ids);
+        return new Result();
+    }
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCommentAttachmentDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCommentAttachmentDao.java
new file mode 100644
index 0000000000..07f076a6f5
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCommentAttachmentDao.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.act.entity.ActCommentAttachmentEntity;
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
+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 2021-09-06
+ */
+@Mapper
+public interface ActCommentAttachmentDao extends BaseDao<ActCommentAttachmentEntity> {
+
+    /**
+     * @Author sun
+     * @Description 查询通知评论所有人员的附件信息
+     **/
+    List<CommentFileDTO> selectActComFile(@Param("groupActId") String groupActId);
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActCommentAttachmentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActCommentAttachmentEntity.java
new file mode 100644
index 0000000000..1e290165ee
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActCommentAttachmentEntity.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.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 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("act_comment_attachment")
+public class ActCommentAttachmentEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 活动Id[group_act_info.id]
+     */
+	private String groupActId;
+
+    /**
+     * 评论Id
+     */
+	private String actCommentId;
+
+    /**
+     * 文件名
+     */
+	private String fileName;
+
+    /**
+     * 附件名（uuid随机生成）
+     */
+	private String attachmentName;
+
+    /**
+     * 文件大小，单位b
+     */
+	private Integer attachmentSize;
+
+    /**
+     * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）
+     */
+	private String attachmentFormat;
+
+    /**
+     * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
+     */
+	private String attachmentType;
+
+    /**
+     * 附件地址
+     */
+	private String attachmentUrl;
+
+    /**
+     * 排序字段
+     */
+	private Integer sort;
+
+    /**
+     * 语音或视频时长，秒
+     */
+	private Integer duration;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActCommentAttachmentService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActCommentAttachmentService.java
new file mode 100644
index 0000000000..c1faff4a04
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActCommentAttachmentService.java
@@ -0,0 +1,103 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.modules.act.entity.ActCommentAttachmentEntity;
+import com.epmet.resi.group.dto.act.ActCommentAttachmentDTO;
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 活动评论附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+public interface ActCommentAttachmentService extends BaseService<ActCommentAttachmentEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ActCommentAttachmentDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    PageData<ActCommentAttachmentDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ActCommentAttachmentDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    List<ActCommentAttachmentDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ActCommentAttachmentDTO
+     * @author generator
+     * @date 2021-09-06
+     */
+    ActCommentAttachmentDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void save(ActCommentAttachmentDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void update(ActCommentAttachmentDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void delete(String[] ids);
+
+    /**
+     * @Author sun
+     * @Description 查询活动评论所有人员的附件信息
+     **/
+    List<CommentFileDTO> getActComFile(String groupActId);
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentAttachmentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentAttachmentServiceImpl.java
new file mode 100644
index 0000000000..916cf5bdda
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentAttachmentServiceImpl.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.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.act.dao.ActCommentAttachmentDao;
+import com.epmet.modules.act.entity.ActCommentAttachmentEntity;
+import com.epmet.modules.act.service.ActCommentAttachmentService;
+import com.epmet.resi.group.dto.act.ActCommentAttachmentDTO;
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
+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 2021-09-06
+ */
+@Service
+public class ActCommentAttachmentServiceImpl extends BaseServiceImpl<ActCommentAttachmentDao, ActCommentAttachmentEntity> implements ActCommentAttachmentService {
+
+
+    @Override
+    public PageData<ActCommentAttachmentDTO> page(Map<String, Object> params) {
+        IPage<ActCommentAttachmentEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ActCommentAttachmentDTO.class);
+    }
+
+    @Override
+    public List<ActCommentAttachmentDTO> list(Map<String, Object> params) {
+        List<ActCommentAttachmentEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ActCommentAttachmentDTO.class);
+    }
+
+    private QueryWrapper<ActCommentAttachmentEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ActCommentAttachmentEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ActCommentAttachmentDTO get(String id) {
+        ActCommentAttachmentEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ActCommentAttachmentDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ActCommentAttachmentDTO dto) {
+        ActCommentAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, ActCommentAttachmentEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ActCommentAttachmentDTO dto) {
+        ActCommentAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, ActCommentAttachmentEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * @Author sun
+     * @Description 查询通知评论所有人员的附件信息
+     **/
+    @Override
+    public List<CommentFileDTO> getActComFile(String groupActId) {
+        return baseDao.selectActComFile(groupActId);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
index c249c4ec28..98890462ca 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
@@ -18,6 +18,7 @@
 package com.epmet.modules.act.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
@@ -28,23 +29,31 @@ import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.act.dao.ActCommentDao;
+import com.epmet.modules.act.entity.ActCommentAttachmentEntity;
 import com.epmet.modules.act.entity.ActCommentEntity;
+import com.epmet.modules.act.service.ActCommentAttachmentService;
 import com.epmet.modules.act.service.ActCommentService;
 import com.epmet.modules.act.service.GroupActInfoService;
 import com.epmet.modules.constant.GroupActConstant;
+import com.epmet.modules.notice.service.NoticeCommentService;
 import com.epmet.resi.group.dto.act.GroupActInfoDTO;
 import com.epmet.resi.group.dto.act.form.CommentFormDTO;
 import com.epmet.resi.group.dto.act.form.CommentQueryFormDTO;
 import com.epmet.resi.group.dto.act.result.CommentResultDTO;
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
+import com.epmet.resi.group.dto.notice.form.NoticeFileDTO;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -65,6 +74,10 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
     private GroupActInfoService groupActInfoService;
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Autowired
+    private NoticeCommentService noticeCommentService;
+    @Autowired
+    private ActCommentAttachmentService actCommentAttachmentService;
 
 
     /**
@@ -74,6 +87,7 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void submitComment(CommentFormDTO formDTO) {
         //1、关闭和已取消不能评论
         GroupActInfoDTO groupActInfoDTO = groupActInfoService.getGroupActInfoDTO(formDTO.getGroupActId());
@@ -96,6 +110,10 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
                 throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
             }
         }
+        //图片安全校验
+        List<String> imageList = formDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
+        noticeCommentService.safetyCheck(new ArrayList<>(), imageList);
+
         //3、插入记录
         ActCommentEntity actCommentEntity = new ActCommentEntity();
         actCommentEntity.setCustomerId(formDTO.getCustomerId());
@@ -103,6 +121,33 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
         actCommentEntity.setCommentUserId(formDTO.getUserId());
         actCommentEntity.setGroupActId(formDTO.getGroupActId());
         baseDao.insert(actCommentEntity);
+
+        //4.保存活动评论附件数据
+        List<ActCommentAttachmentEntity> AttachmentEntityList = new ArrayList<>();
+        //图片
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(formDTO.getImageList())) {
+            AtomicInteger sort = new AtomicInteger();
+            formDTO.getImageList().forEach(img -> {
+                ActCommentAttachmentEntity attachment = new ActCommentAttachmentEntity();
+                attachment.setCustomerId(formDTO.getCustomerId());
+                attachment.setGroupActId(formDTO.getGroupActId());
+                attachment.setActCommentId(actCommentEntity.getId());
+                attachment.setFileName(img.getName());
+                attachment.setAttachmentName("");
+                attachment.setAttachmentSize(img.getSize());
+                attachment.setAttachmentFormat(img.getFormat());
+                attachment.setAttachmentType(img.getType());
+                attachment.setAttachmentUrl(img.getUrl());
+                attachment.setSort(sort.get());
+                attachment.setDuration(img.getDuration());
+                sort.getAndIncrement();
+                AttachmentEntityList.add(attachment);
+            });
+        }
+        if (AttachmentEntityList.size() > NumConstant.ZERO) {
+            actCommentAttachmentService.insertBatch(AttachmentEntityList);
+        }
+
     }
 
     /**
@@ -124,8 +169,11 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
         if (!result.success()) {
             throw new RenException("调用user服务，获取用户基础数据失败");
         }
+        //3.查询活动评论所有人员的附件信息
+        List<CommentFileDTO> fileList = actCommentAttachmentService.getActComFile(formDTO.getGroupActId());
+
         if (!CollectionUtils.isEmpty(result.getData())) {
-            //3.遍历封装数据并返回
+            //4.遍历封装数据并返回
             list.forEach(l -> {
                 result.getData().forEach(user -> {
                     if (l.getCommentUserId().equals(user.getUserId())) {
@@ -133,6 +181,14 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
                         l.setCommentUserName(user.getSurname().concat(user.getName()));
                     }
                 });
+                //每一条评论的附件信息
+                List<CommentFileDTO> imageList = new ArrayList<>();
+                for (CommentFileDTO f : fileList) {
+                    if (l.getCommentUserId().equals(f.getUserId())) {
+                        imageList.add(f);
+                    }
+                }
+                l.setImageList(imageList);
             });
 
         }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeCommentAttachmentController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeCommentAttachmentController.java
new file mode 100644
index 0000000000..baaf689e54
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeCommentAttachmentController.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.notice.controller;
+
+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.notice.service.NoticeCommentAttachmentService;
+import com.epmet.resi.group.dto.notice.NoticeCommentAttachmentDTO;
+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 2021-09-06
+ */
+@RestController
+@RequestMapping("noticecommentattachment")
+public class NoticeCommentAttachmentController {
+    
+    @Autowired
+    private NoticeCommentAttachmentService noticeCommentAttachmentService;
+
+    @GetMapping("page")
+    public Result<PageData<NoticeCommentAttachmentDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<NoticeCommentAttachmentDTO> page = noticeCommentAttachmentService.page(params);
+        return new Result<PageData<NoticeCommentAttachmentDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<NoticeCommentAttachmentDTO> get(@PathVariable("id") String id){
+        NoticeCommentAttachmentDTO data = noticeCommentAttachmentService.get(id);
+        return new Result<NoticeCommentAttachmentDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody NoticeCommentAttachmentDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        noticeCommentAttachmentService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody NoticeCommentAttachmentDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        noticeCommentAttachmentService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        noticeCommentAttachmentService.delete(ids);
+        return new Result();
+    }
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/dao/NoticeCommentAttachmentDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/dao/NoticeCommentAttachmentDao.java
new file mode 100644
index 0000000000..2ad57a60cd
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/dao/NoticeCommentAttachmentDao.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.notice.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.notice.entity.NoticeCommentAttachmentEntity;
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
+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 2021-09-06
+ */
+@Mapper
+public interface NoticeCommentAttachmentDao extends BaseDao<NoticeCommentAttachmentEntity> {
+
+    /**
+     * @Author sun
+     * @Description 查询通知评论所有人员的附件信息
+     **/
+    List<CommentFileDTO> selectNoticeComFile(@Param("noticeId") String noticeId);
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeCommentAttachmentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeCommentAttachmentEntity.java
new file mode 100644
index 0000000000..7ab97e6634
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeCommentAttachmentEntity.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.notice.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 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("notice_comment_attachment")
+public class NoticeCommentAttachmentEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 通知Id
+     */
+	private String noticeId;
+
+    /**
+     * 评论Id
+     */
+	private String noticeCommentId;
+
+    /**
+     * 文件名
+     */
+	private String fileName;
+
+    /**
+     * 附件名（uuid随机生成）
+     */
+	private String attachmentName;
+
+    /**
+     * 文件大小，单位b
+     */
+	private Integer attachmentSize;
+
+    /**
+     * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）
+     */
+	private String attachmentFormat;
+
+    /**
+     * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
+     */
+	private String attachmentType;
+
+    /**
+     * 附件地址
+     */
+	private String attachmentUrl;
+
+    /**
+     * 排序字段
+     */
+	private Integer sort;
+
+    /**
+     * 语音或视频时长，秒
+     */
+	private Integer duration;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeCommentAttachmentService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeCommentAttachmentService.java
new file mode 100644
index 0000000000..5baa7d553d
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeCommentAttachmentService.java
@@ -0,0 +1,103 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.notice.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.modules.notice.entity.NoticeCommentAttachmentEntity;
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
+import com.epmet.resi.group.dto.notice.NoticeCommentAttachmentDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 通知评论附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+public interface NoticeCommentAttachmentService extends BaseService<NoticeCommentAttachmentEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<NoticeCommentAttachmentDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    PageData<NoticeCommentAttachmentDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<NoticeCommentAttachmentDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    List<NoticeCommentAttachmentDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return NoticeCommentAttachmentDTO
+     * @author generator
+     * @date 2021-09-06
+     */
+    NoticeCommentAttachmentDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void save(NoticeCommentAttachmentDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void update(NoticeCommentAttachmentDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void delete(String[] ids);
+
+    /**
+     * @Author sun
+     * @Description 查询通知评论所有人员的附件信息
+     **/
+    List<CommentFileDTO> getNoticeComFile(String noticeId);
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeCommentService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeCommentService.java
index 0ac50c21e7..6684e61d80 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeCommentService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeCommentService.java
@@ -48,4 +48,11 @@ public interface NoticeCommentService extends BaseService<NoticeCommentEntity> {
      * @Description 通知评论列表查询
      **/
     List<NoticeCommentListResultDTO> noticeCommentList(NoticeCommentListFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 文字、图片安全校验
+     **/
+    void safetyCheck(List<String> wordList, List<String> imageList);
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentAttachmentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentAttachmentServiceImpl.java
new file mode 100644
index 0000000000..10c3710894
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentAttachmentServiceImpl.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.notice.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.notice.dao.NoticeCommentAttachmentDao;
+import com.epmet.modules.notice.entity.NoticeCommentAttachmentEntity;
+import com.epmet.modules.notice.service.NoticeCommentAttachmentService;
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
+import com.epmet.resi.group.dto.notice.NoticeCommentAttachmentDTO;
+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 2021-09-06
+ */
+@Service
+public class NoticeCommentAttachmentServiceImpl extends BaseServiceImpl<NoticeCommentAttachmentDao, NoticeCommentAttachmentEntity> implements NoticeCommentAttachmentService {
+
+
+    @Override
+    public PageData<NoticeCommentAttachmentDTO> page(Map<String, Object> params) {
+        IPage<NoticeCommentAttachmentEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, NoticeCommentAttachmentDTO.class);
+    }
+
+    @Override
+    public List<NoticeCommentAttachmentDTO> list(Map<String, Object> params) {
+        List<NoticeCommentAttachmentEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, NoticeCommentAttachmentDTO.class);
+    }
+
+    private QueryWrapper<NoticeCommentAttachmentEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<NoticeCommentAttachmentEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public NoticeCommentAttachmentDTO get(String id) {
+        NoticeCommentAttachmentEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, NoticeCommentAttachmentDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(NoticeCommentAttachmentDTO dto) {
+        NoticeCommentAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, NoticeCommentAttachmentEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(NoticeCommentAttachmentDTO dto) {
+        NoticeCommentAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, NoticeCommentAttachmentEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * @Author sun
+     * @Description 查询通知评论所有人员的附件信息
+     **/
+    @Override
+    public List<CommentFileDTO> getNoticeComFile(String noticeId) {
+        return baseDao.selectNoticeComFile(noticeId);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
index 2ab3994891..a66e3869a5 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
@@ -17,10 +17,13 @@
 
 package com.epmet.modules.notice.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
+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;
@@ -30,18 +33,23 @@ import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.modules.notice.dao.NoticeCommentDao;
+import com.epmet.modules.notice.entity.NoticeCommentAttachmentEntity;
 import com.epmet.modules.notice.entity.NoticeCommentEntity;
 import com.epmet.modules.notice.redis.NoticeCommentRedis;
+import com.epmet.modules.notice.service.NoticeCommentAttachmentService;
 import com.epmet.modules.notice.service.NoticeCommentService;
 import com.epmet.modules.notice.service.NoticeService;
 import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.resi.group.constant.MemberStateConstant;
 import com.epmet.resi.group.constant.TopicConstant;
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.dto.notice.NoticeDTO;
 import com.epmet.resi.group.dto.notice.form.NoticeCommentFormDTO;
 import com.epmet.resi.group.dto.notice.form.NoticeCommentListFormDTO;
+import com.epmet.resi.group.dto.notice.form.NoticeFileDTO;
 import com.epmet.resi.group.dto.notice.result.NoticeCommentListResultDTO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -53,6 +61,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -70,12 +79,16 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
     private String scanApiUrl;
     @Value("${openapi.scan.method.textSyncScan}")
     private String textSyncScanMethod;
+    @Value("${openapi.scan.method.imgSyncScan}")
+    private String imgSyncScanMethod;
     @Autowired
     private NoticeService noticeService;
     @Autowired
     private ResiGroupMemberService resiGroupMemberService;
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Autowired
+    private NoticeCommentAttachmentService noticeCommentAttachmentService;
 
 
     /**
@@ -106,6 +119,9 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
                 }
             }
         }
+        //图片安全校验
+        List<String> imageList = formDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
+        safetyCheck(new ArrayList<>(), imageList);
 
         //2.判断当前用户是否被禁言、移除、非本组成员
         NoticeDTO notice = noticeService.get(formDTO.getNoticeId());
@@ -139,6 +155,33 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
         entity.setNoticeId(formDTO.getNoticeId());
         entity.setCommentContent(formDTO.getCommentContent());
         insert(entity);
+
+        //4.保存通知评论附件数据
+        List<NoticeCommentAttachmentEntity> AttachmentEntityList = new ArrayList<>();
+        //图片
+        if (CollectionUtils.isNotEmpty(formDTO.getImageList())) {
+            AtomicInteger sort = new AtomicInteger();
+            formDTO.getImageList().forEach(img -> {
+                NoticeCommentAttachmentEntity attachment = new NoticeCommentAttachmentEntity();
+                attachment.setCustomerId(notice.getCustomerId());
+                attachment.setNoticeId(formDTO.getNoticeId());
+                attachment.setNoticeCommentId(entity.getId());
+                attachment.setFileName(img.getName());
+                attachment.setAttachmentName("");
+                attachment.setAttachmentSize(img.getSize());
+                attachment.setAttachmentFormat(img.getFormat());
+                attachment.setAttachmentType(img.getType());
+                attachment.setAttachmentUrl(img.getUrl());
+                attachment.setSort(sort.get());
+                attachment.setDuration(img.getDuration());
+                sort.getAndIncrement();
+                AttachmentEntityList.add(attachment);
+            });
+        }
+        if (AttachmentEntityList.size() > NumConstant.ZERO) {
+            noticeCommentAttachmentService.insertBatch(AttachmentEntityList);
+        }
+
     }
 
     /**
@@ -165,7 +208,10 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
         }
         List<UserBaseInfoResultDTO> resultDTOList = result.getData();
 
-        //3.封装数据并返回
+        //3.查询通知评论所有人员的附件信息
+        List<CommentFileDTO> fileList = noticeCommentAttachmentService.getNoticeComFile(formDTO.getNoticeId());
+
+        //4.封装数据并返回
         resultList.forEach(l -> {
             StringBuffer name = new StringBuffer();
             resultDTOList.forEach(user -> {
@@ -175,9 +221,64 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
                 }
             });
             l.setCommentUserName(name.toString());
+            //每一条评论的附件信息
+            List<CommentFileDTO> imageList = new ArrayList<>();
+            for (CommentFileDTO f : fileList) {
+                if (l.getUserId().equals(f.getUserId())) {
+                    imageList.add(f);
+                }
+            }
+            l.setImageList(imageList);
         });
 
         return resultList;
     }
 
+    /**
+     * @Author sun
+     * @Description 文字、图片安全校验
+     **/
+    public void safetyCheck(List<String> wordList, List<String> imageList) {
+        if (imageList.size() != NumConstant.ZERO) {
+            wordList.forEach(word -> {
+                //创建话题内容审核
+                TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+                TextTaskDTO taskDTO = new TextTaskDTO();
+                taskDTO.setContent(word);
+                taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+                textScanParamDTO.getTasks().add(taskDTO);
+                Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+                if (!textSyncScanResult.success()) {
+                    logger.error("safetyCheck textScan return failed,result:"+ JSON.toJSONString(textSyncScanResult));
+                    throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+                } else {
+                    if (!textSyncScanResult.getData().isAllPass()) {
+                        logger.warn(EpmetErrorCode.TEXT_SCAN_FAILED.getMsg().concat(String.format(TopicConstant.CREATE_TOPIC, word)));
+                        throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+                    }
+                }
+            });
+        }
+        //创建话题图片审核
+        if (imageList.size() != NumConstant.ZERO) {
+            ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
+            imageList.forEach(url -> {
+                ImgTaskDTO task = new ImgTaskDTO();
+                task.setDataId(UUID.randomUUID().toString().replace("-", ""));
+                task.setUrl(url);
+                imgScanParamDTO.getTasks().add(task);
+            });
+            Result<SyncScanResult> imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO);
+            if (!imgScanResult.success()) {
+                logger.error("safetyCheck imgScan return failed,result:"+ JSON.toJSONString(imgScanResult));
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            }
+            if (!imgScanResult.getData().isAllPass()) {
+                logger.warn(EpmetErrorCode.IMG_SCAN_FAILED.getMsg());
+                throw new RenException(EpmetErrorCode.IMG_SCAN_FAILED.getCode());
+            }
+
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java
index b21c69a4ae..49f240ca3c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java
@@ -503,7 +503,7 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
      * @Description 文字、图片安全校验
      **/
     private void safetyCheck(List<String> wordList, List<String> imageList) {
-        if (imageList.size() != NumConstant.ZERO) {
+        if (wordList.size() != NumConstant.ZERO) {
             wordList.forEach(word -> {
                 //创建话题内容审核
                 TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicCommentAttachmentController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicCommentAttachmentController.java
new file mode 100644
index 0000000000..9c5dd8f841
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicCommentAttachmentController.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.topic.controller;
+
+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.topic.service.ResiTopicCommentAttachmentService;
+import com.epmet.resi.group.dto.topic.ResiTopicCommentAttachmentDTO;
+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 2021-09-06
+ */
+@RestController
+@RequestMapping("resitopiccommentattachment")
+public class ResiTopicCommentAttachmentController {
+    
+    @Autowired
+    private ResiTopicCommentAttachmentService resiTopicCommentAttachmentService;
+
+    @GetMapping("page")
+    public Result<PageData<ResiTopicCommentAttachmentDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<ResiTopicCommentAttachmentDTO> page = resiTopicCommentAttachmentService.page(params);
+        return new Result<PageData<ResiTopicCommentAttachmentDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ResiTopicCommentAttachmentDTO> get(@PathVariable("id") String id){
+        ResiTopicCommentAttachmentDTO data = resiTopicCommentAttachmentService.get(id);
+        return new Result<ResiTopicCommentAttachmentDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ResiTopicCommentAttachmentDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        resiTopicCommentAttachmentService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ResiTopicCommentAttachmentDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        resiTopicCommentAttachmentService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        resiTopicCommentAttachmentService.delete(ids);
+        return new Result();
+    }
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicCommentAttachmentDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicCommentAttachmentDao.java
new file mode 100644
index 0000000000..ab917a7ba5
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicCommentAttachmentDao.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.topic.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.topic.entity.ResiTopicCommentAttachmentEntity;
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
+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 2021-09-06
+ */
+@Mapper
+public interface ResiTopicCommentAttachmentDao extends BaseDao<ResiTopicCommentAttachmentEntity> {
+
+    /**
+     * @Author sun
+     * @Description 查询通知评论所有人员的附件信息
+     **/
+    List<CommentFileDTO> selectTopicComFile(@Param("topicId") String topicId);
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicCommentAttachmentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicCommentAttachmentEntity.java
new file mode 100644
index 0000000000..d4400a14df
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicCommentAttachmentEntity.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.topic.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 话题评论附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("resi_topic_comment_attachment")
+public class ResiTopicCommentAttachmentEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 话题Id
+     */
+	private String topicId;
+
+    /**
+     * 评论Id
+     */
+	private String topicCommentId;
+
+    /**
+     * 文件名
+     */
+	private String fileName;
+
+    /**
+     * 附件名（uuid随机生成）
+     */
+	private String attachmentName;
+
+    /**
+     * 文件大小，单位b
+     */
+	private Integer attachmentSize;
+
+    /**
+     * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）
+     */
+	private String attachmentFormat;
+
+    /**
+     * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
+     */
+	private String attachmentType;
+
+    /**
+     * 附件地址
+     */
+	private String attachmentUrl;
+
+    /**
+     * 排序字段
+     */
+	private Integer sort;
+
+    /**
+     * 语音或视频时长，秒
+     */
+	private Integer duration;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentAttachmentService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentAttachmentService.java
new file mode 100644
index 0000000000..d29f410d33
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentAttachmentService.java
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.topic.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.modules.topic.entity.ResiTopicCommentAttachmentEntity;
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
+import com.epmet.resi.group.dto.topic.ResiTopicCommentAttachmentDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 话题评论附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+public interface ResiTopicCommentAttachmentService extends BaseService<ResiTopicCommentAttachmentEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ResiTopicCommentAttachmentDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    PageData<ResiTopicCommentAttachmentDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ResiTopicCommentAttachmentDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    List<ResiTopicCommentAttachmentDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ResiTopicCommentAttachmentDTO
+     * @author generator
+     * @date 2021-09-06
+     */
+    ResiTopicCommentAttachmentDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void save(ResiTopicCommentAttachmentDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void update(ResiTopicCommentAttachmentDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void delete(String[] ids);
+
+    /**
+     * @Author sun
+     * @Description 查询话题评论所有人员的附件信息
+     **/
+    List<CommentFileDTO> getTopicComFile(String topicId);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentAttachmentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentAttachmentServiceImpl.java
new file mode 100644
index 0000000000..e44dd792da
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentAttachmentServiceImpl.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.topic.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.topic.dao.ResiTopicCommentAttachmentDao;
+import com.epmet.modules.topic.entity.ResiTopicCommentAttachmentEntity;
+import com.epmet.modules.topic.service.ResiTopicCommentAttachmentService;
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
+import com.epmet.resi.group.dto.topic.ResiTopicCommentAttachmentDTO;
+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 2021-09-06
+ */
+@Service
+public class ResiTopicCommentAttachmentServiceImpl extends BaseServiceImpl<ResiTopicCommentAttachmentDao, ResiTopicCommentAttachmentEntity> implements ResiTopicCommentAttachmentService {
+
+
+    @Override
+    public PageData<ResiTopicCommentAttachmentDTO> page(Map<String, Object> params) {
+        IPage<ResiTopicCommentAttachmentEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ResiTopicCommentAttachmentDTO.class);
+    }
+
+    @Override
+    public List<ResiTopicCommentAttachmentDTO> list(Map<String, Object> params) {
+        List<ResiTopicCommentAttachmentEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ResiTopicCommentAttachmentDTO.class);
+    }
+
+    private QueryWrapper<ResiTopicCommentAttachmentEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ResiTopicCommentAttachmentEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ResiTopicCommentAttachmentDTO get(String id) {
+        ResiTopicCommentAttachmentEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ResiTopicCommentAttachmentDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ResiTopicCommentAttachmentDTO dto) {
+        ResiTopicCommentAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, ResiTopicCommentAttachmentEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ResiTopicCommentAttachmentDTO dto) {
+        ResiTopicCommentAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, ResiTopicCommentAttachmentEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * @Author sun
+     * @Description 查询通知评论所有人员的附件信息
+     **/
+    @Override
+    public List<CommentFileDTO> getTopicComFile(String topicId) {
+        return baseDao.selectTopicComFile(topicId);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
index dd02ae9142..623338a5ec 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
@@ -41,22 +41,25 @@ import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.commons.tools.utils.SendMqMsgUtils;
 import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
-import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.dto.result.CommonDataFilterResultDTO;
+import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.modules.comment.entity.ResiTopicCommentEntity;
 import com.epmet.modules.constant.ResiGroupRedisKeys;
 import com.epmet.modules.constant.WxmpSubscribeConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
+import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
 import com.epmet.modules.group.entity.ResiGroupEntity;
-import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.modules.group.redis.ResiGroupRedis;
 import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.member.redis.ResiGroupMemberRedis;
 import com.epmet.modules.member.service.ResiGroupMemberService;
+import com.epmet.modules.notice.service.NoticeCommentService;
 import com.epmet.modules.topic.dao.ResiTopicCommentDao;
 import com.epmet.modules.topic.dao.ResiTopicDao;
+import com.epmet.modules.topic.entity.ResiTopicCommentAttachmentEntity;
+import com.epmet.modules.topic.service.ResiTopicCommentAttachmentService;
 import com.epmet.modules.topic.service.ResiTopicCommentService;
 import com.epmet.modules.topic.service.ResiTopicService;
 import com.epmet.modules.utils.ModuleConstant;
@@ -64,11 +67,12 @@ import com.epmet.resi.group.constant.MemberStateConstant;
 import com.epmet.resi.group.constant.TopicConstant;
 import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
 import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
-import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO;
+import com.epmet.resi.group.dto.group.result.CommentFileDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO;
 import com.epmet.resi.group.dto.member.result.ResiGroupMemberInfoRedisResultDTO;
+import com.epmet.resi.group.dto.notice.form.NoticeFileDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicCommentDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.ResiPublishCommentFormDTO;
@@ -76,6 +80,7 @@ import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import com.google.common.base.CharMatcher;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -85,6 +90,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -99,32 +105,28 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
 
     @Autowired
     ResiTopicService resiTopicService;
-
     @Autowired
     ResiGroupMemberService resiGroupMemberService;
-
     @Autowired
     EpmetUserFeignClient epmetUserFeignClient;
-
     @Autowired
     ResiGroupMemberRedis resiGroupMemberRedis;
-
     @Autowired
     ResiGroupRedis groupRedis;
-
     @Autowired
     ResiGroupMemberDao resiGroupMemberDao;
-
     @Autowired
     ResiTopicDao resiTopicdDao;
-
     @Autowired
     LoginUserUtil loginUserUtil;
     @Autowired
     private GovOrgFeignClient govOrgFeignClient;
-
     @Autowired
     ResiGroupDao resiGroupDao;
+    @Autowired
+    private NoticeCommentService noticeCommentService;
+    @Autowired
+    private ResiTopicCommentAttachmentService resiTopicCommentAttachmentService;
 
     @Value("${openapi.scan.server.url}")
     private String scanApiUrl;
@@ -214,6 +216,10 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
                 }
             }
         }
+        //图片安全校验
+        List<String> imageList = resiCommentFormDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
+        noticeCommentService.safetyCheck(new ArrayList<>(), imageList);
+
         //1.判断当前用户是否被禁言
         ResiTopicDTO topic = resiTopicService.get(resiCommentFormDTO.getTopicId());
         if(null == topic){
@@ -314,6 +320,32 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
             }
         }
 
+        //保存话题评论附件数据
+        List<ResiTopicCommentAttachmentEntity> AttachmentEntityList = new ArrayList<>();
+        //图片
+        if (CollectionUtils.isNotEmpty(resiCommentFormDTO.getImageList())) {
+            AtomicInteger sort = new AtomicInteger();
+            resiCommentFormDTO.getImageList().forEach(img -> {
+                ResiTopicCommentAttachmentEntity attachment = new ResiTopicCommentAttachmentEntity();
+                attachment.setCustomerId(comment.getCustomerId());
+                attachment.setTopicId(resiCommentFormDTO.getTopicId());
+                attachment.setTopicCommentId(comment.getId());
+                attachment.setFileName(img.getName());
+                attachment.setAttachmentName("");
+                attachment.setAttachmentSize(img.getSize());
+                attachment.setAttachmentFormat(img.getFormat());
+                attachment.setAttachmentType(img.getType());
+                attachment.setAttachmentUrl(img.getUrl());
+                attachment.setSort(sort.get());
+                attachment.setDuration(img.getDuration());
+                sort.getAndIncrement();
+                AttachmentEntityList.add(attachment);
+            });
+        }
+        if (AttachmentEntityList.size() > NumConstant.ZERO) {
+            resiTopicCommentAttachmentService.insertBatch(AttachmentEntityList);
+        }
+
         //对所有关注这个话题的人发送微信订阅
         resiTopicService.sendWxmpUpdateSubscribe(tokenDto,topic.getId(), WxmpSubscribeConstant.TYPE_COMMENT);
         return new Result();
@@ -372,6 +404,20 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
                 });
             }
 
+            //查询话题评论所有人员的附件信息
+            List<CommentFileDTO> fileList = resiTopicCommentAttachmentService.getTopicComFile(commentFormDTO.getTopicId());
+            //封装数据并返回
+            comments.forEach(l -> {
+                //每一条评论的附件信息
+                List<CommentFileDTO> imageList = new ArrayList<>();
+                for (CommentFileDTO f : fileList) {
+                    if (l.getUserId().equals(f.getUserId())) {
+                        imageList.add(f);
+                    }
+                }
+                l.setImageList(imageList);
+            });
+
         }
 
         return new Result<List<ResiCommentResultDTO>>().ok(comments);
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCommentAttachmentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCommentAttachmentDao.xml
new file mode 100644
index 0000000000..88a1997484
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCommentAttachmentDao.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.modules.act.dao.ActCommentAttachmentDao">
+
+    <select id="selectActComFile" resultType="com.epmet.resi.group.dto.group.result.CommentFileDTO">
+        SELECT
+            file_name name,
+            attachment_size size,
+            attachment_format format,
+            attachment_type type,
+            attachment_url url,
+            sort sort,
+            duration duration,
+            created_by userId
+        FROM
+            act_comment_attachment
+        WHERE
+            del_flag = '0'
+        AND group_act_id = #{groupActId}
+        ORDER BY
+            created_by, sort ASC
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeCommentAttachmentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeCommentAttachmentDao.xml
new file mode 100644
index 0000000000..027cf9b729
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeCommentAttachmentDao.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.modules.notice.dao.NoticeCommentAttachmentDao">
+
+    <select id="selectNoticeComFile" resultType="com.epmet.resi.group.dto.group.result.CommentFileDTO">
+        SELECT
+            file_name name,
+            attachment_size size,
+            attachment_format format,
+            attachment_type type,
+            attachment_url url,
+            sort sort,
+            duration duration,
+            created_by userId
+        FROM
+            notice_comment_attachment
+        WHERE
+            del_flag = '0'
+        AND notice_id = #{noticeId}
+        ORDER BY
+            created_by, sort ASC<!-- 同一个人各类型文件靠在一起，按sort升序 -->
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentAttachmentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentAttachmentDao.xml
new file mode 100644
index 0000000000..ff7fcc59e9
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentAttachmentDao.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.modules.topic.dao.ResiTopicCommentAttachmentDao">
+
+    <select id="selectTopicComFile" resultType="com.epmet.resi.group.dto.group.result.CommentFileDTO">
+        SELECT
+            file_name name,
+            attachment_size size,
+            attachment_format format,
+            attachment_type type,
+            attachment_url url,
+            sort sort,
+            duration duration,
+            created_by userId
+        FROM
+            resi_topic_comment_attachment
+        WHERE
+            del_flag = '0'
+        AND topic_id = #{topicId}
+        ORDER BY
+            created_by, sort ASC
+    </select>
+
+</mapper>
\ No newline at end of file

From f86ea8eae01165c09e861c61585a9f02d1ff6998 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Mon, 6 Sep 2021 17:17:02 +0800
Subject: [PATCH 007/134] =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E6=8C=87=E5=8D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/GuideAttachmentDTO.java     | 117 ++++++++++++++++++
 .../java/com/epmet/dto/GuideCategoryDTO.java  |  91 ++++++++++++++
 .../epmet/dto/GuideCategoryDefaultDTO.java    |  86 +++++++++++++
 .../com/epmet/dto/GuideCollectionDTO.java     |  91 ++++++++++++++
 .../src/main/java/com/epmet/dto/GuideDTO.java | 101 +++++++++++++++
 .../com/epmet/dto/GuideExternalLinkDTO.java   |  91 ++++++++++++++
 .../java/com/epmet/dto/GuideModuleDTO.java    |  91 ++++++++++++++
 .../com/epmet/dto/GuideModuleDictDTO.java     |  96 ++++++++++++++
 .../epmet/dto/GuideModuleDictDefaultDTO.java  |  91 ++++++++++++++
 .../controller/GuideCategoryController.java   |  84 +++++++++++++
 .../controller/GuideCollectionController.java |  84 +++++++++++++
 .../com/epmet/controller/GuideController.java |  84 +++++++++++++
 .../controller/GuideModuleController.java     |  84 +++++++++++++
 .../controller/GuideModuleDictController.java |  84 +++++++++++++
 .../com/epmet/dao/GuideAttachmentDao.java     |  33 +++++
 .../java/com/epmet/dao/GuideCategoryDao.java  |  33 +++++
 .../epmet/dao/GuideCategoryDefaultDao.java    |  33 +++++
 .../com/epmet/dao/GuideCollectionDao.java     |  33 +++++
 .../src/main/java/com/epmet/dao/GuideDao.java |  33 +++++
 .../com/epmet/dao/GuideExternalLinkDao.java   |  33 +++++
 .../java/com/epmet/dao/GuideModuleDao.java    |  33 +++++
 .../com/epmet/dao/GuideModuleDictDao.java     |  33 +++++
 .../epmet/dao/GuideModuleDictDefaultDao.java  |  33 +++++
 .../epmet/entity/GuideAttachmentEntity.java   |  83 +++++++++++++
 .../entity/GuideCategoryDefaultEntity.java    |  56 +++++++++
 .../com/epmet/entity/GuideCategoryEntity.java |  61 +++++++++
 .../epmet/entity/GuideCollectionEntity.java   |  61 +++++++++
 .../java/com/epmet/entity/GuideEntity.java    |  71 +++++++++++
 .../epmet/entity/GuideExternalLinkEntity.java |  61 +++++++++
 .../entity/GuideModuleDictDefaultEntity.java  |  61 +++++++++
 .../epmet/entity/GuideModuleDictEntity.java   |  66 ++++++++++
 .../com/epmet/entity/GuideModuleEntity.java   |  61 +++++++++
 .../epmet/service/GuideAttachmentService.java |  95 ++++++++++++++
 .../service/GuideCategoryDefaultService.java  |  95 ++++++++++++++
 .../epmet/service/GuideCategoryService.java   |  95 ++++++++++++++
 .../epmet/service/GuideCollectionService.java |  95 ++++++++++++++
 .../service/GuideExternalLinkService.java     |  95 ++++++++++++++
 .../GuideModuleDictDefaultService.java        |  95 ++++++++++++++
 .../epmet/service/GuideModuleDictService.java |  95 ++++++++++++++
 .../com/epmet/service/GuideModuleService.java |  95 ++++++++++++++
 .../java/com/epmet/service/GuideService.java  |  95 ++++++++++++++
 .../impl/GuideAttachmentServiceImpl.java      | 100 +++++++++++++++
 .../impl/GuideCategoryDefaultServiceImpl.java | 100 +++++++++++++++
 .../impl/GuideCategoryServiceImpl.java        | 100 +++++++++++++++
 .../impl/GuideCollectionServiceImpl.java      | 100 +++++++++++++++
 .../impl/GuideExternalLinkServiceImpl.java    | 100 +++++++++++++++
 .../GuideModuleDictDefaultServiceImpl.java    | 100 +++++++++++++++
 .../impl/GuideModuleDictServiceImpl.java      | 100 +++++++++++++++
 .../service/impl/GuideModuleServiceImpl.java  | 100 +++++++++++++++
 .../epmet/service/impl/GuideServiceImpl.java  | 100 +++++++++++++++
 .../resources/mapper/GuideAttachmentDao.xml   |  26 ++++
 .../resources/mapper/GuideCategoryDao.xml     |  21 ++++
 .../mapper/GuideCategoryDefaultDao.xml        |  20 +++
 .../resources/mapper/GuideCollectionDao.xml   |  21 ++++
 .../src/main/resources/mapper/GuideDao.xml    |  23 ++++
 .../resources/mapper/GuideExternalLinkDao.xml |  21 ++++
 .../main/resources/mapper/GuideModuleDao.xml  |  21 ++++
 .../resources/mapper/GuideModuleDictDao.xml   |  22 ++++
 .../mapper/GuideModuleDictDefaultDao.xml      |  21 ++++
 59 files changed, 4104 insertions(+)
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideAttachmentDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDefaultDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCollectionDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideExternalLinkDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDefaultDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCollectionController.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleController.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleDictController.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideAttachmentDao.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDefaultDao.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCollectionDao.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideExternalLinkDao.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDao.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDictDao.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDictDefaultDao.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideAttachmentEntity.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryDefaultEntity.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryEntity.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCollectionEntity.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideEntity.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideExternalLinkEntity.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictDefaultEntity.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictEntity.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleEntity.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideAttachmentService.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryDefaultService.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideExternalLinkService.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictDefaultService.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictService.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleService.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideAttachmentServiceImpl.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryDefaultServiceImpl.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideExternalLinkServiceImpl.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictDefaultServiceImpl.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictServiceImpl.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleServiceImpl.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideAttachmentDao.xml
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDefaultDao.xml
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCollectionDao.xml
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideExternalLinkDao.xml
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDao.xml
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDictDao.xml
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDictDefaultDao.xml

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideAttachmentDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideAttachmentDTO.java
new file mode 100644
index 0000000000..212e9bc369
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideAttachmentDTO.java
@@ -0,0 +1,117 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+public class GuideAttachmentDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 办事指南ID
+     */
+	private String guideId;
+
+    /**
+     * 附件名
+     */
+	private String attachmentName;
+
+    /**
+     * 文件大小 单位byte
+     */
+	private Integer attachmentSize;
+
+    /**
+     * 文件格式 word、excel、pdf
+     */
+	private String attachmentFormat;
+
+    /**
+     * 类型 
+     */
+	private String attachmentType;
+
+    /**
+     * 附件地址
+     */
+	private String attachmentUrl;
+
+    /**
+     * 语音或视频时长，秒
+     */
+	private Integer duration;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 删除标识 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/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDTO.java
new file mode 100644
index 0000000000..ccd59bc862
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDTO.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+public class GuideCategoryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 分类名
+     */
+	private String categoryName;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 状态 禁用disable 启用enable
+     */
+	private String status;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDefaultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDefaultDTO.java
new file mode 100644
index 0000000000..3d7080d2ff
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDefaultDTO.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+public class GuideCategoryDefaultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 分类名
+     */
+	private String categoryName;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 状态 禁用disable 启用enable
+     */
+	private String status;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCollectionDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCollectionDTO.java
new file mode 100644
index 0000000000..6b9dbfaeee
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCollectionDTO.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+public class GuideCollectionDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 指南ID
+     */
+	private String guideId;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 用户所属客户端 居民端resi 工作端gov
+     */
+	private String app;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideDTO.java
new file mode 100644
index 0000000000..9d5377c34d
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideDTO.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+public class GuideDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 发布单位ID
+     */
+	private String agencyId;
+
+    /**
+     * 所属组织机构ID（customer_agency.id）
+     */
+	private String pid;
+
+    /**
+     * 所有上级组织ID,英文:隔开
+     */
+	private String pids;
+
+    /**
+     * 标题
+     */
+	private String title;
+
+    /**
+     * 分类ID
+     */
+	private String categoryId;
+
+    /**
+     * 删除标识: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/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideExternalLinkDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideExternalLinkDTO.java
new file mode 100644
index 0000000000..3cbc69462e
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideExternalLinkDTO.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+public class GuideExternalLinkDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 指南ID
+     */
+	private String guideId;
+
+    /**
+     * 链接说明
+     */
+	private String description;
+
+    /**
+     * 外部链接
+     */
+	private String externalLink;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDTO.java
new file mode 100644
index 0000000000..40e4fed74e
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDTO.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+public class GuideModuleDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 指南ID
+     */
+	private String guideId;
+
+    /**
+     * 模块ID
+     */
+	private String moduleId;
+
+    /**
+     * 
+     */
+	private String moduleContent;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDTO.java
new file mode 100644
index 0000000000..938e7b211a
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDTO.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+public class GuideModuleDictDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 模块key
+     */
+	private String moduleValue;
+
+    /**
+     * 模块名
+     */
+	private String moduleName;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 状态 禁用disable 启用enable
+     */
+	private String status;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDefaultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDefaultDTO.java
new file mode 100644
index 0000000000..6c59d906f9
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDefaultDTO.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+public class GuideModuleDictDefaultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 模块key
+     */
+	private String moduleValue;
+
+    /**
+     * 模块名
+     */
+	private String moduleName;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 状态 禁用disable 启用enable
+     */
+	private String status;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
new file mode 100644
index 0000000000..03bd231c0b
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
@@ -0,0 +1,84 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+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.GuideCategoryDTO;
+import com.epmet.service.GuideCategoryService;
+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 2021-09-06
+ */
+@RestController
+@RequestMapping("guidecategory")
+public class GuideCategoryController {
+    
+    @Autowired
+    private GuideCategoryService guideCategoryService;
+
+    @GetMapping("page")
+    public Result<PageData<GuideCategoryDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<GuideCategoryDTO> page = guideCategoryService.page(params);
+        return new Result<PageData<GuideCategoryDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<GuideCategoryDTO> get(@PathVariable("id") String id){
+        GuideCategoryDTO data = guideCategoryService.get(id);
+        return new Result<GuideCategoryDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody GuideCategoryDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        guideCategoryService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody GuideCategoryDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        guideCategoryService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        guideCategoryService.delete(ids);
+        return new Result();
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCollectionController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCollectionController.java
new file mode 100644
index 0000000000..08f94a4126
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCollectionController.java
@@ -0,0 +1,84 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+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.GuideCollectionDTO;
+import com.epmet.service.GuideCollectionService;
+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 2021-09-06
+ */
+@RestController
+@RequestMapping("guidecollection")
+public class GuideCollectionController {
+    
+    @Autowired
+    private GuideCollectionService guideCollectionService;
+
+    @GetMapping("page")
+    public Result<PageData<GuideCollectionDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<GuideCollectionDTO> page = guideCollectionService.page(params);
+        return new Result<PageData<GuideCollectionDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<GuideCollectionDTO> get(@PathVariable("id") String id){
+        GuideCollectionDTO data = guideCollectionService.get(id);
+        return new Result<GuideCollectionDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody GuideCollectionDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        guideCollectionService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody GuideCollectionDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        guideCollectionService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        guideCollectionService.delete(ids);
+        return new Result();
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java
new file mode 100644
index 0000000000..d484148233
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java
@@ -0,0 +1,84 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+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.GuideDTO;
+import com.epmet.service.GuideService;
+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 2021-09-06
+ */
+@RestController
+@RequestMapping("guide")
+public class GuideController {
+    
+    @Autowired
+    private GuideService guideService;
+
+    @GetMapping("page")
+    public Result<PageData<GuideDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<GuideDTO> page = guideService.page(params);
+        return new Result<PageData<GuideDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<GuideDTO> get(@PathVariable("id") String id){
+        GuideDTO data = guideService.get(id);
+        return new Result<GuideDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody GuideDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        guideService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody GuideDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        guideService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        guideService.delete(ids);
+        return new Result();
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleController.java
new file mode 100644
index 0000000000..c1823c7684
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleController.java
@@ -0,0 +1,84 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+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.GuideModuleDTO;
+import com.epmet.service.GuideModuleService;
+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 2021-09-06
+ */
+@RestController
+@RequestMapping("guidemodule")
+public class GuideModuleController {
+    
+    @Autowired
+    private GuideModuleService guideModuleService;
+
+    @GetMapping("page")
+    public Result<PageData<GuideModuleDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<GuideModuleDTO> page = guideModuleService.page(params);
+        return new Result<PageData<GuideModuleDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<GuideModuleDTO> get(@PathVariable("id") String id){
+        GuideModuleDTO data = guideModuleService.get(id);
+        return new Result<GuideModuleDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody GuideModuleDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        guideModuleService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody GuideModuleDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        guideModuleService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        guideModuleService.delete(ids);
+        return new Result();
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleDictController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleDictController.java
new file mode 100644
index 0000000000..a8a59b6b8b
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleDictController.java
@@ -0,0 +1,84 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+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.GuideModuleDictDTO;
+import com.epmet.service.GuideModuleDictService;
+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 2021-09-06
+ */
+@RestController
+@RequestMapping("guidemoduledict")
+public class GuideModuleDictController {
+    
+    @Autowired
+    private GuideModuleDictService guideModuleDictService;
+
+    @GetMapping("page")
+    public Result<PageData<GuideModuleDictDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<GuideModuleDictDTO> page = guideModuleDictService.page(params);
+        return new Result<PageData<GuideModuleDictDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<GuideModuleDictDTO> get(@PathVariable("id") String id){
+        GuideModuleDictDTO data = guideModuleDictService.get(id);
+        return new Result<GuideModuleDictDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody GuideModuleDictDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        guideModuleDictService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody GuideModuleDictDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        guideModuleDictService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        guideModuleDictService.delete(ids);
+        return new Result();
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideAttachmentDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideAttachmentDao.java
new file mode 100644
index 0000000000..01e5baddd7
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideAttachmentDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.GuideAttachmentEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 办事指南附件
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Mapper
+public interface GuideAttachmentDao extends BaseDao<GuideAttachmentEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java
new file mode 100644
index 0000000000..a6b9a24cc8
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.GuideCategoryEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 指南分类
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Mapper
+public interface GuideCategoryDao extends BaseDao<GuideCategoryEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDefaultDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDefaultDao.java
new file mode 100644
index 0000000000..3c3b31a12b
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDefaultDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.GuideCategoryDefaultEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 指南默认分类
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Mapper
+public interface GuideCategoryDefaultDao extends BaseDao<GuideCategoryDefaultEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCollectionDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCollectionDao.java
new file mode 100644
index 0000000000..905dfb9f3e
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCollectionDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.GuideCollectionEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 指南收藏表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Mapper
+public interface GuideCollectionDao extends BaseDao<GuideCollectionEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java
new file mode 100644
index 0000000000..cc5039c8d4
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.GuideEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 办事指南表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Mapper
+public interface GuideDao extends BaseDao<GuideEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideExternalLinkDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideExternalLinkDao.java
new file mode 100644
index 0000000000..f766b71680
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideExternalLinkDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.GuideExternalLinkEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 指南外链表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Mapper
+public interface GuideExternalLinkDao extends BaseDao<GuideExternalLinkEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDao.java
new file mode 100644
index 0000000000..d77324965b
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.GuideModuleEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 指南模块关联表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Mapper
+public interface GuideModuleDao extends BaseDao<GuideModuleEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDictDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDictDao.java
new file mode 100644
index 0000000000..8af7910511
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDictDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.GuideModuleDictEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 指南模块字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Mapper
+public interface GuideModuleDictDao extends BaseDao<GuideModuleDictEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDictDefaultDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDictDefaultDao.java
new file mode 100644
index 0000000000..071c7ed2c1
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDictDefaultDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.GuideModuleDictDefaultEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 指南模块默认字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Mapper
+public interface GuideModuleDictDefaultDao extends BaseDao<GuideModuleDictDefaultEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideAttachmentEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideAttachmentEntity.java
new file mode 100644
index 0000000000..192f52b306
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideAttachmentEntity.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 办事指南附件
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("guide_attachment")
+public class GuideAttachmentEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 办事指南ID
+     */
+	private String guideId;
+
+    /**
+     * 附件名
+     */
+	private String attachmentName;
+
+    /**
+     * 文件大小 单位byte
+     */
+	private Integer attachmentSize;
+
+    /**
+     * 文件格式 word、excel、pdf
+     */
+	private String attachmentFormat;
+
+    /**
+     * 类型 
+     */
+	private String attachmentType;
+
+    /**
+     * 附件地址
+     */
+	private String attachmentUrl;
+
+    /**
+     * 语音或视频时长，秒
+     */
+	private Integer duration;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+}
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryDefaultEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryDefaultEntity.java
new file mode 100644
index 0000000000..bb6056e549
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryDefaultEntity.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("guide_category_default")
+public class GuideCategoryDefaultEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 分类名
+     */
+	private String categoryName;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 状态 禁用disable 启用enable
+     */
+	private String status;
+
+}
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryEntity.java
new file mode 100644
index 0000000000..8231f9d5ef
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("guide_category")
+public class GuideCategoryEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 分类名
+     */
+	private String categoryName;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 状态 禁用disable 启用enable
+     */
+	private String status;
+
+}
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCollectionEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCollectionEntity.java
new file mode 100644
index 0000000000..f522884f79
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCollectionEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("guide_collection")
+public class GuideCollectionEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 指南ID
+     */
+	private String guideId;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 用户所属客户端 居民端resi 工作端gov
+     */
+	private String app;
+
+}
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideEntity.java
new file mode 100644
index 0000000000..f135e3f676
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideEntity.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("guide")
+public class GuideEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 发布单位ID
+     */
+	private String agencyId;
+
+    /**
+     * 所属组织机构ID（customer_agency.id）
+     */
+	private String pid;
+
+    /**
+     * 所有上级组织ID,英文:隔开
+     */
+	private String pids;
+
+    /**
+     * 标题
+     */
+	private String title;
+
+    /**
+     * 分类ID
+     */
+	private String categoryId;
+
+}
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideExternalLinkEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideExternalLinkEntity.java
new file mode 100644
index 0000000000..4113a168c5
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideExternalLinkEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("guide_external_link")
+public class GuideExternalLinkEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 指南ID
+     */
+	private String guideId;
+
+    /**
+     * 链接说明
+     */
+	private String description;
+
+    /**
+     * 外部链接
+     */
+	private String externalLink;
+
+}
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictDefaultEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictDefaultEntity.java
new file mode 100644
index 0000000000..f01788acdc
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictDefaultEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("guide_module_dict_default")
+public class GuideModuleDictDefaultEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 模块key
+     */
+	private String moduleValue;
+
+    /**
+     * 模块名
+     */
+	private String moduleName;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 状态 禁用disable 启用enable
+     */
+	private String status;
+
+}
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictEntity.java
new file mode 100644
index 0000000000..2816effef0
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictEntity.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("guide_module_dict")
+public class GuideModuleDictEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 模块key
+     */
+	private String moduleValue;
+
+    /**
+     * 模块名
+     */
+	private String moduleName;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 状态 禁用disable 启用enable
+     */
+	private String status;
+
+}
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleEntity.java
new file mode 100644
index 0000000000..35d602602e
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("guide_module")
+public class GuideModuleEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 指南ID
+     */
+	private String guideId;
+
+    /**
+     * 模块ID
+     */
+	private String moduleId;
+
+    /**
+     * 
+     */
+	private String moduleContent;
+
+}
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideAttachmentService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideAttachmentService.java
new file mode 100644
index 0000000000..0c56c55e62
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideAttachmentService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.GuideAttachmentDTO;
+import com.epmet.entity.GuideAttachmentEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 办事指南附件
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+public interface GuideAttachmentService extends BaseService<GuideAttachmentEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<GuideAttachmentDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    PageData<GuideAttachmentDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<GuideAttachmentDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    List<GuideAttachmentDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return GuideAttachmentDTO
+     * @author generator
+     * @date 2021-09-06
+     */
+    GuideAttachmentDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void save(GuideAttachmentDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void update(GuideAttachmentDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryDefaultService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryDefaultService.java
new file mode 100644
index 0000000000..f7b73ceae8
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryDefaultService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.GuideCategoryDefaultDTO;
+import com.epmet.entity.GuideCategoryDefaultEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 指南默认分类
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+public interface GuideCategoryDefaultService extends BaseService<GuideCategoryDefaultEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<GuideCategoryDefaultDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    PageData<GuideCategoryDefaultDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<GuideCategoryDefaultDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    List<GuideCategoryDefaultDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return GuideCategoryDefaultDTO
+     * @author generator
+     * @date 2021-09-06
+     */
+    GuideCategoryDefaultDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void save(GuideCategoryDefaultDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void update(GuideCategoryDefaultDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
new file mode 100644
index 0000000000..84f995d0fd
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.GuideCategoryDTO;
+import com.epmet.entity.GuideCategoryEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 指南分类
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+public interface GuideCategoryService extends BaseService<GuideCategoryEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<GuideCategoryDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    PageData<GuideCategoryDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<GuideCategoryDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    List<GuideCategoryDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return GuideCategoryDTO
+     * @author generator
+     * @date 2021-09-06
+     */
+    GuideCategoryDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void save(GuideCategoryDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void update(GuideCategoryDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java
new file mode 100644
index 0000000000..6e8266c556
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.GuideCollectionDTO;
+import com.epmet.entity.GuideCollectionEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 指南收藏表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+public interface GuideCollectionService extends BaseService<GuideCollectionEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<GuideCollectionDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    PageData<GuideCollectionDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<GuideCollectionDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    List<GuideCollectionDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return GuideCollectionDTO
+     * @author generator
+     * @date 2021-09-06
+     */
+    GuideCollectionDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void save(GuideCollectionDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void update(GuideCollectionDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideExternalLinkService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideExternalLinkService.java
new file mode 100644
index 0000000000..fcb7cc5b65
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideExternalLinkService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.GuideExternalLinkDTO;
+import com.epmet.entity.GuideExternalLinkEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 指南外链表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+public interface GuideExternalLinkService extends BaseService<GuideExternalLinkEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<GuideExternalLinkDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    PageData<GuideExternalLinkDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<GuideExternalLinkDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    List<GuideExternalLinkDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return GuideExternalLinkDTO
+     * @author generator
+     * @date 2021-09-06
+     */
+    GuideExternalLinkDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void save(GuideExternalLinkDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void update(GuideExternalLinkDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictDefaultService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictDefaultService.java
new file mode 100644
index 0000000000..1af3f23de9
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictDefaultService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.GuideModuleDictDefaultDTO;
+import com.epmet.entity.GuideModuleDictDefaultEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 指南模块默认字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+public interface GuideModuleDictDefaultService extends BaseService<GuideModuleDictDefaultEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<GuideModuleDictDefaultDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    PageData<GuideModuleDictDefaultDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<GuideModuleDictDefaultDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    List<GuideModuleDictDefaultDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return GuideModuleDictDefaultDTO
+     * @author generator
+     * @date 2021-09-06
+     */
+    GuideModuleDictDefaultDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void save(GuideModuleDictDefaultDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void update(GuideModuleDictDefaultDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictService.java
new file mode 100644
index 0000000000..50ea1e80e0
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.GuideModuleDictDTO;
+import com.epmet.entity.GuideModuleDictEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 指南模块字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+public interface GuideModuleDictService extends BaseService<GuideModuleDictEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<GuideModuleDictDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    PageData<GuideModuleDictDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<GuideModuleDictDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    List<GuideModuleDictDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return GuideModuleDictDTO
+     * @author generator
+     * @date 2021-09-06
+     */
+    GuideModuleDictDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void save(GuideModuleDictDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void update(GuideModuleDictDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleService.java
new file mode 100644
index 0000000000..e03d399b5c
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.GuideModuleDTO;
+import com.epmet.entity.GuideModuleEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 指南模块关联表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+public interface GuideModuleService extends BaseService<GuideModuleEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<GuideModuleDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    PageData<GuideModuleDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<GuideModuleDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    List<GuideModuleDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return GuideModuleDTO
+     * @author generator
+     * @date 2021-09-06
+     */
+    GuideModuleDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void save(GuideModuleDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void update(GuideModuleDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java
new file mode 100644
index 0000000000..415a968d01
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.GuideDTO;
+import com.epmet.entity.GuideEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 办事指南表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+public interface GuideService extends BaseService<GuideEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<GuideDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    PageData<GuideDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<GuideDTO>
+     * @author generator
+     * @date 2021-09-06
+     */
+    List<GuideDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return GuideDTO
+     * @author generator
+     * @date 2021-09-06
+     */
+    GuideDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void save(GuideDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void update(GuideDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-06
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideAttachmentServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideAttachmentServiceImpl.java
new file mode 100644
index 0000000000..2f66e4b70e
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideAttachmentServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.GuideAttachmentDao;
+import com.epmet.dto.GuideAttachmentDTO;
+import com.epmet.entity.GuideAttachmentEntity;
+import com.epmet.service.GuideAttachmentService;
+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 2021-09-06
+ */
+@Service
+public class GuideAttachmentServiceImpl extends BaseServiceImpl<GuideAttachmentDao, GuideAttachmentEntity> implements GuideAttachmentService {
+
+
+    @Override
+    public PageData<GuideAttachmentDTO> page(Map<String, Object> params) {
+        IPage<GuideAttachmentEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, GuideAttachmentDTO.class);
+    }
+
+    @Override
+    public List<GuideAttachmentDTO> list(Map<String, Object> params) {
+        List<GuideAttachmentEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, GuideAttachmentDTO.class);
+    }
+
+    private QueryWrapper<GuideAttachmentEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<GuideAttachmentEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public GuideAttachmentDTO get(String id) {
+        GuideAttachmentEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, GuideAttachmentDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(GuideAttachmentDTO dto) {
+        GuideAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, GuideAttachmentEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(GuideAttachmentDTO dto) {
+        GuideAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, GuideAttachmentEntity.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/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryDefaultServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryDefaultServiceImpl.java
new file mode 100644
index 0000000000..4fba3fa9ec
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryDefaultServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.GuideCategoryDefaultDao;
+import com.epmet.dto.GuideCategoryDefaultDTO;
+import com.epmet.entity.GuideCategoryDefaultEntity;
+import com.epmet.service.GuideCategoryDefaultService;
+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 2021-09-06
+ */
+@Service
+public class GuideCategoryDefaultServiceImpl extends BaseServiceImpl<GuideCategoryDefaultDao, GuideCategoryDefaultEntity> implements GuideCategoryDefaultService {
+
+
+    @Override
+    public PageData<GuideCategoryDefaultDTO> page(Map<String, Object> params) {
+        IPage<GuideCategoryDefaultEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, GuideCategoryDefaultDTO.class);
+    }
+
+    @Override
+    public List<GuideCategoryDefaultDTO> list(Map<String, Object> params) {
+        List<GuideCategoryDefaultEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, GuideCategoryDefaultDTO.class);
+    }
+
+    private QueryWrapper<GuideCategoryDefaultEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<GuideCategoryDefaultEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public GuideCategoryDefaultDTO get(String id) {
+        GuideCategoryDefaultEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, GuideCategoryDefaultDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(GuideCategoryDefaultDTO dto) {
+        GuideCategoryDefaultEntity entity = ConvertUtils.sourceToTarget(dto, GuideCategoryDefaultEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(GuideCategoryDefaultDTO dto) {
+        GuideCategoryDefaultEntity entity = ConvertUtils.sourceToTarget(dto, GuideCategoryDefaultEntity.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/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
new file mode 100644
index 0000000000..502f18571a
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.GuideCategoryDao;
+import com.epmet.dto.GuideCategoryDTO;
+import com.epmet.entity.GuideCategoryEntity;
+import com.epmet.service.GuideCategoryService;
+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 2021-09-06
+ */
+@Service
+public class GuideCategoryServiceImpl extends BaseServiceImpl<GuideCategoryDao, GuideCategoryEntity> implements GuideCategoryService {
+
+
+    @Override
+    public PageData<GuideCategoryDTO> page(Map<String, Object> params) {
+        IPage<GuideCategoryEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, GuideCategoryDTO.class);
+    }
+
+    @Override
+    public List<GuideCategoryDTO> list(Map<String, Object> params) {
+        List<GuideCategoryEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, GuideCategoryDTO.class);
+    }
+
+    private QueryWrapper<GuideCategoryEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<GuideCategoryEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public GuideCategoryDTO get(String id) {
+        GuideCategoryEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, GuideCategoryDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(GuideCategoryDTO dto) {
+        GuideCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GuideCategoryEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(GuideCategoryDTO dto) {
+        GuideCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GuideCategoryEntity.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/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java
new file mode 100644
index 0000000000..a73d8228ee
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.GuideCollectionDao;
+import com.epmet.dto.GuideCollectionDTO;
+import com.epmet.entity.GuideCollectionEntity;
+import com.epmet.service.GuideCollectionService;
+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 2021-09-06
+ */
+@Service
+public class GuideCollectionServiceImpl extends BaseServiceImpl<GuideCollectionDao, GuideCollectionEntity> implements GuideCollectionService {
+
+
+    @Override
+    public PageData<GuideCollectionDTO> page(Map<String, Object> params) {
+        IPage<GuideCollectionEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, GuideCollectionDTO.class);
+    }
+
+    @Override
+    public List<GuideCollectionDTO> list(Map<String, Object> params) {
+        List<GuideCollectionEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, GuideCollectionDTO.class);
+    }
+
+    private QueryWrapper<GuideCollectionEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<GuideCollectionEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public GuideCollectionDTO get(String id) {
+        GuideCollectionEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, GuideCollectionDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(GuideCollectionDTO dto) {
+        GuideCollectionEntity entity = ConvertUtils.sourceToTarget(dto, GuideCollectionEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(GuideCollectionDTO dto) {
+        GuideCollectionEntity entity = ConvertUtils.sourceToTarget(dto, GuideCollectionEntity.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/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideExternalLinkServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideExternalLinkServiceImpl.java
new file mode 100644
index 0000000000..a9f080965e
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideExternalLinkServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.GuideExternalLinkDao;
+import com.epmet.dto.GuideExternalLinkDTO;
+import com.epmet.entity.GuideExternalLinkEntity;
+import com.epmet.service.GuideExternalLinkService;
+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 2021-09-06
+ */
+@Service
+public class GuideExternalLinkServiceImpl extends BaseServiceImpl<GuideExternalLinkDao, GuideExternalLinkEntity> implements GuideExternalLinkService {
+
+
+    @Override
+    public PageData<GuideExternalLinkDTO> page(Map<String, Object> params) {
+        IPage<GuideExternalLinkEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, GuideExternalLinkDTO.class);
+    }
+
+    @Override
+    public List<GuideExternalLinkDTO> list(Map<String, Object> params) {
+        List<GuideExternalLinkEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, GuideExternalLinkDTO.class);
+    }
+
+    private QueryWrapper<GuideExternalLinkEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<GuideExternalLinkEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public GuideExternalLinkDTO get(String id) {
+        GuideExternalLinkEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, GuideExternalLinkDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(GuideExternalLinkDTO dto) {
+        GuideExternalLinkEntity entity = ConvertUtils.sourceToTarget(dto, GuideExternalLinkEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(GuideExternalLinkDTO dto) {
+        GuideExternalLinkEntity entity = ConvertUtils.sourceToTarget(dto, GuideExternalLinkEntity.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/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictDefaultServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictDefaultServiceImpl.java
new file mode 100644
index 0000000000..6be5e56dc4
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictDefaultServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.GuideModuleDictDefaultDao;
+import com.epmet.dto.GuideModuleDictDefaultDTO;
+import com.epmet.entity.GuideModuleDictDefaultEntity;
+import com.epmet.service.GuideModuleDictDefaultService;
+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 2021-09-06
+ */
+@Service
+public class GuideModuleDictDefaultServiceImpl extends BaseServiceImpl<GuideModuleDictDefaultDao, GuideModuleDictDefaultEntity> implements GuideModuleDictDefaultService {
+
+
+    @Override
+    public PageData<GuideModuleDictDefaultDTO> page(Map<String, Object> params) {
+        IPage<GuideModuleDictDefaultEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, GuideModuleDictDefaultDTO.class);
+    }
+
+    @Override
+    public List<GuideModuleDictDefaultDTO> list(Map<String, Object> params) {
+        List<GuideModuleDictDefaultEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, GuideModuleDictDefaultDTO.class);
+    }
+
+    private QueryWrapper<GuideModuleDictDefaultEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<GuideModuleDictDefaultEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public GuideModuleDictDefaultDTO get(String id) {
+        GuideModuleDictDefaultEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, GuideModuleDictDefaultDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(GuideModuleDictDefaultDTO dto) {
+        GuideModuleDictDefaultEntity entity = ConvertUtils.sourceToTarget(dto, GuideModuleDictDefaultEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(GuideModuleDictDefaultDTO dto) {
+        GuideModuleDictDefaultEntity entity = ConvertUtils.sourceToTarget(dto, GuideModuleDictDefaultEntity.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/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictServiceImpl.java
new file mode 100644
index 0000000000..c758eebdad
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.GuideModuleDictDao;
+import com.epmet.dto.GuideModuleDictDTO;
+import com.epmet.entity.GuideModuleDictEntity;
+import com.epmet.service.GuideModuleDictService;
+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 2021-09-06
+ */
+@Service
+public class GuideModuleDictServiceImpl extends BaseServiceImpl<GuideModuleDictDao, GuideModuleDictEntity> implements GuideModuleDictService {
+
+
+    @Override
+    public PageData<GuideModuleDictDTO> page(Map<String, Object> params) {
+        IPage<GuideModuleDictEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, GuideModuleDictDTO.class);
+    }
+
+    @Override
+    public List<GuideModuleDictDTO> list(Map<String, Object> params) {
+        List<GuideModuleDictEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, GuideModuleDictDTO.class);
+    }
+
+    private QueryWrapper<GuideModuleDictEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<GuideModuleDictEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public GuideModuleDictDTO get(String id) {
+        GuideModuleDictEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, GuideModuleDictDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(GuideModuleDictDTO dto) {
+        GuideModuleDictEntity entity = ConvertUtils.sourceToTarget(dto, GuideModuleDictEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(GuideModuleDictDTO dto) {
+        GuideModuleDictEntity entity = ConvertUtils.sourceToTarget(dto, GuideModuleDictEntity.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/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleServiceImpl.java
new file mode 100644
index 0000000000..ce07f2e233
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.GuideModuleDao;
+import com.epmet.dto.GuideModuleDTO;
+import com.epmet.entity.GuideModuleEntity;
+import com.epmet.service.GuideModuleService;
+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 2021-09-06
+ */
+@Service
+public class GuideModuleServiceImpl extends BaseServiceImpl<GuideModuleDao, GuideModuleEntity> implements GuideModuleService {
+
+
+    @Override
+    public PageData<GuideModuleDTO> page(Map<String, Object> params) {
+        IPage<GuideModuleEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, GuideModuleDTO.class);
+    }
+
+    @Override
+    public List<GuideModuleDTO> list(Map<String, Object> params) {
+        List<GuideModuleEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, GuideModuleDTO.class);
+    }
+
+    private QueryWrapper<GuideModuleEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<GuideModuleEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public GuideModuleDTO get(String id) {
+        GuideModuleEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, GuideModuleDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(GuideModuleDTO dto) {
+        GuideModuleEntity entity = ConvertUtils.sourceToTarget(dto, GuideModuleEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(GuideModuleDTO dto) {
+        GuideModuleEntity entity = ConvertUtils.sourceToTarget(dto, GuideModuleEntity.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/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
new file mode 100644
index 0000000000..5ac7a56e3e
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.GuideDao;
+import com.epmet.dto.GuideDTO;
+import com.epmet.entity.GuideEntity;
+import com.epmet.service.GuideService;
+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 2021-09-06
+ */
+@Service
+public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> implements GuideService {
+
+
+    @Override
+    public PageData<GuideDTO> page(Map<String, Object> params) {
+        IPage<GuideEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, GuideDTO.class);
+    }
+
+    @Override
+    public List<GuideDTO> list(Map<String, Object> params) {
+        List<GuideEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, GuideDTO.class);
+    }
+
+    private QueryWrapper<GuideEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<GuideEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public GuideDTO get(String id) {
+        GuideEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, GuideDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(GuideDTO dto) {
+        GuideEntity entity = ConvertUtils.sourceToTarget(dto, GuideEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(GuideDTO dto) {
+        GuideEntity entity = ConvertUtils.sourceToTarget(dto, GuideEntity.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/gov-voice/gov-voice-server/src/main/resources/mapper/GuideAttachmentDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideAttachmentDao.xml
new file mode 100644
index 0000000000..7c34e2d2f2
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideAttachmentDao.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.GuideAttachmentDao">
+
+    <resultMap type="com.epmet.entity.GuideAttachmentEntity" id="guideAttachmentMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="guideId" column="GUIDE_ID"/>
+        <result property="attachmentName" column="ATTACHMENT_NAME"/>
+        <result property="attachmentSize" column="ATTACHMENT_SIZE"/>
+        <result property="attachmentFormat" column="ATTACHMENT_FORMAT"/>
+        <result property="attachmentType" column="ATTACHMENT_TYPE"/>
+        <result property="attachmentUrl" column="ATTACHMENT_URL"/>
+        <result property="duration" column="DURATION"/>
+        <result property="sort" column="SORT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
new file mode 100644
index 0000000000..dad8bb6c4c
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.GuideCategoryDao">
+
+    <resultMap type="com.epmet.entity.GuideCategoryEntity" id="guideCategoryMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="categoryName" column="CATEGORY_NAME"/>
+        <result property="sort" column="SORT"/>
+        <result property="status" column="STATUS"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDefaultDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDefaultDao.xml
new file mode 100644
index 0000000000..af77665580
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDefaultDao.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.GuideCategoryDefaultDao">
+
+    <resultMap type="com.epmet.entity.GuideCategoryDefaultEntity" id="guideCategoryDefaultMap">
+        <result property="id" column="ID"/>
+        <result property="categoryName" column="CATEGORY_NAME"/>
+        <result property="sort" column="SORT"/>
+        <result property="status" column="STATUS"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCollectionDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCollectionDao.xml
new file mode 100644
index 0000000000..69f598adf7
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCollectionDao.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.GuideCollectionDao">
+
+    <resultMap type="com.epmet.entity.GuideCollectionEntity" id="guideCollectionMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="guideId" column="GUIDE_ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="app" column="APP"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
new file mode 100644
index 0000000000..071bf38535
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.GuideDao">
+
+    <resultMap type="com.epmet.entity.GuideEntity" id="guideMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="pid" column="PID"/>
+        <result property="pids" column="PIDS"/>
+        <result property="title" column="TITLE"/>
+        <result property="categoryId" column="CATEGORY_ID"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideExternalLinkDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideExternalLinkDao.xml
new file mode 100644
index 0000000000..e570f994b4
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideExternalLinkDao.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.GuideExternalLinkDao">
+
+    <resultMap type="com.epmet.entity.GuideExternalLinkEntity" id="guideExternalLinkMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="guideId" column="GUIDE_ID"/>
+        <result property="description" column="DESCRIPTION"/>
+        <result property="externalLink" column="EXTERNAL_LINK"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDao.xml
new file mode 100644
index 0000000000..a75b2d018f
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDao.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.GuideModuleDao">
+
+    <resultMap type="com.epmet.entity.GuideModuleEntity" id="guideModuleMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="guideId" column="GUIDE_ID"/>
+        <result property="moduleId" column="MODULE_ID"/>
+        <result property="moduleContent" column="MODULE_CONTENT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDictDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDictDao.xml
new file mode 100644
index 0000000000..be18e67c5d
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDictDao.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.GuideModuleDictDao">
+
+    <resultMap type="com.epmet.entity.GuideModuleDictEntity" id="guideModuleDictMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="moduleValue" column="MODULE_VALUE"/>
+        <result property="moduleName" column="MODULE_NAME"/>
+        <result property="sort" column="SORT"/>
+        <result property="status" column="STATUS"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDictDefaultDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDictDefaultDao.xml
new file mode 100644
index 0000000000..89cc9ac2e3
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDictDefaultDao.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.GuideModuleDictDefaultDao">
+
+    <resultMap type="com.epmet.entity.GuideModuleDictDefaultEntity" id="guideModuleDictDefaultMap">
+        <result property="id" column="ID"/>
+        <result property="moduleValue" column="MODULE_VALUE"/>
+        <result property="moduleName" column="MODULE_NAME"/>
+        <result property="sort" column="SORT"/>
+        <result property="status" column="STATUS"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file

From cbde6493a7a985d432cfe84efc4dc22e6d96e10c Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 7 Sep 2021 09:21:22 +0800
Subject: [PATCH 008/134] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=85=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/AllPartyFormDTO.java   | 46 +++++++++++++++++++
 .../epmet/dto/result/AllPartyResultDTO.java   | 41 +++++++++++++++++
 .../epmet/controller/ResiPointController.java | 12 +++++
 .../UserPointStatisticalDailyService.java     | 10 ++++
 .../UserPointStatisticalDailyServiceImpl.java | 33 +++++++++++++
 5 files changed, 142 insertions(+)
 create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AllPartyFormDTO.java
 create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/AllPartyResultDTO.java

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AllPartyFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AllPartyFormDTO.java
new file mode 100644
index 0000000000..ebfea4f918
--- /dev/null
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AllPartyFormDTO.java
@@ -0,0 +1,46 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/6 3:13 下午
+ * @DESC
+ */
+@Data
+public class AllPartyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -600409785611581009L;
+
+
+    /**
+     * 页码
+     **/
+    private Integer pageNo = NumConstant.ONE;
+
+    /**
+     * 每页数据条数
+     **/
+    private Integer pageSize = NumConstant.TEN;
+
+    /**
+     * 本月 monthly 总排行 all;
+     * */
+    private String type;
+
+    /**
+     * 认证成功的党员 的用户ID
+     * */
+    private List<String> userIds;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+}
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/AllPartyResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/AllPartyResultDTO.java
new file mode 100644
index 0000000000..25413e04a5
--- /dev/null
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/AllPartyResultDTO.java
@@ -0,0 +1,41 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/6 3:12 下午
+ * @DESC
+ */
+@Data
+public class AllPartyResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -5889648842876122793L;
+
+    /**
+     * 排序
+     **/
+    private Integer ranking;
+
+    /**
+     * 积分
+     **/
+    private Integer point;
+
+    /**
+     * 头像
+     **/
+    private String userHeadPhoto;
+
+    /**
+     * 名称
+     **/
+    private String realName;
+
+    /**
+     * 用户id
+     **/
+    private String userId;
+}
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 b52a602ede..9f5ee8acf8 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
@@ -159,6 +159,18 @@ public class ResiPointController {
         return new Result<List<ResiAroundPartyPointRankResultDTO>>().ok(resultDTOS);
     }
 
+    /**
+     * @Description  全部党员积分排行
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/6 3:30 下午
+     */
+    @PostMapping("allparty")
+    public Result<List<AllPartyResultDTO>> allParty(@RequestBody AllPartyFormDTO formDTO,@LoginUser TokenDto tokenDto){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<List<AllPartyResultDTO>>().ok(userPointStatisticalDailyService.allParty(formDTO));
+    }
+
     /**
      * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.MyPointTaskResultDTO>>
      * @param tokenDto
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointStatisticalDailyService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointStatisticalDailyService.java
index 6630a87891..1a82b5ca14 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointStatisticalDailyService.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointStatisticalDailyService.java
@@ -20,8 +20,10 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.UserPointStatisticalDailyDTO;
+import com.epmet.dto.form.AllPartyFormDTO;
 import com.epmet.dto.form.ResiAroundPartyPointRankFormDTO;
 import com.epmet.dto.form.ResiPointRankFormDTO;
+import com.epmet.dto.result.AllPartyResultDTO;
 import com.epmet.dto.result.ResiAroundPartyPointRankResultDTO;
 import com.epmet.dto.result.ResiPointRankListResultDTO;
 import com.epmet.entity.UserPointStatisticalDailyEntity;
@@ -125,4 +127,12 @@ public interface UserPointStatisticalDailyService extends BaseService<UserPointS
      * @Date 16:17 2020-12-28
      **/
     List<ResiAroundPartyPointRankResultDTO> listAroundPartyPointRank(ResiAroundPartyPointRankFormDTO formDTO);
+
+    /**
+     * @Description  全部党员积分排行
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/6 3:30 下午
+     */
+    List<AllPartyResultDTO> allParty(AllPartyFormDTO formDTO);
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
index 10ed45500f..23d0381cee 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
@@ -23,11 +23,13 @@ import com.epmet.common.enu.AroundPartyConstant;
 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.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.UserPointStatisticalDailyDao;
 import com.epmet.dto.UserPointStatisticalDailyDTO;
+import com.epmet.dto.form.AllPartyFormDTO;
 import com.epmet.dto.form.ResiAroundPartyPointRankFormDTO;
 import com.epmet.dto.form.ResiPointRankFormDTO;
 import com.epmet.dto.result.*;
@@ -45,6 +47,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -292,6 +295,36 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         return resultDTOS;
     }
 
+    /**
+     * @Description  全部党员积分排行
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/6 3:30 下午
+     */
+    @Override
+    public List<AllPartyResultDTO> allParty(AllPartyFormDTO formDTO) {
+        Result<List<PartymemberInfoDTO>> partyMemberInfosResult = resiPartyMemberOpenFeignClient.getPartyMemberInfoByCustomerId(formDTO.getCustomerId());
+        if (!partyMemberInfosResult.success()){
+            throw new RenException("查询客户下的党员失败......");
+        }
+        if (CollectionUtils.isEmpty(partyMemberInfosResult.getData())){
+            return new ArrayList<>();
+        }
+        List<PartymemberInfoDTO> partyMemberInfos = partyMemberInfosResult.getData();
+        List<String> userIds = partyMemberInfos.stream().map(m -> m.getUserId()).collect(Collectors.toList());
+        ResiAroundPartyPointRankFormDTO selDto = ConvertUtils.sourceToTarget(formDTO, ResiAroundPartyPointRankFormDTO.class);
+        selDto.setUserIds(userIds);
+        List<ResiAroundPartyPointRankResultDTO> resultDTOS = new ArrayList<>();
+        if (AroundPartyConstant.ALL.equals(formDTO.getType())){
+            resultDTOS = baseDao.selectListGridPartyRankByUsablePoint(selDto);
+        }else if (AroundPartyConstant.MONTHLY.equals(formDTO.getType())){
+            resultDTOS = baseDao.selectListGridPartyRankByMonth(selDto);
+        }
+        resultDTOS = getPartyBaseInfo(resultDTOS);
+        List<AllPartyResultDTO> result = ConvertUtils.sourceToTarget(resultDTOS, AllPartyResultDTO.class);
+        return result;
+    }
+
     /**
      * 获取认证通过的党员的 用户id
      *

From ccfbbbe015db88bf35f510d025b6d6fb80ab4a5d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 7 Sep 2021 09:22:30 +0800
Subject: [PATCH 009/134] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=85=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/UserPointStatisticalDailyServiceImpl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
index 23d0381cee..aa9942312d 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
@@ -303,6 +303,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
      */
     @Override
     public List<AllPartyResultDTO> allParty(AllPartyFormDTO formDTO) {
+        formDTO.setPageNo((formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize());
         Result<List<PartymemberInfoDTO>> partyMemberInfosResult = resiPartyMemberOpenFeignClient.getPartyMemberInfoByCustomerId(formDTO.getCustomerId());
         if (!partyMemberInfosResult.success()){
             throw new RenException("查询客户下的党员失败......");

From 50985c9532e0be039b92e2e9bc65560e922390a1 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 7 Sep 2021 10:36:28 +0800
Subject: [PATCH 010/134] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/resi/group/dto/group/result/CommentFileDTO.java  | 2 ++
 .../epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java | 2 +-
 .../epmet/modules/act/service/impl/ActCommentServiceImpl.java  | 3 ++-
 .../modules/notice/service/impl/NoticeCommentServiceImpl.java  | 2 +-
 .../topic/service/impl/ResiTopicCommentServiceImpl.java        | 2 +-
 .../resources/mapper/notice/NoticeCommentAttachmentDao.xml     | 1 +
 .../resources/mapper/topic/ResiTopicCommentAttachmentDao.xml   | 1 +
 7 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CommentFileDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CommentFileDTO.java
index f101a0a657..dfec88238a 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CommentFileDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CommentFileDTO.java
@@ -22,5 +22,7 @@ public class CommentFileDTO implements Serializable {
 	private Integer size;
 	private Integer duration;
 	@JsonIgnore
+	private String commentId;
+	@JsonIgnore
 	private String userId;
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java
index 1044128fcf..f6d7488bb4 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java
@@ -23,7 +23,7 @@ public class NoticeCommentFormDTO {
      * 评论内容300
      */
     @NotBlank(message = "评论内容不能为空",groups = {NoticeCommentFormDTO.UserShow.class})
-    @Length(max = 20, message = "评论内容不能超过300个字符",groups = {NoticeCommentFormDTO.UserShow.class})
+    @Length(max = 300, message = "评论内容不能超过300个字符",groups = {NoticeCommentFormDTO.UserShow.class})
     private String commentContent;
 
     /**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
index 98890462ca..a117db2b23 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
@@ -169,6 +169,7 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
         if (!result.success()) {
             throw new RenException("调用user服务，获取用户基础数据失败");
         }
+
         //3.查询活动评论所有人员的附件信息
         List<CommentFileDTO> fileList = actCommentAttachmentService.getActComFile(formDTO.getGroupActId());
 
@@ -184,7 +185,7 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
                 //每一条评论的附件信息
                 List<CommentFileDTO> imageList = new ArrayList<>();
                 for (CommentFileDTO f : fileList) {
-                    if (l.getCommentUserId().equals(f.getUserId())) {
+                    if (l.getCommentId().equals(f.getCommentId()) && l.getCommentUserId().equals(f.getUserId())) {
                         imageList.add(f);
                     }
                 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
index a66e3869a5..0ab3dbbc09 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
@@ -224,7 +224,7 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
             //每一条评论的附件信息
             List<CommentFileDTO> imageList = new ArrayList<>();
             for (CommentFileDTO f : fileList) {
-                if (l.getUserId().equals(f.getUserId())) {
+                if (l.getNoticeCommentId().equals(f.getCommentId()) && l.getUserId().equals(f.getUserId())) {
                     imageList.add(f);
                 }
             }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
index 623338a5ec..ce928fed18 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
@@ -411,7 +411,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
                 //每一条评论的附件信息
                 List<CommentFileDTO> imageList = new ArrayList<>();
                 for (CommentFileDTO f : fileList) {
-                    if (l.getUserId().equals(f.getUserId())) {
+                    if (l.getCommentId().equals(f.getCommentId()) && l.getUserId().equals(f.getUserId())) {
                         imageList.add(f);
                     }
                 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeCommentAttachmentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeCommentAttachmentDao.xml
index 027cf9b729..d20f434692 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeCommentAttachmentDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeCommentAttachmentDao.xml
@@ -12,6 +12,7 @@
             attachment_url url,
             sort sort,
             duration duration,
+            notice_comment_id commentId,
             created_by userId
         FROM
             notice_comment_attachment
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentAttachmentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentAttachmentDao.xml
index ff7fcc59e9..f4616d1913 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentAttachmentDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentAttachmentDao.xml
@@ -12,6 +12,7 @@
             attachment_url url,
             sort sort,
             duration duration,
+            topic_comment_id commentId,
             created_by userId
         FROM
             resi_topic_comment_attachment

From 7ab738da405a2435e963f5ca3962b7b3a33ff465 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 7 Sep 2021 10:39:16 +0800
Subject: [PATCH 011/134] =?UTF-8?q?=E6=BC=8F=E6=8F=90=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/act/ActCommentAttachmentDao.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCommentAttachmentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCommentAttachmentDao.xml
index 88a1997484..b74e6adc02 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCommentAttachmentDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCommentAttachmentDao.xml
@@ -12,6 +12,7 @@
             attachment_url url,
             sort sort,
             duration duration,
+            act_comment_id commentId,
             created_by userId
         FROM
             act_comment_attachment

From bc1c0b292e75abd43c4762b2e9cf072b0309978f Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 7 Sep 2021 13:37:50 +0800
Subject: [PATCH 012/134] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/UserPointStatisticalDailyDao.java     |  3 ++
 .../UserPointStatisticalDailyServiceImpl.java | 10 ++---
 .../mapper/UserPointStatisticalDailyDao.xml   | 41 +++++++++++++++++++
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java
index 63a3e68c1c..2ae8bb24f5 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java
@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.ResiAroundPartyPointRankFormDTO;
+import com.epmet.dto.result.AllPartyResultDTO;
 import com.epmet.dto.result.ResiAroundPartyPointRankResultDTO;
 import com.epmet.dto.result.ResiPointRankResultDTO;
 import com.epmet.entity.UserPointStatisticalDailyEntity;
@@ -73,6 +74,7 @@ public interface UserPointStatisticalDailyDao extends BaseDao<UserPointStatistic
      * @Date 09:24 2020-12-29
      **/
     List<ResiAroundPartyPointRankResultDTO> selectListGridPartyRankByUsablePoint(ResiAroundPartyPointRankFormDTO formDTO);
+    List<AllPartyResultDTO> selectListGridPartyNewRankByUsablePoint(ResiAroundPartyPointRankFormDTO formDTO);
 
     /**
      * 身边党员-积分排行 ：按网格统计，对本月党员增加的积分 进行排序
@@ -82,4 +84,5 @@ public interface UserPointStatisticalDailyDao extends BaseDao<UserPointStatistic
      * @Date 09:24 2020-12-29
      **/
     List<ResiAroundPartyPointRankResultDTO> selectListGridPartyRankByMonth(ResiAroundPartyPointRankFormDTO formDTO);
+    List<AllPartyResultDTO> selectListGridPartyNewRankByMonth(ResiAroundPartyPointRankFormDTO formDTO);
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
index aa9942312d..c75edbae56 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
@@ -315,14 +315,14 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         List<String> userIds = partyMemberInfos.stream().map(m -> m.getUserId()).collect(Collectors.toList());
         ResiAroundPartyPointRankFormDTO selDto = ConvertUtils.sourceToTarget(formDTO, ResiAroundPartyPointRankFormDTO.class);
         selDto.setUserIds(userIds);
-        List<ResiAroundPartyPointRankResultDTO> resultDTOS = new ArrayList<>();
+        List<AllPartyResultDTO> resultDTOS = new ArrayList<>();
         if (AroundPartyConstant.ALL.equals(formDTO.getType())){
-            resultDTOS = baseDao.selectListGridPartyRankByUsablePoint(selDto);
+            resultDTOS = baseDao.selectListGridPartyNewRankByUsablePoint(selDto);
         }else if (AroundPartyConstant.MONTHLY.equals(formDTO.getType())){
-            resultDTOS = baseDao.selectListGridPartyRankByMonth(selDto);
+            resultDTOS = baseDao.selectListGridPartyNewRankByMonth(selDto);
         }
-        resultDTOS = getPartyBaseInfo(resultDTOS);
-        List<AllPartyResultDTO> result = ConvertUtils.sourceToTarget(resultDTOS, AllPartyResultDTO.class);
+        List<ResiAroundPartyPointRankResultDTO> partyBaseInfo = getPartyBaseInfo(ConvertUtils.sourceToTarget(resultDTOS, ResiAroundPartyPointRankResultDTO.class));
+        List<AllPartyResultDTO> result = ConvertUtils.sourceToTarget(partyBaseInfo, AllPartyResultDTO.class);
         return result;
     }
 
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
index d49ca80396..7d7677ffd1 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
@@ -184,4 +184,45 @@
         ORDER BY P.point DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>
+
+    <select id="selectListGridPartyNewRankByUsablePoint" resultType="com.epmet.dto.result.AllPartyResultDTO">
+        SELECT
+            @curRank := @curRank + 1 AS ranking,
+            @point := IFNULL(p.USABLE_POINT, 0),
+            IFNULL(p.USABLE_POINT, 0) point,
+            p.USER_ID userId
+        FROM user_point_total p
+        <if test="null != userIds and userIds.size() > 0">
+            WHERE p.USER_ID IN
+            <foreach collection="userIds" item="userId" open="(" separator="," close=" )">
+                #{userId}
+            </foreach>
+        </if>
+        ORDER BY IFNULL(p.USABLE_POINT, 0) DESC
+        LIMIT #{pageNo}, #{pageSize}
+    </select>
+
+    <select id="selectListGridPartyNewRankByMonth" resultType="com.epmet.dto.result.AllPartyResultDTO">
+        SELECT
+            @curRank := @curRank + 1 AS ranking,
+            @point := p.point,
+            P.userId,
+            P.point
+        FROM(
+        SELECT
+        pl.USER_ID userId,
+        SUM(PL.POINT) point
+        FROM user_point_action_log pl
+        WHERE pl.DEL_FLAG = '0' AND DATE_FORMAT(pl.CREATED_TIME, '%Y%m')= DATE_FORMAT( CURDATE( ) , '%Y%m' ) AND pl.action_flag = 'plus'
+        GROUP BY pl.USER_ID
+        ) P
+        <if test="null != userIds and userIds.size() > 0">
+            WHERE userId IN
+            <foreach collection="userIds" item="userId" open="(" separator="," close=" )">
+                #{userId}
+            </foreach>
+        </if>
+        ORDER BY P.point DESC
+        LIMIT #{pageNo}, #{pageSize}
+    </select>
 </mapper>

From b5fcc12655cbb5fc5ee33712c4fcc2d2bdb12390 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 7 Sep 2021 13:50:52 +0800
Subject: [PATCH 013/134] =?UTF-8?q?=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/UserPointStatisticalDailyDao.xml  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
index 7d7677ffd1..49179803c7 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
@@ -186,6 +186,7 @@
     </select>
 
     <select id="selectListGridPartyNewRankByUsablePoint" resultType="com.epmet.dto.result.AllPartyResultDTO">
+        SET @curRank = 0;
         SELECT
             @curRank := @curRank + 1 AS ranking,
             @point := IFNULL(p.USABLE_POINT, 0),
@@ -203,6 +204,7 @@
     </select>
 
     <select id="selectListGridPartyNewRankByMonth" resultType="com.epmet.dto.result.AllPartyResultDTO">
+        SET @curRank = 0;
         SELECT
             @curRank := @curRank + 1 AS ranking,
             @point := p.point,

From 989f6194e41e6d997b3e9adda4f6edf72b6496b2 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 7 Sep 2021 13:52:18 +0800
Subject: [PATCH 014/134] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/AllPartyResultDTO.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/AllPartyResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/AllPartyResultDTO.java
index 25413e04a5..a8aabab703 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/AllPartyResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/AllPartyResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -38,4 +39,11 @@ public class AllPartyResultDTO implements Serializable {
      * 用户id
      **/
     private String userId;
+
+    public AllPartyResultDTO() {
+        this.point = NumConstant.ZERO;
+        this.userHeadPhoto = "";
+        this.realName = "";
+        this.userId = "";
+    }
 }

From 41f73d425329ed0c1bc25c0a9b78b7ebc71e40b5 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 8 Sep 2021 09:13:26 +0800
Subject: [PATCH 015/134] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=911.?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=BD=91=E6=A0=BC=E5=86=85=E5=B0=8F=E7=BB=84?=
 =?UTF-8?q?=E6=8E=92=E5=90=8D=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/GroupPointFormDTO.java |  10 +-
 .../result/GroupPointRankingResultDTO.java    |   8 ++
 .../controller/GroupPointController.java      |  23 ++++
 .../service/BizPointTotalDetailService.java   |  13 ++
 .../impl/BizPointTotalDetailServiceImpl.java  | 128 +++++++++++++++++-
 .../group/dto/group/form/GroupFormDTO.java    |  95 +++++++++++++
 .../group/result/GroupDetailResultDTO.java    |   3 +
 .../group/feign/ResiGroupOpenFeignClient.java |  22 +++
 .../ResiGroupOpenFeignClientFallback.java     |  10 ++
 .../group/controller/ResiGroupController.java |  37 +++++
 .../group/service/ResiGroupService.java       |  26 ++++
 .../service/impl/ResiGroupServiceImpl.java    |  59 ++++++++
 12 files changed, 432 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
index b727bb5d1b..8e6ded72e1 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
@@ -1,6 +1,7 @@
 package com.epmet.dto.form;
 
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import com.sun.webkit.LoadListenerClient;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -17,8 +18,15 @@ public class GroupPointFormDTO implements Serializable {
 
 	public interface GroupPoint extends CustomerClientShowGroup {}
 	public interface GridRank extends CustomerClientShowGroup {}
+	public interface GridScopeRank extends CustomerClientShowGroup {}
 	@NotBlank(message = "小组Id不能为空", groups = {GroupPoint.class, GridRank.class})
 	private String groupId;
-	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class})
+	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class, GridScopeRank.class})
 	private String gridId;
+
+	/** 页码 */
+	private Integer pageNo = 1;
+
+	/** 单页条数 */
+	private Integer pageSize = 10;
 }
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
index 275a5917ba..e45a709d6e 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
@@ -35,4 +35,12 @@ public class GroupPointRankingResultDTO implements Serializable {
 	 * 小组ID
 	 */
 	private String groupId;
+
+	/** 头像 */
+	private String groupHeadPhoto;
+
+	/** 类型 branch 支部小组；o */
+	private String groupType;
+
+
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
index 9fd48f00a1..55dbc70813 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
@@ -1,6 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -14,12 +15,15 @@ import com.epmet.service.BizPointTotalDetailService;
 import com.epmet.service.BizPointUserTotalDetailService;
 import com.epmet.service.PointRuleService;
 import com.epmet.utils.ModuleConstant;
+import com.github.pagehelper.PageInfo;
 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 javax.validation.constraints.NotBlank;
+import java.lang.management.MemoryManagerMXBean;
 import java.util.List;
 
 /**
@@ -113,4 +117,23 @@ public class GroupPointController {
 		return new Result<BizPointTotalDetailDTO>().ok(result);
 	}
 
+	/**
+	 * @description 【小组排名】- 网格范围内
+	 *
+	 * @param formDTO
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.07 13:35:45
+	 */
+	@PostMapping("grouppointranking/gridscope")
+	public Result<PageData<GroupPointRankingResultDTO>> listGroupPointRandingInGridScope(@RequestBody GroupPointFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.GridScopeRank.class);
+		String gridId = formDTO.getGridId();
+		Integer pageNo = formDTO.getPageNo();
+		Integer pageSize = formDTO.getPageSize();
+
+		PageData<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInGridScope(gridId, pageNo, pageSize);
+		return new Result<PageData<GroupPointRankingResultDTO>>().ok(page);
+	}
+
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
index 8a81ff5ffb..1d2a0af41e 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
@@ -24,6 +24,7 @@ import com.epmet.dto.form.GroupPointFormDTO;
 import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
 import com.epmet.dto.result.GroupPointRankingResultDTO;
 import com.epmet.entity.BizPointTotalDetailEntity;
+import com.github.pagehelper.PageInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -135,4 +136,16 @@ public interface BizPointTotalDetailService extends BaseService<BizPointTotalDet
 	 * @return com.epmet.dto.BizPointTotalDetailDTO
 	 */
 	BizPointTotalDetailDTO getGroupPoint(GroupPointFormDTO formDTO);
+
+	/**
+	 * @description 网格范围内查询小组排名
+	 *
+	 * @param gridId 网格id
+	 * @param pageNo 页码，默认0
+	 * @param pageSize 单页条数，默认10
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.07 14:18:08
+	 */
+	PageData<GroupPointRankingResultDTO> listGroupPointRandingInGridScope(String gridId, Integer pageNo, Integer pageSize);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
index c1a7dbe14b..8d8648fc57 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
@@ -22,7 +22,10 @@ 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.ServiceConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 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.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -30,7 +33,9 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.BizPointTotalDetailDao;
 import com.epmet.dto.BizPointTotalDetailDTO;
 import com.epmet.dto.form.GroupPointFormDTO;
+import com.epmet.resi.group.dto.group.form.GroupFormDTO;
 import com.epmet.resi.group.dto.group.form.GroupPointDetailFormDTO;
+import com.epmet.resi.group.dto.group.result.GroupDetailResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
 import com.epmet.dto.result.GroupPointRankingResultDTO;
 import com.epmet.entity.BizPointTotalDetailEntity;
@@ -39,6 +44,9 @@ import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.BizPointTotalDetailService;
 import com.epmet.service.BizPointUserTotalDetailService;
 import com.epmet.service.UserPointActionLogService;
+import com.github.pagehelper.Page;
+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;
@@ -57,7 +65,7 @@ import java.util.stream.Collectors;
  * @since v1.0.0 2021-04-20
  */
 @Service
-public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTotalDetailDao, BizPointTotalDetailEntity> implements BizPointTotalDetailService {
+public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTotalDetailDao, BizPointTotalDetailEntity> implements BizPointTotalDetailService, ResultDataResolver {
 
     @Autowired
     private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
@@ -239,4 +247,122 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
         return ConvertUtils.sourceToTarget(entity, BizPointTotalDetailDTO.class);
     }
 
+    @Override
+    public PageData<GroupPointRankingResultDTO> listGroupPointRandingInGridScope(String gridId, Integer pageNo, Integer pageSize) {
+
+        // 1.查询有积分的小组得分排名
+        PageInfo<BizPointTotalDetailEntity> entityPageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> {
+            LambdaQueryWrapper<BizPointTotalDetailEntity> query = new LambdaQueryWrapper<>();
+            query.eq(BizPointTotalDetailEntity::getGridId, gridId);
+            query.eq(BizPointTotalDetailEntity::getBizType, "group");
+            //query.eq(BizPointTotalDetailEntity::getDelFlag, 0); #用mybatis plus不需要手动指定，框架会自动指定
+            query.orderByDesc(BizPointTotalDetailEntity::getTotalPoint);
+            baseDao.selectList(query);
+        });
+
+        List<BizPointTotalDetailEntity> groupList = entityPageInfo.getList();
+
+        List<String> groupIds = groupList.stream().map(g -> g.getObjectId()).collect(Collectors.toList());
+
+        // 2.将列表填充基本信息并且转换为dto
+        List<GroupPointRankingResultDTO> rankingInfoDTOs = convertGroupRankingInfoEntity2DTOs(groupIds, groupList);
+
+        Page page = new Page(pageNo, pageSize);
+
+        // 3.如果不满一页，则填充分数为0的
+        if (pageSize > groupIds.size()) {
+            // 查出网格下已有积分的小组id
+            LambdaQueryWrapper<BizPointTotalDetailEntity> query = new LambdaQueryWrapper<>();
+            query.eq(BizPointTotalDetailEntity::getGridId, gridId);
+            query.eq(BizPointTotalDetailEntity::getBizType, "group");
+            query.select(BizPointTotalDetailEntity::getObjectId);
+            List<String> existingGroupIds = baseDao.selectObjs(query).stream().map(obj -> obj.toString()).collect(Collectors.toList());
+
+            int startRow = page.getStartRow() - existingGroupIds.size();
+            // 不足0的从0开始
+            startRow = Math.max(startRow, 0);
+            List<GroupPointRankingResultDTO> gap;
+            gap = fillGroupPageGap(existingGroupIds, gridId, startRow, pageSize - groupList.size());
+            rankingInfoDTOs.addAll(gap);
+        }
+
+        // 4.排名填充
+        Integer ranking = page.getStartRow() + 1;
+        for (GroupPointRankingResultDTO g : rankingInfoDTOs) {
+            g.setRanking(String.valueOf(ranking));
+            ranking ++;
+        }
+        PageData<GroupPointRankingResultDTO> pageData = new PageData<>(rankingInfoDTOs, entityPageInfo.getTotal());
+        return pageData;
+    }
+
+    /**
+     * @description 获取分页缺口group ranking信息
+     *
+     * @param startRow
+     * @param rowCount
+     * @return
+     * @author wxz
+     * @date 2021.09.07 16:30:28
+     */
+    private List<GroupPointRankingResultDTO> fillGroupPageGap(List<String> existingGroupIds,String searchScopeObjectId, Integer startRow, Integer rowCount) {
+        GroupFormDTO form = new GroupFormDTO();
+        form.setExcludeGroupIds(existingGroupIds);
+        form.setOrder(GroupFormDTO.OrderTypeEnum.DESC);
+        form.setSort(GroupFormDTO.SortTypeEnum.CREATE_TIME);
+        form.setStartRow(startRow);
+        form.setRowCount(rowCount);
+        form.setSearchScopeType(GroupFormDTO.SearchScopeTypeEnum.GRID);
+        form.setSearchScopeObjectId(searchScopeObjectId);
+
+        Result<List<GroupDetailResultDTO>> result = resiGroupOpenFeignClient.listGroupDetailsExcludeGroupIds(form);
+        List<GroupDetailResultDTO> groups = getResultDataOrThrowsException(result, ServiceConstant.RESI_GROUP_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【小组排名】网格内排名：查询积分为0的小组列表失败");
+        if (CollectionUtils.isEmpty(groups)) {
+            return new ArrayList<>();
+        }
+        return groups.stream().map(g -> {
+            GroupPointRankingResultDTO dto = new GroupPointRankingResultDTO();
+            dto.setGroupType(g.getGroupType());
+            dto.setPoint("0");
+            dto.setGroupHeadPhoto(g.getGroupHeadPhoto());
+            dto.setGroupName(g.getGroupName());
+            dto.setGroupId(g.getGroupId());
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * @description 将小组排名信息Entity转化为dto
+     *
+     * @param groupList
+     * @return
+     * @author wxz
+     * @date 2021.09.07 15:52:17
+     */
+    private List<GroupPointRankingResultDTO> convertGroupRankingInfoEntity2DTOs(List<String> groupIds, List<BizPointTotalDetailEntity> groupList) {
+        if (CollectionUtils.isEmpty(groupIds)) {
+            return new ArrayList<>();
+        }
+
+        // 查询这些小组的基本信息
+        Result<List<GroupDetailResultDTO>> listResult = resiGroupOpenFeignClient.listGroupDetailsByGroupIds(groupIds);
+        List<GroupDetailResultDTO> groupInfos = getResultDataOrThrowsException(listResult, ServiceConstant.RESI_GROUP_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【小组排行】批量查询小组信息出错");
+
+        // 将小组基本信息转化为map
+        HashMap<String, GroupDetailResultDTO> groupMap = new HashMap<>();
+        groupInfos.stream().forEach(g -> groupMap.put(g.getGroupId(), g));
+
+        // 将小组信息填充到排名列表中
+        List<GroupPointRankingResultDTO> rankingDTOs = groupList.stream().map(g -> {
+            GroupDetailResultDTO groupInfo = groupMap.get(g.getObjectId());
+            GroupPointRankingResultDTO dto = new GroupPointRankingResultDTO();
+            dto.setGroupId(g.getObjectId());
+            dto.setGroupName(groupInfo.getGroupName());
+            dto.setGroupType(groupInfo.getGroupType());
+            dto.setPoint(g.getTotalPoint().toString());
+            dto.setGroupHeadPhoto(groupInfo.getGroupHeadPhoto());
+            return dto;
+        }).collect(Collectors.toList());
+        return rankingDTOs;
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupFormDTO.java
index 2fc8ba7b9a..23e00b4485 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupFormDTO.java
@@ -1,8 +1,14 @@
 package com.epmet.resi.group.dto.group.form;
 
 import lombok.Data;
+import sun.security.provider.PolicySpiFile;
 
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
+import java.util.PrimitiveIterator;
 
 /**
  * @author zhaoqifeng
@@ -11,7 +17,96 @@ import java.io.Serializable;
  */
 @Data
 public class GroupFormDTO implements Serializable {
+
 	private static final long serialVersionUID = 5330629771935235995L;
+
+	/** 排除某些指定id之外的组列表 */
+	public interface GroupDetailsExcludeGroupIds {}
+
 	private String groupId;
+
 	private String gridId;
+
+	/** 小组所属范围：grid网格，customer客户 */
+	@NotNull(message = "搜索范围类型不能为空", groups = { GroupDetailsExcludeGroupIds.class })
+	private SearchScopeTypeEnum searchScopeType;
+
+	@NotNull(message = "搜索范围对象的ID不能为空", groups = { GroupDetailsExcludeGroupIds.class })
+	private String searchScopeObjectId;
+
+	private List<String> excludeGroupIds;
+
+	/** 从第几条开始取 */
+	private Integer startRow = 0;
+
+	/** 取几条数据 */
+	private Integer rowCount = 10;
+
+	@NotNull(message = "排序字段不能为空", groups = { GroupDetailsExcludeGroupIds.class })
+	private SortTypeEnum sort;
+
+	@NotNull(message = "排序方式不能为空", groups = { GroupDetailsExcludeGroupIds.class })
+	private OrderTypeEnum order;
+
+	/**
+	 * @Description 排序类型
+	 * @author wxz
+	 * @date 2021.09.07 17:00:24
+	*/
+	public enum SortTypeEnum {
+
+		CREATE_TIME("create_time");
+
+		private String sortField;
+
+		SortTypeEnum(String sortField) {
+			this.sortField = sortField;
+		}
+
+		public String getSortField() {
+			return sortField;
+		}
+	}
+
+	/**
+	 * @Description 排序方式
+	 * @author wxz
+	 * @date 2021.09.07 17:02:05
+	*/
+	public enum OrderTypeEnum {
+
+		ASC("asc"),
+		DESC("desc");
+
+		private String orderType;
+
+		OrderTypeEnum(String orderType) {
+			this.orderType = orderType;
+		}
+
+		public String getOrderType() {
+			return orderType;
+		}
+	}
+
+	/**
+	 * @Description 搜索范围类型枚举
+	 * @author wxz
+	 * @date 2021.09.07 20:14:21
+	*/
+	public enum SearchScopeTypeEnum {
+
+		CUSTOMER("customer"),
+		GRID("grid");
+
+		private String scopeType;
+
+		SearchScopeTypeEnum(String scopeType) {
+			this.scopeType = scopeType;
+		}
+
+		public String getScopeType() {
+			return scopeType;
+		}
+	}
 }
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 c7767054d4..82793a5ffd 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
@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 public class GroupDetailResultDTO {
 
     private String groupHeadPhoto;
+    private String groupId;
     private String groupName;
     private String groupIntroduction;
     private Integer editNumLimit;
@@ -17,5 +18,7 @@ public class GroupDetailResultDTO {
     private String auditStatus;
     private Boolean editable;
     private String remark;
+    /** 群组类型:branch:支部小组，ordinary:楼院小组 */
+    private String groupType;
 
 }
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 16e1d8b0c8..cf0844c02b 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
@@ -289,4 +289,26 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping("resi/group/topic/gettopicinfos")
     Result<List<TopicInfoResultDTO>> getTopicInfos(@RequestBody List<String> issueIds);
 
+    /**
+     * @description 根据组id列表批量查询组信息列表
+     *
+     * @param groupIds
+     * @return
+     * @author wxz
+     * @date 2021.09.07 15:33:58
+     */
+    @PostMapping("/resi/group/group/list-groupinfos-by-groupids")
+    Result<List<GroupDetailResultDTO>> listGroupDetailsByGroupIds(@RequestBody List<String> groupIds);
+
+    /**
+     * @description 排除指定的组id之后，按照指定顺序取指定个数的组信息
+     *
+     * @param form
+     * @return
+     * @author wxz
+     * @date 2021.09.07 17:15:55
+     */
+    @PostMapping("/resi/group/group/list-groupinfos-exclude-groupids")
+    Result<List<GroupDetailResultDTO>> listGroupDetailsExcludeGroupIds(@RequestBody GroupFormDTO form);
+
 }
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 94f03f3d41..6b5584a51c 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
@@ -220,4 +220,14 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result<List<TopicInfoResultDTO>> getTopicInfos(List<String> issueIds) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicInfos", issueIds);
     }
+
+    @Override
+    public Result<List<GroupDetailResultDTO>> listGroupDetailsByGroupIds(List<String> groupIds) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listGroupDetailsByGroupIds", groupIds);
+    }
+
+    @Override
+    public Result<List<GroupDetailResultDTO>> listGroupDetailsExcludeGroupIds(GroupFormDTO form) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listGroupDetailsExcludeGroupIds", form);
+    }
 }
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 5fa0d56be9..57d8870685 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
@@ -599,4 +599,41 @@ public class ResiGroupController {
     public Result<Boolean> initAchievement(@RequestParam String customerId) {
         return new Result<Boolean>().ok(statsAchievementService.initAllGroupAchievement(customerId));
     }
+
+    /**
+     * @description 根据组id列表批量查询组信息列表
+     *
+     * @param groupIds
+     * @return
+     * @author wxz
+     * @date 2021.09.07 15:33:58
+     */
+    @PostMapping("list-groupinfos-by-groupids")
+    public Result<List<GroupDetailResultDTO>> listGroupDetailsByGroupIds(@RequestBody List<String> groupIds) {
+        List<GroupDetailResultDTO> groupDetails = resiGroupService.listGroupsByGroupIds(groupIds);
+        return new Result<List<GroupDetailResultDTO>>().ok(groupDetails);
+    }
+
+    /**
+     * @description 排除指定的组id之后，按照指定顺序取指定个数的组信息
+     *
+     * @param form
+     * @return
+     * @author wxz
+     * @date 2021.09.07 17:15:55
+     */
+    @PostMapping("list-groupinfos-exclude-groupids")
+    public Result<List<GroupDetailResultDTO>> listGroupDetailsExcludeGroupIds(@RequestBody GroupFormDTO form) {
+        ValidatorUtils.validateEntity(form, GroupFormDTO.GroupDetailsExcludeGroupIds.class);
+        Integer startRow = form.getStartRow();
+        Integer rowCount = form.getRowCount();
+        List<String> excludeGroupIds = form.getExcludeGroupIds();
+        GroupFormDTO.SortTypeEnum sort = form.getSort();
+        GroupFormDTO.OrderTypeEnum order = form.getOrder();
+        GroupFormDTO.SearchScopeTypeEnum searchScopeType = form.getSearchScopeType();
+        String searchScopeObjectId = form.getSearchScopeObjectId();
+
+        List<GroupDetailResultDTO> groups = resiGroupService.listGroupDetailsExcludeGroupIds(excludeGroupIds, startRow, rowCount, searchScopeType.getScopeType(), searchScopeObjectId, sort.getSortField(), order.getOrderType());
+        return new Result<List<GroupDetailResultDTO>>().ok(groups);
+    }
 }
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 d7761738d8..eed7a355e6 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
@@ -435,4 +435,30 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @return com.epmet.resi.group.dto.group.ResiGroupDTO
 	 */
 	ResiGroupDTO getGroupInfoAndGroupMember(String groupId);
+
+	/**
+	 * @description 根据id列表查询组信息
+	 *
+	 * @param groupIds
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.07 15:27:35
+	 */
+    List<GroupDetailResultDTO> listGroupsByGroupIds(List<String> groupIds);
+
+	/**
+	 * @description 排除指定的组id之后，按照指定顺序取指定个数的组信息
+	 *
+	 * @param excludeGroupIds 排序的组id列表
+	 * @param startRow
+	 * @param rowCount
+	 * @param searchScopeObjectId 小组所属的范围对象id，如果是网格，那就是网格id，如果是客户那就是客户id
+	 * @param searchScopeType 小组所属的范围，grid网格，customer客户
+	 * @param sortType 排序字段
+	 * @param orderType 排序类型
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.07 17:17:09
+	 */
+	List<GroupDetailResultDTO> listGroupDetailsExcludeGroupIds(List<String> excludeGroupIds, Integer startRow, Integer rowCount, String searchScopeType,String searchScopeObjectId, String sortType, String orderType);
 }
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 122fafce0d..8abf0eba12 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
@@ -18,8 +18,10 @@
 package com.epmet.modules.group.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.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg;
 import com.epmet.commons.tools.constant.*;
@@ -80,7 +82,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.send.SendMqMsgUtil;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import kotlin.jvm.internal.Lambda;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -1772,4 +1776,59 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		return resultList;
 	}
 
+	@Override
+	public List<GroupDetailResultDTO> listGroupsByGroupIds(List<String> groupIds) {
+		LambdaQueryWrapper<ResiGroupEntity> query = new LambdaQueryWrapper<>();
+		query.in(ResiGroupEntity::getId, groupIds);
+		query.orderByDesc(ResiGroupEntity::getCreatedTime);
+		query.eq(ResiGroupEntity::getDelFlag, 0);
+		List<ResiGroupEntity> groupEntities = baseDao.selectList(query);
+		List<GroupDetailResultDTO> groupDtos = groupEntities.stream().map(ge -> {
+			GroupDetailResultDTO dto = new GroupDetailResultDTO();
+			dto.setGroupId(ge.getId());
+			dto.setGroupName(ge.getGroupName());
+			dto.setGroupHeadPhoto(ge.getGroupHeadPhoto());
+			dto.setGroupIntroduction(ge.getGroupIntroduction());
+			dto.setGroupType(ge.getGroupType());
+			return dto;
+		}).collect(Collectors.toList());
+		return groupDtos;
+	}
+
+	@Override
+	public List<GroupDetailResultDTO> listGroupDetailsExcludeGroupIds(List<String> excludeGroupIds, Integer startRow, Integer rowCount, String searchScopeType, String searchScopeObjectId, String sortType, String orderType) {
+		LambdaQueryWrapper<ResiGroupEntity> query = new LambdaQueryWrapper<>();
+		if (CollectionUtils.isNotEmpty(excludeGroupIds)) {
+			query.notIn(ResiGroupEntity::getId, excludeGroupIds);
+		}
+		// 利用pagehelper计算起始条数
+		query.last(String.format("limit %s, %s", startRow, rowCount));
+
+		SFunction<ResiGroupEntity, ?> sortFieldFun = null;
+		if (GroupFormDTO.SortTypeEnum.CREATE_TIME.getSortField().equals(sortType)) {
+			sortFieldFun = ResiGroupEntity::getCreatedTime;
+		}
+
+		if (GroupFormDTO.SearchScopeTypeEnum.GRID.getScopeType().equals(searchScopeType)) {
+			query.eq(ResiGroupEntity::getGridId, searchScopeObjectId);
+		} else if (GroupFormDTO.SearchScopeTypeEnum.CUSTOMER.getScopeType().equals(searchScopeType)) {
+			query.eq(ResiGroupEntity::getCustomerId, searchScopeObjectId);
+		}
+
+		if (GroupFormDTO.OrderTypeEnum.ASC.getOrderType().equals(orderType)) {
+			query.orderByAsc(sortFieldFun);
+		} else {
+			query.orderByDesc(sortFieldFun);
+		}
+		List<ResiGroupEntity> groupList = baseDao.selectList(query);
+		return groupList.stream().map(ge -> {
+			GroupDetailResultDTO dto = new GroupDetailResultDTO();
+			dto.setGroupId(ge.getId());
+			dto.setGroupName(ge.getGroupName());
+			dto.setGroupHeadPhoto(ge.getGroupHeadPhoto());
+			dto.setGroupIntroduction(ge.getGroupIntroduction());
+			dto.setGroupType(ge.getGroupType());
+			return dto;
+		}).collect(Collectors.toList());
+	}
 }

From 7ff134f3a4f4d1fe798d7ea27360619e0c3682e5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Sep 2021 11:13:45 +0800
Subject: [PATCH 016/134] =?UTF-8?q?guide=5Fcategory=5Fdefault=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E7=94=9F=E6=88=90=E7=9A=84=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/GuideCategoryDefaultDTO.java    |  86 ---------------
 .../epmet/dao/GuideCategoryDefaultDao.java    |  33 ------
 .../entity/GuideCategoryDefaultEntity.java    |  56 ----------
 .../service/GuideCategoryDefaultService.java  |  95 -----------------
 .../impl/GuideCategoryDefaultServiceImpl.java | 100 ------------------
 .../mapper/GuideCategoryDefaultDao.xml        |  20 ----
 6 files changed, 390 deletions(-)
 delete mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDefaultDTO.java
 delete mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDefaultDao.java
 delete mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryDefaultEntity.java
 delete mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryDefaultService.java
 delete mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryDefaultServiceImpl.java
 delete mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDefaultDao.xml

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDefaultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDefaultDTO.java
deleted file mode 100644
index 3d7080d2ff..0000000000
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDefaultDTO.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-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 2021-09-06
- */
-@Data
-public class GuideCategoryDefaultDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-	private String id;
-
-    /**
-     * 分类名
-     */
-	private String categoryName;
-
-    /**
-     * 排序
-     */
-	private Integer sort;
-
-    /**
-     * 状态 禁用disable 启用enable
-     */
-	private String status;
-
-    /**
-     * 删除标识 0未删除、1已删除
-     */
-	private String delFlag;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
-
-}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDefaultDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDefaultDao.java
deleted file mode 100644
index 3c3b31a12b..0000000000
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDefaultDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.epmet.dao;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.GuideCategoryDefaultEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 指南默认分类
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2021-09-06
- */
-@Mapper
-public interface GuideCategoryDefaultDao extends BaseDao<GuideCategoryDefaultEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryDefaultEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryDefaultEntity.java
deleted file mode 100644
index bb6056e549..0000000000
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryDefaultEntity.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-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 2021-09-06
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("guide_category_default")
-public class GuideCategoryDefaultEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 分类名
-     */
-	private String categoryName;
-
-    /**
-     * 排序
-     */
-	private Integer sort;
-
-    /**
-     * 状态 禁用disable 启用enable
-     */
-	private String status;
-
-}
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryDefaultService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryDefaultService.java
deleted file mode 100644
index f7b73ceae8..0000000000
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryDefaultService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.epmet.service;
-
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.GuideCategoryDefaultDTO;
-import com.epmet.entity.GuideCategoryDefaultEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 指南默认分类
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2021-09-06
- */
-public interface GuideCategoryDefaultService extends BaseService<GuideCategoryDefaultEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<GuideCategoryDefaultDTO>
-     * @author generator
-     * @date 2021-09-06
-     */
-    PageData<GuideCategoryDefaultDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<GuideCategoryDefaultDTO>
-     * @author generator
-     * @date 2021-09-06
-     */
-    List<GuideCategoryDefaultDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return GuideCategoryDefaultDTO
-     * @author generator
-     * @date 2021-09-06
-     */
-    GuideCategoryDefaultDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-09-06
-     */
-    void save(GuideCategoryDefaultDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-09-06
-     */
-    void update(GuideCategoryDefaultDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2021-09-06
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryDefaultServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryDefaultServiceImpl.java
deleted file mode 100644
index 4fba3fa9ec..0000000000
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryDefaultServiceImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-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.GuideCategoryDefaultDao;
-import com.epmet.dto.GuideCategoryDefaultDTO;
-import com.epmet.entity.GuideCategoryDefaultEntity;
-import com.epmet.service.GuideCategoryDefaultService;
-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 2021-09-06
- */
-@Service
-public class GuideCategoryDefaultServiceImpl extends BaseServiceImpl<GuideCategoryDefaultDao, GuideCategoryDefaultEntity> implements GuideCategoryDefaultService {
-
-
-    @Override
-    public PageData<GuideCategoryDefaultDTO> page(Map<String, Object> params) {
-        IPage<GuideCategoryDefaultEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, GuideCategoryDefaultDTO.class);
-    }
-
-    @Override
-    public List<GuideCategoryDefaultDTO> list(Map<String, Object> params) {
-        List<GuideCategoryDefaultEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, GuideCategoryDefaultDTO.class);
-    }
-
-    private QueryWrapper<GuideCategoryDefaultEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<GuideCategoryDefaultEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public GuideCategoryDefaultDTO get(String id) {
-        GuideCategoryDefaultEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, GuideCategoryDefaultDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(GuideCategoryDefaultDTO dto) {
-        GuideCategoryDefaultEntity entity = ConvertUtils.sourceToTarget(dto, GuideCategoryDefaultEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(GuideCategoryDefaultDTO dto) {
-        GuideCategoryDefaultEntity entity = ConvertUtils.sourceToTarget(dto, GuideCategoryDefaultEntity.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/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDefaultDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDefaultDao.xml
deleted file mode 100644
index af77665580..0000000000
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDefaultDao.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.epmet.dao.GuideCategoryDefaultDao">
-
-    <resultMap type="com.epmet.entity.GuideCategoryDefaultEntity" id="guideCategoryDefaultMap">
-        <result property="id" column="ID"/>
-        <result property="categoryName" column="CATEGORY_NAME"/>
-        <result property="sort" column="SORT"/>
-        <result property="status" column="STATUS"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>
\ No newline at end of file

From 5716a47e0aa00de6a0c4821a76678a22d4fda27f Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 8 Sep 2021 11:29:28 +0800
Subject: [PATCH 017/134] =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E6=8C=87=E5=8D=97?=
 =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/exception/EpmetErrorCode.java       |   3 +-
 .../java/com/epmet/dto/form/OrgFormDTO.java   |  17 ++
 .../epmet/feign/GovOrgOpenFeignClient.java    |  10 +
 .../GovOrgOpenFeignClientFallback.java        |  13 +
 .../controller/CustomerAgencyController.java  |  12 +
 .../epmet/service/CustomerAgencyService.java  |   9 +
 .../impl/CustomerAgencyServiceImpl.java       |  14 +
 .../java/com/epmet/dto/AttachmentDTO.java     |  22 ++
 .../java/com/epmet/dto/ExternalLinkDTO.java   |  56 ++++
 .../src/main/java/com/epmet/dto/GuideDTO.java |  17 +-
 .../com/epmet/dto/GuideExternalLinkDTO.java   |   5 +
 .../main/java/com/epmet/dto/ModuleDTO.java    |  58 ++++
 .../com/epmet/dto/form/GuideAddFormDTO.java   |  61 ++++
 .../com/epmet/dto/form/GuideEditFormDTO.java  |  70 +++++
 .../java/com/epmet/dto/form/GuideFormDTO.java |  39 +++
 .../com/epmet/dto/form/GuideListFormDTO.java  |  31 ++
 .../dto/result/GetCategoryResultDTO.java      |  17 ++
 .../dto/result/GuideDetailResultDTO.java      |  67 +++++
 .../epmet/dto/result/GuideListResultDTO.java  |  35 +++
 .../com/epmet/controller/GuideController.java | 102 ++++++-
 .../src/main/java/com/epmet/dao/GuideDao.java |  30 +-
 .../java/com/epmet/dao/GuideModuleDao.java    |  12 +
 .../java/com/epmet/entity/GuideEntity.java    |  23 +-
 .../epmet/entity/GuideExternalLinkEntity.java |   8 +-
 .../epmet/service/GuideAttachmentService.java |  19 ++
 .../service/GuideExternalLinkService.java     |  19 ++
 .../com/epmet/service/GuideModuleService.java |  20 ++
 .../java/com/epmet/service/GuideService.java  |  60 +++-
 .../impl/GuideAttachmentServiceImpl.java      |  49 +++
 .../impl/GuideExternalLinkServiceImpl.java    |  45 +++
 .../service/impl/GuideModuleServiceImpl.java  |  32 ++
 .../epmet/service/impl/GuideServiceImpl.java  | 282 ++++++++++++++++++
 .../src/main/resources/mapper/GuideDao.xml    |  42 ++-
 .../main/resources/mapper/GuideModuleDao.xml  |  13 +
 34 files changed, 1285 insertions(+), 27 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/OrgFormDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/AttachmentDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ExternalLinkDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ModuleDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideAddFormDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideEditFormDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideFormDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GetCategoryResultDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDetailResultDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideListResultDTO.java

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 aa74cd8e2a..4d717f919e 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
@@ -155,7 +155,8 @@ public enum EpmetErrorCode {
 	EXISTED_SPECIAL_PROJECT(8807, "已经添加过此专题"),
 	CAN_NOT_DEL_SPECIAL_PROJECT(8808, "您没有权限删除此专题"),
 	TAG_NOT_EXIST(8809,"标签不存在"),
-
+	GUIDE_IS_NULL(8810,"指南内容不能为空"),
+	GUIDE_IS_NOT_YOURS(8811,"只能删除自己创建的指南"),
 	//公众号  865..开头的码
 	PUBLIC_NOT_EXISTS(8651,"手机号未注册，请先完成信息注册"),
 	SELECT_CUSTOMER_ERROR(8652,"未查询到注册客户信息"),
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/OrgFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/OrgFormDTO.java
new file mode 100644
index 0000000000..6975477321
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/OrgFormDTO.java
@@ -0,0 +1,17 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/7 15:41
+ */
+@Data
+public class OrgFormDTO implements Serializable {
+    private static final long serialVersionUID = -5975063766883885089L;
+    private String orgId;
+    private String orgType;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index e6af374fe2..7e7de0e4b2 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -417,4 +417,14 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/customerstaffagency/queryOrgStaffs")
     Result<Set<String>> queryOrgStaffs(@RequestBody OrgStaffFormDTO formDTO);
+
+    /**
+     * @Description 根据组织或网格或吧部门获取组织信息
+     * @Param formDTO
+     * @Return {@link Result<OrgResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 15:27
+     */
+    @PostMapping("/gov/org/customeragency/getAgencyInfo")
+    Result<OrgResultDTO> getAgencyInfo(@RequestBody OrgFormDTO formDTO);
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index b517c20344..38f5df4626 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -248,6 +248,19 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryOrgStaffs", formDTO);
     }
 
+    /**
+     * @param formDTO
+     * @Description 根据组织或网格或吧部门获取组织信息
+     * @Param formDTO
+     * @Return {@link Result<OrgResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 15:27
+     */
+    @Override
+    public Result<OrgResultDTO> getAgencyInfo(OrgFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyInfo", formDTO);
+    }
+
     @Override
     public Result<String> selectPidsByGridId(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId);
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 963c8b7b95..70c254ee26 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
@@ -312,4 +312,16 @@ public class CustomerAgencyController {
         return new Result<ExtStaffPermissionResultDTO>().ok(customerAgencyService.staffPermissionExt(tokenDto.getUserId()));
     }
 
+    /**
+     * @Description 根据组织或网格或吧部门获取组织信息
+     * @Param formDTO
+     * @Return {@link Result<OrgResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 15:27
+     */
+    @PostMapping("getAgencyInfo")
+    public Result<OrgResultDTO> getAgencyInfo(@RequestBody OrgFormDTO formDTO) {
+        return new Result<OrgResultDTO>().ok(customerAgencyService.getAgencyInfo(formDTO));
+    }
+
 }
\ No newline at end of file
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 fda2f4d09e..aaa691f239 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
@@ -236,4 +236,13 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
     OrganizeTreeResultDTO organizeTree(String agencyId);
 
     void checkAgencyName(String agencyName,String customerId,String agencyId,String parentAgencyId);
+
+    /**
+     * 根据组织或网格或吧部门获取组织信息
+     * @Param formDTO
+     * @Return {@link OrgResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 15:28
+     */
+    OrgResultDTO getAgencyInfo(OrgFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index 38c0fc85b0..554d263173 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
@@ -1075,4 +1075,18 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         }
     }
 
+    /**
+     * 根据组织或网格或吧部门获取组织信息
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link OrgResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 15:28
+     */
+    @Override
+    public OrgResultDTO getAgencyInfo(OrgFormDTO formDTO) {
+        return baseDao.selectAgencyDetail(formDTO.getOrgId(), formDTO.getOrgType());
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/AttachmentDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/AttachmentDTO.java
new file mode 100644
index 0000000000..08fc2f7cc5
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/AttachmentDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/7 16:21
+ */
+@Data
+public class AttachmentDTO implements Serializable {
+    private static final long serialVersionUID = 6505979559566901869L;
+    private String name;
+    private String format;
+    private String type;
+    private String url;
+    private Integer size;
+    private Integer duration;
+
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ExternalLinkDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ExternalLinkDTO.java
new file mode 100644
index 0000000000..e298d31648
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ExternalLinkDTO.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 指南外链表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Data
+public class ExternalLinkDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 链接说明
+     */
+	private String description;
+
+    /**
+     * 外部链接
+     */
+	private String externalLink;
+
+    /**
+     * 外部链接
+     */
+    private Integer sort;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideDTO.java
index 9d5377c34d..f5fe57d143 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -43,10 +44,20 @@ public class GuideDTO implements Serializable {
      */
 	private String customerId;
 
+    /**
+     * 发布单位类型 机关agency 网格grid 部门dept
+     */
+    private String orgType;
+
     /**
      * 发布单位ID
      */
-	private String agencyId;
+	private String orgId;
+
+    /**
+     * 发布单位名称
+     */
+    private String orgName;
 
     /**
      * 所属组织机构ID（customer_agency.id）
@@ -66,7 +77,7 @@ public class GuideDTO implements Serializable {
     /**
      * 分类ID
      */
-	private String categoryId;
+	private String categoryCode;
 
     /**
      * 删除标识:0.未删除 1.已删除
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideExternalLinkDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideExternalLinkDTO.java
index 3cbc69462e..39612bb4ff 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideExternalLinkDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideExternalLinkDTO.java
@@ -58,6 +58,11 @@ public class GuideExternalLinkDTO implements Serializable {
      */
 	private String externalLink;
 
+    /**
+     * 排序
+     */
+    private Integer sort;
+
     /**
      * 删除标识 0未删除、1已删除
      */
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ModuleDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ModuleDTO.java
new file mode 100644
index 0000000000..548395fd96
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ModuleDTO.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 指南模块字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-06
+ */
+@Data
+public class ModuleDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键
+     */
+    private String guideModuleId;
+    /**
+     * 主键
+     */
+	private String moduleId;
+
+    /**
+     * 模块key
+     */
+	private String moduleValue;
+
+    /**
+     * 模块名
+     */
+	private String moduleName;
+
+    /**
+     * 模块内容
+     */
+    private String moduleContent;
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideAddFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideAddFormDTO.java
new file mode 100644
index 0000000000..dd74b3fac6
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideAddFormDTO.java
@@ -0,0 +1,61 @@
+package com.epmet.dto.form;
+
+import com.epmet.dto.AttachmentDTO;
+import com.epmet.dto.ExternalLinkDTO;
+import com.epmet.dto.ModuleDTO;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/7 10:24
+ */
+@NoArgsConstructor
+@Data
+public class GuideAddFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -7750999102010191460L;
+    /**
+     * 标题
+     */
+    @NotBlank(message = "标题不能为空")
+    private String title;
+    /**
+     * 标题
+     */
+    @NotBlank(message = "分类不能为空")
+    private String categoryCode;
+    /**
+     * 机关类型 机关agency 网格grid 部门dept
+     */
+    @NotBlank(message = "所属机关类型不能为空")
+    private String orgType;
+    /**
+     * 所属机关
+     */
+    @NotBlank(message = "所属机关ID不能为空")
+    private String orgId;
+    /**
+     * 所属机关
+     */
+    @NotBlank(message = "所属机关名不能为空")
+    private String orgName;
+    /**
+     * 外部链接
+     */
+    private List<ExternalLinkDTO> externalLinks;
+    /**
+     * 内容模块
+     */
+    private List<ModuleDTO> moduleList;
+    /**
+     * 附件
+     */
+    private List<AttachmentDTO> attachmentList;
+
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideEditFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideEditFormDTO.java
new file mode 100644
index 0000000000..a589c4c1ec
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideEditFormDTO.java
@@ -0,0 +1,70 @@
+package com.epmet.dto.form;
+
+import com.epmet.dto.AttachmentDTO;
+import com.epmet.dto.ExternalLinkDTO;
+import com.epmet.dto.ModuleDTO;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/7 10:24
+ */
+@NoArgsConstructor
+@Data
+public class GuideEditFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -7750999102010191460L;
+    /**
+     * 工作人员ID
+     */
+    private String staffId;
+    /**
+     * 指南ID
+     */
+    @NotBlank(message = "指南id不能为空")
+    private String guideId;
+    /**
+     * 标题
+     */
+    @NotBlank(message = "标题不能为空")
+    private String title;
+    /**
+     * 标题
+     */
+    @NotBlank(message = "分类不能为空")
+    private String categoryCode;
+    /**
+     * 机关类型 机关agency 网格grid 部门dept
+     */
+    @NotBlank(message = "所属机关类型不能为空")
+    private String orgType;
+    /**
+     * 所属机关
+     */
+    @NotBlank(message = "所属机关ID不能为空")
+    private String orgId;
+    /**
+     * 所属机关
+     */
+    @NotBlank(message = "所属机关名不能为空")
+    private String orgName;
+    /**
+     * 外部链接
+     */
+    private List<ExternalLinkDTO> externalLinks;
+    /**
+     * 内容模块
+     */
+    private List<ModuleDTO> moduleList;
+    /**
+     * 附件
+     */
+    private List<AttachmentDTO> attachmentList;
+
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideFormDTO.java
new file mode 100644
index 0000000000..48bfde8f04
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideFormDTO.java
@@ -0,0 +1,39 @@
+package com.epmet.dto.form;
+
+import com.epmet.dto.ExternalLinkDTO;
+import com.epmet.dto.GuideAttachmentDTO;
+import com.epmet.dto.ModuleDTO;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/7 10:24
+ */
+@NoArgsConstructor
+@Data
+public class GuideFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -7750999102010191460L;
+    /**
+     * 标题
+     */
+    @NotBlank(message = "指南id不能为空")
+    private String guideId;
+
+    /**
+     * 工作人员
+     */
+    private String staffId;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java
new file mode 100644
index 0000000000..d4ff3bdfcb
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/7 9:38
+ */
+@NoArgsConstructor
+@Data
+public class GuideListFormDTO extends PageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -4471422632936288213L;
+    /**
+     * 组织ID
+     */
+    private String agencyId;
+    /**
+     * 分类
+     */
+    private String categoryId;
+    /**
+     * 标题
+     */
+    private String guideTitle;
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GetCategoryResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GetCategoryResultDTO.java
new file mode 100644
index 0000000000..6bf568d65d
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GetCategoryResultDTO.java
@@ -0,0 +1,17 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/7 10:52
+ */
+@Data
+public class GetCategoryResultDTO implements Serializable {
+    private static final long serialVersionUID = 3527239091132653541L;
+    private String categoryId;
+    private String categoryName;
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDetailResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDetailResultDTO.java
new file mode 100644
index 0000000000..2987b227a0
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDetailResultDTO.java
@@ -0,0 +1,67 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.AttachmentDTO;
+import com.epmet.dto.ExternalLinkDTO;
+import com.epmet.dto.ModuleDTO;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/7 10:24
+ */
+@NoArgsConstructor
+@Data
+public class GuideDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -7750999102010191460L;
+    /**
+     * 标题
+     */
+    private String guideId;
+    /**
+     * 标题
+     */
+    private String title;
+    /**
+     * 分类ID
+     */
+    private String categoryId;
+    /**
+     * 分类名
+     */
+    private String categoryName;
+    /**
+     * 机关类型 机关agency 网格grid 部门dept
+     */
+    private String orgType;
+    /**
+     * 所属机关
+     */
+    private String orgId;
+    /**
+     * 所属机关名
+     */
+    private String orgName;
+    /**
+     * 是否收藏 1是， 0否
+     */
+    private String collectionFlag;
+    /**
+     * 外部链接
+     */
+    private List<ExternalLinkDTO> externalLinks;
+    /**
+     * 内容模块
+     */
+    private List<ModuleDTO> moduleList;
+    /**
+     * 附件
+     */
+    private List<AttachmentDTO> attachmentList;
+
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideListResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideListResultDTO.java
new file mode 100644
index 0000000000..7cd2400afa
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideListResultDTO.java
@@ -0,0 +1,35 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class GuideListResultDTO implements Serializable {
+	private static final long serialVersionUID = -1360741408368601140L;
+	private String guideId;
+	/**
+	 * 标题
+	 */
+	private String title;
+	/**
+	 * 分类
+	 */
+	private String categoryName;
+	/**
+	 * 创建人ID
+	 */
+	private String createdId;
+	/**
+	 * 创建人姓名
+	 */
+	private String createdName;
+	/**
+	 * 更新时间
+	 */
+	private Date updatedTime;
+}
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java
index d484148233..602916807e 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java
@@ -17,7 +17,10 @@
 
 package com.epmet.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;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -25,6 +28,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.GuideDTO;
+import com.epmet.dto.form.GuideAddFormDTO;
+import com.epmet.dto.form.GuideEditFormDTO;
+import com.epmet.dto.form.GuideFormDTO;
+import com.epmet.dto.form.GuideListFormDTO;
+import com.epmet.dto.result.GuideDetailResultDTO;
+import com.epmet.dto.result.GuideListResultDTO;
 import com.epmet.service.GuideService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -33,7 +42,7 @@ import java.util.Map;
 
 
 /**
- * 办事指南表 
+ * 办事指南表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-06
@@ -41,24 +50,24 @@ import java.util.Map;
 @RestController
 @RequestMapping("guide")
 public class GuideController {
-    
+
     @Autowired
     private GuideService guideService;
 
     @GetMapping("page")
-    public Result<PageData<GuideDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<GuideDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<GuideDTO> page = guideService.page(params);
         return new Result<PageData<GuideDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<GuideDTO> get(@PathVariable("id") String id){
+    public Result<GuideDTO> get(@PathVariable("id") String id) {
         GuideDTO data = guideService.get(id);
         return new Result<GuideDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody GuideDTO dto){
+    public Result save(@RequestBody GuideDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         guideService.save(dto);
@@ -66,7 +75,7 @@ public class GuideController {
     }
 
     @PutMapping
-    public Result update(@RequestBody GuideDTO dto){
+    public Result update(@RequestBody GuideDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         guideService.update(dto);
@@ -74,11 +83,90 @@ public class GuideController {
     }
 
     @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         guideService.delete(ids);
         return new Result();
     }
 
+    /**
+     * @Description 办事指南列表
+     * @Param formDTO
+     * @Return {@link Result< PageData< GuideListResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 13:59
+     */
+    @PostMapping("list")
+    public Result<PageData<GuideListResultDTO>> guideList(@LoginUser TokenDto tokenDto, @RequestBody GuideListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        PageData<GuideListResultDTO> page = guideService.guideList(tokenDto, formDTO);
+        return new Result<PageData<GuideListResultDTO>>().ok(page);
+    }
+
+
+    /**
+     * @Description 添加指南
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:13
+     */
+    @PostMapping("add")
+    public Result guideAdd(@LoginUser TokenDto tokenDto, @RequestBody GuideAddFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        guideService.guideAdd(tokenDto, formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Description 修改指南
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:13
+     */
+    @PostMapping("edit")
+    public Result guideEdit(@LoginUser TokenDto tokenDto, @RequestBody GuideEditFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        formDTO.setStaffId(tokenDto.getUserId());
+        guideService.guideEdit(formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Description 删除指南
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:13
+     */
+    @PostMapping("del")
+    public Result guideDel(@LoginUser TokenDto tokenDto, @RequestBody GuideFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        formDTO.setStaffId(tokenDto.getUserId());
+        guideService.guideDel(formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Description 指南详情
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link Result< GuideDetailResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:13
+     */
+    @PostMapping("detail")
+    public Result<GuideDetailResultDTO> guideDetail(@LoginUser TokenDto tokenDto, @RequestBody GuideFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        GuideDetailResultDTO result = guideService.guideDetail(formDTO);
+        return new Result<GuideDetailResultDTO>().ok(result);
+    }
+
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java
index cc5039c8d4..ec78fb5803 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java
@@ -18,16 +18,42 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.GuideListFormDTO;
+import com.epmet.dto.result.GuideDetailResultDTO;
+import com.epmet.dto.result.GuideListResultDTO;
 import com.epmet.entity.GuideEntity;
 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 2021-09-06
  */
 @Mapper
 public interface GuideDao extends BaseDao<GuideEntity> {
-	
+
+    /**
+     * 指南列表
+     *
+     * @Param formDTO
+     * @Return {@link List<GuideListResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:21
+     */
+    List<GuideListResultDTO> getGuideList(GuideListFormDTO formDTO);
+
+    /**
+     * 指南详情
+     *
+     * @Param guideId
+     * @Return {@link GuideDetailResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 9:59
+     */
+    GuideDetailResultDTO getGuideDetail(@Param("guideId") String guideId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDao.java
index d77324965b..07518e24eb 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideModuleDao.java
@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.ModuleDTO;
 import com.epmet.entity.GuideModuleEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 指南模块关联表
@@ -29,5 +33,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface GuideModuleDao extends BaseDao<GuideModuleEntity> {
+    /**
+     * @Description 获取指南的内容模块
+     * @Param guideId
+     * @Return {@link List< ModuleDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 10:18
+     */
+    List<ModuleDTO> selectByGuideId(@Param("customerId") String customerId, @Param("guideId") String guideId);
 	
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideEntity.java
index f135e3f676..5909729866 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideEntity.java
@@ -18,13 +18,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;
-
 /**
  * 办事指南表 
  *
@@ -43,10 +40,20 @@ public class GuideEntity extends BaseEpmetEntity {
      */
 	private String customerId;
 
-    /**
-     * 发布单位ID
-     */
-	private String agencyId;
+	/**
+	 * 发布单位类型 机关agency 网格grid 部门dept
+	 */
+	private String orgType;
+
+	/**
+	 * 发布单位ID
+	 */
+	private String orgId;
+
+	/**
+	 * 发布单位名称
+	 */
+	private String orgName;
 
     /**
      * 所属组织机构ID（customer_agency.id）
@@ -66,6 +73,6 @@ public class GuideEntity extends BaseEpmetEntity {
     /**
      * 分类ID
      */
-	private String categoryId;
+	private String categoryCode;
 
 }
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideExternalLinkEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideExternalLinkEntity.java
index 4113a168c5..3773c6acea 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideExternalLinkEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideExternalLinkEntity.java
@@ -18,13 +18,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;
-
 /**
  * 指南外链表
  *
@@ -58,4 +55,9 @@ public class GuideExternalLinkEntity extends BaseEpmetEntity {
      */
 	private String externalLink;
 
+	/**
+	 * 排序
+	 */
+	private Integer sort;
+
 }
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideAttachmentService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideAttachmentService.java
index 0c56c55e62..4b297fed10 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideAttachmentService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideAttachmentService.java
@@ -19,6 +19,7 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.AttachmentDTO;
 import com.epmet.dto.GuideAttachmentDTO;
 import com.epmet.entity.GuideAttachmentEntity;
 
@@ -92,4 +93,22 @@ public interface GuideAttachmentService extends BaseService<GuideAttachmentEntit
      * @date 2021-09-06
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 删除指南附件
+     * @Param guideId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 17:16
+     */
+    void deleteByGuideId(String guideId);
+
+    /**
+     * @Description 获取指南附件
+     * @Param guideId
+     * @Return {@link List< AttachmentDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 10:49
+     */
+    List<AttachmentDTO> getByGuideId(String guideId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideExternalLinkService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideExternalLinkService.java
index fcb7cc5b65..e54c0d4675 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideExternalLinkService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideExternalLinkService.java
@@ -19,6 +19,7 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.ExternalLinkDTO;
 import com.epmet.dto.GuideExternalLinkDTO;
 import com.epmet.entity.GuideExternalLinkEntity;
 
@@ -92,4 +93,22 @@ public interface GuideExternalLinkService extends BaseService<GuideExternalLinkE
      * @date 2021-09-06
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 删除指南外链
+     * @Param guideId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 17:20
+     */
+    void deleteByGuideId(String guideId);
+
+    /**
+     * @Description 获取指南外链
+     * @Param guideId
+     * @Return {@link List< ExternalLinkDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 11:05
+     */
+    List<ExternalLinkDTO> getByGuideId(String guideId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleService.java
index e03d399b5c..52837fd28b 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleService.java
@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.GuideModuleDTO;
+import com.epmet.dto.ModuleDTO;
 import com.epmet.entity.GuideModuleEntity;
 
 import java.util.List;
@@ -92,4 +93,23 @@ public interface GuideModuleService extends BaseService<GuideModuleEntity> {
      * @date 2021-09-06
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 删除指南的内容模块
+     * @Param guideId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 17:01
+     */
+    void deleteByGuideId(String guideId);
+
+    /**
+     * @Description
+     * @Param customerId
+     * @Param guideId
+     * @Return {@link ModuleDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 10:13
+     */
+    List<ModuleDTO> getByGuideId(String customerId, String guideId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java
index 415a968d01..2ae50707ec 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java
@@ -19,14 +19,21 @@ 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.dto.GuideDTO;
+import com.epmet.dto.form.GuideAddFormDTO;
+import com.epmet.dto.form.GuideEditFormDTO;
+import com.epmet.dto.form.GuideFormDTO;
+import com.epmet.dto.form.GuideListFormDTO;
+import com.epmet.dto.result.GuideDetailResultDTO;
+import com.epmet.dto.result.GuideListResultDTO;
 import com.epmet.entity.GuideEntity;
 
 import java.util.List;
 import java.util.Map;
 
 /**
- * 办事指南表 
+ * 办事指南表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-06
@@ -92,4 +99,55 @@ public interface GuideService extends BaseService<GuideEntity> {
      * @date 2021-09-06
      */
     void delete(String[] ids);
+
+    /**
+     * 办事指南列表
+     *
+     * @Param formDTO
+     * @Return {@link PageData<GuideListResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:00
+     */
+    PageData<GuideListResultDTO> guideList(TokenDto tokenDto, GuideListFormDTO formDTO);
+
+    /**
+     * 添加指南
+     *
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:12
+     */
+    void guideAdd(TokenDto tokenDto, GuideAddFormDTO formDTO);
+
+    /**
+     * 修改指南
+     *
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:12
+     */
+    void guideEdit(GuideEditFormDTO formDTO);
+
+    /**
+     * 删除指南
+     *
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:12
+     */
+    void guideDel(GuideFormDTO formDTO);
+
+    /**
+     * 指南详情
+     *
+     * @Param formDTO
+     * @Return {@link GuideDetailResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:12
+     */
+    GuideDetailResultDTO guideDetail(GuideFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideAttachmentServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideAttachmentServiceImpl.java
index 2f66e4b70e..43a8c41683 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideAttachmentServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideAttachmentServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -24,16 +25,20 @@ 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.GuideAttachmentDao;
+import com.epmet.dto.AttachmentDTO;
 import com.epmet.dto.GuideAttachmentDTO;
 import com.epmet.entity.GuideAttachmentEntity;
 import com.epmet.service.GuideAttachmentService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 办事指南附件
@@ -97,4 +102,48 @@ public class GuideAttachmentServiceImpl extends BaseServiceImpl<GuideAttachmentD
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param guideId
+     * @Description 删除指南附件
+     * @Param guideId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 17:16
+     */
+    @Override
+    public void deleteByGuideId(String guideId) {
+        LambdaQueryWrapper<GuideAttachmentEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GuideAttachmentEntity::getGuideId, guideId);
+        baseDao.delete(wrapper);
+    }
+
+    /**
+     * @param guideId
+     * @Description 获取指南附件
+     * @Param guideId
+     * @Return {@link List<  AttachmentDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 10:49
+     */
+    @Override
+    public List<AttachmentDTO> getByGuideId(String guideId) {
+        LambdaQueryWrapper<GuideAttachmentEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GuideAttachmentEntity::getGuideId, guideId);
+        wrapper.orderByAsc(GuideAttachmentEntity::getSort);
+        List<GuideAttachmentEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(item -> {
+            AttachmentDTO dto = new AttachmentDTO();
+            dto.setName(item.getAttachmentName());
+            dto.setType(item.getAttachmentType());
+            dto.setUrl(item.getAttachmentUrl());
+            dto.setSize(item.getAttachmentSize());
+            dto.setFormat(item.getAttachmentFormat());
+            dto.setDuration(item.getDuration());
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideExternalLinkServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideExternalLinkServiceImpl.java
index a9f080965e..bd45d0b2a8 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideExternalLinkServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideExternalLinkServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -24,16 +25,20 @@ 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.GuideExternalLinkDao;
+import com.epmet.dto.ExternalLinkDTO;
 import com.epmet.dto.GuideExternalLinkDTO;
 import com.epmet.entity.GuideExternalLinkEntity;
 import com.epmet.service.GuideExternalLinkService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 指南外链表
@@ -97,4 +102,44 @@ public class GuideExternalLinkServiceImpl extends BaseServiceImpl<GuideExternalL
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param guideId
+     * @Description 删除指南外链
+     * @Param guideId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 17:20
+     */
+    @Override
+    public void deleteByGuideId(String guideId) {
+        LambdaQueryWrapper<GuideExternalLinkEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GuideExternalLinkEntity::getGuideId, guideId);
+        baseDao.delete(wrapper);
+    }
+
+    /**
+     * @param guideId
+     * @Description 获取指南外链
+     * @Param guideId
+     * @Return {@link List<  ExternalLinkDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 11:05
+     */
+    @Override
+    public List<ExternalLinkDTO> getByGuideId(String guideId) {
+        LambdaQueryWrapper<GuideExternalLinkEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GuideExternalLinkEntity::getGuideId, guideId);
+        wrapper.orderByAsc(GuideExternalLinkEntity::getSort);
+        List<GuideExternalLinkEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(item -> {
+            ExternalLinkDTO dto = new ExternalLinkDTO();
+            dto.setExternalLink(item.getExternalLink());
+            dto.setDescription(item.getDescription());
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleServiceImpl.java
index ce07f2e233..8a0ef25a72 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -25,13 +26,16 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.GuideModuleDao;
 import com.epmet.dto.GuideModuleDTO;
+import com.epmet.dto.ModuleDTO;
 import com.epmet.entity.GuideModuleEntity;
 import com.epmet.service.GuideModuleService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -97,4 +101,32 @@ public class GuideModuleServiceImpl extends BaseServiceImpl<GuideModuleDao, Guid
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param guideId
+     * @Description 删除指南的内容模块
+     * @Param guideId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 17:01
+     */
+    @Override
+    public void deleteByGuideId(String guideId) {
+        LambdaQueryWrapper<GuideModuleEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GuideModuleEntity::getGuideId, guideId);
+        baseDao.delete(wrapper);
+    }
+
+    /**
+     * @param guideId
+     * @Description 获取指南的内容模块
+     * @Param guideId
+     * @Return {@link ModuleDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 10:13
+     */
+    @Override
+    public List<ModuleDTO> getByGuideId(String customerId, String guideId) {
+        return baseDao.selectByGuideId(customerId, guideId);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
index 5ac7a56e3e..d8a2d2deeb 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
@@ -21,19 +21,43 @@ 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.EpmetErrorCode;
+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.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.OrgInfoConstant;
 import com.epmet.dao.GuideDao;
 import com.epmet.dto.GuideDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.GuideDetailResultDTO;
+import com.epmet.dto.result.GuideListResultDTO;
+import com.epmet.dto.result.OrgResultDTO;
+import com.epmet.entity.GuideAttachmentEntity;
 import com.epmet.entity.GuideEntity;
+import com.epmet.entity.GuideExternalLinkEntity;
+import com.epmet.entity.GuideModuleEntity;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.service.GuideAttachmentService;
+import com.epmet.service.GuideExternalLinkService;
+import com.epmet.service.GuideModuleService;
 import com.epmet.service.GuideService;
+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;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 /**
  * 办事指南表 
@@ -44,6 +68,14 @@ import java.util.Map;
 @Service
 public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> implements GuideService {
 
+    @Resource
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Resource
+    private GuideModuleService guideModuleService;
+    @Resource
+    private GuideAttachmentService guideAttachmentService;
+    @Resource
+    private GuideExternalLinkService guideExternalLinkService;
 
     @Override
     public PageData<GuideDTO> page(Map<String, Object> params) {
@@ -81,6 +113,7 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
     public void save(GuideDTO dto) {
         GuideEntity entity = ConvertUtils.sourceToTarget(dto, GuideEntity.class);
         insert(entity);
+        ConvertUtils.sourceToTarget(entity, GuideDTO.class);
     }
 
     @Override
@@ -97,4 +130,253 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 办事指南列表
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link PageData< GuideListResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:00
+     */
+    @Override
+    public PageData<GuideListResultDTO> guideList(TokenDto tokenDto, GuideListFormDTO formDTO) {
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+        List<GuideListResultDTO> list = baseDao.getGuideList(formDTO);
+        list.forEach(item -> {
+            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), item.getCreatedId());
+            if (null == staffInfoCache) {
+                item.setCategoryName("");
+            } else {
+                item.setCreatedName(staffInfoCache.getRealName());
+            }
+        });
+        PageInfo<GuideListResultDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
+
+    /**
+     * 添加指南
+     *
+     * @param tokenDto
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:12
+     */
+    @Override
+    public void guideAdd(TokenDto tokenDto, GuideAddFormDTO formDTO) {
+        if (CollectionUtils.isEmpty(formDTO.getModuleList()) && CollectionUtils.isEmpty(formDTO.getAttachmentList()) &&
+        CollectionUtils.isEmpty(formDTO.getExternalLinks())) {
+            throw new RenException(EpmetErrorCode.GUIDE_IS_NULL.getCode());
+        }
+        //保存办事指南表
+        GuideDTO guideDTO = new GuideDTO();
+        guideDTO.setCustomerId(tokenDto.getCustomerId());
+        guideDTO.setOrgId(formDTO.getOrgId());
+        guideDTO.setOrgType(formDTO.getOrgType());
+        guideDTO.setOrgName(formDTO.getOrgName());
+        guideDTO.setCategoryCode(formDTO.getCategoryCode());
+        guideDTO.setTitle(formDTO.getTitle());
+        OrgFormDTO orgFormDTO = new OrgFormDTO();
+        orgFormDTO.setOrgId(formDTO.getOrgId());
+        orgFormDTO.setOrgType(formDTO.getOrgType());
+        //获取组织的pId和pIds
+        Result<OrgResultDTO> result =  govOrgOpenFeignClient.getAgencyInfo(orgFormDTO);
+        if (!result.success() || null == result.getData()) {
+            throw new RenException(result.getCode(), result.getMsg());
+        }
+        if (OrgInfoConstant.AGENCY.equals(formDTO.getOrgType())) {
+            guideDTO.setPid(result.getData().getPid());
+        } else {
+            guideDTO.setPid(result.getData().getAgencyId());
+        }
+        guideDTO.setPids(result.getData().getPids().concat(":").concat(result.getData().getAgencyId()));
+        save(guideDTO);
+        //保存办事指南内容模块
+        if (CollectionUtils.isNotEmpty(formDTO.getModuleList())) {
+            List<GuideModuleEntity> guideModuleList = formDTO.getModuleList().stream().map(item -> {
+                GuideModuleEntity entity = new GuideModuleEntity();
+                entity.setCustomerId(tokenDto.getCustomerId());
+                entity.setGuideId(guideDTO.getId());
+                entity.setModuleId(item.getModuleId());
+                entity.setModuleContent(item.getModuleContent());
+                return entity;
+            }).collect(Collectors.toList());
+            guideModuleService.insertBatch(guideModuleList);
+        }
+        //保存附件
+        if (CollectionUtils.isNotEmpty(formDTO.getAttachmentList())) {
+            AtomicInteger i = new AtomicInteger(1);
+            List<GuideAttachmentEntity> attachmentList = formDTO.getAttachmentList().stream().map(item -> {
+                GuideAttachmentEntity entity = new GuideAttachmentEntity();
+                entity.setCustomerId(tokenDto.getCustomerId());
+                entity.setGuideId(guideDTO.getId());
+                entity.setAttachmentName(item.getName());
+                entity.setAttachmentFormat(item.getFormat());
+                entity.setAttachmentSize(item.getSize());
+                entity.setAttachmentType(item.getType());
+                entity.setAttachmentUrl(item.getUrl());
+                entity.setDuration(item.getDuration());
+                entity.setSort(i.getAndIncrement());
+                return entity;
+            }).collect(Collectors.toList());
+            guideAttachmentService.insertBatch(attachmentList);
+        }
+        //保存外链地址
+        if (CollectionUtils.isNotEmpty(formDTO.getExternalLinks())) {
+            AtomicInteger i = new AtomicInteger(1);
+            List<GuideExternalLinkEntity> linkList = formDTO.getExternalLinks().stream().map(item -> {
+                GuideExternalLinkEntity entity = new GuideExternalLinkEntity();
+                entity.setCustomerId(tokenDto.getCustomerId());
+                entity.setGuideId(guideDTO.getId());
+                entity.setExternalLink(item.getExternalLink());
+                entity.setDescription(item.getDescription());
+                entity.setSort(i.getAndIncrement());
+                return entity;
+
+            }).collect(Collectors.toList());
+            guideExternalLinkService.insertBatch(linkList);
+        }
+
+    }
+
+    /**
+     * 修改指南
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:12
+     */
+    @Override
+    public void guideEdit(GuideEditFormDTO formDTO) {
+        if (CollectionUtils.isEmpty(formDTO.getModuleList()) && CollectionUtils.isEmpty(formDTO.getAttachmentList()) &&
+                CollectionUtils.isEmpty(formDTO.getExternalLinks())) {
+            throw new RenException(EpmetErrorCode.GUIDE_IS_NULL.getCode());
+        }
+        //保存办事指南表
+        GuideDTO guideDTO = get(formDTO.getGuideId());
+        if (!formDTO.getStaffId().equals(guideDTO.getCreatedBy())) {
+            throw new RenException(EpmetErrorCode.GUIDE_IS_NOT_YOURS.getCode());
+        }
+        guideDTO.setOrgId(formDTO.getOrgId());
+        guideDTO.setOrgType(formDTO.getOrgType());
+        guideDTO.setCategoryCode(formDTO.getCategoryCode());
+        guideDTO.setTitle(formDTO.getTitle());
+        OrgFormDTO orgFormDTO = new OrgFormDTO();
+        orgFormDTO.setOrgId(formDTO.getOrgId());
+        orgFormDTO.setOrgType(formDTO.getOrgType());
+        guideDTO.setOrgName(formDTO.getOrgName());
+        //获取组织的pId和pIds
+        Result<OrgResultDTO> result =  govOrgOpenFeignClient.getAgencyInfo(orgFormDTO);
+        if (!result.success() || null == result.getData()) {
+            throw new RenException(result.getCode(), result.getMsg());
+        }
+        if (OrgInfoConstant.AGENCY.equals(formDTO.getOrgType())) {
+            guideDTO.setPid(result.getData().getPid());
+        } else {
+            guideDTO.setPid(result.getData().getAgencyId());
+        }
+        guideDTO.setPids(result.getData().getPids().concat(":").concat(result.getData().getAgencyId()));
+        update(guideDTO);
+        //保存办事指南内容模块
+        if (CollectionUtils.isNotEmpty(formDTO.getModuleList())) {
+            List<GuideModuleEntity> guideModuleList = formDTO.getModuleList().stream().map(item -> {
+                GuideModuleEntity entity = new GuideModuleEntity();
+                entity.setCustomerId(guideDTO.getCustomerId());
+                entity.setId(item.getGuideModuleId());
+                entity.setGuideId(guideDTO.getId());
+                entity.setModuleId(item.getModuleId());
+                entity.setModuleContent(item.getModuleContent());
+                return entity;
+            }).collect(Collectors.toList());
+            guideModuleService.insertBatch(guideModuleList.stream().filter(item -> null == item.getId()).collect(Collectors.toList()));
+            guideModuleService.updateBatchById(guideModuleList.stream().filter(item -> null != item.getId()).collect(Collectors.toList()));
+        }
+        //保存附件
+        guideAttachmentService.deleteByGuideId(formDTO.getGuideId());
+        if (CollectionUtils.isNotEmpty(formDTO.getAttachmentList())) {
+            AtomicInteger i = new AtomicInteger(1);
+            List<GuideAttachmentEntity> attachmentList = formDTO.getAttachmentList().stream().map(item -> {
+                GuideAttachmentEntity entity = new GuideAttachmentEntity();
+                entity.setCustomerId(guideDTO.getCustomerId());
+                entity.setGuideId(guideDTO.getId());
+                entity.setAttachmentName(item.getName());
+                entity.setAttachmentFormat(item.getFormat());
+                entity.setAttachmentSize(item.getSize());
+                entity.setAttachmentType(item.getType());
+                entity.setAttachmentUrl(item.getUrl());
+                entity.setDuration(item.getDuration());
+                entity.setSort(i.getAndIncrement());
+                return entity;
+            }).collect(Collectors.toList());
+            guideAttachmentService.insertBatch(attachmentList);
+        }
+        //保存外链地址
+        guideExternalLinkService.deleteByGuideId(formDTO.getGuideId());
+        if (CollectionUtils.isNotEmpty(formDTO.getExternalLinks())) {
+            AtomicInteger i = new AtomicInteger(1);
+            List<GuideExternalLinkEntity> linkList = formDTO.getExternalLinks().stream().map(item -> {
+                GuideExternalLinkEntity entity = new GuideExternalLinkEntity();
+                entity.setCustomerId(guideDTO.getCustomerId());
+                entity.setGuideId(guideDTO.getId());
+                entity.setExternalLink(item.getExternalLink());
+                entity.setDescription(item.getDescription());
+                entity.setSort(i.getAndIncrement());
+                return entity;
+
+            }).collect(Collectors.toList());
+            guideExternalLinkService.insertBatch(linkList);
+        }
+    }
+
+    /**
+     * 删除指南
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:12
+     */
+    @Override
+    public void guideDel(GuideFormDTO formDTO) {
+        GuideDTO guide = get(formDTO.getGuideId());
+        if (!formDTO.getStaffId().equals(guide.getCreatedBy())) {
+            throw new RenException(EpmetErrorCode.GUIDE_IS_NOT_YOURS.getCode());
+        }
+        //删除主表
+        baseDao.deleteById(formDTO.getGuideId());
+        //删除内容模块
+        guideModuleService.deleteByGuideId(formDTO.getGuideId());
+        //删除附件
+        guideAttachmentService.deleteByGuideId(formDTO.getGuideId());
+        //删除外链
+        guideExternalLinkService.deleteByGuideId(formDTO.getGuideId());
+    }
+
+    /**
+     * 指南详情
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link GuideDetailResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/7 14:12
+     */
+    @Override
+    public GuideDetailResultDTO guideDetail(GuideFormDTO formDTO) {
+        //获取指南详情
+        GuideDetailResultDTO result = baseDao.getGuideDetail(formDTO.getGuideId());
+        //获取指南内容模块
+        result.setModuleList(guideModuleService.getByGuideId(formDTO.getCustomerId(), formDTO.getGuideId()));
+        //获取指南附件
+        result.setAttachmentList(guideAttachmentService.getByGuideId(formDTO.getGuideId()));
+        //获取指南外链地址
+        result.setExternalLinks(guideExternalLinkService.getByGuideId(formDTO.getGuideId()));
+        return result;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
index 071bf38535..82a784dbe9 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
@@ -6,11 +6,12 @@
     <resultMap type="com.epmet.entity.GuideEntity" id="guideMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="orgType" column="ORG_TYPE"/>
+        <result property="orgId" column="ORG_ID"/>
         <result property="pid" column="PID"/>
         <result property="pids" column="PIDS"/>
         <result property="title" column="TITLE"/>
-        <result property="categoryId" column="CATEGORY_ID"/>
+        <result property="categoryCode" column="CATEGORY_CODE"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -19,5 +20,42 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="getGuideList" resultType="com.epmet.dto.result.GuideListResultDTO">
+        SELECT
+            g.ID AS "guideId",
+            g.TITLE AS "title",
+            gc.CATEGORY_NAME AS categoryName,
+            g.CREATED_BY AS createdId,
+            g.UPDATED_TIME AS updatedTime,
+        FROM
+            guide g
+        INNER JOIN guide_category gc ON g.CATEGORY_ID = gc.ID
+        WHERE g.DEL_FLAG = 0
+        <if test='null != agencyId and "" != agencyId'>
+            AND g.PIDS LIKE CONCAT( '%', #{agencyId}, '%' )
+        </if>
+        <if test='null != guideTitle and "" != guideTitle'>
+            AND g.TITLE LIKE CONCAT( '%', #{guideTitle}, '%' )
+        </if>
+        <if test='null != categoryId and "" != categoryId'>
+            AND g.CATEGORY_ID = #{categoryId}
+        </if>
+    </select>
+    <select id="getGuideDetail" resultType="com.epmet.dto.result.GuideDetailResultDTO">
+        SELECT
+            g.ID AS "guideId",
+            ORG_TYPE,
+            ORG_ID,
+            ORG_NAME,
+            TITLE,
+            CATEGORY_CODE
+            CATEGORY_NAME
+        FROM
+            guide g
+        INNER JOIN guide_category gc ON g.CATEGORY_CODE = gc.CATEGORY_CODE
+        WHERE
+            g.ID = #{guideId}
+    </select>
+
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDao.xml
index a75b2d018f..3d329b642d 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideModuleDao.xml
@@ -16,6 +16,19 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="selectByGuideId" resultType="com.epmet.dto.ModuleDTO">
+        SELECT
+            gm.ID AS "guideModuleId",
+            gmd.ID AS "moduleId",
+            gmd.MODULE_VALUE,
+            gmd.MODULE_NAME,
+            gm.MODULE_CONTENT
+        FROM guide_module_dict gmd
+        LEFT JOIN guide_module gm ON gmd.ID = gm.MODULE_ID AND gm.DEL_FLAG = 0 AND gm.GUIDE_ID = #{guideId}
+        WHERE gmd.DEL_FLAG = 0
+        AND gmd.CUSTOMER_ID = #{customerId}
+        ORDER BY gmd.SORT ASC
+    </select>
 
 
 </mapper>
\ No newline at end of file

From 9a66324acfe2f83c9125d217434eae04b1e29f74 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 8 Sep 2021 12:42:05 +0800
Subject: [PATCH 018/134] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=911.?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B0=8F=E7=BB=84=E6=80=BB=E6=8E=92=E5=90=8D?=
 =?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/commons/tools/redis/RedisKeys.java  | 12 +++
 .../redis/common/bean/GridInfoCache.java      | 12 +++
 .../com/epmet/dto/form/GroupPointFormDTO.java |  3 +
 .../result/GroupPointRankingResultDTO.java    |  4 +
 .../controller/GroupPointController.java      | 22 +++++-
 .../service/BizPointTotalDetailService.java   |  7 +-
 .../impl/BizPointTotalDetailServiceImpl.java  | 75 ++++++++++++++++---
 .../group/dto/group/form/GroupFormDTO.java    | 25 +------
 .../group/result/GroupDetailResultDTO.java    |  1 +
 .../resi/group/enums/SearchScopeTypeEnum.java | 22 ++++++
 .../group/controller/ResiGroupController.java |  3 +-
 .../service/impl/ResiGroupServiceImpl.java    |  6 +-
 12 files changed, 152 insertions(+), 40 deletions(-)
 create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/enums/SearchScopeTypeEnum.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 bcbded2bd6..0196f02f44 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
@@ -522,4 +522,16 @@ public class RedisKeys {
 	public static String getCustomerStaffInfoKey(String customerId, String staffId) {
 		return rootPrefix.concat("gov:staff:").concat(customerId).concat(StrConstant.COLON).concat(staffId);
 	}
+
+	/**
+	 * @description 网格信息
+	 *
+	 * @param gridId
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.08 11:03:48
+	 */
+    public static String getGridInfoKey(String gridId) {
+		return rootPrefix.concat("gov:grid:").concat(gridId);
+    }
 }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java
new file mode 100644
index 0000000000..2900180581
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java
@@ -0,0 +1,12 @@
+package com.epmet.commons.tools.redis.common.bean;
+
+import lombok.Data;
+
+@Data
+public class GridInfoCache {
+    private String gridId;
+    private String gridNamePath;
+    private String customerId;
+    private String pid;
+    private String pids;
+}
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
index 8e6ded72e1..d1124fe9b8 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
@@ -19,10 +19,13 @@ public class GroupPointFormDTO implements Serializable {
 	public interface GroupPoint extends CustomerClientShowGroup {}
 	public interface GridRank extends CustomerClientShowGroup {}
 	public interface GridScopeRank extends CustomerClientShowGroup {}
+	public interface CustomerScopeRank extends CustomerClientShowGroup {}
 	@NotBlank(message = "小组Id不能为空", groups = {GroupPoint.class, GridRank.class})
 	private String groupId;
 	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class, GridScopeRank.class})
 	private String gridId;
+	@NotBlank(message = "客户Id不能为空", groups = {CustomerScopeRank.class})
+	private String customerId;
 
 	/** 页码 */
 	private Integer pageNo = 1;
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
index e45a709d6e..b99d4313ac 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
@@ -42,5 +42,9 @@ public class GroupPointRankingResultDTO implements Serializable {
 	/** 类型 branch 支部小组；o */
 	private String groupType;
 
+	/** 所属网格id */
+	private String gridId;
 
+	/** 所属网格名称 */
+	private String gridNamePath;
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
index 55dbc70813..1ff898d97d 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
@@ -11,6 +11,7 @@ import com.epmet.dto.result.GroupPointRankingResultDTO;
 import com.epmet.dto.result.GroupPointRuleResultDTO;
 import com.epmet.dto.result.PointRankingResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
+import com.epmet.resi.group.enums.SearchScopeTypeEnum;
 import com.epmet.service.BizPointTotalDetailService;
 import com.epmet.service.BizPointUserTotalDetailService;
 import com.epmet.service.PointRuleService;
@@ -132,7 +133,26 @@ public class GroupPointController {
 		Integer pageNo = formDTO.getPageNo();
 		Integer pageSize = formDTO.getPageSize();
 
-		PageData<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInGridScope(gridId, pageNo, pageSize);
+		PageData<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInGridScope(SearchScopeTypeEnum.GRID, gridId,pageNo, pageSize);
+		return new Result<PageData<GroupPointRankingResultDTO>>().ok(page);
+	}
+
+	/**
+	 * @description 【小组排名】- 客户范围内
+	 *
+	 * @param formDTO
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.08 09:18:37
+	 */
+	@PostMapping("grouppointranking/customerscope")
+	public Result<PageData<GroupPointRankingResultDTO>> listGroupPointRandingInCustomerScope(@RequestBody GroupPointFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.CustomerScopeRank.class);
+		String customerId = formDTO.getCustomerId();
+		Integer pageNo = formDTO.getPageNo();
+		Integer pageSize = formDTO.getPageSize();
+
+		PageData<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInGridScope(SearchScopeTypeEnum.CUSTOMER, customerId, pageNo, pageSize);
 		return new Result<PageData<GroupPointRankingResultDTO>>().ok(page);
 	}
 
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
index 1d2a0af41e..0b64de14bc 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
@@ -24,7 +24,7 @@ import com.epmet.dto.form.GroupPointFormDTO;
 import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
 import com.epmet.dto.result.GroupPointRankingResultDTO;
 import com.epmet.entity.BizPointTotalDetailEntity;
-import com.github.pagehelper.PageInfo;
+import com.epmet.resi.group.enums.SearchScopeTypeEnum;
 
 import java.util.List;
 import java.util.Map;
@@ -140,12 +140,13 @@ public interface BizPointTotalDetailService extends BaseService<BizPointTotalDet
 	/**
 	 * @description 网格范围内查询小组排名
 	 *
-	 * @param gridId 网格id
+	 * @param searchScopeType 搜索小组的范围类型:GroupFormDTO.SearchScopeTypeEnum.GRID/GroupFormDTO.SearchScopeTypeEnum.CUSTOMER
+	 * @param searchScopeId 搜索小组的范围id
 	 * @param pageNo 页码，默认0
 	 * @param pageSize 单页条数，默认10
 	 * @return
 	 * @author wxz
 	 * @date 2021.09.07 14:18:08
 	 */
-	PageData<GroupPointRankingResultDTO> listGroupPointRandingInGridScope(String gridId, Integer pageNo, Integer pageSize);
+	PageData<GroupPointRankingResultDTO> listGroupPointRandingInGridScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
index 8d8648fc57..29723b68a2 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -27,12 +28,17 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 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.RedisKeys;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.BizPointTotalDetailDao;
 import com.epmet.dto.BizPointTotalDetailDTO;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.GroupPointFormDTO;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.resi.group.dto.group.form.GroupFormDTO;
 import com.epmet.resi.group.dto.group.form.GroupPointDetailFormDTO;
 import com.epmet.resi.group.dto.group.result.GroupDetailResultDTO;
@@ -40,6 +46,7 @@ import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
 import com.epmet.dto.result.GroupPointRankingResultDTO;
 import com.epmet.entity.BizPointTotalDetailEntity;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
+import com.epmet.resi.group.enums.SearchScopeTypeEnum;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.BizPointTotalDetailService;
 import com.epmet.service.BizPointUserTotalDetailService;
@@ -50,6 +57,8 @@ 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.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -73,6 +82,10 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
     private BizPointUserTotalDetailService bizPointUserTotalDetailService;
     @Autowired
     private UserPointActionLogService userPointActionLogService;
+    @Autowired
+    private RedisTemplate<String, ?> redisTemplate;
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
 
     @Override
     public PageData<BizPointTotalDetailDTO> page(Map<String, Object> params) {
@@ -248,14 +261,17 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
     }
 
     @Override
-    public PageData<GroupPointRankingResultDTO> listGroupPointRandingInGridScope(String gridId, Integer pageNo, Integer pageSize) {
+    public PageData<GroupPointRankingResultDTO> listGroupPointRandingInGridScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize) {
 
         // 1.查询有积分的小组得分排名
         PageInfo<BizPointTotalDetailEntity> entityPageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> {
             LambdaQueryWrapper<BizPointTotalDetailEntity> query = new LambdaQueryWrapper<>();
-            query.eq(BizPointTotalDetailEntity::getGridId, gridId);
+            if (SearchScopeTypeEnum.CUSTOMER == searchScopeType) {
+                query.eq(BizPointTotalDetailEntity::getCustomerId, searchScopeId);
+            } else if (SearchScopeTypeEnum.GRID == searchScopeType) {
+                query.eq(BizPointTotalDetailEntity::getGridId, searchScopeId);
+            }
             query.eq(BizPointTotalDetailEntity::getBizType, "group");
-            //query.eq(BizPointTotalDetailEntity::getDelFlag, 0); #用mybatis plus不需要手动指定，框架会自动指定
             query.orderByDesc(BizPointTotalDetailEntity::getTotalPoint);
             baseDao.selectList(query);
         });
@@ -273,7 +289,11 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
         if (pageSize > groupIds.size()) {
             // 查出网格下已有积分的小组id
             LambdaQueryWrapper<BizPointTotalDetailEntity> query = new LambdaQueryWrapper<>();
-            query.eq(BizPointTotalDetailEntity::getGridId, gridId);
+            if (SearchScopeTypeEnum.CUSTOMER == searchScopeType) {
+                query.eq(BizPointTotalDetailEntity::getCustomerId, searchScopeId);
+            } else if (SearchScopeTypeEnum.GRID == searchScopeType) {
+                query.eq(BizPointTotalDetailEntity::getGridId, searchScopeId);
+            }
             query.eq(BizPointTotalDetailEntity::getBizType, "group");
             query.select(BizPointTotalDetailEntity::getObjectId);
             List<String> existingGroupIds = baseDao.selectObjs(query).stream().map(obj -> obj.toString()).collect(Collectors.toList());
@@ -282,14 +302,17 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
             // 不足0的从0开始
             startRow = Math.max(startRow, 0);
             List<GroupPointRankingResultDTO> gap;
-            gap = fillGroupPageGap(existingGroupIds, gridId, startRow, pageSize - groupList.size());
+            gap = fillGroupPageGap(existingGroupIds, searchScopeType, searchScopeId, startRow, pageSize - groupList.size());
             rankingInfoDTOs.addAll(gap);
         }
 
         // 4.排名填充
         Integer ranking = page.getStartRow() + 1;
         for (GroupPointRankingResultDTO g : rankingInfoDTOs) {
+            GridInfoCache gridInfo = getGridInfo(g.getGridId());
             g.setRanking(String.valueOf(ranking));
+            g.setGridId(g.getGridId());
+            g.setGridNamePath(gridInfo.getGridNamePath());
             ranking ++;
         }
         PageData<GroupPointRankingResultDTO> pageData = new PageData<>(rankingInfoDTOs, entityPageInfo.getTotal());
@@ -305,18 +328,18 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
      * @author wxz
      * @date 2021.09.07 16:30:28
      */
-    private List<GroupPointRankingResultDTO> fillGroupPageGap(List<String> existingGroupIds,String searchScopeObjectId, Integer startRow, Integer rowCount) {
+    private List<GroupPointRankingResultDTO> fillGroupPageGap(List<String> existingGroupIds, SearchScopeTypeEnum searchScopeType, String searchScopeObjectId, Integer startRow, Integer rowCount) {
         GroupFormDTO form = new GroupFormDTO();
         form.setExcludeGroupIds(existingGroupIds);
         form.setOrder(GroupFormDTO.OrderTypeEnum.DESC);
         form.setSort(GroupFormDTO.SortTypeEnum.CREATE_TIME);
         form.setStartRow(startRow);
         form.setRowCount(rowCount);
-        form.setSearchScopeType(GroupFormDTO.SearchScopeTypeEnum.GRID);
+        form.setSearchScopeType(searchScopeType);
         form.setSearchScopeObjectId(searchScopeObjectId);
 
         Result<List<GroupDetailResultDTO>> result = resiGroupOpenFeignClient.listGroupDetailsExcludeGroupIds(form);
-        List<GroupDetailResultDTO> groups = getResultDataOrThrowsException(result, ServiceConstant.RESI_GROUP_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【小组排名】网格内排名：查询积分为0的小组列表失败");
+        List<GroupDetailResultDTO> groups = getResultDataOrThrowsException(result, ServiceConstant.RESI_GROUP_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【小组排名】查询积分为0的小组列表失败");
         if (CollectionUtils.isEmpty(groups)) {
             return new ArrayList<>();
         }
@@ -327,12 +350,13 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
             dto.setGroupHeadPhoto(g.getGroupHeadPhoto());
             dto.setGroupName(g.getGroupName());
             dto.setGroupId(g.getGroupId());
+            dto.setGridId(g.getGridId());
             return dto;
         }).collect(Collectors.toList());
     }
 
     /**
-     * @description 将小组排名信息Entity转化为dto
+     * @description 将小组排名Entity转化为dto
      *
      * @param groupList
      * @return
@@ -361,8 +385,41 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
             dto.setGroupType(groupInfo.getGroupType());
             dto.setPoint(g.getTotalPoint().toString());
             dto.setGroupHeadPhoto(groupInfo.getGroupHeadPhoto());
+            dto.setGridId(g.getGridId());
             return dto;
         }).collect(Collectors.toList());
         return rankingDTOs;
     }
+
+    /**
+     * @description 查询网格信息
+     *
+     * @param gridId
+     * @return
+     * @author wxz
+     * @date 2021.09.08 11:17:17
+     */
+    public GridInfoCache getGridInfo(String gridId) {
+        HashOperations<String, String, Object> ope = redisTemplate.opsForHash();
+        Map<String, Object> entries = ope.entries(RedisKeys.getGridInfoKey(gridId));
+        if (entries.size() != 0) {
+            return BeanUtil.mapToBean(entries, GridInfoCache.class, true);
+        }
+
+        CustomerGridFormDTO form = new CustomerGridFormDTO();
+        form.setGridId(gridId);
+        Result<CustomerGridDTO> result = govOrgOpenFeignClient.getCustomerGridByGridId(form);
+        if (result == null || !result.success() || result.getData() == null) {
+            return null;
+        }
+
+        GridInfoCache cache = new GridInfoCache();
+        cache.setCustomerId(result.getData().getCustomerId());
+        cache.setGridId(result.getData().getId());
+        cache.setGridNamePath(result.getData().getGridName());
+        cache.setPid(result.getData().getPid());
+        cache.setPids(result.getData().getPids());
+        ope.putAll(RedisKeys.getGridInfoKey(gridId), BeanUtil.beanToMap(cache));
+        return cache;
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupFormDTO.java
index 23e00b4485..96295879f1 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupFormDTO.java
@@ -1,14 +1,10 @@
 package com.epmet.resi.group.dto.group.form;
 
+import com.epmet.resi.group.enums.SearchScopeTypeEnum;
 import lombok.Data;
-import sun.security.provider.PolicySpiFile;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
-import java.util.PrimitiveIterator;
 
 /**
  * @author zhaoqifeng
@@ -89,24 +85,5 @@ public class GroupFormDTO implements Serializable {
 		}
 	}
 
-	/**
-	 * @Description 搜索范围类型枚举
-	 * @author wxz
-	 * @date 2021.09.07 20:14:21
-	*/
-	public enum SearchScopeTypeEnum {
-
-		CUSTOMER("customer"),
-		GRID("grid");
 
-		private String scopeType;
-
-		SearchScopeTypeEnum(String scopeType) {
-			this.scopeType = scopeType;
-		}
-
-		public String getScopeType() {
-			return scopeType;
-		}
-	}
 }
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 82793a5ffd..93247725a4 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
@@ -9,6 +9,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class GroupDetailResultDTO {
 
+    private String gridId;
     private String groupHeadPhoto;
     private String groupId;
     private String groupName;
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/enums/SearchScopeTypeEnum.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/enums/SearchScopeTypeEnum.java
new file mode 100644
index 0000000000..474a2662a1
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/enums/SearchScopeTypeEnum.java
@@ -0,0 +1,22 @@
+package com.epmet.resi.group.enums;
+
+/**
+	 * @Description 搜索范围类型枚举
+	 * @author wxz
+	 * @date 2021.09.07 20:14:21
+	*/
+public enum SearchScopeTypeEnum {
+
+	CUSTOMER("customer"),
+	GRID("grid");
+
+	private String scopeType;
+
+	SearchScopeTypeEnum(String scopeType) {
+		this.scopeType = scopeType;
+	}
+
+	public String getScopeType() {
+		return scopeType;
+	}
+}
\ No newline at end of file
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 57d8870685..5acbf76bb2 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
@@ -33,6 +33,7 @@ import com.epmet.resi.group.dto.group.result.*;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -630,7 +631,7 @@ public class ResiGroupController {
         List<String> excludeGroupIds = form.getExcludeGroupIds();
         GroupFormDTO.SortTypeEnum sort = form.getSort();
         GroupFormDTO.OrderTypeEnum order = form.getOrder();
-        GroupFormDTO.SearchScopeTypeEnum searchScopeType = form.getSearchScopeType();
+        SearchScopeTypeEnum searchScopeType = form.getSearchScopeType();
         String searchScopeObjectId = form.getSearchScopeObjectId();
 
         List<GroupDetailResultDTO> groups = resiGroupService.listGroupDetailsExcludeGroupIds(excludeGroupIds, startRow, rowCount, searchScopeType.getScopeType(), searchScopeObjectId, sort.getSortField(), order.getOrderType());
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 8abf0eba12..68586a600a 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
@@ -81,6 +81,7 @@ import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO;
 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.send.SendMqMsgUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -1809,9 +1810,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			sortFieldFun = ResiGroupEntity::getCreatedTime;
 		}
 
-		if (GroupFormDTO.SearchScopeTypeEnum.GRID.getScopeType().equals(searchScopeType)) {
+		if (SearchScopeTypeEnum.GRID.getScopeType().equals(searchScopeType)) {
 			query.eq(ResiGroupEntity::getGridId, searchScopeObjectId);
-		} else if (GroupFormDTO.SearchScopeTypeEnum.CUSTOMER.getScopeType().equals(searchScopeType)) {
+		} else if (SearchScopeTypeEnum.CUSTOMER.getScopeType().equals(searchScopeType)) {
 			query.eq(ResiGroupEntity::getCustomerId, searchScopeObjectId);
 		}
 
@@ -1828,6 +1829,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			dto.setGroupHeadPhoto(ge.getGroupHeadPhoto());
 			dto.setGroupIntroduction(ge.getGroupIntroduction());
 			dto.setGroupType(ge.getGroupType());
+			dto.setGridId(ge.getGridId());
 			return dto;
 		}).collect(Collectors.toList());
 	}

From 76cc97293fcde69b2bb593a765a0028bf131c24d Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 8 Sep 2021 13:31:35 +0800
Subject: [PATCH 019/134] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8A=A0=E8=BF=94?=
 =?UTF-8?q?=E5=8F=82=E3=80=81=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/govorg/form/OrgStaffListFormDTO.java       |  2 ++
 .../service/govorg/impl/GovOrgServiceImpl.java     | 14 ++++++++++----
 .../mapper/epmetuser/CustomerStaffDao.xml          | 11 ++++++++---
 .../dto/group/result/GroupSummarizeResultDTO.java  |  8 ++++++++
 .../main/resources/mapper/group/ResiGroupDao.xml   | 11 +++++++----
 5 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStaffListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStaffListFormDTO.java
index 7d0ed2f595..391fe968c9 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStaffListFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStaffListFormDTO.java
@@ -45,6 +45,8 @@ public class OrgStaffListFormDTO implements Serializable {
     private List<String> staffIds;
     //token中用户Id
     private String staffId;
+    //人员是否禁用【未禁用enable,已禁用disabled】
+    private String enableFlag = "enable";
     public interface OrgStaff extends CustomerClientShowGroup {}
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index b7b23299ab..8142f4a728 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -3,8 +3,10 @@ package com.epmet.dataaggre.service.govorg.impl;
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 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.RenException;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.govorg.*;
@@ -28,10 +30,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -393,6 +392,13 @@ public class GovOrgServiceImpl implements GovOrgService {
             staffIds.removeIf(s->s.equals(formDTO.getStaffId()));
         }
 
+        //是否具有超级管理员或管理员角色
+        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        Map<String,String> roleMap = staffInfoCache.getRoleMap();
+        if (roleMap.containsKey("root_manager") || roleMap.containsKey("manager")) {
+            formDTO.setEnableFlag("disabled");
+        }
+
         //2.分页查询工作人员基础信息、角色信息【组织人员单位领导角色人员在前；部门人员部门领导角色人员在前；网格人员网格长角色人员在前】
         List<ListStaffResultDTO> staffList = epmetUserService.getStaffInfoList(formDTO);
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
index 07039eeed0..a4ebcae961 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
@@ -61,7 +61,7 @@
             SELECT DISTINCT<!-- 没有这个去重会改变最终的结果顺序，至于为什么还不清楚 -->
                 sr.staff_id,
                 cs.created_time,
-                case when gsr.role_key =
+                case when cs.enable_flag = 'enable' AND gsr.role_key =
                 <choose>
                     <when test="orgType != null and orgType == 'agency' ">
                         'agency_leader'
@@ -73,9 +73,14 @@
                         'grid_manager'
                     </otherwise>
                 </choose>
-                then 1 else 0 end is_first<!-- 有单位领导角色的人赋值为1，没有的赋值为0 -->
+                then 0
+                when cs.enable_flag = 'enable' AND gsr.role_key != 'agency_leader'
+                then 1 else 2 end is_first<!-- 未禁用有相应角色人员赋值0，未禁用无相应角色人员赋值1，禁用人员赋值2 -->
             FROM staff_role sr
             INNER JOIN customer_staff cs ON sr.staff_id = cs.user_id
+            <if test="enableFlag != null and enableFlag != '' and enableFlag == 'enable' ">
+                AND cs.enable_flag = 'enable' <!-- 非超级管理员、管理员只允许查看未禁用人员信息 -->
+            </if>
             INNER JOIN gov_staff_role gsr ON sr.role_id = gsr.id AND gsr.customer_id = #{customerId}
             WHERE
                 sr.del_flag = '0'
@@ -100,7 +105,7 @@
                 </choose>
             ) t
         GROUP BY t.staff_id
-        ORDER BY t.is_first <![CDATA[<>]]> 1, t.created_time desc<!-- 标注有单位领导角色的人不参与排序也就是默认拍在前边,再按创建时间降序 -->
+        ORDER BY t.is_first <![CDATA[<>]]> 0, t.is_first asc, t.created_time desc<!-- 标注有相应角色的人不参与排序也就是默认拍在前边,没有相对于角色的排在后边，禁用人员排在最后 -->
         LIMIT #{pageNo}, #{pageSize}
     </select>
 
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java
index dbf681b90d..28755fffe8 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java
@@ -69,6 +69,14 @@ public class GroupSummarizeResultDTO implements Serializable {
 	 * 进组审核open开启；close关闭
 	 */
 	private String auditSwitch;
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
+	/**
+	 * 小组类型名称
+	 */
+	private String groupTypeName;
 
 	private String level;
 	public GroupSummarizeResultDTO(){
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 82d1531781..a5893e1677 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
@@ -246,14 +246,17 @@
                     AND gmo.OPERATE_STATUS = 'under_auditting'
             ) AS totalApplyingMember,
             rgs.TOTAL_TOPICS,
-            rg.AUDIT_SWITCH
+            rg.AUDIT_SWITCH,
+            rg.group_type groupType,
+            gs.`name` groupTypeName
         FROM
             resi_group rg
             LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )
             LEFT JOIN resi_group_member rgm
-            ON ( rg.id = rgm.RESI_GROUP_ID
-                AND rgm.DEL_FLAG='0'
-                AND rgm.CUSTOMER_USER_ID =#{userId})
+                ON ( rg.id = rgm.RESI_GROUP_ID
+                    AND rgm.DEL_FLAG='0'
+                    AND rgm.CUSTOMER_USER_ID =#{userId})
+            LEFT JOIN resi_group_setup gs ON rg.GROUP_TYPE = gs.GROUP_TYPE AND gs.CUSTOMER_ID = 'default'
         WHERE
             rg.DEL_FLAG = '0'
             AND rgs.DEL_FLAG = '0'

From d919a1c09ac9d6ec35c552e6a12333828ee0e1ae Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 8 Sep 2021 13:39:32 +0800
Subject: [PATCH 020/134] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=B0=8F=E7=BB=84?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89=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/group/ResiGroupDao.xml          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 bf17a2004e..4e7e7b418c 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
@@ -77,8 +77,8 @@
         AND rg.CUSTOMER_ID = #{customerId}
         AND rg.GRID_ID =#{gridId}
         AND rgm.CUSTOMER_USER_ID = #{userId}
-        AND rgm.STATUS IN ( 'approved', 'silent' )
-        AND rg.STATE in('approved','hidden','closed')
+        AND rgm.STATUS IN ( 'approved', 'silent' ,'under_auditting')
+        AND rg.STATE in('approved','hidden','closed','under_auditting')
         <if test="groupType != null and groupType.trim() != ''">
             AND rg.GROUP_TYPE = #{groupType}
         </if>

From de42e5226aef2d257607b7f076e6c0b750e63ff4 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 8 Sep 2021 13:43:28 +0800
Subject: [PATCH 021/134] paixushijian

---
 .../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 4e7e7b418c..3d416b3a91 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
@@ -82,7 +82,7 @@
         <if test="groupType != null and groupType.trim() != ''">
             AND rg.GROUP_TYPE = #{groupType}
         </if>
-        order by rg.LATEST_TOPIC_PUBLISH_DATE desc
+        order by rg.CREATED_TIME desc
         LIMIT #{pageNo}, #{pageSize}
     </select>
 

From e59701c4deb525e2790fdd8049b57b5945cf6d03 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Sep 2021 15:39:29 +0800
Subject: [PATCH 022/134] =?UTF-8?q?web=E5=88=86=E7=B1=BB=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=86=E9=A1=B5=EF=BC=8C=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E4=B8=8B=E6=8B=89=E6=A1=86=E9=80=9A=E7=94=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/constant/Constant.java      | 11 +++
 .../java/com/epmet/dto/GuideCategoryDTO.java  | 43 ++++++----
 .../form/GuideCategoryDropDownFormDTO.java    | 28 +++++++
 .../dto/form/GuideCategoryPageFormDTO.java    | 21 +++++
 .../com/epmet/dto/result/GuideDictResDTO.java | 36 +++++++++
 .../controller/GuideCategoryController.java   | 43 +++++++++-
 .../java/com/epmet/dao/GuideCategoryDao.java  | 27 ++++++-
 .../com/epmet/entity/GuideCategoryEntity.java | 34 ++++----
 .../epmet/service/GuideCategoryService.java   | 25 ++++--
 .../impl/GuideCategoryServiceImpl.java        | 78 +++++++++++++++++--
 .../resources/mapper/GuideCategoryDao.xml     | 59 ++++++++++----
 11 files changed, 342 insertions(+), 63 deletions(-)
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideCategoryDropDownFormDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideCategoryPageFormDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDictResDTO.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java
index 29a7dcda6b..400e3893e4 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java
@@ -160,4 +160,15 @@ public interface Constant {
     // resi_footbar_highlight_num
     // gov_footbar_highlight_num
     String FOOTBAR_HIGHLIGHT_NUM="_footbar_highlight_num";
+
+
+    /**
+     * 未被禁用标识
+     * */
+    String ENABLE = "enable";
+
+    /**
+     * 被禁用标识
+     * */
+    String DISABLE = "disable";
 }
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDTO.java
index ccd59bc862..7d0ed1eef4 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCategoryDTO.java
@@ -17,16 +17,18 @@
 
 package com.epmet.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
  * 指南分类
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2021-09-06
+ * @since v1.0.0 2021-09-08
  */
 @Data
 public class GuideCategoryDTO implements Serializable {
@@ -36,56 +38,67 @@ public class GuideCategoryDTO implements Serializable {
     /**
      * 主键
      */
-	private String id;
+    private String id;
+
+    /**
+     * 客户id，产品默认配置此列存储default
+     */
+    private String customerId;
 
     /**
-     * 客户id
+     * 分类名,客户内唯一
      */
-	private String customerId;
+    private String categoryName;
 
     /**
-     * 分类名
+     * 分类编码：分类名的全拼; eg：gongjijin
      */
-	private String categoryName;
+    private String categoryCode;
 
     /**
      * 排序
      */
-	private Integer sort;
+    private Integer sort;
 
     /**
      * 状态 禁用disable 启用enable
      */
-	private String status;
+    private String status;
 
     /**
      * 删除标识 0未删除、1已删除
      */
-	private String delFlag;
+    @JsonIgnore
+    private String delFlag;
 
     /**
      * 乐观锁
      */
-	private Integer revision;
+    @JsonIgnore
+    private Integer revision;
 
     /**
      * 创建人
      */
-	private String createdBy;
+    @JsonIgnore
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createdTime;
+    @JsonIgnore
+    private Date createdTime;
 
     /**
      * 更新人
      */
-	private String updatedBy;
+    @JsonIgnore
+    private String updatedBy;
 
     /**
      * 更新时间
      */
-	private Date updatedTime;
+    @JsonIgnore
+    private Date updatedTime;
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideCategoryDropDownFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideCategoryDropDownFormDTO.java
new file mode 100644
index 0000000000..a92e1c2e09
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideCategoryDropDownFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 发布指南、编辑指南、查询指南列表  分类下拉框
+ * @Author yinzuomei
+ * @Date 2021/9/8 2:57 下午
+ */
+@Data
+public class GuideCategoryDropDownFormDTO implements Serializable {
+    private static final long serialVersionUID = 9122708701080412461L;
+    public interface AddUserInternalGroup {
+    }
+    /**
+     * 新增指南：saveorupdate；查询指南列表：query
+     */
+    @NotBlank(message = "新增指南：saveorupdate；查询指南列表：query",groups = AddUserInternalGroup.class)
+    private String queryOrigin;
+
+    @NotBlank(message = "当前工作人员所属客户id不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+
+}
+
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideCategoryPageFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideCategoryPageFormDTO.java
new file mode 100644
index 0000000000..b67686e451
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideCategoryPageFormDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 工作端PC或者运营端分页
+ * @Author yinzuomei
+ * @Date 2021/9/8 1:35 下午
+ */
+@Data
+public class GuideCategoryPageFormDTO  implements Serializable {
+    private static final long serialVersionUID = -7551388716349439643L;
+    public interface AddUserInternalGroup {
+    }
+    @NotBlank(message = "客户id不能为空,运营端传default", groups = AddUserInternalGroup.class)
+    private String customerId;
+}
+
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDictResDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDictResDTO.java
new file mode 100644
index 0000000000..8b1cbdf94f
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDictResDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 办事指南】可用分类列表 新增、编辑指南时的下拉框：展示未禁用的分类； 查询指南列表：如果禁用的分类下存在指南列表，则展示，不存在直接不展示
+ * @Author yinzuomei
+ * @Date 2021/9/8 2:44 下午
+ */
+@Data
+public class GuideDictResDTO implements Serializable {
+
+    /**
+     * 分类名,客户内唯一
+     */
+    private String categoryName;
+
+    /**
+     * 分类编码：分类名的全拼; eg：gongjijin
+     */
+    private String categoryCode;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态 禁用disable 启用enable
+     */
+    private String status;
+}
+
+
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
index 03bd231c0b..e34e38770a 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -25,11 +27,14 @@ 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.GuideCategoryDTO;
+import com.epmet.dto.form.GuideCategoryDropDownFormDTO;
+import com.epmet.dto.form.GuideCategoryPageFormDTO;
+import com.epmet.dto.result.GuideDictResDTO;
 import com.epmet.service.GuideCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
+import java.util.List;
 
 
 /**
@@ -45,12 +50,42 @@ public class GuideCategoryController {
     @Autowired
     private GuideCategoryService guideCategoryService;
 
-    @GetMapping("page")
-    public Result<PageData<GuideCategoryDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<GuideCategoryDTO> page = guideCategoryService.page(params);
+    /**
+     * 【办事指南】分类列表-工作端PC和运营端用不分页
+     *
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData<com.epmet.dto.GuideCategoryDTO>>
+     * @author yinzuomei
+     * @date 2021/9/8 1:33 下午
+     */
+    @PostMapping("page")
+    public Result<PageData<GuideCategoryDTO>> page(@RequestBody GuideCategoryPageFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, GuideCategoryPageFormDTO.AddUserInternalGroup.class);
+        PageData<GuideCategoryDTO> page = guideCategoryService.page(formDTO);
         return new Result<PageData<GuideCategoryDTO>>().ok(page);
     }
 
+    /**
+     * 办事指南】可用分类列表 新增、编辑指南时的下拉框：展示未禁用的分类； 查询指南列表：如果禁用的分类下存在指南列表，则展示，不存在直接不展示
+     * 
+     * @param tokenDto 
+     * @return  com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.GuideDictResDTO>> 
+     * @author yinzuomei 
+     * @date 2021/9/8 2:47 下午
+     */
+    @PostMapping("getcategory")
+    public Result<List<GuideDictResDTO>> getCategory(@LoginUser TokenDto tokenDto,@RequestBody GuideCategoryDropDownFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO,GuideCategoryDropDownFormDTO.AddUserInternalGroup.class);
+        return new Result<List<GuideDictResDTO>>().ok(guideCategoryService.getCategory(formDTO));
+    }
+
+
+
+
+
+
+
     @GetMapping("{id}")
     public Result<GuideCategoryDTO> get(@PathVariable("id") String id){
         GuideCategoryDTO data = guideCategoryService.get(id);
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java
index a6b9a24cc8..02d8bcbe43 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java
@@ -18,8 +18,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.GuideCategoryDTO;
+import com.epmet.dto.result.GuideDictResDTO;
 import com.epmet.entity.GuideCategoryEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 指南分类
@@ -29,5 +34,25 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface GuideCategoryDao extends BaseDao<GuideCategoryEntity> {
-	
+
+    /**
+     * 工作端PC或者运营端分类列表查询，不分页
+     *
+     * @param customerId
+     * @return  java.util.List<com.epmet.dto.GuideCategoryDTO>
+     * @author yinzuomei
+     * @date 2021/9/8 1:57 下午
+     */
+    List<GuideCategoryDTO> selectPageByCid(String customerId);
+
+    /**
+     * 办事指南】可用分类列表 新增、编辑指南时的下拉框：展示未禁用的分类； 查询指南列表：如果禁用的分类下存在指南列表，则展示，不存在直接不展示
+     *
+     * @param customerId
+     * @param queryOrigin
+     * @return  java.util.List<com.epmet.dto.result.GuideDictResDTO>
+     * @author yinzuomei
+     * @date 2021/9/8 3:15 下午
+     */
+    List<GuideDictResDTO> selectCategoryDict(@Param("customerId") String customerId, @Param("queryOrigin") String queryOrigin);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryEntity.java
index 8231f9d5ef..c13a7a3df9 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCategoryEntity.java
@@ -18,18 +18,15 @@
 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 2021-09-06
+ * @since v1.0.0 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
@@ -38,24 +35,29 @@ public class GuideCategoryEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
-    /**
-     * 客户id
-     */
+	/**
+	 * 客户id，产品默认配置此列存储default
+	 */
 	private String customerId;
 
-    /**
-     * 分类名
-     */
+	/**
+	 * 分类名,客户内唯一
+	 */
 	private String categoryName;
 
-    /**
-     * 排序
-     */
+	/**
+	 * 分类编码：分类名的全拼; eg：gongjijin
+	 */
+	private String categoryCode;
+
+	/**
+	 * 排序
+	 */
 	private Integer sort;
 
-    /**
-     * 状态 禁用disable 启用enable
-     */
+	/**
+	 * 状态 禁用disable 启用enable
+	 */
 	private String status;
 
 }
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
index 84f995d0fd..22f9ecbc61 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
@@ -20,6 +20,9 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.GuideCategoryDTO;
+import com.epmet.dto.form.GuideCategoryDropDownFormDTO;
+import com.epmet.dto.form.GuideCategoryPageFormDTO;
+import com.epmet.dto.result.GuideDictResDTO;
 import com.epmet.entity.GuideCategoryEntity;
 
 import java.util.List;
@@ -34,14 +37,24 @@ import java.util.Map;
 public interface GuideCategoryService extends BaseService<GuideCategoryEntity> {
 
     /**
-     * 默认分页
+     * 【办事指南】分类列表-工作端PC和运营端用不分页
      *
-     * @param params
-     * @return PageData<GuideCategoryDTO>
-     * @author generator
-     * @date 2021-09-06
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData<com.epmet.dto.GuideCategoryDTO>>
+     * @author yinzuomei
+     * @date 2021/9/8 1:33 下午
+     */
+    PageData<GuideCategoryDTO> page(GuideCategoryPageFormDTO formDTO);
+
+    /**
+     * 办事指南】可用分类列表 新增、编辑指南时的下拉框：展示未禁用的分类； 查询指南列表：如果禁用的分类下存在指南列表，则展示，不存在直接不展示
+     *
+     * @param formDTO
+     * @return  java.util.List<com.epmet.dto.result.GuideDictResDTO>
+     * @author yinzuomei
+     * @date 2021/9/8 3:06 下午
      */
-    PageData<GuideCategoryDTO> page(Map<String, Object> params);
+    List<GuideDictResDTO> getCategory(GuideCategoryDropDownFormDTO formDTO);
 
     /**
      * 默认查询
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
index 502f18571a..32e879790a 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
@@ -18,15 +18,20 @@
 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.Constant;
 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.GuideCategoryDao;
 import com.epmet.dto.GuideCategoryDTO;
+import com.epmet.dto.form.GuideCategoryDropDownFormDTO;
+import com.epmet.dto.form.GuideCategoryPageFormDTO;
+import com.epmet.dto.result.GuideDictResDTO;
 import com.epmet.entity.GuideCategoryEntity;
 import com.epmet.service.GuideCategoryService;
+import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -45,15 +50,74 @@ import java.util.Map;
 public class GuideCategoryServiceImpl extends BaseServiceImpl<GuideCategoryDao, GuideCategoryEntity> implements GuideCategoryService {
 
 
+    /**
+     * 【办事指南】分类列表-工作端PC和运营端用不分页
+     *
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData<com.epmet.dto.GuideCategoryDTO>>
+     * @author yinzuomei
+     * @date 2021/9/8 1:33 下午
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public PageData<GuideCategoryDTO> page(GuideCategoryPageFormDTO formDTO) {
+        List<GuideCategoryDTO> list = baseDao.selectPageByCid(formDTO.getCustomerId());
+        if (CollectionUtils.isEmpty(list) && !formDTO.getCustomerId().equals(Constant.DEFAULT_CUSTOMER)) {
+            //初始化默认的给客户
+            initCustomerGuideCategory(formDTO.getCustomerId());
+            list = baseDao.selectPageByCid(formDTO.getCustomerId());
+        }
+        PageInfo<GuideCategoryDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
+
+    /**
+     *  产品默认分类同步给客户，已经禁用的不同步
+     * 
+     * @param customerId 
+     * @return  void 
+     * @author yinzuomei 
+     * @date 2021/9/8 2:17 下午
+     */
+    private void initCustomerGuideCategory(String customerId) {
+        List<GuideCategoryDTO> list = baseDao.selectPageByCid(Constant.DEFAULT_CUSTOMER);
+        int sort = 1;
+        for (GuideCategoryDTO dto : list) {
+            // 已经禁用的，不同步给客户
+            if (Constant.DISABLE.equals(dto.getStatus())) {
+                continue;
+            }
+            dto.setCustomerId(customerId);
+            //清空主键
+            dto.setId(null);
+            dto.setSort(sort);
+            GuideCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GuideCategoryEntity.class);
+            insert(entity);
+            sort++;
+        }
+    }
+
+
+    /**
+     * 办事指南】可用分类列表 新增、编辑指南时的下拉框：展示未禁用的分类； 查询指南列表：如果禁用的分类下存在指南列表，则展示，不存在直接不展示
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.result.GuideDictResDTO>
+     * @author yinzuomei
+     * @date 2021/9/8 3:06 下午
+     */
     @Override
-    public PageData<GuideCategoryDTO> page(Map<String, Object> params) {
-        IPage<GuideCategoryEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, GuideCategoryDTO.class);
+    public List<GuideDictResDTO> getCategory(GuideCategoryDropDownFormDTO formDTO) {
+        List<GuideDictResDTO> list=baseDao.selectCategoryDict(formDTO.getCustomerId(),formDTO.getQueryOrigin());
+        if (CollectionUtils.isEmpty(list) && !formDTO.getCustomerId().equals(Constant.DEFAULT_CUSTOMER)) {
+            //初始化默认的给客户
+            initCustomerGuideCategory(formDTO.getCustomerId());
+            list=baseDao.selectCategoryDict(formDTO.getCustomerId(),formDTO.getQueryOrigin());
+        }
+        return list;
     }
 
+
     @Override
     public List<GuideCategoryDTO> list(Map<String, Object> params) {
         List<GuideCategoryEntity> entityList = baseDao.selectList(getWrapper(params));
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
index dad8bb6c4c..6af20116bc 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
@@ -3,19 +3,50 @@
 
 <mapper namespace="com.epmet.dao.GuideCategoryDao">
 
-    <resultMap type="com.epmet.entity.GuideCategoryEntity" id="guideCategoryMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="categoryName" column="CATEGORY_NAME"/>
-        <result property="sort" column="SORT"/>
-        <result property="status" column="STATUS"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
+    <!--  工作端PC或者运营端分类列表查询，不分页  -->
+    <select id="selectPageByCid" parameterType="java.lang.String" resultType="com.epmet.dto.GuideCategoryDTO">
+        SELECT
+            gc.ID,
+            gc.CUSTOMER_ID,
+            gc.CATEGORY_NAME,
+            gc.category_code,
+            gc.SORT,
+            gc.`STATUS`
+        FROM
+            guide_category gc
+        WHERE
+            gc.DEL_FLAG = '0'
+          AND gc.CUSTOMER_ID =#{customerId}
+        ORDER BY
+            gc.SORT ASC
+    </select>
 
+    <!--  	新增指南：saveorupdate；查询指南列表：query -->
+    <select id="selectCategoryDict" parameterType="map" resultType="com.epmet.dto.result.GuideDictResDTO">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    gc.CATEGORY_NAME,
+                    gc.category_code,
+                    gc.`STATUS`,
+                    gc.sort,
+                    ( SELECT count( g.id ) FROM guide g WHERE g.CUSTOMER_ID = '' AND g.DEL_FLAG = '0' AND g.CATEGORY_CODE = gc.CATEGORY_CODE ) AS guideTotal
+                FROM
+                    guide_category gc
+                WHERE
+                    gc.DEL_FLAG = '0'
+                  AND CUSTOMER_ID = 'default'
+            ) temp
+        <if test="queryOrigin == 'saveorupdate' ">
+            WHERE  temp.`STATUS` = 'enable'
+        </if>
+        <if test="queryOrigin == 'query' ">
+            WHERE temp.`STATUS` = 'enable'
+            OR ( temp.`STATUS` = 'disable' AND temp.guideTotal > 0 )
+        </if>
+        ORDER BY
+            temp.sort ASC
+    </select>
 </mapper>
\ No newline at end of file

From 18c04e0ced3f4a4e494c1207704bd5927b637de7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Sep 2021 15:59:44 +0800
Subject: [PATCH 023/134] =?UTF-8?q?getcategory=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/result/GuideDictResDTO.java   | 3 +++
 .../java/com/epmet/service/impl/GuideCategoryServiceImpl.java | 2 +-
 .../src/main/resources/mapper/GuideCategoryDao.xml            | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDictResDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDictResDTO.java
index 8b1cbdf94f..00f56ad3f9 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDictResDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDictResDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -25,11 +26,13 @@ public class GuideDictResDTO implements Serializable {
     /**
      * 排序
      */
+    @JsonIgnore
     private Integer sort;
 
     /**
      * 状态 禁用disable 启用enable
      */
+    @JsonIgnore
     private String status;
 }
 
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
index 32e879790a..c876885d6c 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
@@ -81,7 +81,7 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl<GuideCategoryDao,
      */
     private void initCustomerGuideCategory(String customerId) {
         List<GuideCategoryDTO> list = baseDao.selectPageByCid(Constant.DEFAULT_CUSTOMER);
-        int sort = 1;
+        int sort = 0;
         for (GuideCategoryDTO dto : list) {
             // 已经禁用的，不同步给客户
             if (Constant.DISABLE.equals(dto.getStatus())) {
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
index 6af20116bc..08243e6558 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
@@ -32,12 +32,12 @@
                     gc.category_code,
                     gc.`STATUS`,
                     gc.sort,
-                    ( SELECT count( g.id ) FROM guide g WHERE g.CUSTOMER_ID = '' AND g.DEL_FLAG = '0' AND g.CATEGORY_CODE = gc.CATEGORY_CODE ) AS guideTotal
+                    ( SELECT count( g.id ) FROM guide g WHERE g.CUSTOMER_ID = #{customerId} AND g.DEL_FLAG = '0' AND g.CATEGORY_CODE = gc.CATEGORY_CODE ) AS guideTotal
                 FROM
                     guide_category gc
                 WHERE
                     gc.DEL_FLAG = '0'
-                  AND CUSTOMER_ID = 'default'
+                  AND CUSTOMER_ID = #{customerId}
             ) temp
         <if test="queryOrigin == 'saveorupdate' ">
             WHERE  temp.`STATUS` = 'enable'

From 005487aebaf9e1a533c3f5d0547aabf7d60e4c7f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Sep 2021 16:47:27 +0800
Subject: [PATCH 024/134] =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/exception/EpmetErrorCode.java       |  1 +
 .../dto/form/EditGuideCategoryFormDTO.java    | 47 ++++++++++++++
 .../epmet/dto/form/GuideCateOrderFormDTO.java | 56 ++++++++++++++++
 .../controller/GuideCategoryController.java   | 65 ++++++++++++++-----
 .../java/com/epmet/dao/GuideCategoryDao.java  | 34 ++++++++++
 .../epmet/service/GuideCategoryService.java   | 40 ++++++------
 .../impl/GuideCategoryServiceImpl.java        | 59 ++++++++++++-----
 .../resources/mapper/GuideCategoryDao.xml     | 41 ++++++++++++
 8 files changed, 294 insertions(+), 49 deletions(-)
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/EditGuideCategoryFormDTO.java
 create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideCateOrderFormDTO.java

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 4d717f919e..81350a74ba 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
@@ -74,6 +74,7 @@ public enum EpmetErrorCode {
 	AREA_CODE_ALREADY_EXISTS(8208,"组织区划已被占用，请重新选择"),
 	AGENCY_NAME_ALREADY_EXISTS(8209,"当前组织名称已存在，请重新修改"),
 	SET_PARENT_AREA_CODE(8210,"请先设置上级组织区划"),
+	HAVE_GUIDE_CANNOT_DEL(8211,"当前分类已经存在办事指南，不允许删除"),
 
 	REQUIRE_PERMISSION(8301, "您没有足够的操作权限"),
 	THIRD_PLAT_REQUEST_ERROR(8302, "请求第三方平台错误"),
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/EditGuideCategoryFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/EditGuideCategoryFormDTO.java
new file mode 100644
index 0000000000..eedb988ffe
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/EditGuideCategoryFormDTO.java
@@ -0,0 +1,47 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 编辑、禁用、删除统一入参
+ * @Author yinzuomei
+ * @Date 2021/9/8 4:15 下午
+ */
+@Data
+public class EditGuideCategoryFormDTO implements Serializable {
+    private static final long serialVersionUID = -6853534660181580456L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface StatusGroup {
+    }
+
+    public interface UpdateInfoGroup extends CustomerClientShowGroup {
+    }
+
+    public interface DelGroup {
+    }
+    @NotBlank(message = "当前操作人id不能为空", groups = AddUserInternalGroup.class)
+    private String staffId;
+
+    @NotBlank(message = "客户id不能为空",groups = DelGroup.class)
+    private String customerId;
+
+    @NotBlank(message = "id不能为空", groups = AddUserInternalGroup.class)
+    private String id;
+
+    @NotBlank(message = "status不能为空", groups = StatusGroup.class)
+    private String status;
+
+    @NotBlank(message = "分类名称不能为空不能为空", groups = UpdateInfoGroup.class)
+    @Length(max = 10, message = "分类名称最多填入10个字", groups = UpdateInfoGroup.class)
+    private String categoryName;
+
+}
+
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideCateOrderFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideCateOrderFormDTO.java
new file mode 100644
index 0000000000..6b66e9f7c5
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideCateOrderFormDTO.java
@@ -0,0 +1,56 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 分类排序入参DTO
+ * @Author yinzuomei
+ * @Date 2021/9/8 4:03 下午
+ */
+@Data
+public class GuideCateOrderFormDTO implements Serializable {
+    private static final long serialVersionUID = 8671295475212569124L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    @NotBlank(message = "当前操作人id不能为空", groups = AddUserInternalGroup.class)
+    private String staffId;
+
+
+    @NotEmpty(message = "顺序不能为空", groups = {AddUserInternalGroup.class})
+    private List<OrderIndexDTO> orderList;
+
+    /**
+     * 排序索引号dto
+     */
+    public static class OrderIndexDTO {
+        private String id;
+        private Integer orderIndex;
+
+        public OrderIndexDTO() {
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public Integer getOrderIndex() {
+            return orderIndex;
+        }
+
+        public void setOrderIndex(Integer orderIndex) {
+            this.orderIndex = orderIndex;
+        }
+    }
+}
+
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
index e34e38770a..b29c853eec 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
@@ -21,12 +21,13 @@ 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.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.GuideCategoryDTO;
+import com.epmet.dto.form.EditGuideCategoryFormDTO;
+import com.epmet.dto.form.GuideCateOrderFormDTO;
 import com.epmet.dto.form.GuideCategoryDropDownFormDTO;
 import com.epmet.dto.form.GuideCategoryPageFormDTO;
 import com.epmet.dto.result.GuideDictResDTO;
@@ -81,17 +82,58 @@ public class GuideCategoryController {
     }
 
 
+    /**
+     * 保存排序
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/9/8 4:09 下午
+     */
+    @PostMapping("saveorder")
+    public Result saveOrder(@LoginUser TokenDto tokenDto,@RequestBody GuideCateOrderFormDTO formDTO){
+        formDTO.setStaffId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,GuideCateOrderFormDTO.AddUserInternalGroup.class);
+        guideCategoryService.saveOrder(formDTO);
+        return new Result();
+    }
 
+    /**
+     * 禁用或者启用分类
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/9/8 4:19 下午
+     */
+    @PostMapping("disable")
+    public Result disable(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
+        formDTO.setStaffId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,EditGuideCategoryFormDTO.AddUserInternalGroup.class,EditGuideCategoryFormDTO.StatusGroup.class);
+        guideCategoryService.disableGuideCategory(formDTO);
+        return new Result();
+    }
 
-
-
-
-    @GetMapping("{id}")
-    public Result<GuideCategoryDTO> get(@PathVariable("id") String id){
-        GuideCategoryDTO data = guideCategoryService.get(id);
-        return new Result<GuideCategoryDTO>().ok(data);
+    /**
+     * 删除分类，已经存在指南的不允许删除，给予提示
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/9/8 4:45 下午
+     */
+    @PostMapping("delete")
+    public Result delete(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
+        formDTO.setStaffId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,EditGuideCategoryFormDTO.AddUserInternalGroup.class,EditGuideCategoryFormDTO.DelGroup.class);
+        guideCategoryService.delete(formDTO);
+        return new Result();
     }
 
+
     @PostMapping
     public Result save(@RequestBody GuideCategoryDTO dto){
         //效验数据
@@ -108,12 +150,5 @@ public class GuideCategoryController {
         return new Result();
     }
 
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        guideCategoryService.delete(ids);
-        return new Result();
-    }
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java
index 02d8bcbe43..7f66753eca 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java
@@ -55,4 +55,38 @@ public interface GuideCategoryDao extends BaseDao<GuideCategoryEntity> {
      * @date 2021/9/8 3:15 下午
      */
     List<GuideDictResDTO> selectCategoryDict(@Param("customerId") String customerId, @Param("queryOrigin") String queryOrigin);
+
+    /**
+     * 保存排序
+     *
+     * @param id
+     * @param orderIndex
+     * @param staffId
+     * @return  int
+     * @author yinzuomei
+     * @date 2021/9/8 4:11 下午
+     */
+    int updateOrder(@Param("id") String id, @Param("orderIndex") Integer orderIndex, @Param("staffId") String staffId);
+
+    /**
+     * 启用或者禁用
+     *
+     * @param id
+     * @param status
+     * @param staffId
+     * @return  int
+     * @author yinzuomei
+     * @date 2021/9/8 4:22 下午
+     */
+    int updateStatus(@Param("id") String id, @Param("status")String status, @Param("staffId")String staffId);
+
+    /**
+     * 查询这个分类下的项目数
+     *
+     * @param id
+     * @return  int
+     * @author yinzuomei
+     * @date 2021/9/8 4:36 下午
+     */
+    int selectGuideTotal(@Param("id") String id,@Param("customerId") String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
index 22f9ecbc61..905ea44517 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
@@ -20,13 +20,14 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.GuideCategoryDTO;
+import com.epmet.dto.form.EditGuideCategoryFormDTO;
+import com.epmet.dto.form.GuideCateOrderFormDTO;
 import com.epmet.dto.form.GuideCategoryDropDownFormDTO;
 import com.epmet.dto.form.GuideCategoryPageFormDTO;
 import com.epmet.dto.result.GuideDictResDTO;
 import com.epmet.entity.GuideCategoryEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 指南分类
@@ -57,24 +58,25 @@ public interface GuideCategoryService extends BaseService<GuideCategoryEntity> {
     List<GuideDictResDTO> getCategory(GuideCategoryDropDownFormDTO formDTO);
 
     /**
-     * 默认查询
+     * 保存排序
      *
-     * @param params
-     * @return java.util.List<GuideCategoryDTO>
-     * @author generator
-     * @date 2021-09-06
+     * @param formDTO
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/9/8 4:09 下午
      */
-    List<GuideCategoryDTO> list(Map<String, Object> params);
+    void saveOrder(GuideCateOrderFormDTO formDTO);
+
 
     /**
-     * 单条查询
+     * 启用或者禁用分类
      *
-     * @param id
-     * @return GuideCategoryDTO
-     * @author generator
-     * @date 2021-09-06
+     * @param formDTO
+     * @return  int
+     * @author yinzuomei
+     * @date 2021/9/8 4:20 下午
      */
-    GuideCategoryDTO get(String id);
+    void disableGuideCategory(EditGuideCategoryFormDTO formDTO);
 
     /**
      * 默认保存
@@ -97,12 +99,12 @@ public interface GuideCategoryService extends BaseService<GuideCategoryEntity> {
     void update(GuideCategoryDTO dto);
 
     /**
-     * 批量删除
+     * 删除分类，存在办事指南的不允许删除，给予提示
      *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2021-09-06
+     * @param formDTO
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/9/8 4:34 下午
      */
-    void delete(String[] ids);
+    void delete(EditGuideCategoryFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
index c876885d6c..020ee7848b 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
@@ -21,10 +21,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.GuideCategoryDao;
 import com.epmet.dto.GuideCategoryDTO;
+import com.epmet.dto.form.EditGuideCategoryFormDTO;
+import com.epmet.dto.form.GuideCateOrderFormDTO;
 import com.epmet.dto.form.GuideCategoryDropDownFormDTO;
 import com.epmet.dto.form.GuideCategoryPageFormDTO;
 import com.epmet.dto.result.GuideDictResDTO;
@@ -36,7 +40,6 @@ 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;
 
@@ -117,12 +120,33 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl<GuideCategoryDao,
         return list;
     }
 
-
+    /**
+     * 保存排序
+     *
+     * @param formDTO
+     * @return void
+     * @author yinzuomei
+     * @date 2021/9/8 4:09 下午
+     */
+    @Transactional
     @Override
-    public List<GuideCategoryDTO> list(Map<String, Object> params) {
-        List<GuideCategoryEntity> entityList = baseDao.selectList(getWrapper(params));
+    public void saveOrder(GuideCateOrderFormDTO formDTO) {
+        for (GuideCateOrderFormDTO.OrderIndexDTO idx : formDTO.getOrderList()) {
+            baseDao.updateOrder(idx.getId(), idx.getOrderIndex(),formDTO.getStaffId());
+        }
+    }
 
-        return ConvertUtils.sourceToTarget(entityList, GuideCategoryDTO.class);
+    /**
+     * 启用或者禁用分类
+     *
+     * @param formDTO
+     * @return int
+     * @author yinzuomei
+     * @date 2021/9/8 4:20 下午
+     */
+    @Override
+    public void disableGuideCategory(EditGuideCategoryFormDTO formDTO) {
+        baseDao.updateStatus(formDTO.getId(), formDTO.getStatus(),formDTO.getStaffId());
     }
 
     private QueryWrapper<GuideCategoryEntity> getWrapper(Map<String, Object> params){
@@ -134,12 +158,6 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl<GuideCategoryDao,
         return wrapper;
     }
 
-    @Override
-    public GuideCategoryDTO get(String id) {
-        GuideCategoryEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, GuideCategoryDTO.class);
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(GuideCategoryDTO dto) {
@@ -154,11 +172,22 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl<GuideCategoryDao,
         updateById(entity);
     }
 
+    /**
+     * 删除分类，存在办事指南的不允许删除，给予提示
+     *
+     * @param formDTO
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/9/8 4:34 下午
+     */
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
+    public void delete(EditGuideCategoryFormDTO formDTO) {
+        // 存在指南的分类不允许删除
+        if(baseDao.selectGuideTotal(formDTO.getId(),formDTO.getCustomerId())>0){
+            throw new RenException(EpmetErrorCode.HAVE_GUIDE_CANNOT_DEL.getCode(),EpmetErrorCode.HAVE_GUIDE_CANNOT_DEL.getMsg());
+        }
+        baseDao.deleteById(formDTO.getId());
     }
 
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
index 08243e6558..6baff0aed8 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
@@ -49,4 +49,45 @@
         ORDER BY
             temp.sort ASC
     </select>
+
+
+    <!--    保存排序-->
+    <update id="updateOrder" parameterType="map">
+        update guide_category
+        set SORT=#{orderIndex},
+            UPDATED_BY=#{staffId},
+            UPDATED_TIME=NOW()
+        where id=#{id}
+          and del_flag='0'
+    </update>
+
+    <!--    启用或者禁用-->
+    <update id="updateStatus" parameterType="map">
+        update guide_category
+        set status=#{status},
+            UPDATED_BY=#{staffId},
+            UPDATED_TIME=NOW()
+        where id=#{id}
+        and del_flag='0'
+    </update>
+
+    <!--    查询分类下的办事指南数量-->
+    <select id="selectGuideTotal" parameterType="map" resultType="int">
+        SELECT
+            count( id ) AS total
+        FROM
+            guide g
+        WHERE
+            g.DEL_FLAG = '0'
+          AND g.CUSTOMER_ID = #{customerId}
+          AND g.CATEGORY_CODE =(
+            SELECT
+                gc.CATEGORY_CODE
+            FROM
+                guide_category gc
+            WHERE
+                gc.DEL_FLAG = '0'
+              AND gc.id = #{id}
+        )
+    </select>
 </mapper>
\ No newline at end of file

From b0eb2dc7adb4c5533de1ce9e30de8e26adb3352f Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 8 Sep 2021 17:13:19 +0800
Subject: [PATCH 025/134] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=B8=8B=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=A0=91=20=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=89=80=E5=9C=A8=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/AgencyTreeResultDTO.java | 31 +++++++++++
 .../dto/result/StaffOrgListResultDTO.java     | 27 ++++++++++
 .../controller/CustomerAgencyController.java  | 12 +++++
 .../com/epmet/controller/StaffController.java | 12 +++++
 .../java/com/epmet/dao/CustomerAgencyDao.java |  4 ++
 .../epmet/service/CustomerAgencyService.java  | 10 ++++
 .../java/com/epmet/service/StaffService.java  |  9 ++++
 .../impl/CustomerAgencyServiceImpl.java       | 14 +++++
 .../epmet/service/impl/StaffServiceImpl.java  | 51 ++++++++++++++++++-
 .../resources/mapper/CustomerAgencyDao.xml    | 35 +++++++++++++
 10 files changed, 203 insertions(+), 2 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffOrgListResultDTO.java

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java
new file mode 100644
index 0000000000..896ebfb57c
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/8 15:06
+ */
+@Data
+public class AgencyTreeResultDTO implements Serializable {
+    private static final long serialVersionUID = -311212619121062367L;
+    /**
+     * 机关组织Id
+     */
+    private String agencyId;
+
+    /**
+     * 机关组织名称
+     */
+    private String agencyName;
+
+    private String pid;
+    /**
+     * 下级机关组织
+     */
+    private List<AgencyTreeResultDTO> subAgencyList;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffOrgListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffOrgListResultDTO.java
new file mode 100644
index 0000000000..2473c623fd
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffOrgListResultDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/8 15:11
+ */
+@Data
+public class StaffOrgListResultDTO implements Serializable {
+    private static final long serialVersionUID = -7717333635633000120L;
+    /**
+     * 组织ID
+     */
+    private String orgId;
+    /**
+     * 组织名称
+     */
+    private String orgName;
+    /**
+     * 组织类型机关agency 网格grid 部门dept
+     */
+    private String orgType;
+}
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 70c254ee26..11d5e13542 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
@@ -324,4 +324,16 @@ public class CustomerAgencyController {
         return new Result<OrgResultDTO>().ok(customerAgencyService.getAgencyInfo(formDTO));
     }
 
+    /**
+     * @Description 获取客户下组织树
+     * @Param tokenDTO
+     * @Return {@link Result<  AgencyTreeResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 15:20
+     */
+    @PostMapping("agencylist")
+    public Result<AgencyTreeResultDTO> getAgencyList(@LoginUser TokenDto tokenDTO) {
+        return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getAgencyList(tokenDTO));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
index b95b96c0b9..6d3b50b408 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
@@ -195,4 +195,16 @@ public class StaffController {
 		return staffService.addStaffV2(fromDTO);
 	}
 
+	/**
+	 * @Description 用户所属组织
+	 * @Param tokenDto
+	 * @Return {@link Result< StaffOrgListResultDTO>}
+	 * @Author zhaoqifeng
+	 * @Date 2021/9/8 16:55
+	 */
+	@PostMapping("orgList")
+	public Result<List<StaffOrgListResultDTO>> staffOrgList(@LoginUser TokenDto tokenDto) {
+		return new Result<List<StaffOrgListResultDTO>>().ok(staffService.staffOrgList(tokenDto));
+	}
+
 }
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 b0149c28d8..145178f50f 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
@@ -239,4 +239,8 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @author sun
      */
     OrgResultDTO selectAgencyDetail(@Param("orgId") String orgId, @Param("orgType") String orgType);
+
+    AgencyTreeResultDTO getAllAgency(@Param("customerId") String customerId);
+
+    List<AgencyTreeResultDTO> getSubAgencyList(@Param("pid") String pid);
 }
\ No newline at end of file
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 aaa691f239..c1a1915a72 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
@@ -19,6 +19,7 @@ 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.CustomerAgencyDTO;
 import com.epmet.dto.form.*;
@@ -245,4 +246,13 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @Date 2021/9/7 15:28
      */
     OrgResultDTO getAgencyInfo(OrgFormDTO formDTO);
+
+    /**
+     * @Description 获取客户下组织树
+     * @Param tokenDTO
+     * @Return {@link AgencyTreeResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 15:21
+     */
+    AgencyTreeResultDTO getAgencyList(TokenDto tokenDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
index d88298dfbf..ccd998c0fc 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
@@ -129,4 +129,13 @@ public interface StaffService {
 	 * @author sun
 	 */
     Result addStaffV2(AddStaffV2FromDTO fromDTO);
+
+	/**
+	 * @Description 工作人员所属组织
+	 * @Param tokenDto
+	 * @Return {@link StaffOrgListResultDTO}
+	 * @Author zhaoqifeng
+	 * @Date 2021/9/8 16:57
+	 */
+	List<StaffOrgListResultDTO> staffOrgList(TokenDto tokenDto);
 }
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 554d263173..4f1de1ae91 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
@@ -25,6 +25,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 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.Result;
 import com.epmet.constant.CustomerAgencyConstant;
@@ -1089,4 +1090,17 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return baseDao.selectAgencyDetail(formDTO.getOrgId(), formDTO.getOrgType());
     }
 
+    /**
+     * @param tokenDTO
+     * @Description 获取客户下组织树
+     * @Param tokenDTO
+     * @Return {@link AgencyTreeResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 15:21
+     */
+    @Override
+    public AgencyTreeResultDTO getAgencyList(TokenDto tokenDTO) {
+        return baseDao.getAllAgency(tokenDTO.getCustomerId());
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index 9d6504d673..f0cc95c409 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -11,9 +11,7 @@ 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.Result;
-import com.epmet.constant.CustomerAgencyConstant;
 import com.epmet.constant.OrgInfoConstant;
-import com.epmet.dao.CustomerAgencyDao;
 import com.epmet.dao.CustomerStaffAgencyDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
@@ -21,6 +19,7 @@ import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.feign.*;
 import com.epmet.service.*;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -566,5 +566,52 @@ public class StaffServiceImpl implements StaffService {
 		return new Result();
 	}
 
+	/**
+	 * @param tokenDto
+	 * @Description 工作人员所属组织
+	 * @Param tokenDto
+	 * @Return {@link StaffOrgListResultDTO}
+	 * @Author zhaoqifeng
+	 * @Date 2021/9/8 16:57
+	 */
+	@Override
+	public List<StaffOrgListResultDTO> staffOrgList(TokenDto tokenDto) {
+		//redis获取工作人员信息
+		CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+		if (null == staffInfoCache) {
+			return Collections.emptyList();
+		}
+		List<StaffOrgListResultDTO> list = new ArrayList<>();
+		//工作人员所在组织
+		StaffOrgListResultDTO agency = new StaffOrgListResultDTO();
+		agency.setOrgId(staffInfoCache.getAgencyId());
+		agency.setOrgName(staffInfoCache.getAgencyName());
+		agency.setOrgType(OrgInfoConstant.AGENCY);
+		list.add(agency);
+		//工作人员所在部门
+		if(CollectionUtils.isNotEmpty(staffInfoCache.getDeptList())) {
+			List<StaffOrgListResultDTO> deptList = staffInfoCache.getDeptList().stream().map(item -> {
+				StaffOrgListResultDTO dto = new StaffOrgListResultDTO();
+				dto.setOrgId(item.getId());
+				dto.setOrgName(item.getName());
+				dto.setOrgType(OrgInfoConstant.DEPT);
+				return dto;
+			}).collect(Collectors.toList());
+			list.addAll(deptList);
+		}
+		//工作人员所在网格
+		if(CollectionUtils.isNotEmpty(staffInfoCache.getGridList())) {
+			List<StaffOrgListResultDTO> gridList = staffInfoCache.getGridList().stream().map(item -> {
+				StaffOrgListResultDTO dto = new StaffOrgListResultDTO();
+				dto.setOrgId(item.getId());
+				dto.setOrgName(item.getName());
+				dto.setOrgType(OrgInfoConstant.GRID);
+				return dto;
+			}).collect(Collectors.toList());
+			list.addAll(gridList);
+		}
+		return list;
+	}
+
 
 }
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 a30207d922..2799ea36a0 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
@@ -503,5 +503,40 @@
             </otherwise>
         </choose>
     </select>
+    <resultMap id="BaseResultMap" type="com.epmet.dto.result.AgencyTreeResultDTO">
+        <result column="agencyId" property="agencyId"/>
+        <result column="agencyName" property="agencyName"/>
+        <result column="pid" property="pid"/>
+    </resultMap>
+    <resultMap id="NodeTreeResult" type="com.epmet.dto.result.AgencyTreeResultDTO"
+               extends="BaseResultMap">
+        <collection property="subAgencyList" column="PID" ofType="com.epmet.dto.result.AgencyTreeResultDTO"
+                    javaType="java.util.ArrayList" select="getSubAgencyList">
+        </collection>
+    </resultMap>
+
+    <select id="getSubAgencyList" resultMap="NodeTreeResult">
+        select
+            ID AS agencyId,
+            ORGANIZATION_NAME AS agencyName,
+            PID
+        from customer_agency
+        where
+        DEL_FLAG = 0
+        AND PID= #{pid}
+        ORDER BY ID
+    </select>
+    <select id="getAllAgency" resultType="com.epmet.dto.result.AgencyTreeResultDTO">
+        select
+            ID AS agencyId,
+            ORGANIZATION_NAME AS agencyName,
+            PID
+        from
+            customer_agency
+        where
+             DEL_FLAG = 0
+            AND PID ='0'
+            AND CUSTOMER_ID = #{customerId}
+    </select>
 
 </mapper>
\ No newline at end of file

From 6e79562bffdab748cd812f25715755892c6d9ec0 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 8 Sep 2021 17:26:52 +0800
Subject: [PATCH 026/134] =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E6=8C=87=E5=8D=97?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/OssController.java   | 31 +++++++++++++++++++
 .../java/com/epmet/utils/ModuleConstant.java  |  1 +
 2 files changed, 32 insertions(+)

diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
index 4fc64984c9..8ab04b8758 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
@@ -401,4 +401,35 @@ public class OssController {
 		return ossService.uploadImgV2(file, PrivacyType.EXTERNAL, customerId);
 	}
 
+	/**
+	 * @Description 办事指南上传附件
+	 * @Param file
+	 * @Param customerId
+	 * @Return {@link Result< UploadImgResultDTO>}
+	 * @Author zhaoqifeng
+	 * @Date 2021/9/8 17:14
+	 */
+	@PostMapping("upload-guide-file")
+	public Result<UploadImgResultDTO> uploadGuideFile(@RequestPart(value = "file") MultipartFile file, @RequestParam("customerId") String customerId) {
+		String fileName = file.getOriginalFilename();
+		String format = "-" + fileName.substring(fileName.lastIndexOf(".") + NumConstant.ONE) + "-";
+		format = format.toLowerCase();
+		// 体积限制
+		int sizeMb = 10;
+		// 大小限制10m
+		int sizeThreshold = sizeMb * 1024 * 1024;
+		if (file.getSize() > sizeThreshold) {
+			throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode(),
+					EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg().concat("，限制在").concat(String.valueOf(sizeMb)).concat("M以内"));
+		}
+
+		// 格式限制，只允许png和jpeg
+		if (!ModuleConstant.GUIDE_FILE_DOC.contains(format)) {
+			throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getCode()
+					, EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getMsg());
+		}
+
+		return ossService.uploadImgV2(file, PrivacyType.EXTERNAL, customerId);
+	}
+
 }
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/utils/ModuleConstant.java
index 07a11d9ed7..71d5f177e2 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/utils/ModuleConstant.java
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/utils/ModuleConstant.java
@@ -43,6 +43,7 @@ public interface ModuleConstant extends Constant {
      * 项目附件-允许的文件类型
      */
     String PROJECT_FILE_DOC = "-pdf-ppt-pptx-doc-docx-xls-xlsx-";
+    String GUIDE_FILE_DOC = "-pdf-doc-docx-xls-xlsx-";
     /**
      * 项目附件-允许的音频类型
      */

From 4777b56d32502c544a2639bb9381f42103c571e6 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 8 Sep 2021 17:40:31 +0800
Subject: [PATCH 027/134] wxController

---
 .../com/epmet/controller/WxController.java    | 125 ++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java

diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java
new file mode 100644
index 0000000000..71fc73ef60
--- /dev/null
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java
@@ -0,0 +1,125 @@
+
+package com.epmet.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+
+/**
+ * desc:微信配置测试
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-08
+ */
+@RestController
+@RequestMapping("wechat")
+public class WxController {
+    private static Logger log = LoggerFactory.getLogger(WxController.class);
+
+
+    @RequestMapping("check")
+    public void doGet(HttpServletRequest request, HttpServletResponse response) {
+        log.debug("weixin get...");
+        // 微信加密签名，signature结合了开发者填写的token参数和请求中的timestamp参数、nonce参数。
+        String signature = request.getParameter("signature");
+        // 时间戳
+        String timestamp = request.getParameter("timestamp");
+        // 随机数
+        String nonce = request.getParameter("nonce");
+        // 随机字符串
+        String echostr = request.getParameter("echostr");
+
+        // 通过检验signature对请求进行校验，若校验成功则原样返回echostr，表示接入成功，否则接入失败
+        PrintWriter out = null;
+        try {
+            out = response.getWriter();
+            if (WxController.checkSignature(signature, timestamp, nonce)) {
+                log.debug("weixin get success....");
+                out.print(echostr);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (out != null)
+                out.close();
+        }
+    }
+
+    /**
+     * 与接口配置信息中的Token要一致
+     */
+    private static String token = "o2opri3hschiwit";
+
+    /**
+     * 验证签名
+     *
+     * @param signature
+     * @param timestamp
+     * @param nonce
+     * @return
+     */
+    public static boolean checkSignature(String signature, String timestamp, String nonce) {
+        String[] arr = new String[]{token, timestamp, nonce};
+        // 将token、timestamp、nonce三个参数进行字典序排序
+        Arrays.sort(arr);
+        StringBuilder content = new StringBuilder();
+        for (int i = 0; i < arr.length; i++) {
+            content.append(arr[i]);
+        }
+        MessageDigest md = null;
+        String tmpStr = null;
+
+        try {
+            md = MessageDigest.getInstance("SHA-1");
+            // 将三个参数字符串拼接成一个字符串进行sha1加密
+            byte[] digest = md.digest(content.toString().getBytes());
+            tmpStr = byteToStr(digest);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+
+        content = null;
+        // 将sha1加密后的字符串可与signature对比，标识该请求来源于微信
+        return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false;
+    }
+
+    /**
+     * 将字节数组转换为十六进制字符串
+     *
+     * @param byteArray
+     * @return
+     */
+    private static String byteToStr(byte[] byteArray) {
+        String strDigest = "";
+        for (int i = 0; i < byteArray.length; i++) {
+            strDigest += byteToHexStr(byteArray[i]);
+        }
+        return strDigest;
+    }
+
+    /**
+     * 将字节转换为十六进制字符串
+     *
+     * @param mByte
+     * @return
+     */
+    private static String byteToHexStr(byte mByte) {
+        char[] Digit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+        char[] tempArr = new char[2];
+        tempArr[0] = Digit[(mByte >>> 4) & 0X0F];
+        tempArr[1] = Digit[mByte & 0X0F];
+
+        String s = new String(tempArr);
+        return s;
+    }
+}

From 0fe294e7dc5432c2427a11bb9e7d45e60f49ba2b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Sep 2021 17:58:07 +0800
Subject: [PATCH 028/134] qihuo

---
 epmet-commons/epmet-commons-tools/pom.xml     |  6 +++
 .../tools/exception/EpmetErrorCode.java       |  1 +
 .../commons/tools/utils}/Pinyin4jUtil.java    | 13 ++---
 .../epmet/model/IndexExcelDataListener.java   |  2 +-
 .../main/java/com/epmet/model/IndexModel.java |  2 +-
 .../dto/form/EditGuideCategoryFormDTO.java    | 10 ++--
 .../controller/GuideCategoryController.java   | 49 +++++++++++++------
 .../java/com/epmet/dao/GuideCategoryDao.java  |  6 +++
 .../epmet/service/GuideCategoryService.java   |  4 +-
 .../impl/GuideCategoryServiceImpl.java        | 42 +++++++++++++---
 .../resources/mapper/GuideCategoryDao.xml     | 37 ++++++++++++++
 .../dto/result/StaffBasicInfoResultDTO.java   |  7 +++
 .../java/com/epmet/dao/CustomerStaffDao.java  |  2 +
 .../impl/CustomerStaffServiceImpl.java        |  3 ++
 .../resources/mapper/CustomerStaffDao.xml     | 10 ++++
 15 files changed, 159 insertions(+), 35 deletions(-)
 rename {epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util => epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils}/Pinyin4jUtil.java (94%)

diff --git a/epmet-commons/epmet-commons-tools/pom.xml b/epmet-commons/epmet-commons-tools/pom.xml
index d8073505ce..ae545279f9 100644
--- a/epmet-commons/epmet-commons-tools/pom.xml
+++ b/epmet-commons/epmet-commons-tools/pom.xml
@@ -163,6 +163,12 @@
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.github.wnjustdoit</groupId>
+            <artifactId>pinyin4j</artifactId>
+            <version>2.6.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
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 81350a74ba..5efb12edb9 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
@@ -75,6 +75,7 @@ public enum EpmetErrorCode {
 	AGENCY_NAME_ALREADY_EXISTS(8209,"当前组织名称已存在，请重新修改"),
 	SET_PARENT_AREA_CODE(8210,"请先设置上级组织区划"),
 	HAVE_GUIDE_CANNOT_DEL(8211,"当前分类已经存在办事指南，不允许删除"),
+	GUIDE_CATEGORY_NAME_EXITS(8212,"分类已存在"),
 
 	REQUIRE_PERMISSION(8301, "您没有足够的操作权限"),
 	THIRD_PLAT_REQUEST_ERROR(8302, "请求第三方平台错误"),
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Pinyin4jUtil.java
similarity index 94%
rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
rename to epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Pinyin4jUtil.java
index 8d392a2c21..103baa6b0d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Pinyin4jUtil.java
@@ -1,4 +1,4 @@
-package com.epmet.util;
+package com.epmet.commons.tools.utils;
 
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
@@ -42,7 +42,7 @@ public class Pinyin4jUtil {
      */
     public static String getFirstSpellPinYin(String src, boolean isFullSpell) {
         String targetStr = Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(src, isFullSpell, 1));
-        System.out.println(targetStr);
+        System.out.println("targetStr="+targetStr);
         String[] split = targetStr.split(",");
         if (split.length > 1) {
             targetStr = split[0];
@@ -59,7 +59,7 @@ public class Pinyin4jUtil {
      */
     public static String getSpellPinYin(String src, boolean isFullSpell,Integer preFont) {
         String targetStr = Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(src, isFullSpell, preFont));
-        System.out.println(targetStr);
+        System.out.println("targetStr="+targetStr);
         String[] split = targetStr.split(",");
         if (split.length > 1) {
             targetStr = split[0];
@@ -196,8 +196,9 @@ public class Pinyin4jUtil {
     }
 
     public static void main(String[] args) {
-        System.out.println(getFirstSpellPinYin("区直部门",false));
-        System.out.println(getSpellPinYin("党员提出话题数",false,4));
-        System.out.println(getSpellPinYin("社区超期项目数",false,4));
+        //System.out.println(getSpellPinYin("社区超期项目数",true,0));
+        System.out.println(getFirstSpellPinYin("区直部门",true));
+        //System.out.println(getSpellPinYin("党员提出话题数",false,4));
+        //System.out.println(getSpellPinYin("社区超期项目数",false,4));
     }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java
index 3fe392276f..690543f0d2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java
@@ -4,6 +4,7 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.utils.Pinyin4jUtil;
 import com.epmet.commons.tools.utils.UniqueIdGenerator;
 import com.epmet.entity.evaluationindex.screen.IndexDictEntity;
 import com.epmet.entity.evaluationindex.screen.IndexGroupDetailTemplateEntity;
@@ -13,7 +14,6 @@ import com.epmet.service.evaluationindex.screen.IndexGroupDetailService;
 import com.epmet.service.evaluationindex.screen.IndexGroupDetailTemplateService;
 import com.epmet.service.evaluationindex.screen.IndexGroupTemplateService;
 import com.epmet.support.normalizing.Correlation;
-import com.epmet.util.Pinyin4jUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexModel.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexModel.java
index cc1aed7759..b1860f8dfc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexModel.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexModel.java
@@ -2,7 +2,7 @@ package com.epmet.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.epmet.commons.tools.constant.StrConstant;
-import com.epmet.util.Pinyin4jUtil;
+import com.epmet.commons.tools.utils.Pinyin4jUtil;
 import lombok.Data;
 
 @Data
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/EditGuideCategoryFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/EditGuideCategoryFormDTO.java
index eedb988ffe..79286ba45f 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/EditGuideCategoryFormDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/EditGuideCategoryFormDTO.java
@@ -24,23 +24,25 @@ public class EditGuideCategoryFormDTO implements Serializable {
 
     public interface UpdateInfoGroup extends CustomerClientShowGroup {
     }
+    public interface SaveInfoGroup extends CustomerClientShowGroup {
+    }
 
     public interface DelGroup {
     }
     @NotBlank(message = "当前操作人id不能为空", groups = AddUserInternalGroup.class)
     private String staffId;
 
-    @NotBlank(message = "客户id不能为空",groups = DelGroup.class)
+    @NotBlank(message = "客户id不能为空",groups = {DelGroup.class,UpdateInfoGroup.class,SaveInfoGroup.class})
     private String customerId;
 
-    @NotBlank(message = "id不能为空", groups = AddUserInternalGroup.class)
+    @NotBlank(message = "id不能为空", groups = {StatusGroup.class,DelGroup.class,UpdateInfoGroup.class})
     private String id;
 
     @NotBlank(message = "status不能为空", groups = StatusGroup.class)
     private String status;
 
-    @NotBlank(message = "分类名称不能为空不能为空", groups = UpdateInfoGroup.class)
-    @Length(max = 10, message = "分类名称最多填入10个字", groups = UpdateInfoGroup.class)
+    @NotBlank(message = "分类名称不能为空不能为空", groups = {UpdateInfoGroup.class,SaveInfoGroup.class})
+    @Length(max = 10, message = "分类名称最多填入10个字", groups = {UpdateInfoGroup.class,SaveInfoGroup.class})
     private String categoryName;
 
 }
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
index b29c853eec..7015ade670 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
@@ -22,9 +22,6 @@ 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.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.GuideCategoryDTO;
 import com.epmet.dto.form.EditGuideCategoryFormDTO;
 import com.epmet.dto.form.GuideCateOrderFormDTO;
@@ -33,7 +30,10 @@ import com.epmet.dto.form.GuideCategoryPageFormDTO;
 import com.epmet.dto.result.GuideDictResDTO;
 import com.epmet.service.GuideCategoryService;
 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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -111,7 +111,7 @@ public class GuideCategoryController {
     @PostMapping("disable")
     public Result disable(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
         formDTO.setStaffId(tokenDto.getUserId());
-        ValidatorUtils.validateEntity(formDTO,EditGuideCategoryFormDTO.AddUserInternalGroup.class,EditGuideCategoryFormDTO.StatusGroup.class);
+        ValidatorUtils.validateEntity(formDTO,EditGuideCategoryFormDTO.StatusGroup.class,EditGuideCategoryFormDTO.AddUserInternalGroup.class);
         guideCategoryService.disableGuideCategory(formDTO);
         return new Result();
     }
@@ -134,19 +134,38 @@ public class GuideCategoryController {
     }
 
 
-    @PostMapping
-    public Result save(@RequestBody GuideCategoryDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        guideCategoryService.save(dto);
+    /**
+     * 新增分类，名称和编码客户内唯一
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/9/8 5:11 下午
+     */
+    @PostMapping("save")
+    public Result save(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
+        formDTO.setStaffId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,EditGuideCategoryFormDTO.AddUserInternalGroup.class,EditGuideCategoryFormDTO.SaveInfoGroup.class);
+        guideCategoryService.save(formDTO);
         return new Result();
     }
 
-    @PutMapping
-    public Result update(@RequestBody GuideCategoryDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        guideCategoryService.update(dto);
+
+    /**
+     * 编辑名称
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/9/8 5:37 下午
+     */
+    @PostMapping("update")
+    public Result update(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
+        formDTO.setStaffId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,EditGuideCategoryFormDTO.AddUserInternalGroup.class,EditGuideCategoryFormDTO.UpdateInfoGroup.class);
+        guideCategoryService.update(formDTO);
         return new Result();
     }
 
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java
index 7f66753eca..71f757fd23 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideCategoryDao.java
@@ -89,4 +89,10 @@ public interface GuideCategoryDao extends BaseDao<GuideCategoryEntity> {
      * @date 2021/9/8 4:36 下午
      */
     int selectGuideTotal(@Param("id") String id,@Param("customerId") String customerId);
+
+    int selectCategoryName(@Param("categoryName") String categoryName, @Param("customerId")String customerId, @Param("excludeId") String excludeId);
+
+    int selectCurrentOrder(String customerId);
+
+    int selectCategoryCode(@Param("categoryCode") String categoryCode, @Param("customerId")String customerId, @Param("excludeId") String excludeId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
index 905ea44517..f652f1036a 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
@@ -86,7 +86,7 @@ public interface GuideCategoryService extends BaseService<GuideCategoryEntity> {
      * @author generator
      * @date 2021-09-06
      */
-    void save(GuideCategoryDTO dto);
+    void save(EditGuideCategoryFormDTO dto);
 
     /**
      * 默认更新
@@ -96,7 +96,7 @@ public interface GuideCategoryService extends BaseService<GuideCategoryEntity> {
      * @author generator
      * @date 2021-09-06
      */
-    void update(GuideCategoryDTO dto);
+    void update(EditGuideCategoryFormDTO dto);
 
     /**
      * 删除分类，存在办事指南的不允许删除，给予提示
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
index 020ee7848b..44ceab9717 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
@@ -25,6 +25,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 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.Pinyin4jUtil;
 import com.epmet.dao.GuideCategoryDao;
 import com.epmet.dto.GuideCategoryDTO;
 import com.epmet.dto.form.EditGuideCategoryFormDTO;
@@ -158,20 +159,49 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl<GuideCategoryDao,
         return wrapper;
     }
 
+    /**
+     * 新增分类，名称和编码客户内唯一
+     *
+     * @param dto
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/9/8 5:12 下午
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(GuideCategoryDTO dto) {
-        GuideCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GuideCategoryEntity.class);
+    public void save(EditGuideCategoryFormDTO dto) {
+        if (baseDao.selectCategoryName(dto.getCategoryName().trim(), dto.getCustomerId(), null) > 0) {
+            throw new RenException(EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getCode(), EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getMsg());
+        }
+        String categoryCode = Pinyin4jUtil.getFirstSpellPinYin(dto.getCategoryName(), true);
+        if (baseDao.selectCategoryCode(categoryCode, dto.getCustomerId(), null) > 0) {
+            throw new RenException(EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getCode(), EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getMsg());
+        }
+        GuideCategoryEntity entity = new GuideCategoryEntity();
+        entity.setCustomerId(dto.getCustomerId());
+        entity.setCategoryName(dto.getCategoryName());
+        entity.setCategoryCode(categoryCode);
+        int currentMax = baseDao.selectCurrentOrder(dto.getCustomerId());
+        entity.setSort(currentMax == 0 ? currentMax : currentMax + 1);
+        entity.setStatus(Constant.ENABLE);
         insert(entity);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(GuideCategoryDTO dto) {
-        GuideCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GuideCategoryEntity.class);
-        updateById(entity);
+    public void update(EditGuideCategoryFormDTO dto) {
+        if (baseDao.selectCategoryName(dto.getCategoryName().trim(), dto.getCustomerId(), dto.getId()) > 0) {
+            throw new RenException(EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getCode(), EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getMsg());
+        }
+        String categoryCode = Pinyin4jUtil.getFirstSpellPinYin(dto.getCategoryName(), true);
+        if (baseDao.selectCategoryCode(categoryCode, dto.getCustomerId(), dto.getId()) > 0) {
+            throw new RenException(EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getCode(), EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getMsg());
+        }
+        GuideCategoryEntity origin=baseDao.selectById(dto.getId());
+        origin.setCategoryCode(categoryCode);
+        origin.setCategoryName(dto.getCategoryName());
+        updateById(origin);
     }
-
     /**
      * 删除分类，存在办事指南的不允许删除，给予提示
      *
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
index 6baff0aed8..7bd2f78df8 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml
@@ -90,4 +90,41 @@
               AND gc.id = #{id}
         )
     </select>
+
+    <select id="selectCategoryName" parameterType="map" resultType="int">
+        SELECT
+            count( gc.id )
+        FROM
+            guide_category gc
+        WHERE
+            gc.DEL_FLAG = '0'
+          AND gc.CUSTOMER_ID = #{customerId}
+          AND gc.CATEGORY_NAME = #{categoryName}
+        <if test='null != excludeId and excludeId != ""'>
+          AND gc.id !=#{excludeId}
+        </if>
+    </select>
+
+    <select id="selectCategoryCode" parameterType="map" resultType="int">
+        SELECT
+        count( gc.id )
+        FROM
+        guide_category gc
+        WHERE
+        gc.DEL_FLAG = '0'
+        AND gc.CUSTOMER_ID = #{customerId}
+        AND gc.CATEGORY_CODE = #{categoryCode}
+        <if test='null != excludeId and excludeId != ""'>
+            AND gc.id !=#{excludeId}
+        </if>
+    </select>
+    <select id="selectCurrentOrder" parameterType="java.lang.String" resultType="int">
+        SELECT
+            ifnull(max(gc.SORT),0) as num
+        FROM
+            guide_category gc
+        WHERE
+            gc.DEL_FLAG = '0'
+          AND gc.CUSTOMER_ID =#{customerId}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java
index 04962a5396..7de2636450 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 获取pc工作端登陆用户信息
@@ -60,4 +61,10 @@ public class StaffBasicInfoResultDTO implements Serializable {
      * 状态  0：停用    1：正常
      */
     private Integer status;
+
+	/**
+	 * 工作人员的所有角色key，09.08新增：工作端PC端用到了
+	 */
+    private List<String> roleList;
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
index d0679eb2b6..97e4bf7424 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
@@ -213,4 +213,6 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 	 * @return
 	 */
 	List<CustomerStaffDTO> listDTOS(@Param("customerId") String customerId, @Param("realName") String realName, @Param("mobile") String mobile, @Param("userIds") List<String> userIds);
+
+    List<String> selectStaffRoles(@Param("userId") String userId,@Param("customerId") String customerId);
 }
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 740b4b8d6e..989b86924d 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
@@ -703,6 +703,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
     @Override
     public Result<StaffBasicInfoResultDTO> selectStaffBasicInfo(String userId) {
 		StaffBasicInfoResultDTO resultDTO = baseDao.selectStaffBasicInfo(userId);
+		if(null!=resultDTO){
+			resultDTO.setRoleList(baseDao.selectStaffRoles(userId,resultDTO.getCustomerId()));
+		}
         return new Result<StaffBasicInfoResultDTO>().ok(resultDTO);
     }
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
index 9e3265747c..4448cb0566 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
@@ -416,4 +416,14 @@
         )
     </select>
 
+    <select id="selectStaffRoles" parameterType="map" resultType="java.lang.String">
+        select distinct gsr.ROLE_KEY from gov_staff_role gsr
+        where gsr.DEL_FLAG='0'
+          AND GSR.CUSTOMER_ID=#{customerId}
+          AND gsr.id in(
+            select sr.ROLE_ID from staff_role sr
+            where sr.DEL_FLAG='0'
+              and sr.STAFF_ID=#{userId}
+        )
+    </select>
 </mapper>

From c2f45bc4b608e8a4ecf4044e3380f2f89ce55b67 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 8 Sep 2021 18:00:33 +0800
Subject: [PATCH 029/134] =?UTF-8?q?wxController=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/WxController.java    | 125 ++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 epmet-auth/src/main/java/com/epmet/controller/WxController.java

diff --git a/epmet-auth/src/main/java/com/epmet/controller/WxController.java b/epmet-auth/src/main/java/com/epmet/controller/WxController.java
new file mode 100644
index 0000000000..71fc73ef60
--- /dev/null
+++ b/epmet-auth/src/main/java/com/epmet/controller/WxController.java
@@ -0,0 +1,125 @@
+
+package com.epmet.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+
+/**
+ * desc:微信配置测试
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-08
+ */
+@RestController
+@RequestMapping("wechat")
+public class WxController {
+    private static Logger log = LoggerFactory.getLogger(WxController.class);
+
+
+    @RequestMapping("check")
+    public void doGet(HttpServletRequest request, HttpServletResponse response) {
+        log.debug("weixin get...");
+        // 微信加密签名，signature结合了开发者填写的token参数和请求中的timestamp参数、nonce参数。
+        String signature = request.getParameter("signature");
+        // 时间戳
+        String timestamp = request.getParameter("timestamp");
+        // 随机数
+        String nonce = request.getParameter("nonce");
+        // 随机字符串
+        String echostr = request.getParameter("echostr");
+
+        // 通过检验signature对请求进行校验，若校验成功则原样返回echostr，表示接入成功，否则接入失败
+        PrintWriter out = null;
+        try {
+            out = response.getWriter();
+            if (WxController.checkSignature(signature, timestamp, nonce)) {
+                log.debug("weixin get success....");
+                out.print(echostr);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (out != null)
+                out.close();
+        }
+    }
+
+    /**
+     * 与接口配置信息中的Token要一致
+     */
+    private static String token = "o2opri3hschiwit";
+
+    /**
+     * 验证签名
+     *
+     * @param signature
+     * @param timestamp
+     * @param nonce
+     * @return
+     */
+    public static boolean checkSignature(String signature, String timestamp, String nonce) {
+        String[] arr = new String[]{token, timestamp, nonce};
+        // 将token、timestamp、nonce三个参数进行字典序排序
+        Arrays.sort(arr);
+        StringBuilder content = new StringBuilder();
+        for (int i = 0; i < arr.length; i++) {
+            content.append(arr[i]);
+        }
+        MessageDigest md = null;
+        String tmpStr = null;
+
+        try {
+            md = MessageDigest.getInstance("SHA-1");
+            // 将三个参数字符串拼接成一个字符串进行sha1加密
+            byte[] digest = md.digest(content.toString().getBytes());
+            tmpStr = byteToStr(digest);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+
+        content = null;
+        // 将sha1加密后的字符串可与signature对比，标识该请求来源于微信
+        return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false;
+    }
+
+    /**
+     * 将字节数组转换为十六进制字符串
+     *
+     * @param byteArray
+     * @return
+     */
+    private static String byteToStr(byte[] byteArray) {
+        String strDigest = "";
+        for (int i = 0; i < byteArray.length; i++) {
+            strDigest += byteToHexStr(byteArray[i]);
+        }
+        return strDigest;
+    }
+
+    /**
+     * 将字节转换为十六进制字符串
+     *
+     * @param mByte
+     * @return
+     */
+    private static String byteToHexStr(byte mByte) {
+        char[] Digit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+        char[] tempArr = new char[2];
+        tempArr[0] = Digit[(mByte >>> 4) & 0X0F];
+        tempArr[1] = Digit[mByte & 0X0F];
+
+        String s = new String(tempArr);
+        return s;
+    }
+}

From 1556f334df998c6eb317946eea5bb47bd557be81 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Sep 2021 18:07:07 +0800
Subject: [PATCH 030/134] bugfix

---
 .../com/epmet/controller/GuideCategoryController.java  | 10 ++++------
 .../java/com/epmet/service/GuideCategoryService.java   |  4 ++--
 .../epmet/service/impl/GuideCategoryServiceImpl.java   |  6 ++++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
index 7015ade670..b1e8824223 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java
@@ -144,11 +144,10 @@ public class GuideCategoryController {
      * @date 2021/9/8 5:11 下午
      */
     @PostMapping("save")
-    public Result save(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
+    public Result<GuideCategoryDTO> save(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
         formDTO.setStaffId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO,EditGuideCategoryFormDTO.AddUserInternalGroup.class,EditGuideCategoryFormDTO.SaveInfoGroup.class);
-        guideCategoryService.save(formDTO);
-        return new Result();
+        return new Result<GuideCategoryDTO>().ok(guideCategoryService.save(formDTO));
     }
 
 
@@ -162,11 +161,10 @@ public class GuideCategoryController {
      * @date 2021/9/8 5:37 下午
      */
     @PostMapping("update")
-    public Result update(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
+    public Result<GuideCategoryDTO> update(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
         formDTO.setStaffId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO,EditGuideCategoryFormDTO.AddUserInternalGroup.class,EditGuideCategoryFormDTO.UpdateInfoGroup.class);
-        guideCategoryService.update(formDTO);
-        return new Result();
+        return new Result<GuideCategoryDTO>().ok(guideCategoryService.update(formDTO));
     }
 
 
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
index f652f1036a..5bde4619e6 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java
@@ -86,7 +86,7 @@ public interface GuideCategoryService extends BaseService<GuideCategoryEntity> {
      * @author generator
      * @date 2021-09-06
      */
-    void save(EditGuideCategoryFormDTO dto);
+    GuideCategoryDTO save(EditGuideCategoryFormDTO dto);
 
     /**
      * 默认更新
@@ -96,7 +96,7 @@ public interface GuideCategoryService extends BaseService<GuideCategoryEntity> {
      * @author generator
      * @date 2021-09-06
      */
-    void update(EditGuideCategoryFormDTO dto);
+    GuideCategoryDTO update(EditGuideCategoryFormDTO dto);
 
     /**
      * 删除分类，存在办事指南的不允许删除，给予提示
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
index 44ceab9717..6f3f7a082a 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java
@@ -169,7 +169,7 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl<GuideCategoryDao,
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(EditGuideCategoryFormDTO dto) {
+    public GuideCategoryDTO save(EditGuideCategoryFormDTO dto) {
         if (baseDao.selectCategoryName(dto.getCategoryName().trim(), dto.getCustomerId(), null) > 0) {
             throw new RenException(EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getCode(), EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getMsg());
         }
@@ -185,11 +185,12 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl<GuideCategoryDao,
         entity.setSort(currentMax == 0 ? currentMax : currentMax + 1);
         entity.setStatus(Constant.ENABLE);
         insert(entity);
+        return ConvertUtils.sourceToTarget(entity,GuideCategoryDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(EditGuideCategoryFormDTO dto) {
+    public GuideCategoryDTO update(EditGuideCategoryFormDTO dto) {
         if (baseDao.selectCategoryName(dto.getCategoryName().trim(), dto.getCustomerId(), dto.getId()) > 0) {
             throw new RenException(EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getCode(), EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getMsg());
         }
@@ -201,6 +202,7 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl<GuideCategoryDao,
         origin.setCategoryCode(categoryCode);
         origin.setCategoryName(dto.getCategoryName());
         updateById(origin);
+        return ConvertUtils.sourceToTarget(origin,GuideCategoryDTO.class);
     }
     /**
      * 删除分类，存在办事指南的不允许删除，给予提示

From f178763d1579578f2ee64d3d73eb68e0dcd4c163 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 8 Sep 2021 18:07:54 +0800
Subject: [PATCH 031/134] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8A=9E=E4=BA=8B?=
 =?UTF-8?q?=E6=8C=87=E5=8D=97=E5=86=85=E5=AE=B9=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GuideModuleDictDefaultService.java        |  9 ++++
 .../epmet/service/GuideModuleDictService.java | 10 +++++
 .../GuideModuleDictDefaultServiceImpl.java    | 14 ++++++
 .../impl/GuideModuleDictServiceImpl.java      | 43 +++++++++++++++++++
 .../epmet/service/impl/GuideServiceImpl.java  |  3 ++
 5 files changed, 79 insertions(+)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictDefaultService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictDefaultService.java
index 1af3f23de9..2bf1b3aac7 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictDefaultService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictDefaultService.java
@@ -92,4 +92,13 @@ public interface GuideModuleDictDefaultService extends BaseService<GuideModuleDi
      * @date 2021-09-06
      */
     void delete(String[] ids);
+
+    /**
+     * 获取默认配置
+     * @Param
+     * @Return {@link List< GuideModuleDictDefaultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 17:44
+     */
+    List<GuideModuleDictDefaultDTO> getList();
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictService.java
index 50ea1e80e0..7f1ae4a0e4 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleDictService.java
@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.GuideModuleDictDTO;
+import com.epmet.dto.ModuleDTO;
 import com.epmet.entity.GuideModuleDictEntity;
 
 import java.util.List;
@@ -92,4 +93,13 @@ public interface GuideModuleDictService extends BaseService<GuideModuleDictEntit
      * @date 2021-09-06
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 获取模块列表
+     * @Param customerId
+     * @Return {@link List< ModuleDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 17:50
+     */
+    List<ModuleDTO> getModuleList(String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictDefaultServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictDefaultServiceImpl.java
index 6be5e56dc4..ecc0fff0bb 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictDefaultServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictDefaultServiceImpl.java
@@ -97,4 +97,18 @@ public class GuideModuleDictDefaultServiceImpl extends BaseServiceImpl<GuideModu
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 获取默认配置
+     *
+     * @Param
+     * @Return {@link List< GuideModuleDictDefaultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 17:44
+     */
+    @Override
+    public List<GuideModuleDictDefaultDTO> getList() {
+        QueryWrapper<GuideModuleDictDefaultEntity> wrapper = new QueryWrapper<>();
+        return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), GuideModuleDictDefaultDTO.class);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictServiceImpl.java
index c758eebdad..72bfeb9d05 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -25,15 +26,21 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.GuideModuleDictDao;
 import com.epmet.dto.GuideModuleDictDTO;
+import com.epmet.dto.GuideModuleDictDefaultDTO;
+import com.epmet.dto.ModuleDTO;
 import com.epmet.entity.GuideModuleDictEntity;
+import com.epmet.service.GuideModuleDictDefaultService;
 import com.epmet.service.GuideModuleDictService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 指南模块字典表
@@ -44,6 +51,8 @@ import java.util.Map;
 @Service
 public class GuideModuleDictServiceImpl extends BaseServiceImpl<GuideModuleDictDao, GuideModuleDictEntity> implements GuideModuleDictService {
 
+    @Resource
+    private GuideModuleDictDefaultService guideModuleDictDefaultService;
 
     @Override
     public PageData<GuideModuleDictDTO> page(Map<String, Object> params) {
@@ -97,4 +106,38 @@ public class GuideModuleDictServiceImpl extends BaseServiceImpl<GuideModuleDictD
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param customerId
+     * @Description 获取模块列表
+     * @Param customerId
+     * @Return {@link List<  ModuleDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 17:50
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<ModuleDTO> getModuleList(String customerId) {
+        LambdaQueryWrapper<GuideModuleDictEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GuideModuleDictEntity::getCustomerId, customerId);
+        wrapper.orderByAsc(GuideModuleDictEntity::getSort);
+        List<GuideModuleDictEntity> list = baseDao.selectList(wrapper);
+        //结果为空，初始化默认配置
+        if (CollectionUtils.isEmpty(list)) {
+            List<GuideModuleDictDefaultDTO> defaultList =  guideModuleDictDefaultService.getList();
+            List<GuideModuleDictEntity> moduleList = ConvertUtils.sourceToTarget(defaultList, GuideModuleDictEntity.class);
+            moduleList.forEach(item -> {
+                item.setCustomerId(customerId);
+            });
+            insertBatch(moduleList);
+            list = baseDao.selectList(wrapper);
+        }
+        return list.stream().map(item -> {
+            ModuleDTO dto = new ModuleDTO();
+            dto.setModuleId(item.getId());
+            dto.setModuleValue(item.getModuleValue());
+            dto.setModuleName(item.getModuleName());
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
index d8a2d2deeb..ac643590eb 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
@@ -165,6 +165,7 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
      * @Date 2021/9/7 14:12
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void guideAdd(TokenDto tokenDto, GuideAddFormDTO formDTO) {
         if (CollectionUtils.isEmpty(formDTO.getModuleList()) && CollectionUtils.isEmpty(formDTO.getAttachmentList()) &&
         CollectionUtils.isEmpty(formDTO.getExternalLinks())) {
@@ -251,6 +252,7 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
      * @Date 2021/9/7 14:12
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void guideEdit(GuideEditFormDTO formDTO) {
         if (CollectionUtils.isEmpty(formDTO.getModuleList()) && CollectionUtils.isEmpty(formDTO.getAttachmentList()) &&
                 CollectionUtils.isEmpty(formDTO.getExternalLinks())) {
@@ -342,6 +344,7 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
      * @Date 2021/9/7 14:12
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void guideDel(GuideFormDTO formDTO) {
         GuideDTO guide = get(formDTO.getGuideId());
         if (!formDTO.getStaffId().equals(guide.getCreatedBy())) {

From babd4c73c2c16682180c8abc3249c589b2d4f799 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 9 Sep 2021 09:04:29 +0800
Subject: [PATCH 032/134] =?UTF-8?q?wxController=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/WxController.java    |  64 ++++-----
 .../com/epmet/controller/WxController.java    | 125 ------------------
 2 files changed, 28 insertions(+), 161 deletions(-)
 delete mode 100644 epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java

diff --git a/epmet-auth/src/main/java/com/epmet/controller/WxController.java b/epmet-auth/src/main/java/com/epmet/controller/WxController.java
index 71fc73ef60..5723e7106a 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/WxController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/WxController.java
@@ -8,11 +8,11 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
+import java.util.Enumeration;
 
 
 /**
@@ -28,48 +28,39 @@ public class WxController {
 
 
     @RequestMapping("check")
-    public void doGet(HttpServletRequest request, HttpServletResponse response) {
-        log.debug("weixin get...");
-        // 微信加密签名，signature结合了开发者填写的token参数和请求中的timestamp参数、nonce参数。
-        String signature = request.getParameter("signature");
-        // 时间戳
-        String timestamp = request.getParameter("timestamp");
-        // 随机数
-        String nonce = request.getParameter("nonce");
-        // 随机字符串
-        String echostr = request.getParameter("echostr");
-
-        // 通过检验signature对请求进行校验，若校验成功则原样返回echostr，表示接入成功，否则接入失败
-        PrintWriter out = null;
-        try {
-            out = response.getWriter();
-            if (WxController.checkSignature(signature, timestamp, nonce)) {
-                log.debug("weixin get success....");
-                out.print(echostr);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (out != null)
-                out.close();
+    public void get(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        System.out.println("========WechatController========= ");
+        Enumeration pNames = request.getParameterNames();
+        while (pNames.hasMoreElements()) {
+            String name = (String) pNames.nextElement();
+            String value = request.getParameter(name);
+            // out.print(name + "=" + value);
+
+            String log = "name =" + name + "     value =" + value;
         }
+
+        String signature = request.getParameter("signature");/// 微信加密签名
+        String timestamp = request.getParameter("timestamp");/// 时间戳
+        String nonce = request.getParameter("nonce"); /// 随机数
+        String echostr = request.getParameter("echostr"); // 随机字符串
+        response.reset();
+        PrintWriter out = response.getWriter();
+
+//        if (this.checkSignature(signature, timestamp, nonce)) {
+//            out.print(echostr);
+//        }
+        out.close();
+        out = null;
     }
 
-    /**
-     * 与接口配置信息中的Token要一致
-     */
-    private static String token = "o2opri3hschiwit";
 
     /**
-     * 验证签名
-     *
-     * @param signature
-     * @param timestamp
-     * @param nonce
-     * @return
+     * 校验签名
      */
     public static boolean checkSignature(String signature, String timestamp, String nonce) {
-        String[] arr = new String[]{token, timestamp, nonce};
+        System.out.println("signature:" + signature + "timestamp:" + timestamp + "nonc:" + nonce);
+        String WECHAT_TOKEN = "1jkoyyih83nj8";
+        String[] arr = new String[]{WECHAT_TOKEN, timestamp, nonce};
         // 将token、timestamp、nonce三个参数进行字典序排序
         Arrays.sort(arr);
         StringBuilder content = new StringBuilder();
@@ -90,6 +81,7 @@ public class WxController {
 
         content = null;
         // 将sha1加密后的字符串可与signature对比，标识该请求来源于微信
+        System.out.println(tmpStr.equals(signature.toUpperCase()));
         return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false;
     }
 
diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java
deleted file mode 100644
index 71fc73ef60..0000000000
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-
-package com.epmet.controller;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-
-
-/**
- * desc:微信配置测试
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-03-08
- */
-@RestController
-@RequestMapping("wechat")
-public class WxController {
-    private static Logger log = LoggerFactory.getLogger(WxController.class);
-
-
-    @RequestMapping("check")
-    public void doGet(HttpServletRequest request, HttpServletResponse response) {
-        log.debug("weixin get...");
-        // 微信加密签名，signature结合了开发者填写的token参数和请求中的timestamp参数、nonce参数。
-        String signature = request.getParameter("signature");
-        // 时间戳
-        String timestamp = request.getParameter("timestamp");
-        // 随机数
-        String nonce = request.getParameter("nonce");
-        // 随机字符串
-        String echostr = request.getParameter("echostr");
-
-        // 通过检验signature对请求进行校验，若校验成功则原样返回echostr，表示接入成功，否则接入失败
-        PrintWriter out = null;
-        try {
-            out = response.getWriter();
-            if (WxController.checkSignature(signature, timestamp, nonce)) {
-                log.debug("weixin get success....");
-                out.print(echostr);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (out != null)
-                out.close();
-        }
-    }
-
-    /**
-     * 与接口配置信息中的Token要一致
-     */
-    private static String token = "o2opri3hschiwit";
-
-    /**
-     * 验证签名
-     *
-     * @param signature
-     * @param timestamp
-     * @param nonce
-     * @return
-     */
-    public static boolean checkSignature(String signature, String timestamp, String nonce) {
-        String[] arr = new String[]{token, timestamp, nonce};
-        // 将token、timestamp、nonce三个参数进行字典序排序
-        Arrays.sort(arr);
-        StringBuilder content = new StringBuilder();
-        for (int i = 0; i < arr.length; i++) {
-            content.append(arr[i]);
-        }
-        MessageDigest md = null;
-        String tmpStr = null;
-
-        try {
-            md = MessageDigest.getInstance("SHA-1");
-            // 将三个参数字符串拼接成一个字符串进行sha1加密
-            byte[] digest = md.digest(content.toString().getBytes());
-            tmpStr = byteToStr(digest);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        }
-
-        content = null;
-        // 将sha1加密后的字符串可与signature对比，标识该请求来源于微信
-        return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false;
-    }
-
-    /**
-     * 将字节数组转换为十六进制字符串
-     *
-     * @param byteArray
-     * @return
-     */
-    private static String byteToStr(byte[] byteArray) {
-        String strDigest = "";
-        for (int i = 0; i < byteArray.length; i++) {
-            strDigest += byteToHexStr(byteArray[i]);
-        }
-        return strDigest;
-    }
-
-    /**
-     * 将字节转换为十六进制字符串
-     *
-     * @param mByte
-     * @return
-     */
-    private static String byteToHexStr(byte mByte) {
-        char[] Digit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-        char[] tempArr = new char[2];
-        tempArr[0] = Digit[(mByte >>> 4) & 0X0F];
-        tempArr[1] = Digit[mByte & 0X0F];
-
-        String s = new String(tempArr);
-        return s;
-    }
-}

From 94e7f017cb97c879d24c3138ea73b1d40988928d Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 9 Sep 2021 09:22:22 +0800
Subject: [PATCH 033/134] 1

---
 .../com/epmet/controller/WxController.java    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/epmet-auth/src/main/java/com/epmet/controller/WxController.java b/epmet-auth/src/main/java/com/epmet/controller/WxController.java
index 5723e7106a..3ea0b091a5 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/WxController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/WxController.java
@@ -4,6 +4,8 @@ package com.epmet.controller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
@@ -114,4 +116,27 @@ public class WxController {
         String s = new String(tempArr);
         return s;
     }
+
+
+    /**
+     * 打开开发者模式签名认证
+     * @param signature
+     * @param timestamp
+     * @param nonce
+     * @param echostr
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/service", method = RequestMethod.GET)
+    public Object defaultView(String signature, String timestamp, String nonce, String echostr) {
+        if (echostr == null || echostr.isEmpty()) {
+            return nonce;
+        }
+        if (this.checkSignature(signature, timestamp, nonce)) {
+            return echostr;
+        }
+        return nonce;
+    }
+
+
 }

From 71fe7cacd7208901a9bec8289ce2ef2ecbd25b45 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Sep 2021 09:53:32 +0800
Subject: [PATCH 034/134] =?UTF-8?q?/oper/crm/customer/getcostomerInfo?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E5=B7=B2=E5=88=A0=E9=99=A4=EF=BC=8C=E4=B8=8D=E8=A6=81=E6=8A=A5?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=EF=BC=8Cuser=E3=80=81crm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/CustomerServiceImpl.java | 4 ++++
 .../java/com/epmet/service/impl/UserAdviceServiceImpl.java    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
index f66c547f6c..3b31e4feac 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
@@ -215,6 +215,10 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
     @Override
     public Result<CustomerDTO> getCustomerInfo(CustomerDTO dto) {
         CustomerEntity entity = baseDao.selectById(dto.getId());
+        if (null == entity) {
+            log.warn(String.format("当前客户id：%s,已删除", dto.getId()));
+            return new Result();
+        }
         List<String> customerIds=customerRelationService.getAllSubCustomerIds(dto.getId());
         CustomerDTO customerDTO=ConvertUtils.sourceToTarget(entity, CustomerDTO.class);
         if(CollectionUtils.isEmpty(customerIds)){
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
index bdf908849f..3f189b5426 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
@@ -334,7 +334,7 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         CustomerDTO customerDTO = new CustomerDTO();
         customerDTO.setId(dto.getCustomerId());
         Result<CustomerDTO> customerInfo = operCrmOpenFeignClient.getCustomerInfo(customerDTO);
-        if (customerInfo.success()){
+        if (customerInfo.success() && null != customerInfo.getData()) {
             userAdviceDTO.setCustomerName(customerInfo.getData().getCustomerName());
         }else {
             logger.error("customerId:{},获取customerName失败",dto.getCustomerId());

From 0955cf0500c546353988e7bcbce5d15606a3a43f Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 9 Sep 2021 10:26:28 +0800
Subject: [PATCH 035/134] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=911.?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=88=91=E6=89=80=E5=9C=A8=E7=9A=84=E5=B0=8F?=
 =?UTF-8?q?=E7=BB=84=E6=8E=92=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/GroupPointFormDTO.java |  9 ++-
 .../result/GroupPointRankingResultDTO.java    |  6 ++
 .../controller/GroupPointController.java      | 20 ++++-
 .../com/epmet/dao/BizPointTotalDetailDao.java | 23 ++++++
 .../service/BizPointTotalDetailService.java   | 13 +++-
 .../impl/BizPointTotalDetailServiceImpl.java  | 74 ++++++++++++++++++-
 .../mapper/BizPointTotalDetailDao.xml         | 46 ++++++++++++
 .../dto/group/form/GroupsByMemberFormDTO.java | 17 +++++
 .../group/result/GroupDetailResultDTO.java    |  2 +-
 .../dto/group/result/RankingResultDTO.java    | 11 +++
 .../group/feign/ResiGroupOpenFeignClient.java | 10 +++
 .../ResiGroupOpenFeignClientFallback.java     |  5 ++
 .../group/controller/ResiGroupController.java | 17 +++++
 .../epmet/modules/group/dao/ResiGroupDao.java | 11 +++
 .../group/service/ResiGroupService.java       | 11 +++
 .../service/impl/ResiGroupServiceImpl.java    |  6 ++
 .../resources/mapper/group/ResiGroupDao.xml   | 18 +++++
 17 files changed, 288 insertions(+), 11 deletions(-)
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupsByMemberFormDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RankingResultDTO.java

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
index d1124fe9b8..641d5fbe9f 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
@@ -18,14 +18,17 @@ public class GroupPointFormDTO implements Serializable {
 
 	public interface GroupPoint extends CustomerClientShowGroup {}
 	public interface GridRank extends CustomerClientShowGroup {}
-	public interface GridScopeRank extends CustomerClientShowGroup {}
-	public interface CustomerScopeRank extends CustomerClientShowGroup {}
+	public interface GridScopeRank {}
+	public interface CustomerScopeRank {}
+	public interface MyGroupRank {}
 	@NotBlank(message = "小组Id不能为空", groups = {GroupPoint.class, GridRank.class})
 	private String groupId;
-	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class, GridScopeRank.class})
+	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class, GridScopeRank.class, MyGroupRank.class})
 	private String gridId;
 	@NotBlank(message = "客户Id不能为空", groups = {CustomerScopeRank.class})
 	private String customerId;
+	@NotBlank(message = "用户ID不能为空", groups = {MyGroupRank.class})
+	private String userId;
 
 	/** 页码 */
 	private Integer pageNo = 1;
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
index b99d4313ac..2f06640b73 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
@@ -47,4 +47,10 @@ public class GroupPointRankingResultDTO implements Serializable {
 
 	/** 所属网格名称 */
 	private String gridNamePath;
+
+	/** 网格内排名 */
+	private Integer gridRanking;
+
+	/** 客户下总排名 */
+	private Integer customerRanking;
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
index 1ff898d97d..d2901df068 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
@@ -133,7 +133,7 @@ public class GroupPointController {
 		Integer pageNo = formDTO.getPageNo();
 		Integer pageSize = formDTO.getPageSize();
 
-		PageData<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInGridScope(SearchScopeTypeEnum.GRID, gridId,pageNo, pageSize);
+		PageData<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.GRID, gridId,pageNo, pageSize);
 		return new Result<PageData<GroupPointRankingResultDTO>>().ok(page);
 	}
 
@@ -152,8 +152,24 @@ public class GroupPointController {
 		Integer pageNo = formDTO.getPageNo();
 		Integer pageSize = formDTO.getPageSize();
 
-		PageData<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInGridScope(SearchScopeTypeEnum.CUSTOMER, customerId, pageNo, pageSize);
+		PageData<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.CUSTOMER, customerId, pageNo, pageSize);
 		return new Result<PageData<GroupPointRankingResultDTO>>().ok(page);
 	}
 
+	/**
+	 * @description 【小组排名】- 列出我所在的小组的积分排名
+	 *
+	 * @param formDTO
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.08 13:31:09
+	 */
+	@PostMapping("grouppointranking/mygroups")
+	public Result<List<GroupPointRankingResultDTO>> listMyGroupPointRanding(@RequestBody GroupPointFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.MyGroupRank.class);
+		String userId = formDTO.getUserId();
+		String gridId = formDTO.getGridId();
+		List<GroupPointRankingResultDTO> list = bizPointTotalDetailService.listMyGroupPointRanding(userId, gridId);
+		return new Result<List<GroupPointRankingResultDTO>>().ok(list);
+	}
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/BizPointTotalDetailDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/BizPointTotalDetailDao.java
index 26e05f5a7b..1fb34f99e7 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/BizPointTotalDetailDao.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/BizPointTotalDetailDao.java
@@ -40,4 +40,27 @@ public interface BizPointTotalDetailDao extends BaseDao<BizPointTotalDetailEntit
 	 * @return com.epmet.dto.BizPointTotalDetailDTO
 	 */
 	BizPointTotalDetailDTO selectDataByObject(@Param("type")String type, @Param("objectId")String objectId);
+
+	/**
+	 * @description 查询object在指定范围内的排名
+	 *
+	 * @param bizType
+	 * @param groupId
+	 * @param scope
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.08 17:36:17
+	 */
+    Integer getRanking(@Param("bizType") String bizType, @Param("groupId") String groupId, @Param("scope") String scope);
+
+    /**
+     * @description 搜索指定范围内，最低名次
+     *
+     * @param scope
+     * @param scopeId
+     * @return
+     * @author wxz
+     * @date 2021.09.09 09:53:37
+     */
+    Integer getMinRanking(@Param("bizType") String bizType,@Param("searchScope") String scope, @Param("searchScopeId") String scopeId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
index 0b64de14bc..94204eb3ed 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
@@ -148,5 +148,16 @@ public interface BizPointTotalDetailService extends BaseService<BizPointTotalDet
 	 * @author wxz
 	 * @date 2021.09.07 14:18:08
 	 */
-	PageData<GroupPointRankingResultDTO> listGroupPointRandingInGridScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize);
+	PageData<GroupPointRankingResultDTO> listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize);
+
+	/**
+	 * @description 【小组排名】- 列出我所在的小组的积分排名
+	 *
+	 * @param userId
+	 * @param gridId
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.08 13:34:49
+	 */
+	List<GroupPointRankingResultDTO> listMyGroupPointRanding(String userId, String gridId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
index 29723b68a2..037779147b 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
@@ -41,11 +41,13 @@ import com.epmet.dto.form.GroupPointFormDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.resi.group.dto.group.form.GroupFormDTO;
 import com.epmet.resi.group.dto.group.form.GroupPointDetailFormDTO;
+import com.epmet.resi.group.dto.group.form.GroupsByMemberFormDTO;
 import com.epmet.resi.group.dto.group.result.GroupDetailResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
 import com.epmet.dto.result.GroupPointRankingResultDTO;
 import com.epmet.entity.BizPointTotalDetailEntity;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
+import com.epmet.resi.group.dto.group.result.RankingResultDTO;
 import com.epmet.resi.group.enums.SearchScopeTypeEnum;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.BizPointTotalDetailService;
@@ -261,7 +263,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
     }
 
     @Override
-    public PageData<GroupPointRankingResultDTO> listGroupPointRandingInGridScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize) {
+    public PageData<GroupPointRankingResultDTO> listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize) {
 
         // 1.查询有积分的小组得分排名
         PageInfo<BizPointTotalDetailEntity> entityPageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> {
@@ -306,14 +308,21 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
             rankingInfoDTOs.addAll(gap);
         }
 
-        // 4.排名填充
+        // 4.排名填充。有积分的按照积分排序，分数一样的名次一样
         Integer ranking = page.getStartRow() + 1;
+        Integer prevPoint = null;
         for (GroupPointRankingResultDTO g : rankingInfoDTOs) {
+            Integer point = Integer.valueOf(g.getPoint());
+            if (prevPoint != null && prevPoint > point) {
+                // 此举是为了在积分一样的情况下，给与相同的排名
+                ranking ++;
+            }
+
             GridInfoCache gridInfo = getGridInfo(g.getGridId());
-            g.setRanking(String.valueOf(ranking));
             g.setGridId(g.getGridId());
             g.setGridNamePath(gridInfo.getGridNamePath());
-            ranking ++;
+            g.setRanking(String.valueOf(ranking));
+            prevPoint = point;
         }
         PageData<GroupPointRankingResultDTO> pageData = new PageData<>(rankingInfoDTOs, entityPageInfo.getTotal());
         return pageData;
@@ -422,4 +431,61 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
         ope.putAll(RedisKeys.getGridInfoKey(gridId), BeanUtil.beanToMap(cache));
         return cache;
     }
+
+    @Override
+    public List<GroupPointRankingResultDTO> listMyGroupPointRanding(String userId, String gridId) {
+        // 1.查询网格内我所在的小组
+        GroupsByMemberFormDTO form = new GroupsByMemberFormDTO();
+        form.setGridId(gridId);
+        form.setUserId(userId);
+        List<GroupDetailResultDTO> groupList = getResultDataOrThrowsException(resiGroupOpenFeignClient.listGroupsByMember(form),
+                ServiceConstant.RESI_GROUP_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【我所在的小组排名】查询组列表失败");
+
+        if (CollectionUtils.isEmpty(groupList)) {
+            return new ArrayList();
+        }
+
+        // 2.填充分数和排名
+        GroupDetailResultDTO firstGroup = groupList.get(0);
+
+        // 网格和客户下，分别有多少个有积分的小组，后面用于给哪些没有任何积分记录的小组排名
+        Integer gridMinRanking = baseDao.getMinRanking("group", "grid", gridId);
+        Integer customerMinRanking = baseDao.getMinRanking("group", "customer", firstGroup.getCustomerId());
+
+        List<GroupPointRankingResultDTO> groupDtoList = groupList.stream().map(g -> {
+            // 积分
+            Integer point = 0;
+            // 网格内的排名
+            Integer gridRanking = null;
+            // 客户下的排名
+            Integer customerRanking = null;
+
+            LambdaQueryWrapper<BizPointTotalDetailEntity> query = new LambdaQueryWrapper<>();
+            query.eq(BizPointTotalDetailEntity::getBizType, "group");
+            query.eq(BizPointTotalDetailEntity::getObjectId, g.getGroupId());
+            BizPointTotalDetailEntity groupPoint = baseDao.selectOne(query);
+            if (groupPoint == null) {
+                // 该小组没有积分
+                gridRanking = gridMinRanking + 1;
+                customerRanking = customerMinRanking + 1;
+            } else {
+                // 该小组有积分
+                point = groupPoint.getTotalPoint();
+                gridRanking = baseDao.getRanking("group", g.getGroupId(), "grid");
+                customerRanking = baseDao.getRanking("group", g.getGroupId(), "customer");
+            }
+
+            GroupPointRankingResultDTO dto = new GroupPointRankingResultDTO();
+            dto.setGridId(g.getGridId());
+            dto.setGroupHeadPhoto(g.getGroupHeadPhoto());
+            dto.setGroupType(g.getGroupType());
+            dto.setGroupId(g.getGroupId());
+            dto.setGroupName(g.getGroupName());
+            dto.setPoint(point.toString());
+            dto.setGridRanking(gridRanking);
+            dto.setCustomerRanking(customerRanking);
+            return dto;
+        }).collect(Collectors.toList());
+        return groupDtoList;
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/BizPointTotalDetailDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/BizPointTotalDetailDao.xml
index e1e8202e83..e65cfbabf5 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/BizPointTotalDetailDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/BizPointTotalDetailDao.xml
@@ -29,5 +29,51 @@
         and OBJECT_ID = #{objectId}
     </select>
 
+    <!--查询object在指定范围内的排名-->
+    <select id="getRanking" resultType="java.lang.Integer">
+        select count(distinct p_2.TOTAL_POINT) + 1 as ranking
+        from biz_point_total_detail point
+            inner join biz_point_total_detail p_2
+                on (point.BIZ_TYPE = p_2.BIZ_TYPE and p_2.DEL_FLAG = 0 and
+                point.TOTAL_POINT &lt; p_2.TOTAL_POINT
+                <if test="scope == 'grid'">
+                    and point.GRID_ID = p_2.GRID_ID
+                </if>
+                <if test="scope == 'customer'">
+                    and point.CUSTOMER_ID = p_2.CUSTOMER_ID
+                </if>
+                )
+        where
+            point.OBJECT_ID = #{groupId}
+            and point.BIZ_TYPE = #{bizType}
+            and point.DEL_FLAG = 0
+    </select>
+
+    <!--获取指定范围内最低排名。子查询是取最低分的那个对象出来-->
+    <select id="getMinRanking" resultType="java.lang.Integer">
+        select count(distinct p.TOTAL_POINT) + 1 as ranking
+        from biz_point_total_detail p
+                 inner join
+             (select point.OBJECT_ID, point.BIZ_TYPE, point.GRID_ID, point.CUSTOMER_ID, point.TOTAL_POINT
+              from biz_point_total_detail point
 
+              where point.BIZ_TYPE = #{bizType}
+                and point.DEL_FLAG = 0
+                <if test="searchScope == 'grid'">
+                    and point.GRID_ID = #{searchScopeId}
+                </if>
+                <if test="searchScope == 'customer'">
+                    and point.CUSTOMER_ID = #{searchScopeId}
+                </if>
+              order by point.TOTAL_POINT asc limit 1) t
+              on (p.BIZ_TYPE = t.BIZ_TYPE
+                  and p.TOTAL_POINT > t.TOTAL_POINT
+                  <if test="searchScope == 'grid'">
+                      and p.GRID_ID = t.GRID_ID
+                  </if>
+                    <if test="searchScope == 'customer'">
+                        and p.CUSTOMER_ID = t.CUSTOMER_ID
+                    </if>
+                  )
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupsByMemberFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupsByMemberFormDTO.java
new file mode 100644
index 0000000000..806b07629e
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupsByMemberFormDTO.java
@@ -0,0 +1,17 @@
+package com.epmet.resi.group.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description 根据成员查询组列表form
+ * @author wxz
+ * @date 2021.09.08 14:12:44
+*/
+@Data
+public class GroupsByMemberFormDTO {
+    private String gridId;
+    @NotNull(message = "成员用户ID不能为空")
+    private String userId;
+}
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 93247725a4..fd585419a2 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
@@ -21,5 +21,5 @@ public class GroupDetailResultDTO {
     private String remark;
     /** 群组类型:branch:支部小组，ordinary:楼院小组 */
     private String groupType;
-
+    private String customerId;
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RankingResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RankingResultDTO.java
new file mode 100644
index 0000000000..99357eb400
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RankingResultDTO.java
@@ -0,0 +1,11 @@
+package com.epmet.resi.group.dto.group.result;
+
+import lombok.Data;
+
+@Data
+public class RankingResultDTO {
+
+    private Integer gridRanking;
+    private Integer customerRanking;
+
+}
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 cf0844c02b..1762b35d97 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
@@ -311,4 +311,14 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping("/resi/group/group/list-groupinfos-exclude-groupids")
     Result<List<GroupDetailResultDTO>> listGroupDetailsExcludeGroupIds(@RequestBody GroupFormDTO form);
 
+    /**
+     * @description 根据组成员查询所在的小组列表。可选条件包括:grid
+     *
+     * @param formDTO
+     * @return
+     * @author wxz
+     * @date 2021.09.08 13:51:05
+     */
+    @PostMapping("/resi/group/group/list-groups-by-member")
+    Result<List<GroupDetailResultDTO>> listGroupsByMember(@RequestBody GroupsByMemberFormDTO formDTO);
 }
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 6b5584a51c..8c2f5303ee 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
@@ -230,4 +230,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result<List<GroupDetailResultDTO>> listGroupDetailsExcludeGroupIds(GroupFormDTO form) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listGroupDetailsExcludeGroupIds", form);
     }
+
+    @Override
+    public Result<List<GroupDetailResultDTO>> listGroupsByMember(GroupsByMemberFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listGroupsByMember", formDTO);
+    }
 }
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 5acbf76bb2..e90adf8c14 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
@@ -637,4 +637,21 @@ public class ResiGroupController {
         List<GroupDetailResultDTO> groups = resiGroupService.listGroupDetailsExcludeGroupIds(excludeGroupIds, startRow, rowCount, searchScopeType.getScopeType(), searchScopeObjectId, sort.getSortField(), order.getOrderType());
         return new Result<List<GroupDetailResultDTO>>().ok(groups);
     }
+
+    /**
+     * @description 根据组成员查询所在的小组列表。可选条件包括:grid
+     *
+     * @param formDTO
+     * @return
+     * @author wxz
+     * @date 2021.09.08 13:51:05
+     */
+    @PostMapping("list-groups-by-member")
+    public Result<List<GroupDetailResultDTO>> listGroupsByMember(@RequestBody GroupsByMemberFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        String gridId = formDTO.getGridId();
+        String userId = formDTO.getUserId();
+        List<GroupDetailResultDTO> groups = resiGroupService.listGroupsByMember(userId, gridId);
+        return new Result<List<GroupDetailResultDTO>>().ok(groups);
+    }
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
index 44f8312d9c..3a0b47c336 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
@@ -335,4 +335,15 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
 	 * @return java.util.List<com.epmet.resi.group.dto.member.result.GroupAchievementDTO>
 	 */
 	List<GroupAchievementDTO> selectRecentGroupAchievements(@Param("userId") String userId, @Param("gridId") String gridId);
+
+	/**
+	 * @description 根据组成员查询所在组列表。如有需要，可以增加其他if条件，或者增加排序参数
+	 *
+	 * @param memberUserId
+	 * @param gridId
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.08 14:00:52
+	 */
+	List<GroupDetailResultDTO> listGroupsByMember(@Param("memberUserId") String memberUserId, @Param("gridId") String gridId);
 }
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 eed7a355e6..122083cceb 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
@@ -461,4 +461,15 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @date 2021.09.07 17:17:09
 	 */
 	List<GroupDetailResultDTO> listGroupDetailsExcludeGroupIds(List<String> excludeGroupIds, Integer startRow, Integer rowCount, String searchScopeType,String searchScopeObjectId, String sortType, String orderType);
+
+	/**
+	 * @description 根据成员查询组列表
+	 *
+	 * @param memberUserId
+	 * @param gridId
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.08 13:59:31
+	 */
+	List<GroupDetailResultDTO> listGroupsByMember(String memberUserId, String gridId);
 }
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 68586a600a..1c85fb903a 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
@@ -40,6 +40,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
+import com.epmet.dto.BizPointTotalDetailDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
@@ -1833,4 +1834,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			return dto;
 		}).collect(Collectors.toList());
 	}
+
+	@Override
+	public List<GroupDetailResultDTO> listGroupsByMember(String memberUserId, String gridId) {
+		return baseDao.listGroupsByMember(memberUserId, gridId);
+	}
 }
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 82d1531781..4dc83a5c90 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
@@ -1059,4 +1059,22 @@
         ORDER BY releaseTime DESC
     </select>
 
+    <select id="listGroupsByMember" resultType="com.epmet.resi.group.dto.group.result.GroupDetailResultDTO">
+        select resi_group.ID as groupId,
+               resi_group.GRID_ID,
+               resi_group.GROUP_HEAD_PHOTO,
+               resi_group.GROUP_NAME,
+               resi_group.GROUP_INTRODUCTION,
+               resi_group.GROUP_TYPE,
+               resi_group.CUSTOMER_ID
+        from resi_group
+                 inner join resi_group_member
+                            on (resi_group.ID = resi_group_member.RESI_GROUP_ID and resi_group_member.DEL_FLAG = 0)
+        where resi_group_member.CUSTOMER_USER_ID = #{memberUserId}
+          and resi_group.DEL_FLAG = 0
+          <if test="gridId != null and gridId.trim() != ''">
+              and resi_group.GRID_ID=#{gridId}
+          </if>
+        order by resi_group.CREATED_TIME desc
+    </select>
 </mapper>

From 04bdc9b6589b6a1137117724ca22c865bd3ed77e Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Sep 2021 10:41:22 +0800
Subject: [PATCH 036/134] =?UTF-8?q?=E6=8C=87=E5=8D=97=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E5=92=8C=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/GuideListFormDTO.java  |  1 +
 .../controller/GuideCollectionController.java | 18 ++++++++++
 .../com/epmet/controller/GuideController.java |  8 +++++
 .../src/main/java/com/epmet/dao/GuideDao.java | 11 ++++++
 .../epmet/service/GuideCollectionService.java | 12 +++++++
 .../java/com/epmet/service/GuideService.java  | 11 ++++++
 .../impl/GuideCollectionServiceImpl.java      | 35 +++++++++++++++++++
 .../epmet/service/impl/GuideServiceImpl.java  | 27 ++++++++++++++
 .../src/main/resources/mapper/GuideDao.xml    | 18 +++++++++-
 9 files changed, 140 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java
index d4ff3bdfcb..2e36d7c517 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java
@@ -16,6 +16,7 @@ import java.io.Serializable;
 public class GuideListFormDTO extends PageFormDTO implements Serializable {
 
     private static final long serialVersionUID = -4471422632936288213L;
+    private String customerId;
     /**
      * 组织ID
      */
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCollectionController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCollectionController.java
index 08f94a4126..5c6ffe5019 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCollectionController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCollectionController.java
@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -25,6 +27,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.GuideCollectionDTO;
+import com.epmet.dto.form.GuideFormDTO;
 import com.epmet.service.GuideCollectionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -81,4 +84,19 @@ public class GuideCollectionController {
         return new Result();
     }
 
+    /**
+     * @Description 收藏指南
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2021/9/9 9:46
+     */
+    @PostMapping("collection")
+    public Result collection(@LoginUser TokenDto tokenDto, @RequestBody GuideFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        guideCollectionService.collection(tokenDto, formDTO);
+        return new Result();
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java
index 602916807e..c9b9ccfead 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java
@@ -169,4 +169,12 @@ public class GuideController {
     }
 
 
+    @PostMapping("collectionlist")
+    public Result<PageData<GuideListResultDTO>> collectionList(@LoginUser TokenDto tokenDto, @RequestBody PageFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        PageData<GuideListResultDTO> page = guideService.collectionList(tokenDto, formDTO);
+        return new Result<PageData<GuideListResultDTO>>().ok(page);
+    }
+
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java
index ec78fb5803..77d3f6e805 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.form.GuideListFormDTO;
 import com.epmet.dto.result.GuideDetailResultDTO;
 import com.epmet.dto.result.GuideListResultDTO;
@@ -56,4 +57,14 @@ public interface GuideDao extends BaseDao<GuideEntity> {
      */
     GuideDetailResultDTO getGuideDetail(@Param("guideId") String guideId);
 
+    /**
+     * 收藏列表
+     *
+     * @Param tokenDto
+     * @Return {@link List< GuideListResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/9 10:09
+     */
+    List<GuideListResultDTO> getCollectionList(TokenDto tokenDto);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java
index 6e8266c556..a4acb0b6e4 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java
@@ -19,7 +19,9 @@ 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.dto.GuideCollectionDTO;
+import com.epmet.dto.form.GuideFormDTO;
 import com.epmet.entity.GuideCollectionEntity;
 
 import java.util.List;
@@ -92,4 +94,14 @@ public interface GuideCollectionService extends BaseService<GuideCollectionEntit
      * @date 2021-09-06
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 收藏指南
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/9 9:46
+     */
+    void collection(TokenDto tokenDto, GuideFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java
index 2ae50707ec..8538186413 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java
@@ -18,6 +18,7 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+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.dto.GuideDTO;
@@ -150,4 +151,14 @@ public interface GuideService extends BaseService<GuideEntity> {
      * @Date 2021/9/7 14:12
      */
     GuideDetailResultDTO guideDetail(GuideFormDTO formDTO);
+
+    /**
+     * @Description 收藏列表
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link PageData< GuideListResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/9 10:07
+     */
+    PageData<GuideListResultDTO> collectionList(TokenDto tokenDto, PageFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java
index a73d8228ee..382a9db1ce 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java
@@ -17,14 +17,17 @@
 
 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.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.GuideCollectionDao;
 import com.epmet.dto.GuideCollectionDTO;
+import com.epmet.dto.form.GuideFormDTO;
 import com.epmet.entity.GuideCollectionEntity;
 import com.epmet.service.GuideCollectionService;
 import org.apache.commons.lang3.StringUtils;
@@ -97,4 +100,36 @@ public class GuideCollectionServiceImpl extends BaseServiceImpl<GuideCollectionD
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param tokenDto
+     * @param formDTO
+     * @Description 收藏指南
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/9 9:46
+     */
+    @Override
+    public void collection(TokenDto tokenDto, GuideFormDTO formDTO) {
+        //获取指南收藏信息
+        LambdaQueryWrapper<GuideCollectionEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GuideCollectionEntity::getGuideId, formDTO.getGuideId());
+        wrapper.eq(GuideCollectionEntity::getUserId, tokenDto.getUserId());
+        wrapper.eq(GuideCollectionEntity::getApp, tokenDto.getApp());
+        wrapper.eq(GuideCollectionEntity::getCustomerId, tokenDto.getCustomerId());
+        GuideCollectionEntity entity = baseDao.selectOne(wrapper);
+        //如果没有收藏记录，则添加收藏，有就删除收藏
+        if (null == entity) {
+            entity = new GuideCollectionEntity();
+            entity.setCustomerId(tokenDto.getCustomerId());
+            entity.setUserId(tokenDto.getUserId());
+            entity.setGuideId(formDTO.getGuideId());
+            entity.setApp(tokenDto.getApp());
+            insert(entity);
+        } else {
+            deleteById(entity.getId());
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
index ac643590eb..abd1116256 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
@@ -21,6 +21,7 @@ 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.form.PageFormDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
@@ -142,6 +143,7 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
     @Override
     public PageData<GuideListResultDTO> guideList(TokenDto tokenDto, GuideListFormDTO formDTO) {
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         List<GuideListResultDTO> list = baseDao.getGuideList(formDTO);
         list.forEach(item -> {
             CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), item.getCreatedId());
@@ -382,4 +384,29 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
         return result;
     }
 
+    /**
+     * @param tokenDto
+     * @Description 收藏列表
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link PageData< GuideListResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/9 10:03
+     */
+    @Override
+    public PageData<GuideListResultDTO> collectionList(TokenDto tokenDto, PageFormDTO formDTO) {
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+        List<GuideListResultDTO> list = baseDao.getCollectionList(tokenDto);
+        list.forEach(item -> {
+            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), item.getCreatedId());
+            if (null == staffInfoCache) {
+                item.setCategoryName("");
+            } else {
+                item.setCreatedName(staffInfoCache.getRealName());
+            }
+        });
+        PageInfo<GuideListResultDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
index 82a784dbe9..c557360208 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
@@ -29,8 +29,9 @@
             g.UPDATED_TIME AS updatedTime,
         FROM
             guide g
-        INNER JOIN guide_category gc ON g.CATEGORY_ID = gc.ID
+        INNER JOIN guide_category gc ON g.CATEGORY_ID = gc.ID AND gc.DEL_FLAG = 0 AND gc.CUSTOMER_ID = #{customerId}
         WHERE g.DEL_FLAG = 0
+        AND g.CUSTOMER_ID = #{customerId}
         <if test='null != agencyId and "" != agencyId'>
             AND g.PIDS LIKE CONCAT( '%', #{agencyId}, '%' )
         </if>
@@ -56,6 +57,21 @@
         WHERE
             g.ID = #{guideId}
     </select>
+    <select id="getCollectionList" resultType="com.epmet.dto.result.GuideListResultDTO">
+        SELECT
+            g.ID AS "guideId",
+            g.TITLE AS "title",
+            gc.CATEGORY_NAME AS categoryName,
+            g.CREATED_BY AS createdId,
+            g.UPDATED_TIME AS updatedTime,
+        FROM
+            guide g
+        INNER JOIN guide_category gc ON g.CATEGORY_ID = gc.ID AND gc.DEL_FLAG = 0 AND gc.CUSTOMER_ID = #{customerId}
+        INNER JOIN guide_collection gco ON g.ID = gco.GUIDE_ID AND gco.USER_ID = #{userId} AND gco.APP = #{app} AND gco.DEL_FLAG = 0
+        WHERE g.DEL_FLAG = 0
+        AND g.CUSTOMER_ID = #{customerId}
+        ORDER BY gco.CREATED_TIME DESC
+    </select>
 
 
 </mapper>
\ No newline at end of file

From 1ecef89fb099815de465ca59b2563e7ae046e2a2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Sep 2021 10:46:30 +0800
Subject: [PATCH 037/134] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=86=E5=B8=83=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScreenProjectDistributionFormDTO.java     |  1 +
 .../ScreenProjectDistributionResultDTO.java   |  6 ++++
 .../mapper/screen/ScreenProjectDataDao.xml    | 32 +++++++++----------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java
index b6eeff0053..d189574ef3 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java
@@ -21,6 +21,7 @@ public class ScreenProjectDistributionFormDTO implements Serializable {
 
     /**
      * 如果为空返回全部；可选值：1:红色事件；2：黄色事件；3：绿色事件
+     * all:全部
      */
     @NotBlank(message = "level不能为空")
     private String level;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java
index ec2c9e5219..a45acf622c 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java
@@ -37,4 +37,10 @@ public class ScreenProjectDistributionResultDTO implements Serializable {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date projectCreateTime;
+
+
+    /**
+     * 分类名称 add 21.09.9
+     */
+    private String categoryName;
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
index 543b9d3eb4..a4a6582cf2 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
@@ -12,7 +12,8 @@
             longitude AS longitude,
             latitude AS latitude,
             PROJECT_CREATE_TIME AS projectCreateTime,
-            CUSTOMER_ID AS customerId
+            CUSTOMER_ID AS customerId,
+            ALL_CATEGORY_NAME as categoryName
         FROM
             screen_project_data
         WHERE
@@ -30,26 +31,23 @@
             <if test="ids == null and agencyId != null">
                 and org_id = #{agencyId}
             </if>
-
-            <choose>
-                <when test='level != null and "1" == level'>
-                    and PROJECT_STATUS_CODE ='pending'
-                </when>
-                <when test='level != null and "2" == level'>
-                    and PROJECT_STATUS_CODE ='pending'
-                </when>
-                <when test='level != null and "3" == level'>
-                    and PROJECT_STATUS_CODE !='pending'
-                    and DATE_SUB(CURDATE(), INTERVAL 30 DAY) &lt;= date(PROJECT_CREATE_TIME)
-                </when>
-                <otherwise>
-                    and PROJECT_STATUS_CODE ='pending'
-                </otherwise>
-            </choose>
+            <if test='level != null and "1" == level'>
+                and PROJECT_STATUS_CODE ='pending'
+            </if>
+            <if test='level != null and "2" == level'>
+                and PROJECT_STATUS_CODE ='pending'
+            </if>
+            <if test='level != null and "3" == level'>
+                and PROJECT_STATUS_CODE !='pending'
+                and DATE_SUB(CURDATE(), INTERVAL 30 DAY) &lt;= date(PROJECT_CREATE_TIME)
+            </if>
         order by PROJECT_CREATE_TIME desc
         <if test='level != null and "3" == level'>
             LIMIT #{pageSize}
         </if>
+        <if test='level != null and "all" == level'>
+            LIMIT #{pageSize}
+        </if>
     </select>
     <select id="selectIdsByAreaCode" resultType="java.lang.String">
         select agency_id as id from screen_customer_agency where del_flag = '0' and area_code like concat(#{areaCode},'%')

From 02af83b58b2b51513373a4568a3ed5538c375670 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Sep 2021 10:47:47 +0800
Subject: [PATCH 038/134] =?UTF-8?q?=E6=8C=87=E5=8D=97=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/GuideDetailResultDTO.java    | 2 +-
 .../gov-voice-server/src/main/resources/mapper/GuideDao.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDetailResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDetailResultDTO.java
index 2987b227a0..88844f301c 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDetailResultDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDetailResultDTO.java
@@ -30,7 +30,7 @@ public class GuideDetailResultDTO implements Serializable {
     /**
      * 分类ID
      */
-    private String categoryId;
+    private String categoryCode;
     /**
      * 分类名
      */
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
index c557360208..6c1afa1cf6 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
@@ -49,7 +49,7 @@
             ORG_ID,
             ORG_NAME,
             TITLE,
-            CATEGORY_CODE
+            CATEGORY_CODE,
             CATEGORY_NAME
         FROM
             guide g

From 40ad19b6f3d1b231e4b2bce0f8fc94123826ebc5 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Sep 2021 11:08:53 +0800
Subject: [PATCH 039/134] =?UTF-8?q?=E6=8C=87=E5=8D=97=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/GuideServiceImpl.java  | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
index abd1116256..0d06633106 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
@@ -145,14 +145,16 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         formDTO.setCustomerId(tokenDto.getCustomerId());
         List<GuideListResultDTO> list = baseDao.getGuideList(formDTO);
-        list.forEach(item -> {
-            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), item.getCreatedId());
-            if (null == staffInfoCache) {
-                item.setCategoryName("");
-            } else {
-                item.setCreatedName(staffInfoCache.getRealName());
-            }
-        });
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.forEach(item -> {
+                CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), item.getCreatedId());
+                if (null == staffInfoCache) {
+                    item.setCategoryName("");
+                } else {
+                    item.setCreatedName(staffInfoCache.getRealName());
+                }
+            });
+        }
         PageInfo<GuideListResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }
@@ -397,14 +399,16 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
     public PageData<GuideListResultDTO> collectionList(TokenDto tokenDto, PageFormDTO formDTO) {
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         List<GuideListResultDTO> list = baseDao.getCollectionList(tokenDto);
-        list.forEach(item -> {
-            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), item.getCreatedId());
-            if (null == staffInfoCache) {
-                item.setCategoryName("");
-            } else {
-                item.setCreatedName(staffInfoCache.getRealName());
-            }
-        });
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.forEach(item -> {
+                CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), item.getCreatedId());
+                if (null == staffInfoCache) {
+                    item.setCategoryName("");
+                } else {
+                    item.setCreatedName(staffInfoCache.getRealName());
+                }
+            });
+        }
         PageInfo<GuideListResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }

From a36d41696e916f425f2cfdb7c6f2ac3ebe2a473f Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Sep 2021 11:55:20 +0800
Subject: [PATCH 040/134] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=B8=8B=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerAgencyDao.xml             | 2 +-
 1 file changed, 1 insertion(+), 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 2799ea36a0..481d222f04 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
@@ -526,7 +526,7 @@
         AND PID= #{pid}
         ORDER BY ID
     </select>
-    <select id="getAllAgency" resultType="com.epmet.dto.result.AgencyTreeResultDTO">
+    <select id="getAllAgency" resultMap="NodeTreeResult">
         select
             ID AS agencyId,
             ORGANIZATION_NAME AS agencyName,

From 7c465452e377eba37970d87b2caa72d49f1a5c4a Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Sep 2021 12:01:41 +0800
Subject: [PATCH 041/134] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=B8=8B=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerAgencyDao.xml             | 2 +-
 1 file changed, 1 insertion(+), 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 481d222f04..89a5df87f4 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
@@ -510,7 +510,7 @@
     </resultMap>
     <resultMap id="NodeTreeResult" type="com.epmet.dto.result.AgencyTreeResultDTO"
                extends="BaseResultMap">
-        <collection property="subAgencyList" column="PID" ofType="com.epmet.dto.result.AgencyTreeResultDTO"
+        <collection property="subAgencyList" column="agencyId" ofType="com.epmet.dto.result.AgencyTreeResultDTO"
                     javaType="java.util.ArrayList" select="getSubAgencyList">
         </collection>
     </resultMap>

From 325a834d2a50c5573dc200df84d2888f20301422 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Sep 2021 12:35:30 +0800
Subject: [PATCH 042/134] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=86=E5=B8=83=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=20bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/screen/ScreenProjectDataDao.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
index a4a6582cf2..e890e36389 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
@@ -19,7 +19,7 @@
         WHERE
             del_flag = '0'
             AND UNIX_TIMESTAMP(CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL 1 MONTH))
-            <if test="level != null and level.trim()!=''">
+            <if test="level != null and level.trim()!='' and level !='all'">
                 and project_level = #{level}
             </if>
             <if test="ids != null">

From 9ecc4f4e1865ba6867448c5a676465772d13b8c3 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Sep 2021 13:56:04 +0800
Subject: [PATCH 043/134] =?UTF-8?q?=E6=8C=87=E5=8D=97=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=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/GuideDao.xml               | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
index 6c1afa1cf6..037eabb07f 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
@@ -24,12 +24,12 @@
         SELECT
             g.ID AS "guideId",
             g.TITLE AS "title",
-            gc.CATEGORY_NAME AS categoryName,
-            g.CREATED_BY AS createdId,
-            g.UPDATED_TIME AS updatedTime,
+            gc.CATEGORY_NAME AS "categoryName",
+            g.CREATED_BY AS "createdId",
+            g.UPDATED_TIME AS "updatedTime"
         FROM
             guide g
-        INNER JOIN guide_category gc ON g.CATEGORY_ID = gc.ID AND gc.DEL_FLAG = 0 AND gc.CUSTOMER_ID = #{customerId}
+        INNER JOIN guide_category gc ON g.CATEGORY_CODE = gc.CATEGORY_CODE AND gc.DEL_FLAG = 0 AND gc.CUSTOMER_ID = #{customerId}
         WHERE g.DEL_FLAG = 0
         AND g.CUSTOMER_ID = #{customerId}
         <if test='null != agencyId and "" != agencyId'>
@@ -41,6 +41,7 @@
         <if test='null != categoryId and "" != categoryId'>
             AND g.CATEGORY_ID = #{categoryId}
         </if>
+        ORDER BY g.CREATED_TIME DESC
     </select>
     <select id="getGuideDetail" resultType="com.epmet.dto.result.GuideDetailResultDTO">
         SELECT

From e039818a42388e6a5242310bd43f20a97c762c5a Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Sep 2021 14:02:40 +0800
Subject: [PATCH 044/134] =?UTF-8?q?=E6=8C=87=E5=8D=97=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/GuideListFormDTO.java   |  2 +-
 .../src/main/resources/mapper/GuideDao.xml     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java
index 2e36d7c517..d8edcf1308 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java
@@ -24,7 +24,7 @@ public class GuideListFormDTO extends PageFormDTO implements Serializable {
     /**
      * 分类
      */
-    private String categoryId;
+    private String categoryCode;
     /**
      * 标题
      */
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
index 037eabb07f..f86c8e0882 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
@@ -38,20 +38,20 @@
         <if test='null != guideTitle and "" != guideTitle'>
             AND g.TITLE LIKE CONCAT( '%', #{guideTitle}, '%' )
         </if>
-        <if test='null != categoryId and "" != categoryId'>
-            AND g.CATEGORY_ID = #{categoryId}
+        <if test='null != categoryCode and "" != categoryCode'>
+            AND g.CATEGORY_CODE = #{categoryCode}
         </if>
         ORDER BY g.CREATED_TIME DESC
     </select>
     <select id="getGuideDetail" resultType="com.epmet.dto.result.GuideDetailResultDTO">
         SELECT
             g.ID AS "guideId",
-            ORG_TYPE,
-            ORG_ID,
-            ORG_NAME,
-            TITLE,
-            CATEGORY_CODE,
-            CATEGORY_NAME
+            g.ORG_TYPE,
+            g.ORG_ID,
+            g.ORG_NAME,
+            g.TITLE,
+            g.CATEGORY_CODE,
+            gc.CATEGORY_NAME
         FROM
             guide g
         INNER JOIN guide_category gc ON g.CATEGORY_CODE = gc.CATEGORY_CODE
@@ -67,7 +67,7 @@
             g.UPDATED_TIME AS updatedTime,
         FROM
             guide g
-        INNER JOIN guide_category gc ON g.CATEGORY_ID = gc.ID AND gc.DEL_FLAG = 0 AND gc.CUSTOMER_ID = #{customerId}
+        INNER JOIN guide_category gc ON g.CATEGORY_CODE = gc.CATEGORY_CODE AND gc.DEL_FLAG = 0 AND gc.CUSTOMER_ID = #{customerId}
         INNER JOIN guide_collection gco ON g.ID = gco.GUIDE_ID AND gco.USER_ID = #{userId} AND gco.APP = #{app} AND gco.DEL_FLAG = 0
         WHERE g.DEL_FLAG = 0
         AND g.CUSTOMER_ID = #{customerId}

From c58018ee16afee707d0a2b71cc2a769331832099 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Sep 2021 14:54:11 +0800
Subject: [PATCH 045/134] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8A=9E=E4=BA=8B?=
 =?UTF-8?q?=E6=8C=87=E5=8D=97=E5=86=85=E5=AE=B9=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GuideModuleController.java     |  9 +++++++++
 .../com/epmet/service/GuideModuleService.java |  9 +++++++++
 .../service/impl/GuideModuleServiceImpl.java  | 19 +++++++++++++++++--
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleController.java
index c1823c7684..78735bb601 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleController.java
@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -25,10 +27,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.GuideModuleDTO;
+import com.epmet.dto.ModuleDTO;
 import com.epmet.service.GuideModuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -81,4 +85,9 @@ public class GuideModuleController {
         return new Result();
     }
 
+    @PostMapping()
+    public Result<List<ModuleDTO>> getModuleList(@LoginUser TokenDto tokenDto) {
+        return new Result<List<ModuleDTO>>().ok(guideModuleService.getModuleList(tokenDto.getCustomerId()));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleService.java
index 52837fd28b..dc7857f8f9 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideModuleService.java
@@ -112,4 +112,13 @@ public interface GuideModuleService extends BaseService<GuideModuleEntity> {
      * @Date 2021/9/8 10:13
      */
     List<ModuleDTO> getByGuideId(String customerId, String guideId);
+
+    /**
+     * @Description 获取模块列表
+     * @Param customerId
+     * @Return {@link List< ModuleDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/9 14:46
+     */
+    List<ModuleDTO> getModuleList(String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleServiceImpl.java
index 8a0ef25a72..0ccf158036 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleServiceImpl.java
@@ -28,14 +28,14 @@ import com.epmet.dao.GuideModuleDao;
 import com.epmet.dto.GuideModuleDTO;
 import com.epmet.dto.ModuleDTO;
 import com.epmet.entity.GuideModuleEntity;
+import com.epmet.service.GuideModuleDictService;
 import com.epmet.service.GuideModuleService;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -48,6 +48,8 @@ import java.util.Map;
 @Service
 public class GuideModuleServiceImpl extends BaseServiceImpl<GuideModuleDao, GuideModuleEntity> implements GuideModuleService {
 
+    @Resource
+    private GuideModuleDictService guideModuleDictService;
 
     @Override
     public PageData<GuideModuleDTO> page(Map<String, Object> params) {
@@ -129,4 +131,17 @@ public class GuideModuleServiceImpl extends BaseServiceImpl<GuideModuleDao, Guid
         return baseDao.selectByGuideId(customerId, guideId);
     }
 
+    /**
+     * @param customerId
+     * @Description 获取模块列表
+     * @Param customerId
+     * @Return {@link List< ModuleDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/9 14:46
+     */
+    @Override
+    public List<ModuleDTO> getModuleList(String customerId) {
+        return guideModuleDictService.getModuleList(customerId);
+    }
+
 }
\ No newline at end of file

From 4147a7291ecd0470a0a556b4f5ac941cbcda970f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Sep 2021 14:54:38 +0800
Subject: [PATCH 046/134] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=EF=BC=9A=E5=A4=A7=E5=B1=8F=E6=96=B0=E5=A2=9E=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=97=E8=A1=A8=EF=BC=9A=E9=A6=96=E6=AC=A1?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B9=B3=E9=98=B4=E6=95=B4=E4=B8=AA=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E4=B8=8B=EF=BC=8C=E8=BF=9130=E5=A4=A9=E5=86=85?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=EF=BC=8C=E5=B1=95=E7=A4=BA=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=90=8D=E7=A7=B0=EF=BC=88=E5=89=8D=E7=AB=AF=E6=88=AA?=
 =?UTF-8?q?=E5=8F=96=E7=AC=AC=E4=B8=80=E4=B8=AA-=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E5=AD=97=EF=BC=89=E3=80=81=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E3=80=81=E9=A1=B9=E7=9B=AE=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E3=80=82=E7=82=B9=E5=87=BB8=E4=B8=AA=E8=A1=97=E9=81=93?=
 =?UTF-8?q?=EF=BC=8C=E8=81=94=E5=8A=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/screen/impl/ScreenProjectServiceImpl.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
index c740aa4c5e..3d673b31c4 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
@@ -85,6 +85,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
     /**
      * @Description 中央区事件分析-项目分布
      * 【2021-06-03 修改查询红黄绿事件事件范围为一个月】
+     * 【2021-09-09】大屏新增普通事件列表：首次查询平阴整个客户下，近30天内的项目，展示分类名称（前端截取第一个-之前的文字）、颜色等级、项目标题。点击8个街道，联动。
      * @param formDTO
      * @return com.epmet.commons.tools.utils.Result
      * @Author liushaowen

From 06c6a152d7091e1c972dba2ee7d03052fe948fd5 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Sep 2021 15:04:33 +0800
Subject: [PATCH 047/134] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8A=9E=E4=BA=8B?=
 =?UTF-8?q?=E6=8C=87=E5=8D=97=E5=86=85=E5=AE=B9=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/GuideModuleController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleController.java
index 78735bb601..dcaad21808 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideModuleController.java
@@ -85,7 +85,7 @@ public class GuideModuleController {
         return new Result();
     }
 
-    @PostMapping()
+    @PostMapping("list")
     public Result<List<ModuleDTO>> getModuleList(@LoginUser TokenDto tokenDto) {
         return new Result<List<ModuleDTO>>().ok(guideModuleService.getModuleList(tokenDto.getCustomerId()));
     }

From 2eebe89a5d75d3884c52b0e72a3205e3c14cbc6a Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 9 Sep 2021 15:12:50 +0800
Subject: [PATCH 048/134] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E3=80=90?=
 =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=8E=92=E5=90=8D=E3=80=91=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89PageData=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/GroupPointController.java   | 12 ++++++------
 .../epmet/service/BizPointTotalDetailService.java    |  2 +-
 .../service/impl/BizPointTotalDetailServiceImpl.java |  5 ++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
index d2901df068..82c21cefcc 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
@@ -127,14 +127,14 @@ public class GroupPointController {
 	 * @date 2021.09.07 13:35:45
 	 */
 	@PostMapping("grouppointranking/gridscope")
-	public Result<PageData<GroupPointRankingResultDTO>> listGroupPointRandingInGridScope(@RequestBody GroupPointFormDTO formDTO) {
+	public Result<List<GroupPointRankingResultDTO>> listGroupPointRandingInGridScope(@RequestBody GroupPointFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.GridScopeRank.class);
 		String gridId = formDTO.getGridId();
 		Integer pageNo = formDTO.getPageNo();
 		Integer pageSize = formDTO.getPageSize();
 
-		PageData<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.GRID, gridId,pageNo, pageSize);
-		return new Result<PageData<GroupPointRankingResultDTO>>().ok(page);
+		List<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.GRID, gridId,pageNo, pageSize);
+		return new Result<List<GroupPointRankingResultDTO>>().ok(page);
 	}
 
 	/**
@@ -146,14 +146,14 @@ public class GroupPointController {
 	 * @date 2021.09.08 09:18:37
 	 */
 	@PostMapping("grouppointranking/customerscope")
-	public Result<PageData<GroupPointRankingResultDTO>> listGroupPointRandingInCustomerScope(@RequestBody GroupPointFormDTO formDTO) {
+	public Result<List<GroupPointRankingResultDTO>> listGroupPointRandingInCustomerScope(@RequestBody GroupPointFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.CustomerScopeRank.class);
 		String customerId = formDTO.getCustomerId();
 		Integer pageNo = formDTO.getPageNo();
 		Integer pageSize = formDTO.getPageSize();
 
-		PageData<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.CUSTOMER, customerId, pageNo, pageSize);
-		return new Result<PageData<GroupPointRankingResultDTO>>().ok(page);
+		List<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.CUSTOMER, customerId, pageNo, pageSize);
+		return new Result<List<GroupPointRankingResultDTO>>().ok(page);
 	}
 
 	/**
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
index 94204eb3ed..b15043255a 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
@@ -148,7 +148,7 @@ public interface BizPointTotalDetailService extends BaseService<BizPointTotalDet
 	 * @author wxz
 	 * @date 2021.09.07 14:18:08
 	 */
-	PageData<GroupPointRankingResultDTO> listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize);
+	List<GroupPointRankingResultDTO> listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize);
 
 	/**
 	 * @description 【小组排名】- 列出我所在的小组的积分排名
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
index 037779147b..49732c9d88 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
@@ -263,7 +263,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
     }
 
     @Override
-    public PageData<GroupPointRankingResultDTO> listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize) {
+    public List<GroupPointRankingResultDTO> listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize) {
 
         // 1.查询有积分的小组得分排名
         PageInfo<BizPointTotalDetailEntity> entityPageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> {
@@ -324,8 +324,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
             g.setRanking(String.valueOf(ranking));
             prevPoint = point;
         }
-        PageData<GroupPointRankingResultDTO> pageData = new PageData<>(rankingInfoDTOs, entityPageInfo.getTotal());
-        return pageData;
+        return rankingInfoDTOs;
     }
 
     /**

From 6068aa02799659b34cb4e426a4571394c02b626d Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 9 Sep 2021 16:00:39 +0800
Subject: [PATCH 049/134] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E5=B0=8F=E7=BB=84=E6=8E=92=E5=90=8D=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=8E=BB=E6=8E=89userId=E4=BC=A0=E5=85=A5?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E7=94=A8token=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/GroupPointFormDTO.java   | 2 --
 .../main/java/com/epmet/controller/GroupPointController.java  | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
index 641d5fbe9f..56825c39ca 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
@@ -27,8 +27,6 @@ public class GroupPointFormDTO implements Serializable {
 	private String gridId;
 	@NotBlank(message = "客户Id不能为空", groups = {CustomerScopeRank.class})
 	private String customerId;
-	@NotBlank(message = "用户ID不能为空", groups = {MyGroupRank.class})
-	private String userId;
 
 	/** 页码 */
 	private Integer pageNo = 1;
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
index 82c21cefcc..91526bcc16 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
@@ -165,9 +165,9 @@ public class GroupPointController {
 	 * @date 2021.09.08 13:31:09
 	 */
 	@PostMapping("grouppointranking/mygroups")
-	public Result<List<GroupPointRankingResultDTO>> listMyGroupPointRanding(@RequestBody GroupPointFormDTO formDTO) {
+	public Result<List<GroupPointRankingResultDTO>> listMyGroupPointRanding(@LoginUser TokenDto loginInfo, @RequestBody GroupPointFormDTO formDTO) {
+		String userId = loginInfo.getUserId();
 		ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.MyGroupRank.class);
-		String userId = formDTO.getUserId();
 		String gridId = formDTO.getGridId();
 		List<GroupPointRankingResultDTO> list = bizPointTotalDetailService.listMyGroupPointRanding(userId, gridId);
 		return new Result<List<GroupPointRankingResultDTO>>().ok(list);

From f170d48f49813480c95c1f48777cf9d6c117891c Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Sep 2021 16:19:32 +0800
Subject: [PATCH 050/134] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=A2=9E=E5=8A=A0agencyID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java   | 1 +
 1 file changed, 1 insertion(+)

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 92a02290bd..649ab17806 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
@@ -598,6 +598,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             log.error("getStaffInfo have any agency staffId:{}",staffId);
             return null;
         }
+        result.setAgencyId(agencyDTO.getId());
         result.setAgencyName(agencyDTO.getOrganizationName());
         StaffOrgRelationResultDTO fromOrgTypeDto = govOrgService.getStaffFromOrgType(staffId);
         String fromOrgType = OrgTypeEnum.AGENCY.getCode();

From 58ac365d5f935678289aec02e00c5208c7caf614 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Sep 2021 16:42:34 +0800
Subject: [PATCH 051/134] =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E6=8C=87=E5=8D=97?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=A1=A8=E6=B7=BB=E5=8A=A0=EF=BC=8C=20?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=88=86=E7=B1=BBsql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migration/V0.0.7__create_guide_table.sql  | 139 ++++++++++++++++++
 .../V0.0.8__insert_default_guidecategory.sql  |  12 ++
 2 files changed, 151 insertions(+)
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.7__create_guide_table.sql
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.8__insert_default_guidecategory.sql

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.7__create_guide_table.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.7__create_guide_table.sql
new file mode 100644
index 0000000000..af177ee0d7
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.7__create_guide_table.sql
@@ -0,0 +1,139 @@
+CREATE TABLE `guide` (
+                         `ID` varchar(64) NOT NULL COMMENT 'ID 唯一标识',
+                         `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+                         `ORG_TYPE` varchar(255) DEFAULT NULL COMMENT '机关agency 网格grid 部门dept',
+                         `ORG_ID` varchar(64) NOT NULL COMMENT '发布单位ID',
+                         `ORG_NAME` varchar(128) DEFAULT NULL COMMENT '发布单位名',
+                         `PID` varchar(64) NOT NULL COMMENT '所属组织机构ID（customer_agency.id）',
+                         `PIDS` varchar(1024) NOT NULL COMMENT '所有上级组织ID,英文:隔开',
+                         `TITLE` varchar(128) NOT NULL COMMENT '标题',
+                         `CATEGORY_CODE` varchar(32) NOT NULL COMMENT '分类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=COMPACT COMMENT='办事指南表 ';
+
+
+CREATE TABLE `guide_attachment` (
+                                    `ID` varchar(64) NOT NULL COMMENT '唯一标识',
+                                    `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+                                    `GUIDE_ID` varchar(64) NOT NULL COMMENT '办事指南ID',
+                                    `ATTACHMENT_NAME` varchar(128) DEFAULT NULL COMMENT '附件名',
+                                    `ATTACHMENT_SIZE` int(11) DEFAULT NULL COMMENT '文件大小 单位byte',
+                                    `ATTACHMENT_FORMAT` varchar(32) DEFAULT NULL COMMENT '文件格式 word、excel、pdf',
+                                    `ATTACHMENT_TYPE` varchar(32) DEFAULT NULL COMMENT '类型 ',
+                                    `ATTACHMENT_URL` varchar(256) DEFAULT NULL COMMENT '附件地址',
+                                    `DURATION` int(11) DEFAULT NULL COMMENT '语音或视频时长，秒',
+                                    `SORT` int(11) NOT NULL COMMENT '排序',
+                                    `DEL_FLAG` int(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=DYNAMIC COMMENT='办事指南附件';
+
+
+CREATE TABLE `guide_category` (
+                                  `ID` varchar(64) NOT NULL COMMENT '主键',
+                                  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id，产品默认配置此列存储default',
+                                  `CATEGORY_NAME` varchar(64) NOT NULL COMMENT '分类名,客户内唯一',
+                                  `CATEGORY_CODE` varchar(64) NOT NULL COMMENT '分类编码：分类名的全拼; eg：gongjijin',
+                                  `SORT` int(11) NOT NULL COMMENT '排序',
+                                  `STATUS` varchar(10) NOT NULL COMMENT '状态 禁用disable 启用enable',
+                                  `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+                                  `REVISION` int(11) NOT NULL DEFAULT '0' 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`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='指南分类';
+
+
+CREATE TABLE `guide_collection` (
+                                    `ID` varchar(64) NOT NULL COMMENT '主键',
+                                    `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+                                    `GUIDE_ID` varchar(64) NOT NULL COMMENT '指南ID',
+                                    `USER_ID` varchar(64) NOT NULL COMMENT '用户ID',
+                                    `APP` varchar(64) NOT NULL COMMENT '用户所属客户端 居民端resi 工作端gov',
+                                    `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+                                    `REVISION` int(11) NOT NULL DEFAULT '0' 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`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='指南收藏表';
+
+
+CREATE TABLE `guide_external_link` (
+                                       `ID` varchar(64) NOT NULL COMMENT '主键',
+                                       `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+                                       `GUIDE_ID` varchar(64) NOT NULL COMMENT '指南ID',
+                                       `DESCRIPTION` varchar(64) NOT NULL COMMENT '链接说明',
+                                       `EXTERNAL_LINK` varchar(255) NOT NULL COMMENT '外部链接',
+                                       `SORT` int(11) NOT NULL COMMENT '排序',
+                                       `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+                                       `REVISION` int(11) NOT NULL DEFAULT '0' 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`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='指南外链表';
+
+
+CREATE TABLE `guide_module` (
+                                `ID` varchar(64) NOT NULL COMMENT '主键',
+                                `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+                                `GUIDE_ID` varchar(64) NOT NULL COMMENT '指南ID',
+                                `MODULE_ID` varchar(64) NOT NULL COMMENT '模块ID',
+                                `MODULE_CONTENT` longtext,
+                                `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+                                `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+                                `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+                                `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间',
+                                PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='指南模块关联表';
+
+
+CREATE TABLE `guide_module_dict` (
+                                     `ID` varchar(64) NOT NULL COMMENT '主键',
+                                     `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+                                     `MODULE_VALUE` varchar(64) NOT NULL COMMENT '模块key',
+                                     `MODULE_NAME` varchar(64) NOT NULL COMMENT '模块名',
+                                     `SORT` int(11) NOT NULL COMMENT '排序',
+                                     `STATUS` varchar(10) NOT NULL COMMENT '状态 禁用disable 启用enable',
+                                     `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+                                     `REVISION` int(11) NOT NULL DEFAULT '0' 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`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='指南模块字典表';
+
+
+CREATE TABLE `guide_module_dict_default` (
+                                             `ID` varchar(64) NOT NULL COMMENT '主键',
+                                             `MODULE_VALUE` varchar(64) NOT NULL COMMENT '模块key',
+                                             `MODULE_NAME` varchar(64) NOT NULL COMMENT '模块名',
+                                             `SORT` int(11) NOT NULL COMMENT '排序',
+                                             `STATUS` varchar(10) NOT NULL COMMENT '状态 禁用disable 启用enable',
+                                             `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+                                             `REVISION` int(11) NOT NULL DEFAULT '0' 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`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='指南模块默认字典表';
+
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.8__insert_default_guidecategory.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.8__insert_default_guidecategory.sql
new file mode 100644
index 0000000000..8a95feaad8
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.8__insert_default_guidecategory.sql
@@ -0,0 +1,12 @@
+INSERT INTO `epmet_gov_voice`.`guide_category` (`ID`, `CUSTOMER_ID`, `CATEGORY_NAME`, `CATEGORY_CODE`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', 'default', '社保', 'shebao', 0, 'enable', '0', 0, 'default', '2021-09-08 14:21:09', 'default', '2021-09-08 14:21:19');
+INSERT INTO `epmet_gov_voice`.`guide_category` (`ID`, `CUSTOMER_ID`, `CATEGORY_NAME`, `CATEGORY_CODE`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', 'default', '驾驶行驶', 'jiashixingshi', 1, 'enable', '0', 0, 'default', '2021-09-08 14:21:09', 'default', '2021-09-08 14:21:19');
+INSERT INTO `epmet_gov_voice`.`guide_category` (`ID`, `CUSTOMER_ID`, `CATEGORY_NAME`, `CATEGORY_CODE`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3', 'default', '公积金', 'gongjijin', 2, 'enable', '0', 0, 'default', '2021-09-08 14:21:09', 'default', '2021-09-08 14:21:19');
+INSERT INTO `epmet_gov_voice`.`guide_category` (`ID`, `CUSTOMER_ID`, `CATEGORY_NAME`, `CATEGORY_CODE`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4', 'default', '出入境', 'churujing', 3, 'enable', '0', 0, 'default', '2021-09-08 14:21:09', 'default', '2021-09-08 14:21:19');
+INSERT INTO `epmet_gov_voice`.`guide_category` (`ID`, `CUSTOMER_ID`, `CATEGORY_NAME`, `CATEGORY_CODE`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5', 'default', '婚育收养', 'hunyushouyang', 4, 'enable', '0', 0, 'default', '2021-09-08 14:21:09', 'default', '2021-09-08 14:21:19');
+INSERT INTO `epmet_gov_voice`.`guide_category` (`ID`, `CUSTOMER_ID`, `CATEGORY_NAME`, `CATEGORY_CODE`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('6', 'default', '户政', 'huzheng', 5, 'enable', '0', 0, 'default', '2021-09-08 14:21:09', 'default', '2021-09-08 14:21:19');
+INSERT INTO `epmet_gov_voice`.`guide_category` (`ID`, `CUSTOMER_ID`, `CATEGORY_NAME`, `CATEGORY_CODE`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('7', 'default', '教育培训', 'jiaoyupeixun', 6, 'enable', '0', 0, 'default', '2021-09-08 14:21:09', 'default', '2021-09-08 14:21:19');
+INSERT INTO `epmet_gov_voice`.`guide_category` (`ID`, `CUSTOMER_ID`, `CATEGORY_NAME`, `CATEGORY_CODE`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('8', 'default', '劳动就业', 'laodongjiuye', 7, 'enable', '0', 0, 'default', '2021-09-08 14:21:09', 'default', '2021-09-08 14:21:19');
+INSERT INTO `epmet_gov_voice`.`guide_category` (`ID`, `CUSTOMER_ID`, `CATEGORY_NAME`, `CATEGORY_CODE`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('9', 'default', '办税指南', 'banshuizhinan', 8, 'enable', '0', 0, 'default', '2021-09-08 14:21:09', 'default', '2021-09-08 14:21:19');
+INSERT INTO `epmet_gov_voice`.`guide_category` (`ID`, `CUSTOMER_ID`, `CATEGORY_NAME`, `CATEGORY_CODE`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10', 'default', '人才', 'rencai', 9, 'enable', '0', 0, 'default', '2021-09-08 14:21:09', 'default', '2021-09-08 14:21:19');
+INSERT INTO `epmet_gov_voice`.`guide_category` (`ID`, `CUSTOMER_ID`, `CATEGORY_NAME`, `CATEGORY_CODE`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('11', 'default', '职业资格', 'zhiyezige', 10, 'enable', '0', 0, 'default', '2021-09-08 14:21:09', 'default', '2021-09-08 14:21:19');
+INSERT INTO `epmet_gov_voice`.`guide_category` (`ID`, `CUSTOMER_ID`, `CATEGORY_NAME`, `CATEGORY_CODE`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('12', 'default', '医疗健康', 'yiliaojiankang', 11, 'enable', '0', 0, 'default', '2021-09-08 14:21:09', 'default', '2021-09-08 14:21:19');
\ No newline at end of file

From b0c64065e57a4f1d7dd5265e34bc9fdf8c2ebeee Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Sep 2021 16:50:44 +0800
Subject: [PATCH 052/134] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=87=E5=8D=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/GuideServiceImpl.java   | 5 ++---
 .../gov-voice-server/src/main/resources/mapper/GuideDao.xml  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
index 0d06633106..5ff3c79d6d 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
@@ -114,7 +114,6 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
     public void save(GuideDTO dto) {
         GuideEntity entity = ConvertUtils.sourceToTarget(dto, GuideEntity.class);
         insert(entity);
-        ConvertUtils.sourceToTarget(entity, GuideDTO.class);
     }
 
     @Override
@@ -176,7 +175,7 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
             throw new RenException(EpmetErrorCode.GUIDE_IS_NULL.getCode());
         }
         //保存办事指南表
-        GuideDTO guideDTO = new GuideDTO();
+        GuideEntity guideDTO = new GuideEntity();
         guideDTO.setCustomerId(tokenDto.getCustomerId());
         guideDTO.setOrgId(formDTO.getOrgId());
         guideDTO.setOrgType(formDTO.getOrgType());
@@ -197,7 +196,7 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
             guideDTO.setPid(result.getData().getAgencyId());
         }
         guideDTO.setPids(result.getData().getPids().concat(":").concat(result.getData().getAgencyId()));
-        save(guideDTO);
+        insert(guideDTO);
         //保存办事指南内容模块
         if (CollectionUtils.isNotEmpty(formDTO.getModuleList())) {
             List<GuideModuleEntity> guideModuleList = formDTO.getModuleList().stream().map(item -> {
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
index f86c8e0882..e88ab6e889 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
@@ -64,7 +64,7 @@
             g.TITLE AS "title",
             gc.CATEGORY_NAME AS categoryName,
             g.CREATED_BY AS createdId,
-            g.UPDATED_TIME AS updatedTime,
+            g.UPDATED_TIME AS updatedTime
         FROM
             guide g
         INNER JOIN guide_category gc ON g.CATEGORY_CODE = gc.CATEGORY_CODE AND gc.DEL_FLAG = 0 AND gc.CUSTOMER_ID = #{customerId}

From f0af01bec7673009da3e31404613e186335db7e9 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Sep 2021 17:26:48 +0800
Subject: [PATCH 053/134] =?UTF-8?q?=E6=8C=87=E5=8D=97=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/service/impl/GuideServiceImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
index 5ff3c79d6d..75e6210ff2 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
@@ -376,6 +376,9 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
     public GuideDetailResultDTO guideDetail(GuideFormDTO formDTO) {
         //获取指南详情
         GuideDetailResultDTO result = baseDao.getGuideDetail(formDTO.getGuideId());
+        if (null == result) {
+            result = new GuideDetailResultDTO();
+        }
         //获取指南内容模块
         result.setModuleList(guideModuleService.getByGuideId(formDTO.getCustomerId(), formDTO.getGuideId()));
         //获取指南附件

From 927687d69887c973ae1eed76afebd1821b9f7770 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Sep 2021 17:37:53 +0800
Subject: [PATCH 054/134] =?UTF-8?q?=E6=8C=87=E5=8D=97=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java | 3 ++-
 .../src/main/java/com/epmet/service/impl/GuideServiceImpl.java | 2 +-
 .../gov-voice-server/src/main/resources/mapper/GuideDao.xml    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java
index 77d3f6e805..18644f0249 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java
@@ -50,12 +50,13 @@ public interface GuideDao extends BaseDao<GuideEntity> {
     /**
      * 指南详情
      *
+     * @Param customerId
      * @Param guideId
      * @Return {@link GuideDetailResultDTO}
      * @Author zhaoqifeng
      * @Date 2021/9/8 9:59
      */
-    GuideDetailResultDTO getGuideDetail(@Param("guideId") String guideId);
+    GuideDetailResultDTO getGuideDetail(@Param("customerId") String customerId, @Param("guideId") String guideId);
 
     /**
      * 收藏列表
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
index 75e6210ff2..6bfbb59e41 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
@@ -375,7 +375,7 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
     @Override
     public GuideDetailResultDTO guideDetail(GuideFormDTO formDTO) {
         //获取指南详情
-        GuideDetailResultDTO result = baseDao.getGuideDetail(formDTO.getGuideId());
+        GuideDetailResultDTO result = baseDao.getGuideDetail(formDTO.getCustomerId(), formDTO.getGuideId());
         if (null == result) {
             result = new GuideDetailResultDTO();
         }
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
index e88ab6e889..a850719121 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
@@ -54,7 +54,7 @@
             gc.CATEGORY_NAME
         FROM
             guide g
-        INNER JOIN guide_category gc ON g.CATEGORY_CODE = gc.CATEGORY_CODE
+        INNER JOIN guide_category gc ON g.CATEGORY_CODE = gc.CATEGORY_CODE AND gc.CUSTOMER_ID = #{customerId}
         WHERE
             g.ID = #{guideId}
     </select>

From 1ef07c1406f9f1f2a174dc66711903b6bc507d2d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 09:20:44 +0800
Subject: [PATCH 055/134] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=9C=89=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BC=93=E5=AD=98=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=8F=91=E5=B8=83=EF=BC=9Auser=E3=80=81repor?=
 =?UTF-8?q?t=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/impl/ScreenProjectServiceImpl.java | 15 +++++++------
 .../epmet/feign/EpmetUserOpenFeignClient.java | 11 ++++++++++
 .../EpmetUserOpenFeignClientFallback.java     | 13 ++++++++++++
 .../com/epmet/controller/UserController.java  | 21 +++++++++++++++----
 .../src/main/java/com/epmet/dao/UserDao.java  | 11 ++++++++++
 .../java/com/epmet/service/UserService.java   | 10 +++++++++
 .../epmet/service/impl/UserServiceImpl.java   | 13 ++++++++++++
 .../src/main/resources/mapper/UserDao.xml     | 14 +++++++++++++
 8 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
index 3d673b31c4..a23152697e 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
@@ -1,6 +1,7 @@
 package com.epmet.datareport.service.evaluationindex.screen.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -11,6 +12,7 @@ import com.epmet.datareport.dao.evaluationindex.screen.ScreenEventImgDataDao;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenProjectCategoryOrgDailyDao;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenProjectDataDao;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectService;
+import com.epmet.dto.UserDTO;
 import com.epmet.dto.form.CustomerAgencyUserRoleFormDTO;
 import com.epmet.dto.form.screen.CategoryAnalysisFormDTO;
 import com.epmet.dto.form.screen.ColorProjectTotalFormDTO;
@@ -23,7 +25,6 @@ import com.epmet.evaluationindex.screen.dto.result.ProjectDetailResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDetailResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDistributionResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.feign.OperCrmOpenFeignClient;
 import com.epmet.project.CustomerProjectCategoryDTO;
 import com.epmet.project.dto.form.CategoryTopAppealFormDTO;
 import com.epmet.project.dto.result.CategoryTopAppealResultDTO;
@@ -60,8 +61,6 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
     @Autowired
     private ScreenProjectCategoryOrgDailyDao screenProjectCategoryOrgDailyDao;
     @Autowired
-    private OperCrmOpenFeignClient operCrmOpenFeignClient;
-    @Autowired
     private EpmetUserOpenFeignClient userOpenFeignClient;
 
     /**
@@ -118,9 +117,13 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
                 CustomerAgencyUserRoleFormDTO userRoleFormDTO = new CustomerAgencyUserRoleFormDTO();
                 userRoleFormDTO.setCustomerId(formDTO.getCustomerId());
                 userRoleFormDTO.setStaffId(item.getReportUserId());
-                Map<String, String> staffRoleMap = CustomerStaffRedis.getStaffRoleMap(formDTO.getCustomerId(), item.getReportUserId());
-                if (!CollectionUtils.isEmpty(staffRoleMap)){
-                    item.setReportUserRoleSet(staffRoleMap.keySet());
+                //只有工作端的用户才调用此接口
+                Result<UserDTO> userDTOResult = userOpenFeignClient.queryUserClient(item.getReportUserId());
+                if (userDTOResult.success() && null != userDTOResult.getData() && AppClientConstant.APP_GOV.equals(userDTOResult.getData().getFromApp())) {
+                    Map<String, String> staffRoleMap = CustomerStaffRedis.getStaffRoleMap(formDTO.getCustomerId(), item.getReportUserId());
+                    if (!CollectionUtils.isEmpty(staffRoleMap)) {
+                        item.setReportUserRoleSet(staffRoleMap.keySet());
+                    }
                 }
             }
 
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 2c913bd585..cbec879b5b 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
@@ -635,4 +635,15 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/statsstaffpatrolrecorddaily/patrolinfo")
     Result<List<PatrolYuShanResultDTO>> patrolInfo(@RequestParam("agencyId")String agencyId);
+
+    /**
+     * 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员
+     *
+     * @param userId
+     * @return
+     * @author yinzuomei
+     * @date 2021/9/10 8:56 上午
+     */
+    @GetMapping(value = "/epmetuser/user/queryUserClient/{userId}")
+    Result<UserDTO> queryUserClient(@PathVariable("userId") String userId);
 }
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 a68cab52f5..183196dad8 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
@@ -450,4 +450,17 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<List<PatrolYuShanResultDTO>> patrolInfo(String agencyId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "patrolInfo", agencyId);
     }
+
+    /**
+     * 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员
+     *
+     * @param userId
+     * @return
+     * @author yinzuomei
+     * @date 2021/9/10 8:56 上午
+     */
+    @Override
+    public Result<UserDTO> queryUserClient(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryUserClient", userId);
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java
index d4a4148450..f1cbcb114a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java
@@ -12,11 +12,9 @@ import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.UserService;
+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.*;
 
 /**
  * @Description
@@ -172,4 +170,19 @@ public class UserController {
 		return new Result<UserDTO>().ok(userService.saveUserInfo(formDTO));
 	}
 
+	/**
+	 * 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员
+	 *
+	 * @param userId
+	 * @return  com.epmet.commons.tools.utils.Result<com.epmet.dto.UserDTO>
+	 * @author yinzuomei
+	 * @date 2021/9/10 8:49 上午
+	 */
+	@GetMapping("queryUserClient/{userId}")
+	public Result<UserDTO> queryUserClient(@PathVariable String userId){
+		if(StringUtils.isBlank(userId)){
+			return new Result<>();
+		}
+		return new Result<UserDTO>().ok(userService.queryUserClient(userId));
+	}
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java
index 7dc2a768d8..e4c7a2cec5 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java
@@ -1,6 +1,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.UserDTO;
 import com.epmet.dto.form.CreatedTimeByUserIdFormDTO;
 import com.epmet.dto.form.UserBasicInfoFormDTO;
 import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
@@ -52,4 +53,14 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @Description 居民端-查询用户基础信息
      **/
     UserBasicInfo selectUserBasicInfo(UserBasicInfoFormDTO formDTO);
+
+    /**
+     * 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员
+     *
+     * @param userId
+     * @return  com.epmet.dto.UserDTO
+     * @author yinzuomei
+     * @date 2021/9/10 8:51 上午
+     */
+    UserDTO selectByUserId(String userId);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java
index cc2fb1aecf..33e7b1c7ad 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java
@@ -94,4 +94,14 @@ public interface UserService extends BaseService<UserEntity> {
      * @date 2021/1/19 上午10:35
      */
     UserDTO saveUserInfo(UserInfoFormDTO formDTO);
+
+    /**
+     * 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员
+     *
+     * @param userId
+     * @return  com.epmet.dto.UserDTO
+     * @author yinzuomei
+     * @date 2021/9/10 8:50 上午
+     */
+    UserDTO queryUserClient(String userId);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
index 515f2ccba9..6c56b705a8 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
@@ -329,4 +329,17 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return result;
     }
 
+    /**
+     * 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员
+     *
+     * @param userId
+     * @return com.epmet.dto.UserDTO
+     * @author yinzuomei
+     * @date 2021/9/10 8:50 上午
+     */
+    @Override
+    public UserDTO queryUserClient(String userId) {
+        return baseDao.selectByUserId(userId);
+    }
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml
index a46001c8c6..bbdaf024ba 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml
@@ -67,4 +67,18 @@
         AND u.id = #{userId}
         LIMIT 1
     </select>
+
+    <!--  根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员   -->
+    <select id="selectByUserId" parameterType="java.lang.String" resultType="com.epmet.dto.UserDTO">
+        SELECT
+            u.id,
+            u.CUSTOMER_ID,
+            u.FROM_APP,
+            u.FROM_CLIENT
+        FROM
+            USER u
+        WHERE
+            u.DEL_FLAG = '0'
+          AND u.id = #{userId}
+    </select>
 </mapper>

From 1783725b734797072806a569da85a9d5a94b6086 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 10 Sep 2021 10:02:46 +0800
Subject: [PATCH 056/134] =?UTF-8?q?=E6=8C=87=E5=8D=97=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/GuideController.java |  2 +-
 .../epmet/service/GuideCollectionService.java | 10 +++++++++
 .../java/com/epmet/service/GuideService.java  |  3 ++-
 .../impl/GuideCollectionServiceImpl.java      | 22 +++++++++++++++++++
 .../epmet/service/impl/GuideServiceImpl.java  | 15 ++++++++-----
 5 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java
index c9b9ccfead..88d8115216 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java
@@ -164,7 +164,7 @@ public class GuideController {
     public Result<GuideDetailResultDTO> guideDetail(@LoginUser TokenDto tokenDto, @RequestBody GuideFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         formDTO.setCustomerId(tokenDto.getCustomerId());
-        GuideDetailResultDTO result = guideService.guideDetail(formDTO);
+        GuideDetailResultDTO result = guideService.guideDetail(tokenDto, formDTO);
         return new Result<GuideDetailResultDTO>().ok(result);
     }
 
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java
index a4acb0b6e4..bd2e97c482 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java
@@ -104,4 +104,14 @@ public interface GuideCollectionService extends BaseService<GuideCollectionEntit
      * @Date 2021/9/9 9:46
      */
     void collection(TokenDto tokenDto, GuideFormDTO formDTO);
+
+    /**
+     * @Description 获取收藏信息
+     * @Param tokenDto
+     * @Param guideId
+     * @Return {@link GuideCollectionDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/10 9:52
+     */
+    GuideCollectionDTO getCollection(TokenDto tokenDto, String guideId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java
index 8538186413..a2493a88ac 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideService.java
@@ -145,12 +145,13 @@ public interface GuideService extends BaseService<GuideEntity> {
     /**
      * 指南详情
      *
+     * @Param tokenDto
      * @Param formDTO
      * @Return {@link GuideDetailResultDTO}
      * @Author zhaoqifeng
      * @Date 2021/9/7 14:12
      */
-    GuideDetailResultDTO guideDetail(GuideFormDTO formDTO);
+    GuideDetailResultDTO guideDetail(TokenDto tokenDto, GuideFormDTO formDTO);
 
     /**
      * @Description 收藏列表
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java
index 382a9db1ce..ef0696fa12 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java
@@ -132,4 +132,26 @@ public class GuideCollectionServiceImpl extends BaseServiceImpl<GuideCollectionD
         }
     }
 
+    /**
+     * @param tokenDto
+     * @param guideId
+     * @Description 获取收藏信息
+     * @Param tokenDto
+     * @Param guideId
+     * @Return {@link GuideCollectionDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/10 9:52
+     */
+    @Override
+    public GuideCollectionDTO getCollection(TokenDto tokenDto, String guideId) {
+        //获取指南收藏信息
+        LambdaQueryWrapper<GuideCollectionEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GuideCollectionEntity::getGuideId, guideId);
+        wrapper.eq(GuideCollectionEntity::getUserId, tokenDto.getUserId());
+        wrapper.eq(GuideCollectionEntity::getApp, tokenDto.getApp());
+        wrapper.eq(GuideCollectionEntity::getCustomerId, tokenDto.getCustomerId());
+        GuideCollectionEntity entity = baseDao.selectOne(wrapper);
+        return ConvertUtils.sourceToTarget(entity, GuideCollectionDTO.class);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
index 6bfbb59e41..d93f21b2af 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java
@@ -21,6 +21,7 @@ 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.form.PageFormDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -42,10 +43,7 @@ import com.epmet.entity.GuideEntity;
 import com.epmet.entity.GuideExternalLinkEntity;
 import com.epmet.entity.GuideModuleEntity;
 import com.epmet.feign.GovOrgOpenFeignClient;
-import com.epmet.service.GuideAttachmentService;
-import com.epmet.service.GuideExternalLinkService;
-import com.epmet.service.GuideModuleService;
-import com.epmet.service.GuideService;
+import com.epmet.service.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections4.CollectionUtils;
@@ -77,6 +75,8 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
     private GuideAttachmentService guideAttachmentService;
     @Resource
     private GuideExternalLinkService guideExternalLinkService;
+    @Resource
+    private GuideCollectionService guideCollectionService;
 
     @Override
     public PageData<GuideDTO> page(Map<String, Object> params) {
@@ -373,7 +373,7 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
      * @Date 2021/9/7 14:12
      */
     @Override
-    public GuideDetailResultDTO guideDetail(GuideFormDTO formDTO) {
+    public GuideDetailResultDTO guideDetail(TokenDto tokenDto, GuideFormDTO formDTO) {
         //获取指南详情
         GuideDetailResultDTO result = baseDao.getGuideDetail(formDTO.getCustomerId(), formDTO.getGuideId());
         if (null == result) {
@@ -385,6 +385,11 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
         result.setAttachmentList(guideAttachmentService.getByGuideId(formDTO.getGuideId()));
         //获取指南外链地址
         result.setExternalLinks(guideExternalLinkService.getByGuideId(formDTO.getGuideId()));
+        //是否收藏
+        result.setCollectionFlag(NumConstant.ZERO_STR);
+        if (null != guideCollectionService.getCollection(tokenDto, formDTO.getGuideId())) {
+            result.setCollectionFlag(NumConstant.ONE_STR);
+        }
         return result;
     }
 

From 1443c242bb5273451ac98b6b51ac82e62765b32a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 10 Sep 2021 10:27:57 +0800
Subject: [PATCH 057/134] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/CustomerDataManageExcel.java        | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java
new file mode 100644
index 0000000000..22d159a349
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java
@@ -0,0 +1,50 @@
+package com.epmet.dataaggre.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/10 10:15 上午
+ * @DESC
+ */
+@Data
+public class CustomerDataManageExcel {
+
+    @Excel(name = "组织")
+    private String orgName;
+
+    @Excel(name = "用户数")
+    private Integer userCount;
+
+    @Excel(name = "居民数")
+    private Integer residentCount;
+
+    @Excel(name = "党员数")
+    private Integer partyMemberCount;
+
+    @Excel(name = "小组数")
+    private Integer groupCount;
+
+    @Excel(name = "话题数")
+    private Integer topicCount;
+
+    @Excel(name = "议题数")
+    private Integer issueCount;
+
+    @Excel(name = "项目数")
+    private Integer projectCount;
+
+    @Excel(name = "结案项目数")
+    private Integer closedProjectCount;
+
+    @Excel(name = "巡查人数")
+    private Integer patrolPeopleCount;
+
+    @Excel(name = "巡查次数")
+    private Integer patrolCount;
+
+    @Excel(name = "巡查时长")
+    private Integer patrolDuration;
+
+}

From cb0c6f7730612f0e0e952fae2a3c36f684919353 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 10 Sep 2021 10:28:53 +0800
Subject: [PATCH 058/134] =?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

---
 .../modules/act/service/impl/ActCommentServiceImpl.java     | 6 ++++--
 .../notice/service/impl/NoticeCommentServiceImpl.java       | 6 ++++--
 .../topic/service/impl/ResiTopicCommentServiceImpl.java     | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
index a117db2b23..a902a78dc6 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
@@ -111,8 +111,10 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
             }
         }
         //图片安全校验
-        List<String> imageList = formDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
-        noticeCommentService.safetyCheck(new ArrayList<>(), imageList);
+        if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(formDTO.getImageList())){
+            List<String> imageList = formDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
+            noticeCommentService.safetyCheck(new ArrayList<>(), imageList);
+        }
 
         //3、插入记录
         ActCommentEntity actCommentEntity = new ActCommentEntity();
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
index 0ab3dbbc09..7556f18444 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
@@ -120,8 +120,10 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
             }
         }
         //图片安全校验
-        List<String> imageList = formDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
-        safetyCheck(new ArrayList<>(), imageList);
+        if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(formDTO.getImageList())){
+            List<String> imageList = formDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
+            safetyCheck(new ArrayList<>(), imageList);
+        }
 
         //2.判断当前用户是否被禁言、移除、非本组成员
         NoticeDTO notice = noticeService.get(formDTO.getNoticeId());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
index ce928fed18..d392e1f3e5 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
@@ -217,8 +217,10 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
             }
         }
         //图片安全校验
-        List<String> imageList = resiCommentFormDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
-        noticeCommentService.safetyCheck(new ArrayList<>(), imageList);
+        if(CollectionUtils.isNotEmpty(resiCommentFormDTO.getImageList())){
+            List<String> imageList = resiCommentFormDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
+            noticeCommentService.safetyCheck(new ArrayList<>(), imageList);
+        }
 
         //1.判断当前用户是否被禁言
         ResiTopicDTO topic = resiTopicService.get(resiCommentFormDTO.getTopicId());

From 3a25ada1ff65be30d5cadd59be9d57a2bba1e7b6 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 10 Sep 2021 10:55:01 +0800
Subject: [PATCH 059/134] xxxx

---
 .../java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java
index 22d159a349..4c2dd81ba0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java
@@ -45,6 +45,6 @@ public class CustomerDataManageExcel {
     private Integer patrolCount;
 
     @Excel(name = "巡查时长")
-    private Integer patrolDuration;
+    private String patrolDuration;
 
 }

From 68e4833d49f5c4be8e112d2c0a2cfff1ca02d34b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 10 Sep 2021 11:12:02 +0800
Subject: [PATCH 060/134] DTO

---
 .../form/CustomerDataManageFormDTO.java       | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
new file mode 100644
index 0000000000..950169c020
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
@@ -0,0 +1,58 @@
+package com.epmet.dataaggre.dto.datastats.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/10 11:04 上午
+ * @DESC
+ */
+@Data
+public class CustomerDataManageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 6462094914874831738L;
+
+    public interface CustomerDataManageForm{}
+
+    /**
+     * 客户ID
+     */
+    @NotBlank(message = "客户ID不能为空",groups = CustomerDataManageForm.class)
+    private String customerId;
+
+    /**
+     * 组织ID
+     */
+    @NotBlank(message = "组织ID不能为空",groups = CustomerDataManageForm.class)
+    private String agencyId;
+
+    /**
+     * 区间:Interval  截止:end
+     */
+    @NotBlank(message = "type不能为空",groups = CustomerDataManageForm.class)
+    private String type;
+
+    /**
+     * 开始时间【yyyymmdd】
+     */
+    private String startTime;
+
+    /**
+     * 结束时间【yyyymmdd】
+     */
+    @NotBlank(message = "结束时间不能为空",groups = CustomerDataManageForm.class)
+    private String endTime;
+
+    private Integer pageNo;
+
+    private Integer pageSize;
+
+    /**
+     * 是否分页【true分  false不分】
+     */
+    @NotBlank(message = "是否分页不能为空",groups = CustomerDataManageForm.class)
+    private Boolean isPage;
+}

From 132482b8063659a3d36e158891e8f37be26e6ed1 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 10 Sep 2021 13:49:22 +0800
Subject: [PATCH 061/134] dto

---
 .../dto/datastats/form/CustomerDataManageFormDTO.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
index 950169c020..164efa9f1c 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dataaggre.dto.datastats.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -53,6 +54,6 @@ public class CustomerDataManageFormDTO implements Serializable {
     /**
      * 是否分页【true分  false不分】
      */
-    @NotBlank(message = "是否分页不能为空",groups = CustomerDataManageForm.class)
+    @NotNull(message = "是否分页不能为空",groups = CustomerDataManageForm.class)
     private Boolean isPage;
 }

From b72f9f8887208eb4719264ff3916e77af9953761 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 14:05:11 +0800
Subject: [PATCH 062/134] =?UTF-8?q?=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E7=BB=99=E7=BD=91=E6=A0=BC=E9=95=BF?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E8=AE=B0=E5=BD=95=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=B1=BB=E5=9E=8B=E3=80=81=E7=94=B3=E8=AF=B7id?=
 =?UTF-8?q?=E5=88=B0user=5Fmessage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/UserMessageDTO.java  |  8 ++++++++
 .../java/com/epmet/dto/form/UserMessageFormDTO.java  | 11 +++++++++--
 .../form/ResiWarmheartedSubmitFormDTO.java           |  5 +++++
 .../impl/ResiWarmheartedApplyServiceImpl.java        | 12 ++++++++++--
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/UserMessageDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/UserMessageDTO.java
index d44c80ae47..2a86b7a7d3 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/UserMessageDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/UserMessageDTO.java
@@ -109,4 +109,12 @@ public class UserMessageDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 消息分类: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/dto/form/UserMessageFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/UserMessageFormDTO.java
index e00bb88342..309a1222cc 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/UserMessageFormDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/UserMessageFormDTO.java
@@ -1,8 +1,6 @@
 package com.epmet.dto.form;
 
-import lombok.Builder;
 import lombok.Data;
-import net.bytebuddy.implementation.bind.annotation.Default;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -61,4 +59,13 @@ public class UserMessageFormDTO implements Serializable {
 	 * 调用者 【分内部调用和外部调用，内部调用值为空，外部默认为：外挂-站内信】
 	 */
 	private String referer;
+
+	/**
+	 * 消息分类:info-上传下达消息 详见UserMessageTypeConstant
+	 */
+	private String messageType;
+	/**
+	 * 消息对应的业务id,比如message_type=info时，此列存储的是消息id,可跳转到消息详情
+	 */
+	private String targetId;
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java
index 38497917d8..61f1c0f8f5 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java
@@ -73,4 +73,9 @@ public class ResiWarmheartedSubmitFormDTO implements Serializable {
      */
     private String messageText;
 
+    /**
+     * 无需前端传入，此列用来数据传值
+     */
+    private String applyId;
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
index 549a5ce8af..f9cda1fe09 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
@@ -29,6 +29,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.PartyMemberConstant;
 import com.epmet.constant.ReadFlagConstant;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.UserRoleDTO;
@@ -211,7 +212,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 			}
 			formDTO.setMessageText(messageContent);
 			//1:将申请记录存入热心居民申请表中
-			saveResiWarmApply(formDTO);
+			String applyId=saveResiWarmApply(formDTO);
+			formDTO.setApplyId(applyId);
 			//2:将最后一次操作行为更新到热心居民申请行为记录表中
 			resiWarmheartedVisitService.updateResiWarmVisit(formDTO);
 			//3:添加消息信息，给网格长发消息
@@ -234,7 +236,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 	 * @param formDTO
 	 * @return
 	 */
-	public void saveResiWarmApply(ResiWarmheartedSubmitFormDTO formDTO) {
+	public String saveResiWarmApply(ResiWarmheartedSubmitFormDTO formDTO) {
 		ResiWarmheartedApplyEntity entity = new ResiWarmheartedApplyEntity();
 		entity.setCustomerId(formDTO.getCustomerId());
 		entity.setGridId(formDTO.getGridId());
@@ -245,6 +247,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		entity.setReadFlag(ResiWarmheartedVisitConstant.UN_READ);
 		entity.setMessageText(formDTO.getMessageText());
 		baseDao.insert(entity);
+		return entity.getId();
 	}
 	/**
 	 * 热心居民申请像网格长发送消息
@@ -289,6 +292,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 					}
 					msgDTO.setMessageContent(formDTO.getMessageText());
 					msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
+
+					//21.09.10:记录消息类型和对应的业务id
+					msgDTO.setMessageType(UserMessageTypeConstant.WARMHEARTED_APPLY);
+					msgDTO.setTargetId(formDTO.getApplyId());
+
 					msgList.add(msgDTO);
 					//微信订阅
 					WxSubscribeMessageFormDTO subscribeDTO = new WxSubscribeMessageFormDTO();

From c22f5070f660ee693898c2fbb0ec5b89574dcc95 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 14:41:03 +0800
Subject: [PATCH 063/134] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=80=9A=E7=9F=A5=E7=BD=91=E6=A0=BC=E9=95=BF?=
 =?UTF-8?q?=E3=80=81=E5=AE=A1=E6=A0=B8=E7=BB=93=E6=9E=9C=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E3=80=82=E8=AE=B0=E5=BD=95targetId=E3=80=81m?=
 =?UTF-8?q?essageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/constant/UserMessageTypeConstant.java   | 12 +++++++++++-
 .../impl/PartyMemberConfirmServiceImpl.java       | 15 +++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 1dcdce9821..1c201b9628 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -16,9 +16,19 @@ public interface UserMessageTypeConstant {
 
     /**
      * 居民端提交热心居民申请，通知网格长
+     * targetId:resi_warmhearted_apply.id
      */
     String WARMHEARTED_APPLY="warmhearted_apply";
 
+    /**
+     * 居民端认证党员时，补充信息填写完成提交后，通知网格长，人工审核党员申请
+     * targetId:partymember_info.id
+     */
+    String CERTIFY_PARTY_APPLY="certify_party_apply";
 
-
+    /**
+     * 工作端审核居民是否是党员，通知居民。
+     * targetId:partymember_info.id
+     */
+    String CERTIFY_PARTY_APPLY_RES="certify_party_apply_res";
 }
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 1610de67c6..c30e3d298f 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
@@ -8,10 +8,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constant.PartyMemberConstant;
-import com.epmet.constant.PartyMemberMessageConstant;
-import com.epmet.constant.ReadFlagConstant;
-import com.epmet.constant.SmsTemplateConstant;
+import com.epmet.constant.*;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -651,6 +648,11 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		userMessageFormDTO.setGridId(formDTO.getGridId());
 		userMessageFormDTO.setApp(AppClientConstant.APP_RESI);
 		userMessageFormDTO.setTitle(PartyMemberMessageConstant.PARTY_AUTH_TITLE);
+
+		//21.09.10:记录消息类型和对应的业务id
+		userMessageFormDTO.setMessageType(UserMessageTypeConstant.CERTIFY_PARTY_APPLY_RES);
+		userMessageFormDTO.setTargetId(formDTO.getId());
+
 		//调用gov-org服务查询网格信息
 		CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
 		customerGridFormDTO.setGridId(formDTO.getGridId());
@@ -729,7 +731,12 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 					msgDTO.setTitle(PartyMemberMessageConstant.PARTY_AUTH_TITLE);
 					msgDTO.setMessageContent(message);
 					msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
+
+					//21.09.10:记录消息类型和对应的业务id
+					msgDTO.setMessageType(UserMessageTypeConstant.CERTIFY_PARTY_APPLY);
+					msgDTO.setTargetId(formDTO.getId());
 					msgList.add(msgDTO);
+
 					//微信订阅
 					WxSubscribeMessageFormDTO subscribeDTO = new WxSubscribeMessageFormDTO();
 					subscribeDTO.setClientType(AppClientConstant.APP_GOV);

From d5843a3708f229218528ce63f7c1479fdf6efc70 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 14:45:48 +0800
Subject: [PATCH 064/134] =?UTF-8?q?=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E5=AE=A1=E6=A0=B8=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=B1=85=E6=B0=91=E3=80=82=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?targetId=E3=80=81messageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/constant/UserMessageTypeConstant.java     | 5 +++++
 .../service/impl/ResiWarmheartedApplyServiceImpl.java        | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 1c201b9628..8744bbb665 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -19,6 +19,11 @@ public interface UserMessageTypeConstant {
      * targetId:resi_warmhearted_apply.id
      */
     String WARMHEARTED_APPLY="warmhearted_apply";
+    /**
+     * 工作端审核完热心居民申请，通知居民结果
+     * targetId:resi_warmhearted_apply.id
+     */
+    String WARMHEARTED_APPLY_RES="warmhearted_apply_res";
 
     /**
      * 居民端认证党员时，补充信息填写完成提交后，通知网格长，人工审核党员申请
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
index f9cda1fe09..553f20bae2 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
@@ -474,6 +474,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		userMessageFormDTO.setGridId(formDTO.getGridId());
 		userMessageFormDTO.setUserId(formDTO.getUserId());
 		userMessageFormDTO.setApp(AppClientConstant.APP_RESI);
+
+		//21.09.10:记录消息类型和对应的业务id
+		userMessageFormDTO.setMessageType(UserMessageTypeConstant.WARMHEARTED_APPLY_RES);
+		userMessageFormDTO.setTargetId(formDTO.getId());
+
 		if (StrConstant.SPECIAL_CUSTOMER.equals(formDTO.getCustomerId())) {
 			userMessageFormDTO.setTitle("您有一条组长申请消息");
 		} else {

From 4f4e8f3123ff0df4d83af1bc2be05999ba6a0243 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 15:05:38 +0800
Subject: [PATCH 065/134] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=94=B3=E8=AF=B7=E5=88=9B=E5=BB=BA=E5=B0=8F=E7=BB=84?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E4=BA=A4=E5=B0=8F=E7=BB=84=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E9=80=9A=E7=9F=A5=E7=BD=91=E6=A0=BC=E9=95=BF?=
 =?UTF-8?q?=EF=BC=8C=E5=AD=98=E5=82=A8targetId=EF=BC=8CmessageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/constant/UserMessageTypeConstant.java   |  6 ++++++
 .../group/service/impl/ResiGroupServiceImpl.java  | 15 +++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 8744bbb665..418162155f 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -36,4 +36,10 @@ public interface UserMessageTypeConstant {
      * targetId:partymember_info.id
      */
     String CERTIFY_PARTY_APPLY_RES="certify_party_apply_res";
+
+    /**
+     * 居民端用户申请创建小组，提交小组信息后，通知网格长
+     * targetId:resi_group.id
+     */
+    String CREATE_GROUP_APPLY="create_group_apply";
 }
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 1c85fb903a..c81e3ac4d1 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
@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 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.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -40,7 +41,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
-import com.epmet.dto.BizPointTotalDetailDTO;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
@@ -48,7 +49,6 @@ import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
-import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.modules.feign.EpmetMessageFeignClient;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
@@ -84,9 +84,7 @@ 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.send.SendMqMsgUtil;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import kotlin.jvm.internal.Lambda;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -527,7 +525,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		}
 		resiGroupStatisticalService.save(resiGroupStatisticalDTO);
 		//发送消息：创建小组
-		sendMsgResi2Gov(UserMessageConstant.CREATE_GROUP_APPLYING_MSG_TITLE,msg,applyCreateGroupFormDTO.getGridId(),applyCreateGroupFormDTO.getUserId(),applyCreateGroupFormDTO.getCustomerId());
+		sendMsgResi2Gov(UserMessageConstant.CREATE_GROUP_APPLYING_MSG_TITLE,msg,applyCreateGroupFormDTO.getGridId(),applyCreateGroupFormDTO.getUserId(),applyCreateGroupFormDTO.getCustomerId(), resiGroupEntity.getId());
 	}
 
 
@@ -1157,7 +1155,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @author wangc
 	 * @date 2020.04.29 22:49
 	 **/
-	private void sendMsgResi2Gov(String title,String msg,String gridId,String userId,String customerId){
+	private void sendMsgResi2Gov(String title,String msg,String gridId,String userId,String customerId,String groupId){
 		//1.查询加入当前网格下的人员 customer_staff_grid
 		CommonGridIdFormDTO commonGridIdFormDTO = new CommonGridIdFormDTO();
 		commonGridIdFormDTO.setGridId(gridId);
@@ -1188,6 +1186,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 					msgObj.setReadFlag(ReadFlagConstant.UN_READ);
 					msgObj.setTitle(title);
 					msgObj.setUserId(to);
+
+					//21.09.10:记录消息类型和对应的业务id
+					msgObj.setMessageType(UserMessageTypeConstant.CREATE_GROUP_APPLY);
+					msgObj.setTargetId(groupId);
+
 					msgList.add(msgObj);
 					//微信订阅
 					WxSubscribeMessageFormDTO subscribeDTO = new WxSubscribeMessageFormDTO();

From fb0bf999015840970fe2c0caf35a69176329148a Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 10 Sep 2021 15:09:47 +0800
Subject: [PATCH 066/134] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8E=E8=BF=98=E5=8E=9F-=E7=9B=B8?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/user/impl/UserServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
index c154ead20b..13665c52f8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
@@ -116,16 +116,16 @@ public class UserServiceImpl implements UserService {
         if(null != agencyMap && agencyMap.size() > NumConstant.ZERO){
             agencyMap.forEach((agencyId,v) -> {
                 if(null != v && v.size() > NumConstant.ZERO){
-                    /*queryUserData(ModuleConstant.DIM_BELONGING_GRID,
+                    queryUserData(ModuleConstant.DIM_BELONGING_GRID,
                             agencyId,
                             // v.get(NumConstant.ZERO).getPid(),
                             v.get(NumConstant.ZERO).getCustomerId(),
                             new HashSet<>(v.get(NumConstant.ZERO).getGridIds()),
                             targetDate,
                             dataPacket,
-                            timeDimension);*/
-                    traverseGridUserDispose(agencyId,v.get(NumConstant.ZERO).getCustomerId(),new HashSet<>(v.get(NumConstant.ZERO).getGridIds())
-                            ,targetDate,dataPacket,timeDimension);
+                            timeDimension);
+                    /*traverseGridUserDispose(agencyId,v.get(NumConstant.ZERO).getCustomerId(),new HashSet<>(v.get(NumConstant.ZERO).getGridIds())
+                            ,targetDate,dataPacket,timeDimension);*/
                 }
             });
         }

From 5c42eb58fbc000b3149b1f470e31a3755d0790f5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 15:19:52 +0800
Subject: [PATCH 067/134] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=BB=BA=E7=BE=A4=E7=94=B3=E8=AF=B7=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=BB=BA=E7=BB=84=E4=BA=BA=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=EF=BC=8C=E5=AD=98=E5=82=A8targetId=EF=BC=8CmessageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/constant/UserMessageTypeConstant.java    |  6 ++++++
 .../group/service/impl/ResiGroupServiceImpl.java       | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 418162155f..bcce33a915 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -42,4 +42,10 @@ public interface UserMessageTypeConstant {
      * targetId:resi_group.id
      */
     String CREATE_GROUP_APPLY="create_group_apply";
+
+    /**
+     * 工作端审核建群申请后，通知建组人结果
+     * targetId:resi_group.id
+     */
+    String CREATE_GROUP_APPLY_RES="create_group_apply_res";
 }
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 c81e3ac4d1..1ec41e6060 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
@@ -719,6 +719,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		userMessageFormDTO.setGridId(resiGroupDTO.getGridId());
 		userMessageFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
 		userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.AGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName()));
+
+		//21.09.10:记录消息类型和对应的业务id
+		userMessageFormDTO.setMessageType(UserMessageTypeConstant.CREATE_GROUP_APPLY_RES);
+		userMessageFormDTO.setTargetId(agreeApplyGroupFormDTO.getGroupId());
+
 		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
 			logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,String.format(UserMessageConstant.AGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName())));
 		}
@@ -783,6 +788,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		userMessageFormDTO.setGridId(resiGroupDTO.getGridId());
 		userMessageFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
 		userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.DISAGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason()));
+
+		//21.09.10:记录消息类型和对应的业务id
+		userMessageFormDTO.setMessageType(UserMessageTypeConstant.CREATE_GROUP_APPLY_RES);
+		userMessageFormDTO.setTargetId(disAgreeApplyGroupFormDTO.getGroupId());
+
 		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
 			logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,String.format(UserMessageConstant.DISAGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason())));
 		}

From e7da49b02dd09dd6d5e1c78b6ca14b28aa3a52e4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 15:31:43 +0800
Subject: [PATCH 068/134] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=8D=95=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=85=A5=E7=BE=A4=EF=BC=8C=E9=80=9A=E7=9F=A5=E7=BB=84?=
 =?UTF-8?q?=E9=95=BF=E5=AE=A1=E6=A0=B8,=E5=AD=98=E5=82=A8targetId=EF=BC=8C?=
 =?UTF-8?q?messageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/constant/UserMessageTypeConstant.java | 6 ++++++
 .../member/service/impl/ResiGroupMemberServiceImpl.java  | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index bcce33a915..54b280cd99 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -48,4 +48,10 @@ public interface UserMessageTypeConstant {
      * targetId:resi_group.id
      */
     String CREATE_GROUP_APPLY_RES="create_group_apply_res";
+
+    /**
+     * 居民单申请入群，通知组长审核
+     * targetId:resi_group.id
+     */
+    String APPLY_ENTER_GROUP="apply_enter_group";
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index 92a5b04871..2faf36c79f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -25,6 +25,7 @@ import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg;
 import com.epmet.commons.tools.constant.*;
 import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
@@ -33,6 +34,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.SendMqMsgUtils;
 import com.epmet.constant.ReadFlagConstant;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dto.IssueShareLinkVisitRecordDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.form.*;
@@ -45,7 +47,6 @@ import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.modules.constant.GroupMemberConstant;
 import com.epmet.modules.constant.UserMessageConstant;
-import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
@@ -61,7 +62,6 @@ import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.modules.topic.entity.TopicShareLinkVisitRecordEntity;
 import com.epmet.modules.topic.service.ResiTopicService;
 import com.epmet.modules.topic.service.TopicShareLinkVisitRecordService;
-import com.epmet.modules.topic.service.impl.ResiTopicServiceImpl;
 import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.resi.group.constant.EnterGroupTypeConstant;
 import com.epmet.resi.group.constant.LeaderFlagConstant;
@@ -315,6 +315,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 			userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 			//通知群主
 			userMessage.setUserId(groupLeader.getCustomerUserId());
+
+			//21.09.10:记录消息类型和对应的业务id
+			userMessage.setMessageType(UserMessageTypeConstant.APPLY_ENTER_GROUP);
+			userMessage.setTargetId(resiGroupDTO.getId());
+
 			epmetMessageOpenFeignClient.saveUserMessage(userMessage);
 
 			//微信订阅

From 9f89d01355336395bccc2cda9a6e7dea4ff90947 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 15:37:20 +0800
Subject: [PATCH 069/134] =?UTF-8?q?=E7=BB=84=E9=95=BF=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=AE=8C=E5=85=A5=E7=BE=A4=E7=94=B3=E8=AF=B7=EF=BC=8C=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=B1=85=E6=B0=91=E7=BB=93=E6=9E=9C,=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8targetId=EF=BC=8CmessageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/constant/UserMessageTypeConstant.java    |  6 ++++++
 .../service/impl/ResiGroupMemberServiceImpl.java       | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 54b280cd99..20041347b2 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -54,4 +54,10 @@ public interface UserMessageTypeConstant {
      * targetId:resi_group.id
      */
     String APPLY_ENTER_GROUP="apply_enter_group";
+
+    /**
+     * 组长审核完入群申请，通知居民结果
+     * targetId:resi_group.id
+     */
+    String APPLY_ENTER_GROUP_RES="apply_enter_group_res";
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index 2faf36c79f..1f2a2d0681 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -739,6 +739,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		userMessage.setMessageContent(messageContent);
 		userMessage.setReadFlag(ReadFlagConstant.UN_READ);
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
+
+		//21.09.10:记录消息类型和对应的业务id
+		userMessage.setMessageType(UserMessageTypeConstant.APPLY_ENTER_GROUP_RES);
+		userMessage.setTargetId(resiGroupMemberDTO.getResiGroupId());
+
 		//通知群主
 		userMessage.setUserId(resiGroupMemberDTO.getCustomerUserId());
 		epmetMessageOpenFeignClient.saveUserMessage(userMessage);
@@ -824,6 +829,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		userMessage.setMessageContent(messageContent);
 		userMessage.setReadFlag(ReadFlagConstant.UN_READ);
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
+
+		//21.09.10:记录消息类型和对应的业务id
+		userMessage.setMessageType(UserMessageTypeConstant.APPLY_ENTER_GROUP_RES);
+		userMessage.setTargetId(groupMemeberOperationDTO.getGroupId());
+
 		//通知群主
 		userMessage.setUserId(groupMemeberOperationDTO.getCustomerUserId());
 		epmetMessageOpenFeignClient.saveUserMessage(userMessage);

From 5ab79e7c85b14946979ef061938ff8158f2fb2a6 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 15:52:23 +0800
Subject: [PATCH 070/134] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E5=85=A5=E7=BB=84?=
 =?UTF-8?q?=E7=9A=84=EF=BC=8C=E9=80=9A=E7=9F=A5=E7=BB=84=E9=95=BFxx?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BA=86,=E5=AD=98=E5=82=A8targetId=EF=BC=8C?=
 =?UTF-8?q?messageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/constant/UserMessageTypeConstant.java    | 6 ++++++
 .../invitation/service/impl/GroupInvitationServiceImpl.java | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 20041347b2..da42eb0290 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -60,4 +60,10 @@ public interface UserMessageTypeConstant {
      * targetId:resi_group.id
      */
     String APPLY_ENTER_GROUP_RES="apply_enter_group_res";
+
+    /**
+     * 组员通过连接自动入组的，通知组长
+     * targetId:resi_group.id
+     */
+    String ENTER_GROUP_BY_LINK_RES="enter_group_by_link_res";
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
index 563e5a8140..a6b031710c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
@@ -28,6 +28,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ReadFlagConstant;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
@@ -642,6 +643,11 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		userMessage.setMessageContent(messageContent);
 		userMessage.setReadFlag(ReadFlagConstant.UN_READ);
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
+
+		//21.09.10:记录消息类型和对应的业务id
+		userMessage.setMessageType(UserMessageTypeConstant.ENTER_GROUP_BY_LINK_RES);
+		userMessage.setTargetId(resiGroupDTO.getId());
+
 		//通知群主
 		userMessage.setUserId(groupInvitationDTO.getInviterUserId());
 		Result result = epmetMessageOpenFeignClient.saveUserMessage(userMessage);

From 3eeffaab90197ea01ee66d2f4190026d665093b3 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 16:08:10 +0800
Subject: [PATCH 071/134] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8Bkey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/UserMessageTypeConstant.java     | 20 ++++++++++++-------
 .../service/impl/ResiGroupServiceImpl.java    |  6 +++---
 .../impl/GroupInvitationServiceImpl.java      |  2 +-
 .../impl/ResiGroupMemberServiceImpl.java      |  6 +++---
 .../impl/PartyMemberConfirmServiceImpl.java   |  4 ++--
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index da42eb0290..38fce38af4 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -25,45 +25,51 @@ public interface UserMessageTypeConstant {
      */
     String WARMHEARTED_APPLY_RES="warmhearted_apply_res";
 
+
     /**
      * 居民端认证党员时，补充信息填写完成提交后，通知网格长，人工审核党员申请
      * targetId:partymember_info.id
      */
-    String CERTIFY_PARTY_APPLY="certify_party_apply";
+    String PARTY_CERTIFY_APPLY="party_certify_apply";
 
     /**
      * 工作端审核居民是否是党员，通知居民。
      * targetId:partymember_info.id
      */
-    String CERTIFY_PARTY_APPLY_RES="certify_party_apply_res";
+    String PARTY_CERTIFY_APPLY_RES="party_certify_apply_res";
+
+
 
     /**
      * 居民端用户申请创建小组，提交小组信息后，通知网格长
      * targetId:resi_group.id
      */
-    String CREATE_GROUP_APPLY="create_group_apply";
+    String GROUP_CREATE_GROUP_APPLY="group_create_group_apply";
 
     /**
      * 工作端审核建群申请后，通知建组人结果
      * targetId:resi_group.id
      */
-    String CREATE_GROUP_APPLY_RES="create_group_apply_res";
+    String GROUP_CREATE_GROUP_RES="group_create_group_res";
 
     /**
      * 居民单申请入群，通知组长审核
      * targetId:resi_group.id
      */
-    String APPLY_ENTER_GROUP="apply_enter_group";
+    String GROUP_APPLY_ENTER="group_apply_enter";
 
     /**
      * 组长审核完入群申请，通知居民结果
      * targetId:resi_group.id
      */
-    String APPLY_ENTER_GROUP_RES="apply_enter_group_res";
+    String GROUP_APPLY_ENTER_RES="group_apply_enter_res";
 
     /**
      * 组员通过连接自动入组的，通知组长
      * targetId:resi_group.id
      */
-    String ENTER_GROUP_BY_LINK_RES="enter_group_by_link_res";
+    String GROUP_ENTER_GROUP_BY_LINK_RES="group_enter_group_by_link_res";
+
+
+
 }
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 1ec41e6060..57d34c83b6 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
@@ -721,7 +721,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.AGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName()));
 
 		//21.09.10:记录消息类型和对应的业务id
-		userMessageFormDTO.setMessageType(UserMessageTypeConstant.CREATE_GROUP_APPLY_RES);
+		userMessageFormDTO.setMessageType(UserMessageTypeConstant.GROUP_CREATE_GROUP_RES);
 		userMessageFormDTO.setTargetId(agreeApplyGroupFormDTO.getGroupId());
 
 		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
@@ -790,7 +790,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.DISAGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason()));
 
 		//21.09.10:记录消息类型和对应的业务id
-		userMessageFormDTO.setMessageType(UserMessageTypeConstant.CREATE_GROUP_APPLY_RES);
+		userMessageFormDTO.setMessageType(UserMessageTypeConstant.GROUP_CREATE_GROUP_RES);
 		userMessageFormDTO.setTargetId(disAgreeApplyGroupFormDTO.getGroupId());
 
 		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
@@ -1198,7 +1198,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 					msgObj.setUserId(to);
 
 					//21.09.10:记录消息类型和对应的业务id
-					msgObj.setMessageType(UserMessageTypeConstant.CREATE_GROUP_APPLY);
+					msgObj.setMessageType(UserMessageTypeConstant.GROUP_CREATE_GROUP_APPLY);
 					msgObj.setTargetId(groupId);
 
 					msgList.add(msgObj);
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
index a6b031710c..28a58d0a12 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
@@ -645,7 +645,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 
 		//21.09.10:记录消息类型和对应的业务id
-		userMessage.setMessageType(UserMessageTypeConstant.ENTER_GROUP_BY_LINK_RES);
+		userMessage.setMessageType(UserMessageTypeConstant.GROUP_ENTER_GROUP_BY_LINK_RES);
 		userMessage.setTargetId(resiGroupDTO.getId());
 
 		//通知群主
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index 1f2a2d0681..4303cc9599 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -317,7 +317,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 			userMessage.setUserId(groupLeader.getCustomerUserId());
 
 			//21.09.10:记录消息类型和对应的业务id
-			userMessage.setMessageType(UserMessageTypeConstant.APPLY_ENTER_GROUP);
+			userMessage.setMessageType(UserMessageTypeConstant.GROUP_APPLY_ENTER);
 			userMessage.setTargetId(resiGroupDTO.getId());
 
 			epmetMessageOpenFeignClient.saveUserMessage(userMessage);
@@ -741,7 +741,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 
 		//21.09.10:记录消息类型和对应的业务id
-		userMessage.setMessageType(UserMessageTypeConstant.APPLY_ENTER_GROUP_RES);
+		userMessage.setMessageType(UserMessageTypeConstant.GROUP_APPLY_ENTER_RES);
 		userMessage.setTargetId(resiGroupMemberDTO.getResiGroupId());
 
 		//通知群主
@@ -831,7 +831,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 
 		//21.09.10:记录消息类型和对应的业务id
-		userMessage.setMessageType(UserMessageTypeConstant.APPLY_ENTER_GROUP_RES);
+		userMessage.setMessageType(UserMessageTypeConstant.GROUP_APPLY_ENTER_RES);
 		userMessage.setTargetId(groupMemeberOperationDTO.getGroupId());
 
 		//通知群主
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 c30e3d298f..502a520dc3 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
@@ -650,7 +650,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		userMessageFormDTO.setTitle(PartyMemberMessageConstant.PARTY_AUTH_TITLE);
 
 		//21.09.10:记录消息类型和对应的业务id
-		userMessageFormDTO.setMessageType(UserMessageTypeConstant.CERTIFY_PARTY_APPLY_RES);
+		userMessageFormDTO.setMessageType(UserMessageTypeConstant.PARTY_CERTIFY_APPLY_RES);
 		userMessageFormDTO.setTargetId(formDTO.getId());
 
 		//调用gov-org服务查询网格信息
@@ -733,7 +733,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 					msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
 
 					//21.09.10:记录消息类型和对应的业务id
-					msgDTO.setMessageType(UserMessageTypeConstant.CERTIFY_PARTY_APPLY);
+					msgDTO.setMessageType(UserMessageTypeConstant.PARTY_CERTIFY_APPLY);
 					msgDTO.setTargetId(formDTO.getId());
 					msgList.add(msgDTO);
 

From 2b9f9ee4d400fb878c8dae605fa4eefa7ff84658 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 16:30:25 +0800
Subject: [PATCH 072/134] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E3=80=81=E8=AE=AE=E9=A2=98=E8=BD=AC=E9=A1=B9=E7=9B=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8targetId=EF=BC=8CmessageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/UserMessageTypeConstant.java     | 13 ++++++++++++
 .../epmet/service/impl/IssueServiceImpl.java  | 21 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 38fce38af4..389c9facc9 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -72,4 +72,17 @@ public interface UserMessageTypeConstant {
 
 
 
+
+    /**
+     * 关闭议题时，已解决或者无需解决，通知议题发起人、话题创建人
+     * targetId:issue.id
+     */
+    String ISSUE_CLOSE_ISSUE="issue_close_issue";
+
+    /**
+     * 议题转项目时给话题创建人、议题发起人、勾选的工作人员分别推送消息
+     * targetId:居民端用户：issue.id工作端：project.id
+     */
+    String ISSUE_SHIFT_PROJECT="issue_shift_project";
+
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 1a131bb685..7ca7b0551c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -24,6 +24,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constant.IssueConstant;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.UserMessageConstant;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dao.IssueDao;
 import com.epmet.dao.IssueProcessDao;
 import com.epmet.dao.IssueProjectRelationDao;
@@ -755,6 +756,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         msgDTO.setMessageContent(messageContent);
         msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
         msgDTO.setUserId(topicDTO.getCreatedBy());
+
+        //21.09.10:记录消息类型和对应的业务id
+        msgDTO.setMessageType(UserMessageTypeConstant.ISSUE_CLOSE_ISSUE);
+        msgDTO.setTargetId(entity.getId());
+
         msgList.add(msgDTO);
         //话题人和议题人是同一个人时则只发送一条居民消息
         if (!topicDTO.getCreatedBy().equals(entity.getCreatedBy())) {
@@ -1067,11 +1073,21 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         msgDTO.setMessageContent(topicIssueMessage);
         msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
         msgDTO.setUserId(formDTO.getTopicDTO().getCreatedBy());
+
+        //21.09.10:记录消息类型和对应的业务id
+        msgDTO.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT);
+        msgDTO.setTargetId(entity.getId());
+
         msgList.add(msgDTO);
         //话题人和议题人是同一个人时则只发送一条居民消息
         if (!formDTO.getTopicDTO().getCreatedBy().equals(entity.getCreatedBy())) {
             UserMessageFormDTO msgIssue = ConvertUtils.sourceToTarget(msgDTO, UserMessageFormDTO.class);
             msgIssue.setUserId(entity.getCreatedBy());
+
+            //21.09.10:记录消息类型和对应的业务id
+            msgDTO.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT);
+            msgDTO.setTargetId(entity.getId());
+
             msgList.add(msgIssue);
         }
         //2:创建项目工作人员消息对象
@@ -1088,6 +1104,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                 msg.setMessageContent(projectStaffMessage);
                 msg.setReadFlag(ReadFlagConstant.UN_READ);
                 msg.setUserId(staff.getStaffId());
+
+                //21.09.10:记录消息类型和对应的业务id
+                msgDTO.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT);
+                msgDTO.setTargetId(issueProjectResultDTO.getProjectId());
+
                 msgList.add(msg);
                 map.put(staff.getStaffId(),staff.getStaffId());
             }

From 4b4c53acbacbb306623610bd7762842cc4ef6f1d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 16:34:08 +0800
Subject: [PATCH 073/134] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B5=81=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=AD=98=E5=82=A8targetId=EF=BC=8CmessageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/constant/UserMessageTypeConstant.java    |  6 ++++++
 .../epmet/service/impl/ProjectProcessServiceImpl.java  | 10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 389c9facc9..5d0d635f21 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -85,4 +85,10 @@ public interface UserMessageTypeConstant {
      */
     String ISSUE_SHIFT_PROJECT="issue_shift_project";
 
+
+    /**
+     * 项目流转
+     * targetId:project.id
+     */
+    String PROJECT_TRANSFER="project_transfer";
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
index ad3fec6959..de0a8347f4 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
@@ -36,10 +36,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.IpUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
-import com.epmet.constant.ProjectConstant;
-import com.epmet.constant.ReadFlagConstant;
-import com.epmet.constant.SmsTemplateConstant;
-import com.epmet.constant.UserMessageConstant;
+import com.epmet.constant.*;
 import com.epmet.dao.ProjectOrgRelationDao;
 import com.epmet.dao.ProjectDao;
 import com.epmet.dao.ProjectProcessDao;
@@ -451,6 +448,11 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
                 msg.setMessageContent(projectStaffMessage);
                 msg.setReadFlag(ReadFlagConstant.UN_READ);
                 msg.setUserId(staff.getStaffId());
+
+                //21.09.10:记录消息类型和对应的业务id
+                msg.setMessageType(UserMessageTypeConstant.PROJECT_TRANSFER);
+                msg.setTargetId(formDTO.getProjectId());
+
                 msgList.add(msg);
                 map.put(staff.getStaffId(),staff.getStaffId());
             }

From fda7232373be63c8a104fa2be8957850657efd71 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 16:47:55 +0800
Subject: [PATCH 074/134] =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E3=80=81=E7=BB=93?=
 =?UTF-8?q?=E6=A1=88=E3=80=81=E9=80=80=E5=9B=9E=E3=80=81=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E7=AB=8B=E9=A1=B9=EF=BC=8C=E5=AD=98=E5=82=A8targetId=EF=BC=8Cm?=
 =?UTF-8?q?essageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/UserMessageTypeConstant.java     | 25 +++++++++++++
 .../service/impl/ProjectServiceImpl.java      | 35 ++++++++++++++++---
 .../service/impl/ProjectTraceServiceImpl.java | 23 +++++++-----
 3 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 5d0d635f21..a1453db60f 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -91,4 +91,29 @@ public interface UserMessageTypeConstant {
      * targetId:project.id
      */
     String PROJECT_TRANSFER="project_transfer";
+
+    /**
+     * 项目结案
+     * targetId:project.id
+     */
+    String PROJECT_CLOSED="project_closed";
+
+    /**
+     * 项目退回
+     * targetId:project.id
+     */
+    String PROJECT_RETURN="project_return";
+
+    /**
+     * 项目立项
+     * targetId:project.id
+     */
+    String PROJECT_APPROVAL="project_approval";
+
+    /**
+     * 事件立项
+     * targetId:project.id
+     */
+    String PROJECT_FROM_RESI_EVENT="project_from_resi_event";
+
 }
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 bc6a2616c7..e03e78d573 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
@@ -31,10 +31,7 @@ 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.ParameterKeyConstant;
-import com.epmet.constant.ProjectConstant;
-import com.epmet.constant.SmsTemplateConstant;
-import com.epmet.constant.UserMessageConstant;
+import com.epmet.constant.*;
 import com.epmet.dao.ProjectDao;
 import com.epmet.dao.ProjectOrgRelationDao;
 import com.epmet.dao.ProjectSatisfactionStatisticsDao;
@@ -513,6 +510,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			messageFormDTO.setTitle(UserMessageConstant.PROJECT_TITLE);
 			messageFormDTO.setMessageContent(String.format(UserMessageConstant.PROJECT_CLOSED_MSG, projectEntity.getTitle(), fromDTO.getPublicReply()));
 			messageFormDTO.setReadFlag(Constant.UNREAD);
+
+			//21.09.10:记录消息类型和对应的业务id
+			messageFormDTO.setMessageType(UserMessageTypeConstant.PROJECT_CLOSED);
+			messageFormDTO.setTargetId(fromDTO.getProjectId());
+
 			msgList.add(messageFormDTO);
 			WxSubscribeMessageFormDTO msg = new WxSubscribeMessageFormDTO();
 			msg.setCustomerId(projectEntity.getCustomerId());
@@ -536,6 +538,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			messageFormDTO.setTitle(UserMessageConstant.PROJECT_TITLE);
 			messageFormDTO.setMessageContent(String.format(UserMessageConstant.PROJECT_CLOSED_MSG, projectEntity.getTitle(), fromDTO.getPublicReply()));
 			messageFormDTO.setReadFlag(Constant.UNREAD);
+
+			//21.09.10:记录消息类型和对应的业务id
+			messageFormDTO.setMessageType(UserMessageTypeConstant.PROJECT_CLOSED);
+			messageFormDTO.setTargetId(fromDTO.getProjectId());
+
 			msgList.add(messageFormDTO);
 			WxSubscribeMessageFormDTO msg = new WxSubscribeMessageFormDTO();
 			msg.setCustomerId(projectEntity.getCustomerId());
@@ -694,6 +701,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			messageFormDTO.setTitle(UserMessageConstant.PROJECT_TITLE);
 			messageFormDTO.setMessageContent(String.format(UserMessageConstant.PROJECT_CLOSED_MSG, projectEntity.getTitle(), fromDTO.getPublicReply()));
 			messageFormDTO.setReadFlag(Constant.UNREAD);
+
+			//21.09.10:记录消息类型和对应的业务id
+			messageFormDTO.setMessageType(UserMessageTypeConstant.PROJECT_CLOSED);
+			messageFormDTO.setTargetId(fromDTO.getProjectId());
+
 			msgList.add(messageFormDTO);
 			WxSubscribeMessageFormDTO msg = new WxSubscribeMessageFormDTO();
 			msg.setCustomerId(projectEntity.getCustomerId());
@@ -717,6 +729,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			messageFormDTO.setTitle(UserMessageConstant.PROJECT_TITLE);
 			messageFormDTO.setMessageContent(String.format(UserMessageConstant.PROJECT_CLOSED_MSG, projectEntity.getTitle(), fromDTO.getPublicReply()));
 			messageFormDTO.setReadFlag(Constant.UNREAD);
+
+			//21.09.10:记录消息类型和对应的业务id
+			messageFormDTO.setMessageType(UserMessageTypeConstant.PROJECT_CLOSED);
+			messageFormDTO.setTargetId(fromDTO.getProjectId());
+
 			msgList.add(messageFormDTO);
 			WxSubscribeMessageFormDTO msg = new WxSubscribeMessageFormDTO();
 			msg.setCustomerId(projectEntity.getCustomerId());
@@ -881,6 +898,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		messageFormDTO.setTitle(UserMessageConstant.PROJECT_TITLE);
 		messageFormDTO.setMessageContent(String.format(UserMessageConstant.PROJECT_RESOLVED_MSG, projectEntity.getTitle()));
 		messageFormDTO.setReadFlag(Constant.UNREAD);
+
+		//21.09.10:记录消息类型和对应的业务id
+		messageFormDTO.setMessageType(UserMessageTypeConstant.PROJECT_RETURN);
+		messageFormDTO.setTargetId(fromDTO.getProjectId());
+
 		msgList.add(messageFormDTO);
 		messageFeignClient.saveUserMessageList(msgList);
 		//2020.10.26  添加项目退回给勾选人推送微信订阅消息 sun
@@ -2056,6 +2078,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		messageFormDTO.setTitle(UserMessageConstant.PROJECT_TITLE);
 		messageFormDTO.setMessageContent(String.format(UserMessageConstant.PROJECT_RESOLVED_MSG, projectEntity.getTitle()));
 		messageFormDTO.setReadFlag(Constant.UNREAD);
+
+		//21.09.10:记录消息类型和对应的业务id
+		messageFormDTO.setMessageType(UserMessageTypeConstant.PROJECT_RETURN);
+		messageFormDTO.setTargetId(fromDTO.getProjectId());
+
 		msgList.add(messageFormDTO);
 		messageFeignClient.saveUserMessageList(msgList);
 		//2020.10.26  添加项目退回给勾选人推送微信订阅消息 sun
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
index 1e4a1b64b4..e8e79882f7 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
@@ -15,10 +15,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.IpUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
-import com.epmet.constant.ProjectConstant;
-import com.epmet.constant.ReadFlagConstant;
-import com.epmet.constant.SmsTemplateConstant;
-import com.epmet.constant.UserMessageConstant;
+import com.epmet.constant.*;
 import com.epmet.dao.ProjectOrgRelationDao;
 import com.epmet.dao.ProjectProcessAttachmentDao;
 import com.epmet.dao.ProjectProcessDao;
@@ -488,7 +485,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 
 		//4.推送站内信、微信、短信消息
 		//4-1.调用epmet-message服务，给工作端勾选的工作人员发送消息
-		if (!shiftProjectMessage(formDTO).success()) {
+		if (!shiftProjectMessage(formDTO,projectEntity.getId()).success()) {
 			throw new RenException("项目立项，推送站内信失败");
 		}
 
@@ -565,7 +562,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 	 * @Description 项目立项给勾选的工作人员推送站内信消息
 	 * @author sun
 	 */
-	private Result shiftProjectMessage(ProjectApprovalFormDTO formDTO) {
+	private Result shiftProjectMessage(ProjectApprovalFormDTO formDTO,String projectId) {
 		List<UserMessageFormDTO> msgList = new ArrayList<>();
 		//1.创建项目工作人员消息对象
 		String projectStaffMessage = String.format(UserMessageConstant.PROJECT_RESOLVED_MSG, formDTO.getTitle());
@@ -581,6 +578,11 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 				msg.setMessageContent(projectStaffMessage);
 				msg.setReadFlag(ReadFlagConstant.UN_READ);
 				msg.setUserId(staff.getStaffId());
+
+				//21.09.10:记录消息类型和对应的业务id
+				msg.setMessageType(UserMessageTypeConstant.PROJECT_APPROVAL);
+				msg.setTargetId(projectId);
+
 				msgList.add(msg);
 				map.put(staff.getStaffId(),staff.getStaffId());
 			}
@@ -789,7 +791,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 
 		//4.推送站内信、微信、短信消息
 		//4-1.调用epmet-message服务，给工作端勾选的工作人员发送消息
-		if (!shiftProjectMessage(formDTO.getStaffList(),formDTO.getCustomerId(),formDTO.getTitle()).success()) {
+		if (!shiftProjectMessage(formDTO.getStaffList(),formDTO.getCustomerId(),formDTO.getTitle(),projectEntity.getId()).success()) {
 			throw new RenException("事件转为项目，推送站内信失败");
 		}
 
@@ -919,7 +921,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 	 * @Description 项目立项给勾选的工作人员推送站内信消息
 	 * @author yinzuomei
 	 */
-	private Result shiftProjectMessage(List<TickStaffFormDTO> staffList,String customerId,String title) {
+	private Result shiftProjectMessage(List<TickStaffFormDTO> staffList,String customerId,String title,String projectId) {
 		List<UserMessageFormDTO> msgList = new ArrayList<>();
 		//1.创建项目工作人员消息对象
 		String projectStaffMessage = String.format(UserMessageConstant.PROJECT_RESOLVED_MSG, title);
@@ -935,6 +937,11 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 				msg.setMessageContent(projectStaffMessage);
 				msg.setReadFlag(ReadFlagConstant.UN_READ);
 				msg.setUserId(staff.getStaffId());
+
+				//21.09.10:记录消息类型和对应的业务id
+				msg.setTargetId(projectId);
+				msg.setMessageType(UserMessageTypeConstant.PROJECT_FROM_RESI_EVENT);
+
 				msgList.add(msg);
 				map.put(staff.getStaffId(),staff.getStaffId());
 			}

From 6a02bc00eae495c22d5e07f1e7f9144cb63dd330 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 10 Sep 2021 16:59:56 +0800
Subject: [PATCH 075/134] =?UTF-8?q?poi=E6=A1=86=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/utils/ExcelUtils.java | 41 ++++++++++++
 .../controller/DataStatsController.java       | 24 +++++--
 .../evaluationindex/EvaluationIndexDao.java   |  8 +++
 .../service/datastats/DataStatsService.java   | 10 +++
 .../datastats/impl/DataStatsServiceImpl.java  | 64 ++++++++++++++++++-
 .../EvaluationIndexService.java               |  8 +++
 .../impl/EvaluationIndexServiceImpl.java      | 11 ++++
 .../evaluationindex/EvaluationIndexDao.xml    |  7 ++
 8 files changed, 166 insertions(+), 7 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
index 2ac6af82a5..6eef730ad4 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
@@ -14,11 +14,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -80,4 +82,43 @@ public class ExcelUtils {
 
         exportExcel(response, fileName, targetList, targetClass);
     }
+
+    public static void exportExcelToTargetDisposeAll(HttpServletResponse response, String fileName, Collection<?> sourceList,
+                                           Class<?> targetClass) throws Exception {
+        if (!CollectionUtils.isEmpty(sourceList)){
+            List<Object> targetList = new ArrayList<>(sourceList.size());
+            for(Object source : sourceList){
+                Object target = targetClass.newInstance();
+                BeanUtils.copyProperties(source, target);
+                targetList.add(target);
+            }
+            exportExcelDispose(response, fileName, targetList, targetClass);
+        }else {
+            exportExcelDispose(response, fileName, new ArrayList<>(), targetClass);
+        }
+
+
+    }
+
+    public static void exportExcelDispose(HttpServletResponse response, String fileName, Collection<?> list,
+                                   Class<?> pojoClass) throws IOException {
+        if(StringUtils.isBlank(fileName)){
+            //当前日期
+            fileName = DateUtils.format(new Date());
+        }
+        ExportParams params = new ExportParams(fileName, "sheet的Name");
+        Workbook workbook = ExcelExportUtil.exportExcel(params, pojoClass, list);
+        Sheet sheet1 = workbook.getSheetAt(0);
+        sheet1.setDefaultColumnWidth(50*256);
+        sheet1.setDefaultRowHeight((short)(2*256));
+        response.setCharacterEncoding("UTF-8");
+        response.setHeader("content-Type", "application/vnd.ms-excel");
+        response.setHeader("Content-Disposition",
+                "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xls");
+        ServletOutputStream out = response.getOutputStream();
+        workbook.write(out);
+        out.flush();
+        out.close();
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
index a56d769119..3e495ab112 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
@@ -1,18 +1,20 @@
 package com.epmet.dataaggre.controller;
 
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.datastats.form.*;
 import com.epmet.dataaggre.dto.datastats.result.*;
+import com.epmet.dataaggre.excel.CustomerDataManageExcel;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 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;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author sun
@@ -215,4 +217,18 @@ public class DataStatsController {
         return new Result<GovrnRatioResultDTO>().ok(dataStatsService.governRatio(formDTO));
     }
 
+    /**
+     * @Description 客户数据管理导出
+     * @Param formDTO
+     * @Param response
+     * @author zxc
+     * @date 2021/9/10 3:52 下午
+     */
+    @PostMapping("operateexport")
+    public void CustomerDataManage(@RequestBody CustomerDataManageFormDTO formDTO, HttpServletResponse response) throws Exception {
+        ValidatorUtils.validateEntity(formDTO, CustomerDataManageFormDTO.CustomerDataManageForm.class);
+        dataStatsService.CustomerDataManage(formDTO,response);
+    }
+
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java
index 197b4e05e6..138ff3d449 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java
@@ -95,4 +95,12 @@ public interface EvaluationIndexDao {
      */
     List<ScreenCustomerAgencyDTO> getSubAgencyListByAgency(@Param("agencyId") String agencyId, @Param("areaCode") String areaCode, @Param("list") List<String> list);
 
+    /**
+     * @Description  根据组织ID查询组织名
+     * @Param agencyId
+     * @author zxc
+     * @date 2021/9/10 3:54 下午
+     */
+    String selectAgencyNameByAgencyId(@Param("agencyId")String agencyId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index d4756648a0..30df4925a1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -9,6 +9,7 @@ import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -229,4 +230,13 @@ public interface DataStatsService {
      * @author sun
      */
     List<GridMemberPatrolListResultDTO> getGirdMemberPatrol(GridMemberPatrolListFormDTO formDTO);
+
+    /**
+     * @Description 客户数据管理导出
+     * @Param formDTO
+     * @Param response
+     * @author zxc
+     * @date 2021/9/10 3:52 下午
+     */
+    void CustomerDataManage(CustomerDataManageFormDTO formDTO, HttpServletResponse response) throws Exception;
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 1002b8c34a..19441f076a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -6,7 +6,8 @@ import com.epmet.commons.tools.constant.NumConstant;
  import com.epmet.commons.tools.constant.StrConstant;
  import com.epmet.commons.tools.enums.OrgLevelEnum;
 import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.dataaggre.constant.DataSourceConstant;
+ import com.epmet.commons.tools.utils.ExcelUtils;
+ import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.constant.OrgConstant;
 import com.epmet.dataaggre.dao.datastats.DataStatsDao;
 import com.epmet.dataaggre.dao.datastats.FactGridMemberStatisticsDailyDao;
@@ -24,7 +25,8 @@ import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
 import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity;
-import com.epmet.dataaggre.service.datastats.DataStatsService;
+ import com.epmet.dataaggre.excel.CustomerDataManageExcel;
+ import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
 import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
 import com.epmet.dataaggre.service.opercrm.CustomerRelation;
@@ -35,7 +37,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
+ import javax.servlet.http.HttpServletResponse;
+ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
@@ -1841,4 +1844,59 @@ public class DataStatsServiceImpl implements DataStatsService {
         return dataStatsDao.selectGirdMemberPatrol(formDTO);
     }
 
+    /**
+     * @Description 客户数据管理导出
+     * @Param formDTO
+     * @Param response
+     * @author zxc
+     * @date 2021/9/10 3:52 下午
+     */
+    @Override
+    public void CustomerDataManage(CustomerDataManageFormDTO formDTO, HttpServletResponse response) throws Exception {
+        List<CustomerDataManageExcel> l = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(l)){
+            CustomerDataManageExcel d3 = new CustomerDataManageExcel();
+            d3.setOrgName("合计");
+            d3.setUserCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getUserCount)));
+            d3.setResidentCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getResidentCount)));
+            d3.setPartyMemberCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPartyMemberCount)));
+            d3.setGroupCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getGroupCount)));
+            d3.setTopicCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getTopicCount)));
+            d3.setIssueCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getIssueCount)));
+            d3.setProjectCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getProjectCount)));
+            d3.setClosedProjectCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getClosedProjectCount)));
+            d3.setPatrolPeopleCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPatrolPeopleCount)));
+            d3.setPatrolCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPatrolCount)));
+            d3.setPatrolDuration("");
+            l.add(d3);
+        }
+        String fileName = excelName(formDTO);
+        ExcelUtils.exportExcelToTargetDisposeAll(response,fileName,l, CustomerDataManageExcel.class);
+    }
+
+    public String excelName(CustomerDataManageFormDTO formDTO){
+        StringBuffer s = new StringBuffer();
+        String agencyName = indexService.selectAgencyNameByAgencyId(formDTO.getAgencyId());
+        s.append(agencyName);
+        if (StringUtils.isNotBlank(formDTO.getStartTime())){
+            String startTime = formDTO.getStartTime();
+            String sYear = startTime.substring(0, 4);
+            String sMonth = startTime.substring(4, 6);
+            String sDay = startTime.substring(6, 8);
+            String endTime = formDTO.getEndTime();
+            String eYear = endTime.substring(0, 4);
+            String eMonth = endTime.substring(4, 6);
+            String eDay = endTime.substring(6, 8);
+            s.append(sYear).append("年").append(sMonth).append("月").append(sDay).append("日-")
+                    .append(eYear).append("年").append(eMonth).append("月").append(eDay).append("日区间新增值");
+        }else {
+            String endTime = formDTO.getEndTime();
+            String eYear = endTime.substring(0, 4);
+            String eMonth = endTime.substring(4, 6);
+            String eDay = endTime.substring(6, 8);
+            s.append(eYear).append("年").append(eMonth).append("月").append(eDay).append("日截止累计值");
+        }
+        return s.toString();
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
index 43be38a84f..fe37824d86 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
@@ -71,4 +71,12 @@ public interface EvaluationIndexService {
      */
     List<ScreenCustomerAgencyDTO> getSubAgencyListByAgency(String agencyId);
 
+    /**
+     * @Description  根据组织ID查询组织名
+     * @Param agencyId
+     * @author zxc
+     * @date 2021/9/10 3:54 下午
+     */
+    String selectAgencyNameByAgencyId(String agencyId);
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
index f8c7eb301a..d648c07732 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
@@ -143,4 +143,15 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
         }
     }
 
+    /**
+     * @Description  根据组织ID查询组织名
+     * @Param agencyId
+     * @author zxc
+     * @date 2021/9/10 3:54 下午
+     */
+    @Override
+    public String selectAgencyNameByAgencyId(String agencyId) {
+        return evaluationIndexDao.selectAgencyNameByAgencyId(agencyId);
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
index 7ad70627dc..afa7e56c2d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
@@ -175,4 +175,11 @@
         </if>
     </select>
 
+    <!-- 根据组织ID查询组织名 -->
+    <select id="selectAgencyNameByAgencyId" resultType="java.lang.String">
+        SELECT AGENCY_NAME FROM screen_customer_agency
+        WHERE AGENCY_ID = #{agencyId}
+          AND DEL_FLAG = 0
+    </select>
+
 </mapper>

From ea804e9ceeaa6802936e22e7e0b37fff4d8a2832 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 17:05:47 +0800
Subject: [PATCH 076/134] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=85=9A=E5=BB=BA?=
 =?UTF-8?q?=E5=A3=B0=E9=9F=B3=EF=BC=8C=E5=AD=98=E5=82=A8targetId=EF=BC=8Cm?=
 =?UTF-8?q?essageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/UserMessageTypeConstant.java     |  6 +++++
 .../service/impl/ArticleServiceImpl.java      | 22 ++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index a1453db60f..1de4d926f6 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -116,4 +116,10 @@ public interface UserMessageTypeConstant {
      */
     String PROJECT_FROM_RESI_EVENT="project_from_resi_event";
 
+
+    /**
+     * 发布党建声音
+     * targetId:article.DRAFT_ID
+     */
+    String PARTY_VOICE_PUBLISH="party_voice_publish";
 }
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index 62274c346b..1d95335423 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -976,7 +976,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		}
 
 		if (!isOk) {
-			this.sendMsg(draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
+			//发布文章内容审核
+			this.sendMsg(draftEntity.getId(),draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
 			this.wxmpMsg(draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
 			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL, null);
 			return null;
@@ -1054,7 +1055,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			}
 		} catch (Exception e) {
 			log.error("scanContent exception", e);
-			this.sendMsg(draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
+			//发布文章内容审核
+			this.sendMsg(draftEntity.getId(),draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
 			this.wxmpMsg(draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
 			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL, null);
 		}
@@ -1092,7 +1094,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			}
 		} catch (Exception e) {
 			log.error("scanAllPassPublishArticle update db exception", e);
-			this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
+			//发布文章内容审核
+			this.sendMsg(draft.getId(),draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
 			this.wxmpMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
 			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}
@@ -1157,12 +1160,14 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 				} else if (titleFail) {
 					auditMsg = ModuleConstant.DRAFT_TITLE;
 				}
-				this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_AUDIT_CONTENT, draft.getTitle(), auditMsg));
+				//发布文章内容审核
+				this.sendMsg(draft.getId(),draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_AUDIT_CONTENT, draft.getTitle(), auditMsg));
 				this.wxmpMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_AUDIT_CONTENT, draft.getTitle(), auditMsg));
 			}
 		} catch (Exception e) {
 			log.error("scanAllPassPublishArticle update db exception", e);
-			this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
+			//发布文章内容审核
+			this.sendMsg(draft.getId(),draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
 			this.wxmpMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
 			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}
@@ -1174,7 +1179,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		return this.saveOrUpdateContent(tokenDto, fromDTO, false);
 	}
 
-	public Result sendMsg(String customerId, String title, String content) {
+	public Result sendMsg(String draftId,String customerId, String title, String content) {
 		UserMessageFormDTO formDTO = new UserMessageFormDTO();
 		formDTO.setCustomerId(customerId);
 		formDTO.setGridId("");
@@ -1183,6 +1188,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		formDTO.setTitle(String.format(ModuleConstant.MSG_TITLE, title));
 		formDTO.setMessageContent(content);
 		formDTO.setReadFlag(ReadFlagConstant.UN_READ);
+
+		//21.09.10:记录消息类型和对应的业务id
+		formDTO.setMessageType(UserMessageTypeConstant.PARTY_VOICE_PUBLISH);
+		formDTO.setTargetId(draftId);
+
 		return epmetMessageOpenFeignClient.saveUserMessage(formDTO);
 	}
 	/**

From a5d41c6f62e5ea8393f1edae4e481b7d71639d88 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 10 Sep 2021 17:11:25 +0800
Subject: [PATCH 077/134] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=9B=9E=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/user/impl/UserServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
index 13665c52f8..c154ead20b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
@@ -116,16 +116,16 @@ public class UserServiceImpl implements UserService {
         if(null != agencyMap && agencyMap.size() > NumConstant.ZERO){
             agencyMap.forEach((agencyId,v) -> {
                 if(null != v && v.size() > NumConstant.ZERO){
-                    queryUserData(ModuleConstant.DIM_BELONGING_GRID,
+                    /*queryUserData(ModuleConstant.DIM_BELONGING_GRID,
                             agencyId,
                             // v.get(NumConstant.ZERO).getPid(),
                             v.get(NumConstant.ZERO).getCustomerId(),
                             new HashSet<>(v.get(NumConstant.ZERO).getGridIds()),
                             targetDate,
                             dataPacket,
-                            timeDimension);
-                    /*traverseGridUserDispose(agencyId,v.get(NumConstant.ZERO).getCustomerId(),new HashSet<>(v.get(NumConstant.ZERO).getGridIds())
-                            ,targetDate,dataPacket,timeDimension);*/
+                            timeDimension);*/
+                    traverseGridUserDispose(agencyId,v.get(NumConstant.ZERO).getCustomerId(),new HashSet<>(v.get(NumConstant.ZERO).getGridIds())
+                            ,targetDate,dataPacket,timeDimension);
                 }
             });
         }

From 5b8c4a374f5bd7a737e1f7f3004090be13758892 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 17:19:34 +0800
Subject: [PATCH 078/134] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E5=86=85=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=B4=BB=E5=8A=A8=E3=80=81=E7=BC=96=E8=BE=91=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=EF=BC=8C=E5=AD=98=E5=82=A8targetId=EF=BC=8CmessageTyp?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/constant/UserMessageTypeConstant.java | 13 +++++++++++++
 .../act/service/impl/GroupActInfoServiceImpl.java   |  9 +++++++++
 2 files changed, 22 insertions(+)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 1de4d926f6..435bb82903 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -70,6 +70,19 @@ public interface UserMessageTypeConstant {
      */
     String GROUP_ENTER_GROUP_BY_LINK_RES="group_enter_group_by_link_res";
 
+    /**
+     * 组内发布活动
+     * targetId:group_act_info.id
+     */
+    String GROUP_ACT_PUBLISH="group_act_publish";
+    /**
+     * 组内发布活动,进行编辑
+     * targetId:group_act_info.id
+     */
+    String GROUP_ACT_CHANGE="group_act_change";
+
+
+
 
 
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index 48334bac4e..a12a281396 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -35,6 +35,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
@@ -262,9 +263,17 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
                 if(StringUtils.isNotBlank(formDTO.getGroupActId())){
                     // 活动修改后，站内信通知全组成员“您有一条小组消息   【某某小组】更新了********活动详情，请查看。
                     userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.CHANGED_GROUP_ACT, resiGroupDTO.getGroupName(), groupActInfoEntity.getTitle()));
+
+                    //21.09.10:记录消息类型和对应的业务id
+                    userMessageFormDTO.setMessageType(UserMessageTypeConstant.GROUP_ACT_PUBLISH);
+                    userMessageFormDTO.setTargetId(groupActInfoEntity.getId());
                 }else{
                     // 活动发布，站内信通知全组成员“您有一条小组消息   【某某小组】发布了*******活动，请查看。
                     userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.PUBLISH_GROUP_ACT, resiGroupDTO.getGroupName(), groupActInfoEntity.getTitle()));
+
+                    //21.09.10:记录消息类型和对应的业务id
+                    userMessageFormDTO.setMessageType(UserMessageTypeConstant.GROUP_ACT_CHANGE);
+                    userMessageFormDTO.setTargetId(groupActInfoEntity.getId());
                 }
                 list.add(userMessageFormDTO);
             }

From 2c0deecb9b805d162fb316987fd40d5a91c80855 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 17:22:01 +0800
Subject: [PATCH 079/134] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E5=86=85=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=B4=BB=E5=8A=A8=EF=BC=8C=E5=AD=98=E5=82=A8targetId?=
 =?UTF-8?q?=EF=BC=8CmessageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/constant/UserMessageTypeConstant.java    | 6 +++++-
 .../modules/act/service/impl/GroupActInfoServiceImpl.java   | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 435bb82903..6cb754a94f 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -80,7 +80,11 @@ public interface UserMessageTypeConstant {
      * targetId:group_act_info.id
      */
     String GROUP_ACT_CHANGE="group_act_change";
-
+    /**
+     * 组内活动，取消
+     * targetId:group_act_info.id
+     */
+    String GROUP_ACT_CANCEL="group_act_cancel";
 
 
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index a12a281396..b7e20cb493 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -766,6 +766,11 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
                     userMessageFormDTO.setTitle(UserMessageConstant.GROUP_TITLE);
                     userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
                     userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.CANCEL_GROUP_ACT, resiGroupDTO.getGroupName(), actInfoEntity.getTitle()));
+
+                    //21.09.10:记录消息类型和对应的业务id
+                    userMessageFormDTO.setMessageType(UserMessageTypeConstant.GROUP_ACT_CANCEL);
+                    userMessageFormDTO.setTargetId(actInfoEntity.getId());
+
                     list.add(userMessageFormDTO);
                 }
             });

From 4e0af170482401e22de64c922d6fbd6f7ad787f2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 17:31:36 +0800
Subject: [PATCH 080/134] =?UTF-8?q?=E8=BD=AC=E4=BA=A4=E7=BB=84=E9=95=BF?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=EF=BC=8C=E5=AD=98=E5=82=A8targetId=EF=BC=8Cm?=
 =?UTF-8?q?essageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/constant/UserMessageTypeConstant.java    | 10 ++++++++++
 .../impl/GroupLeaderTransferRecordServiceImpl.java     |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 6cb754a94f..c69e463370 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -86,6 +86,16 @@ public interface UserMessageTypeConstant {
      */
     String GROUP_ACT_CANCEL="group_act_cancel";
 
+    /**
+     * 工作端转交组长，通知原组长
+     * targetId:resi_group.id
+     */
+    String GROUP_ORIGINAL_LEADER_DOWN="group_original_leader_down";
+    /**
+     * 新人组织，告诉他这个好消息
+     * targetId:resi_group.id
+     */
+    String GROUP_NEW_LEADER_UP="group_new_leader_up";
 
 
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupLeaderTransferRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupLeaderTransferRecordServiceImpl.java
index 492047cf9b..8e2e484b13 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupLeaderTransferRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupLeaderTransferRecordServiceImpl.java
@@ -25,6 +25,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
@@ -204,6 +205,10 @@ public class GroupLeaderTransferRecordServiceImpl extends BaseServiceImpl<GroupL
             originalLeader.setCustomerId(formDTO.getCustomerId());
             originalLeader.setMessageContent(String.format(UserMessageConstant.ORIGINAL_LEADER_DOWN,resiGroupDTO.getGroupName()));
 
+            //21.09.10:记录消息类型和对应的业务id
+            originalLeader.setMessageType(UserMessageTypeConstant.GROUP_ORIGINAL_LEADER_DOWN);
+            originalLeader.setTargetId(resiGroupDTO.getId());
+
             msgList.add(originalLeader);
         }
         //新组长
@@ -217,6 +222,10 @@ public class GroupLeaderTransferRecordServiceImpl extends BaseServiceImpl<GroupL
         newLeader.setCustomerId(formDTO.getCustomerId());
         newLeader.setMessageContent(String.format(UserMessageConstant.NEW_LEADER_UP,resiGroupDTO.getGroupName()));
 
+        //21.09.10:记录消息类型和对应的业务id
+        newLeader.setMessageType(UserMessageTypeConstant.GROUP_NEW_LEADER_UP);
+        newLeader.setTargetId(resiGroupDTO.getId());
+
         msgList.add(newLeader);
         if(!epmetMessageOpenFeignClient.saveUserMessageList(msgList).success()){
             log.warn("转让组发送站内信失败");

From abb5e472b4812fc5be26f2fc81c7f77e7ff7aeb0 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 10 Sep 2021 17:31:57 +0800
Subject: [PATCH 081/134] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=A7=AF=E5=88=86=E6=8E=92=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/BizPointUserTotalDetailDTO.java |   5 +-
 .../dto/result/GridPointRankResultDTO.java    |  21 +++
 .../dto/result/MyPointRankResultDTO.java      |  21 +++
 .../epmet/controller/ResiPointController.java |  30 ++++
 .../dao/UserPointStatisticalDailyDao.java     |   6 +
 .../UserPointStatisticalDailyService.java     |  26 +++-
 .../UserPointStatisticalDailyServiceImpl.java | 144 +++++++++++++++++-
 .../mapper/UserPointStatisticalDailyDao.xml   |  50 ++++++
 8 files changed, 298 insertions(+), 5 deletions(-)
 create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GridPointRankResultDTO.java
 create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/BizPointUserTotalDetailDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/BizPointUserTotalDetailDTO.java
index 3e5dc04f11..fde907f861 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/BizPointUserTotalDetailDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/BizPointUserTotalDetailDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,6 @@ public class BizPointUserTotalDetailDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    private String rank;
+
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GridPointRankResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GridPointRankResultDTO.java
new file mode 100644
index 0000000000..2ef1819bcc
--- /dev/null
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GridPointRankResultDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/10 14:11
+ */
+@NoArgsConstructor
+@Data
+public class GridPointRankResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3288606889536923166L;
+    private String gridName;
+    private String agencyRank;
+    private String customerRank;
+}
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java
new file mode 100644
index 0000000000..484c8f8055
--- /dev/null
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/10 13:44
+ */
+@NoArgsConstructor
+@Data
+public class MyPointRankResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -2438231097029179782L;
+    private String headPhoto;
+    private String gridRank;
+    private String customerRank;
+}
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 9f5ee8acf8..dbef30e35f 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
@@ -190,4 +190,34 @@ public class ResiPointController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<List<MyPointTaskResultDTO>>().ok(pointActionLogService.queryMyPointTaskList(formDTO));
     }
+
+    /**
+     * @Description 个人当月积分在网格和客户中的排名
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link Result< MyPointTaskResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/10 14:13
+     */
+    @PostMapping("mypointrank")
+    public Result<MyPointRankResultDTO> myPointRank(@LoginUser TokenDto tokenDto, @RequestBody GroupPointFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.GridRank.class);
+        return new Result<MyPointRankResultDTO>().ok(userPointStatisticalDailyService.myPointRank(tokenDto, formDTO));
+    }
+
+    /**
+     * @Description 网格当月积分在组织和客户内排名
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link Result<GridPointRankResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/10 14:13
+     */
+    @PostMapping("gridpointrank")
+    public Result<GridPointRankResultDTO> gridPointRank(@LoginUser TokenDto tokenDto, @RequestBody GroupPointFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.GridRank.class);
+        return new Result<GridPointRankResultDTO>().ok(userPointStatisticalDailyService.gridPointRank(tokenDto, formDTO));
+    }
+
+
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java
index 2ae8bb24f5..2966e00f75 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.BizPointUserTotalDetailDTO;
 import com.epmet.dto.form.ResiAroundPartyPointRankFormDTO;
 import com.epmet.dto.result.AllPartyResultDTO;
 import com.epmet.dto.result.ResiAroundPartyPointRankResultDTO;
@@ -85,4 +86,9 @@ public interface UserPointStatisticalDailyDao extends BaseDao<UserPointStatistic
      **/
     List<ResiAroundPartyPointRankResultDTO> selectListGridPartyRankByMonth(ResiAroundPartyPointRankFormDTO formDTO);
     List<AllPartyResultDTO> selectListGridPartyNewRankByMonth(ResiAroundPartyPointRankFormDTO formDTO);
+
+    List<BizPointUserTotalDetailDTO> selectUserPointByMonth(@Param("customerId") String customerId, @Param("agencyId") String agencyId,
+                                                            @Param("gridId") String gridId);
+
+    List<BizPointUserTotalDetailDTO> selectGridPointByMonth(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointStatisticalDailyService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointStatisticalDailyService.java
index 1a82b5ca14..a563768be5 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointStatisticalDailyService.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointStatisticalDailyService.java
@@ -19,13 +19,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.dto.UserPointStatisticalDailyDTO;
 import com.epmet.dto.form.AllPartyFormDTO;
+import com.epmet.dto.form.GroupPointFormDTO;
 import com.epmet.dto.form.ResiAroundPartyPointRankFormDTO;
 import com.epmet.dto.form.ResiPointRankFormDTO;
-import com.epmet.dto.result.AllPartyResultDTO;
-import com.epmet.dto.result.ResiAroundPartyPointRankResultDTO;
-import com.epmet.dto.result.ResiPointRankListResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.UserPointStatisticalDailyEntity;
 
 import java.util.List;
@@ -135,4 +135,24 @@ public interface UserPointStatisticalDailyService extends BaseService<UserPointS
      * @date 2021/9/6 3:30 下午
      */
     List<AllPartyResultDTO> allParty(AllPartyFormDTO formDTO);
+
+    /**
+     * @Description 个人当月积分在网格和客户中的排名
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link MyPointRankResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/10 14:18
+     */
+    MyPointRankResultDTO myPointRank(TokenDto tokenDto, GroupPointFormDTO formDTO);
+
+    /**
+     * @Description 网格当月积分在组织和客户内排名
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link GridPointRankResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/10 14:18
+     */
+    GridPointRankResultDTO gridPointRank(TokenDto tokenDto, GroupPointFormDTO formDTO);
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
index c75edbae56..65f8916512 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
@@ -25,11 +25,14 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 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.Result;
 import com.epmet.dao.UserPointStatisticalDailyDao;
+import com.epmet.dto.BizPointUserTotalDetailDTO;
 import com.epmet.dto.UserPointStatisticalDailyDTO;
 import com.epmet.dto.form.AllPartyFormDTO;
+import com.epmet.dto.form.GroupPointFormDTO;
 import com.epmet.dto.form.ResiAroundPartyPointRankFormDTO;
 import com.epmet.dto.form.ResiPointRankFormDTO;
 import com.epmet.dto.result.*;
@@ -43,13 +46,14 @@ import com.epmet.utils.DimIdGenerator;
 import com.epmet.utils.ModuleConstant;
 import com.github.pagehelper.PageHelper;
 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;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -326,6 +330,64 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         return result;
     }
 
+    /**
+     * @param tokenDto
+     * @param formDTO
+     * @Description 个人当月积分在网格和客户中的排名
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link MyPointRankResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/10 14:18
+     */
+    @Override
+    public MyPointRankResultDTO myPointRank(TokenDto tokenDto, GroupPointFormDTO formDTO) {
+        List<String> userIds = new ArrayList<>();
+        userIds.add(tokenDto.getUserId());
+        //获取我的个人信息
+        Result<List<UserBaseInfoResultDTO>> myInfoResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+        if(!myInfoResult.success()){
+            throw new RenException(myInfoResult.getCode(), myInfoResult.getMsg());
+        }
+        MyPointRankResultDTO result = new MyPointRankResultDTO();
+        result.setHeadPhoto(myInfoResult.getData().get(0).getHeadImgUrl());
+        //获取客户下用户积分
+        List<BizPointUserTotalDetailDTO> list = getUserPointList(tokenDto.getCustomerId(), null, null);
+        result.setCustomerRank(getRank(list, tokenDto.getUserId()));
+        //获取网格用户积分
+        List<BizPointUserTotalDetailDTO> gridRankList = getUserPointList(tokenDto.getCustomerId(), null, formDTO.getGridId());
+        result.setCustomerRank(getRank(gridRankList, tokenDto.getUserId()));
+        return result;
+    }
+
+    /**
+     * @param tokenDto
+     * @param formDTO
+     * @Description 网格当月积分在组织和客户内排名
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link GridPointRankResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/10 14:18
+     */
+    @Override
+    public GridPointRankResultDTO gridPointRank(TokenDto tokenDto, GroupPointFormDTO formDTO) {
+        GridPointRankResultDTO result = new GridPointRankResultDTO();
+        //获取网格信息
+        Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(formDTO.getGridId());
+        if (!gridInfoResult.success()) {
+            throw new RenException(gridInfoResult.getCode());
+        }
+        result.setGridName(gridInfoResult.getData().getGridName());
+        String agencyId = gridInfoResult.getData().getParentAgencyId();
+        //获取客户下用户积分
+        List<BizPointUserTotalDetailDTO> list = getGridPointList(tokenDto.getCustomerId(), null);
+        result.setCustomerRank(getGridRank(list, formDTO.getGridId()));
+        List<BizPointUserTotalDetailDTO> agencyPointList = getGridPointList(tokenDto.getCustomerId(), agencyId);
+        result.setAgencyRank(getGridRank(agencyPointList, formDTO.getGridId()));
+        return result;
+    }
+
     /**
      * 获取认证通过的党员的 用户id
      *
@@ -372,4 +434,84 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         }
         return rankResultDTOS;
     }
+
+    /**
+     * @Description 获取客户下用户的当月积分
+     *
+     * @Param customerId
+     * @Return {@link List<BizPointUserTotalDetailDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/10 15:04
+     */
+    private List<BizPointUserTotalDetailDTO> getUserPointList(String customerId, String agencyId, String gridId) {
+        return baseDao.selectUserPointByMonth(customerId, agencyId, gridId);
+    }
+
+    private List<BizPointUserTotalDetailDTO> getGridPointList(String customerId, String agencyId) {
+        return baseDao.selectGridPointByMonth(customerId, agencyId);
+    }
+
+    private Boolean havePoint(List<BizPointUserTotalDetailDTO> list, String userId) {
+        Map<String, Integer> map = list.stream().collect(Collectors.toMap(BizPointUserTotalDetailDTO::getUserId, BizPointUserTotalDetailDTO::getTotalPoint));
+        return null != map.get(userId);
+    }
+
+
+    private String getGridRank(List<BizPointUserTotalDetailDTO> list, String gridId) {
+        if (CollectionUtils.isEmpty(list)) {
+            return NumConstant.ONE_STR;
+        }
+        //如果当月网格没有积分变动，则积分为0
+        Map<String, Integer> map = list.stream().collect(Collectors.toMap(BizPointUserTotalDetailDTO::getGridId, BizPointUserTotalDetailDTO::getTotalPoint));
+        if (null == map.get(gridId)) {
+            BizPointUserTotalDetailDTO dto = new BizPointUserTotalDetailDTO();
+            dto.setGridId(gridId);
+            dto.setTotalPoint(NumConstant.ZERO);
+            list.add(dto);
+        }
+        //排序
+        list = list.stream().sorted(Comparator.comparing(BizPointUserTotalDetailDTO :: getTotalPoint).reversed()
+                        .thenComparing(BizPointUserTotalDetailDTO::getGridId))
+                .collect(Collectors.toList());
+        AtomicInteger i = new AtomicInteger(1);
+        AtomicInteger point = new AtomicInteger(0);
+        list.forEach(item -> {
+            if (item.getTotalPoint().equals(point.get())) {
+                item.setRank(String.valueOf(i));
+            } else {
+                item.setRank(String.valueOf(i.getAndIncrement()));
+            }
+            point.set(item.getTotalPoint());
+        });
+        Map<String, String> rankMap = list.stream().collect(Collectors.toMap(BizPointUserTotalDetailDTO::getGridId, BizPointUserTotalDetailDTO::getRank));
+        return rankMap.get(gridId);
+    }
+
+    private String getRank(List<BizPointUserTotalDetailDTO> list, String userId) {
+        if (CollectionUtils.isEmpty(list)) {
+            return NumConstant.ONE_STR;
+        }
+        if (!havePoint(list, userId)) {
+            BizPointUserTotalDetailDTO dto = new BizPointUserTotalDetailDTO();
+            dto.setUserId(userId);
+            dto.setTotalPoint(NumConstant.ZERO);
+            list.add(dto);
+        }
+        //排序
+        list = list.stream().sorted(Comparator.comparing(BizPointUserTotalDetailDTO :: getTotalPoint).reversed()
+                        .thenComparing(BizPointUserTotalDetailDTO::getUserId))
+                .collect(Collectors.toList());
+        AtomicInteger i = new AtomicInteger(1);
+        AtomicInteger point = new AtomicInteger(0);
+        list.forEach(item -> {
+            if (item.getTotalPoint().equals(point.get())) {
+                item.setRank(String.valueOf(i));
+            } else {
+                item.setRank(String.valueOf(i.getAndIncrement()));
+            }
+            point.set(item.getTotalPoint());
+        });
+        Map<String, String> map = list.stream().collect(Collectors.toMap(BizPointUserTotalDetailDTO::getUserId, BizPointUserTotalDetailDTO::getRank));
+        return map.get(userId);
+    }
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
index 49179803c7..6bd5f6b76a 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
@@ -227,4 +227,54 @@
         ORDER BY P.point DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>
+
+    <select id="selectUserPointByMonth" resultType="com.epmet.dto.BizPointUserTotalDetailDTO">
+        SELECT
+            a.CUSTOMER_ID,
+            a.AGENCY_ID,
+            a.GRID_ID,
+            a.USER_ID,
+            SUM( POINT ) AS TOTAL_POINT
+        FROM
+            biz_point_user_total_detail a
+            INNER JOIN user_point_action_log b ON a.USER_ID = b.USER_ID
+            AND b.CUSTOMER_ID = #{customerId}
+            AND DATE_FORMAT( b.CREATED_TIME, '%Y%m' )= DATE_FORMAT( CURDATE( ), '%Y%m' )
+            AND b.DEL_FLAG = '0'
+        WHERE
+            a.DEL_FLAG = '0'
+            AND a.CUSTOMER_ID = #{customerId}
+            <if test="null != agencyId and agencyId != ''">
+                AND a.AGENCY_ID = #{agencyId}
+            </if>
+            <if test="null != gridId and gridId != ''">
+                AND a.GRID_ID = #{gridId}
+            </if>
+            GROUP BY a.CUSTOMER_ID,
+            a.AGENCY_ID,
+            a.GRID_ID,
+            a.USER_ID
+    </select>
+    <select id="selectGridPointByMonth" resultType="com.epmet.dto.BizPointUserTotalDetailDTO">
+        SELECT
+            a.CUSTOMER_ID,
+            a.AGENCY_ID,
+            a.GRID_ID,
+            SUM( POINT ) AS TOTAL_POINT
+        FROM
+            biz_point_user_total_detail a
+            INNER JOIN user_point_action_log b ON a.USER_ID = b.USER_ID
+            AND b.CUSTOMER_ID = #{customerId}
+            AND DATE_FORMAT( b.CREATED_TIME, '%Y%m' )= DATE_FORMAT( CURDATE( ), '%Y%m' )
+            AND b.DEL_FLAG = '0'
+        WHERE
+            a.DEL_FLAG = '0'
+            AND a.CUSTOMER_ID = #{customerId}
+            <if test="null != agencyId and agencyId != ''">
+                AND a.AGENCY_ID = #{agencyId}
+            </if>
+            GROUP BY a.CUSTOMER_ID,
+            a.AGENCY_ID,
+            a.GRID_ID
+    </select>
 </mapper>

From b9a5c2d1716a8252135a1fd9a04148b498cddcd1 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 10 Sep 2021 17:33:14 +0800
Subject: [PATCH 082/134] =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/CustomerDataManageFormDTO.java       |   4 +-
 .../result/CustomerDataManageResultDTO.java   |  37 +++++++
 .../ScreenAgencyOrGridListDTO.java            |  31 ++++++
 .../controller/DataStatsController.java       |  10 ++
 .../service/datastats/DataStatsService.java   |   8 ++
 .../datastats/impl/DataStatsServiceImpl.java  | 104 ++++++++++++------
 .../EvaluationIndexService.java               |   7 ++
 .../impl/EvaluationIndexServiceImpl.java      |  41 +++++++
 8 files changed, 208 insertions(+), 34 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenAgencyOrGridListDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
index 164efa9f1c..9ac1b660fe 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
@@ -47,9 +47,9 @@ public class CustomerDataManageFormDTO implements Serializable {
     @NotBlank(message = "结束时间不能为空",groups = CustomerDataManageForm.class)
     private String endTime;
 
-    private Integer pageNo;
+    private Integer pageNo = 1;
 
-    private Integer pageSize;
+    private Integer pageSize = 20;
 
     /**
      * 是否分页【true分  false不分】
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
new file mode 100644
index 0000000000..71ed7bf9b1
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import lombok.Data;
+
+/**
+ * @Description 运营情况数据导出-接口返参
+ * @Auth sun
+ */
+@Data
+public class CustomerDataManageResultDTO {
+
+    //组织
+    private String orgName;
+    //用户数
+    private Integer userCount;
+    //居民数
+    private Integer residentCount;
+    //党员数
+    private Integer partyMemberCount;
+    //小组数
+    private Integer groupCount;
+    //话题数
+    private Integer topicCount;
+    //议题数
+    private Integer issueCount;
+    //项目数
+    private Integer projectCount;
+    //结案项目数
+    private Integer closedProjectCount;
+    //巡查人数
+    private Integer patrolPeopleCount;
+    //巡查次数
+    private Integer patrolCount;
+    //巡查时长
+    private String patrolDuration;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenAgencyOrGridListDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenAgencyOrGridListDTO.java
new file mode 100644
index 0000000000..07afb7fbb6
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenAgencyOrGridListDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dataaggre.dto.evaluationindex;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author sun
+ * @Description 根据组织Id判断查询直属下级组织/网格列表，组织存在子客户的查询包含子客户组织数据
+ */
+@Data
+public class ScreenAgencyOrGridListDTO implements Serializable {
+    private static final long serialVersionUID = 6328123559936824470L;
+    //组织级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city,省级:province）
+    private String level;
+    //直属下级组织或网格集合
+    private List<AgencyGrid> agencyGridList;
+
+    @Data
+    public class AgencyGrid {
+        //组织id
+        private String agencyId;
+        //组织名称
+        private String agencyName;
+        //网格Id
+        private String gridId;
+        //网格name
+        private String gridName;
+    }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
index 3e495ab112..25268127cf 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
@@ -230,5 +230,15 @@ public class DataStatsController {
         dataStatsService.CustomerDataManage(formDTO,response);
     }
 
+    /**
+     * @Param formDTO
+     * @Description 运营情况数据查询
+     * @author sun
+     */
+    @PostMapping("governratio")
+    public Result<List<CustomerDataManageResultDTO>> operateexport(@RequestBody CustomerDataManageFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, CustomerDataManageFormDTO.CustomerDataManageForm.class);
+        return new Result<List<CustomerDataManageResultDTO>>().ok(dataStatsService.operateExport(formDTO));
+    }
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index 30df4925a1..11fd673ceb 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -10,6 +10,7 @@ import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 
 import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -239,4 +240,11 @@ public interface DataStatsService {
      * @date 2021/9/10 3:52 下午
      */
     void CustomerDataManage(CustomerDataManageFormDTO formDTO, HttpServletResponse response) throws Exception;
+
+    /**
+     * @Description 运营情况数据查询
+     * @author sun
+     */
+    List<CustomerDataManageResultDTO> operateExport(CustomerDataManageFormDTO formDTO) throws ParseException;
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 19441f076a..062a51d105 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -2,50 +2,53 @@
 
  import com.alibaba.fastjson.JSON;
  import com.epmet.commons.dynamic.datasource.annotation.DataSource;
-import com.epmet.commons.tools.constant.NumConstant;
+ import com.epmet.commons.tools.constant.NumConstant;
  import com.epmet.commons.tools.constant.StrConstant;
  import com.epmet.commons.tools.enums.OrgLevelEnum;
-import com.epmet.commons.tools.utils.DateUtils;
+ import com.epmet.commons.tools.exception.RenException;
+ import com.epmet.commons.tools.utils.DateUtils;
  import com.epmet.commons.tools.utils.ExcelUtils;
  import com.epmet.dataaggre.constant.DataSourceConstant;
-import com.epmet.dataaggre.constant.OrgConstant;
-import com.epmet.dataaggre.dao.datastats.DataStatsDao;
-import com.epmet.dataaggre.dao.datastats.FactGridMemberStatisticsDailyDao;
-import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
-import com.epmet.dataaggre.dto.datastats.form.*;
-import com.epmet.dataaggre.dto.datastats.result.*;
+ import com.epmet.dataaggre.constant.OrgConstant;
+ import com.epmet.dataaggre.dao.datastats.DataStatsDao;
+ import com.epmet.dataaggre.dao.datastats.FactGridMemberStatisticsDailyDao;
+ import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
+ import com.epmet.dataaggre.dto.datastats.form.*;
+ import com.epmet.dataaggre.dto.datastats.result.*;
  import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO;
  import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO;
  import com.epmet.dataaggre.dto.epmetuser.result.PatrolDailySumResult;
-import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
-import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
-import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
-import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
-import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
-import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
-import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
-import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity;
+ import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO;
+ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
+ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
+ import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
+ import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
+ import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
+ import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
+ import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
+ import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity;
  import com.epmet.dataaggre.excel.CustomerDataManageExcel;
  import com.epmet.dataaggre.service.datastats.DataStatsService;
-import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
-import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
-import com.epmet.dataaggre.service.opercrm.CustomerRelation;
-import com.github.pagehelper.PageHelper;
-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;
+ import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
+ import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
+ import com.epmet.dataaggre.service.opercrm.CustomerRelation;
+ import com.github.pagehelper.PageHelper;
+ 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;
 
  import javax.servlet.http.HttpServletResponse;
  import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
+ import java.math.RoundingMode;
+ import java.text.NumberFormat;
+ import java.text.ParseException;
+ import java.text.SimpleDateFormat;
+ import java.util.*;
+ import java.util.concurrent.atomic.AtomicInteger;
+ import java.util.concurrent.atomic.AtomicReference;
+ import java.util.stream.Collectors;
 
 /**
  * @Author sun
@@ -1899,4 +1902,41 @@ public class DataStatsServiceImpl implements DataStatsService {
         return s.toString();
     }
 
+    /**
+     * @Param formDTO
+     * @Description 运营情况数据查询
+     * @author sun
+     */
+    @Override
+    public List<CustomerDataManageResultDTO> operateExport(CustomerDataManageFormDTO formDTO) throws ParseException {
+        //1.必要参数校验及处理
+        if (!"Interval".equals(formDTO.getType()) && StringUtils.isEmpty(formDTO.getStartTime())) {
+            throw new RenException("请选择开始时间或查询累计值");
+        }
+        //入参有开始时间的则需要减去一天
+        if (StringUtils.isNotBlank(formDTO.getStartTime())) {
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            Date date = format.parse(formDTO.getStartTime());
+            Date yesterday = DateUtils.addDateDays(date, -1);
+            formDTO.setStartTime(format.format(yesterday));
+        }
+
+        //2.查询组织现在，判断查询下级组织还是网格数据
+        ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId());
+        if (null == agencyGrid) {
+            return new ArrayList<>();
+        }
+        List<String> idList;
+        if (!"community".equals(agencyGrid.getLevel())) {
+            //组织层级用户、群组、话题、议题、项目、巡查数据查询
+            idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getAgencyId).collect(Collectors.toList());
+        } else {
+            //网格层级用户、群组、话题、议题、项目、巡查数据查询
+            idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getGridId).collect(Collectors.toList());
+
+        }
+        //3.封装数据并返回
+        return null;
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
index fe37824d86..67468e32de 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
@@ -2,6 +2,7 @@ package com.epmet.dataaggre.service.evaluationindex;
 
 import com.epmet.dataaggre.dto.datastats.form.GovrnRatioFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
@@ -79,4 +80,10 @@ public interface EvaluationIndexService {
      */
     String selectAgencyNameByAgencyId(String agencyId);
 
+    /**
+     * @Description 根据组织Id判断查询直属下级组织/网格列表，组织存在子客户的查询包含子客户组织数据
+     * @author sun
+     */
+    ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String agencyId);
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
index d648c07732..6e97769b26 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
@@ -2,10 +2,12 @@ package com.epmet.dataaggre.service.evaluationindex.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.evaluationindex.EvaluationIndexDao;
 import com.epmet.dataaggre.dto.datastats.form.GovrnRatioFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
@@ -154,4 +156,43 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
         return evaluationIndexDao.selectAgencyNameByAgencyId(agencyId);
     }
 
+    /**
+     * @Description 根据组织Id判断查询直属下级组织/网格列表，组织存在子客户的查询包含子客户组织数据
+     * @author sun
+     */
+    @Override
+    public ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String agencyId) {
+        ScreenAgencyOrGridListDTO resultDTO = new ScreenAgencyOrGridListDTO();
+        List<ScreenAgencyOrGridListDTO.AgencyGrid> agencyGridList = new ArrayList<>();
+        //1.查询组织信息
+        ScreenCustomerAgencyDTO dto = evaluationIndexDao.getByAgencyId(agencyId);
+        if (dto == null) {
+            log.error(String.format("组织信息不存在,组织Id->%s"), agencyId);
+            return new ScreenAgencyOrGridListDTO();
+        }
+        //2.根据组织级别判断查询直属组织或网格列表
+        List<ScreenCustomerAgencyDTO> agencyList = new ArrayList<>();
+        List<ScreenCustomerGridDTO> gridList = new ArrayList<>();
+        if (!"community".equals(dto.getLevel())) {
+            //2-1.直属下级组织列表
+            //2.判断客户是否存在子客户
+            List<String> list = customerRelation.haveSubCustomer(dto.getCustomerId());
+            if (!CollectionUtils.isNotEmpty(list)) {
+                agencyList = evaluationIndexDao.getSubAgencyListByAgency(agencyId, null, null);
+            } else {
+                list.add(dto.getCustomerId());
+                agencyList = evaluationIndexDao.getSubAgencyListByAgency(null, dto.getAreaCode(), list);
+            }
+            agencyGridList = ConvertUtils.sourceToTarget(agencyList, ScreenAgencyOrGridListDTO.AgencyGrid.class);
+        } else {
+            //2-2.直属下级网格列表
+            gridList = evaluationIndexDao.getSubGridList(agencyId);
+            agencyGridList = ConvertUtils.sourceToTarget(gridList, ScreenAgencyOrGridListDTO.AgencyGrid.class);
+        }
+
+        resultDTO.setLevel(dto.getLevel());
+        resultDTO.setAgencyGridList(agencyGridList);
+        return resultDTO;
+    }
+
 }

From 228020bf972c82b5a251ce0adbc973afdeec67c9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 17:37:23 +0800
Subject: [PATCH 083/134] =?UTF-8?q?=E7=A6=81=E8=A8=80=E7=BB=84=E5=91=98?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=BB=96=EF=BC=8C=E5=AD=98=E5=82=A8targetId?=
 =?UTF-8?q?=EF=BC=8CmessageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/constant/UserMessageTypeConstant.java  | 8 ++++++--
 .../member/service/impl/ResiGroupMemberServiceImpl.java   | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index c69e463370..6f1e00c247 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -92,11 +92,15 @@ public interface UserMessageTypeConstant {
      */
     String GROUP_ORIGINAL_LEADER_DOWN="group_original_leader_down";
     /**
-     * 新人组织，告诉他这个好消息
+     * 新任组长，告诉他这个好消息
      * targetId:resi_group.id
      */
     String GROUP_NEW_LEADER_UP="group_new_leader_up";
-
+    /**
+     * 禁言组员
+     * targetId:resi_group.id
+     */
+    String GROUP_SLIENT_MEMBER="group_slient_member";
 
 
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index 4303cc9599..ce4d199730 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -935,6 +935,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		String messageContent=String.format(UserMessageConstant.SLIENT_IN_GROUP, dateStr);
 		userMessageFormDTO.setMessageContent(messageContent);
 		userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
+
+		//21.09.10:记录消息类型和对应的业务id
+		userMessageFormDTO.setMessageType(UserMessageTypeConstant.GROUP_SLIENT_MEMBER);
+		userMessageFormDTO.setTargetId(resiGroupMemberEntity.getResiGroupId());
+
 		epmetMessageOpenFeignClient.saveUserMessage(userMessageFormDTO);
 		//发送微信订阅
 		WxSubscribeMessageFormDTO subscribeMessageFormDTO =  new WxSubscribeMessageFormDTO();

From 3f673101af417ee232ab4a855350fee1139ed9aa Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 17:46:40 +0800
Subject: [PATCH 084/134] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E5=86=85=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E9=80=9A=E7=9F=A5=E3=80=81=E7=BC=96=E8=BE=91=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=EF=BC=8C=E5=AD=98=E5=82=A8targetId=EF=BC=8CmessageTyp?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/constant/UserMessageTypeConstant.java   | 12 ++++++++++++
 .../notice/service/impl/NoticeServiceImpl.java    | 15 ++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 6f1e00c247..6dc2ede42a 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -102,6 +102,18 @@ public interface UserMessageTypeConstant {
      */
     String GROUP_SLIENT_MEMBER="group_slient_member";
 
+    /**
+     * 发布小组内通知
+     * targetId:notice.id
+     */
+    String GROUP_MESSAGE_PUBLISH="group_message_publish";
+    /**
+     * 发布小组内通知
+     * targetId:notice.id
+     */
+    String GROUP_MESSAGE_EDIT="group_message_edit";
+
+
 
 
     /**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java
index 49f240ca3c..afe0ce523d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java
@@ -33,6 +33,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
@@ -58,7 +59,10 @@ import com.epmet.modules.notice.service.NoticeService;
 import com.epmet.resi.group.constant.TopicConstant;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.dto.notice.NoticeDTO;
-import com.epmet.resi.group.dto.notice.form.*;
+import com.epmet.resi.group.dto.notice.form.AddNoticeFormDTO;
+import com.epmet.resi.group.dto.notice.form.EditNoticeFormDTO;
+import com.epmet.resi.group.dto.notice.form.NoticeDetailFormDTO;
+import com.epmet.resi.group.dto.notice.form.NoticeFileDTO;
 import com.epmet.resi.group.dto.notice.result.NoticeDetailResultDTO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.logging.Log;
@@ -272,6 +276,10 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
                 userMessageFormDTO.setTitle(UserMessageConstant.GROUP_TITLE);
                 userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
                 userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.GROUP_NOTICE_ADD, groupEntity.getGroupName(), formDTO.getTitle()));
+
+                //21.09.10:记录消息类型和对应的业务id
+                userMessageFormDTO.setMessageType(UserMessageTypeConstant.GROUP_MESSAGE_PUBLISH);
+                userMessageFormDTO.setTargetId(messageEntity.getMessageId());
                 userMessageFormDTOS.add(userMessageFormDTO);
             }
         });
@@ -430,6 +438,11 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
                 userMessageFormDTO.setTitle(UserMessageConstant.GROUP_TITLE);
                 userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
                 userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.GROUP_NOTICE_EDIT, groupEntity.getGroupName(), formDTO.getTitle()));
+
+                //21.09.10:记录消息类型和对应的业务id
+                userMessageFormDTO.setTargetId(entity.getId());
+                userMessageFormDTO.setMessageType(UserMessageTypeConstant.GROUP_MESSAGE_EDIT);
+
                 userMessageFormDTOS.add(userMessageFormDTO);
             }
         });

From 7c530d7861e1995f4987808524c1b4254639c441 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 17:55:43 +0800
Subject: [PATCH 085/134] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E7=88=B1=E5=BF=83?=
 =?UTF-8?q?=E4=BA=92=E5=8A=A9=E3=80=81=E6=B4=BB=E5=8A=A8=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=EF=BC=8C=E5=AD=98=E5=82=A8targetId=EF=BC=8CmessageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/WorkActServiceImpl.java  |  7 ++++++-
 .../epmet/service/impl/WorkActUserServiceImpl.java  |  6 ++++++
 .../com/epmet/constant/UserMessageTypeConstant.java | 13 +++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
index 15f6ee311f..b552ee29bc 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
@@ -21,6 +21,7 @@ import com.epmet.commons.tools.utils.*;
 import com.epmet.constant.ActConstant;
 import com.epmet.constant.ActMessageConstant;
 import com.epmet.constant.ReadFlagConstant;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dao.*;
 import com.epmet.dto.*;
 import com.epmet.dto.form.UserMessageFormDTO;
@@ -32,7 +33,6 @@ import com.epmet.entity.*;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.*;
-import com.epmet.utils.ModuleConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -694,6 +694,11 @@ public class WorkActServiceImpl implements WorkActService {
                 userMessageFormDTO.setMessageContent(String.format(ActMessageConstant.ACT_CANCELED,
                         actInfoDTO.getTitle(),
                         formDTO.getCancelReason()));
+
+                //21.09.10:记录消息类型和对应的业务id
+                userMessageFormDTO.setMessageType(UserMessageTypeConstant.HEART_CANCEL_ACT);
+                userMessageFormDTO.setTargetId(formDTO.getActId());
+
                 userMessageFormDTOS.add(userMessageFormDTO);
                 //2020.10.26  添加发送微信订阅消息功能  sun
                 WxSubscribeMessageFormDTO dto = new WxSubscribeMessageFormDTO();
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
index 735c82dda1..2a67649019 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
@@ -11,6 +11,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ActConstant;
 import com.epmet.constant.ActMessageConstant;
 import com.epmet.constant.ReadFlagConstant;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dao.ActInfoDao;
 import com.epmet.dao.ActUserLogDao;
 import com.epmet.dao.ActUserRelationDao;
@@ -639,6 +640,11 @@ public class WorkActUserServiceImpl implements WorkActUserService {
             } else if (ActConstant.ACT_USER_STATUS_REFUSED.equals(type)) {
                 userMessageFormDTO.setMessageContent(String.format(ActMessageConstant.AUDIT_REFUSED, actInfo.getTitle(), actUserRelationEntity.getFailureReason()));
             }
+
+            //21.09.10:记录消息类型和对应的业务id
+            userMessageFormDTO.setMessageType(UserMessageTypeConstant.HEART_SIGIN_UP_RES);
+            userMessageFormDTO.setTargetId(actUserRelationEntity.getId());
+
             Result result = epmetMessageOpenFeignClient.saveUserMessage(userMessageFormDTO);
             if (result.success()) {
                 logger.info("审核成功，已成功发送站内信");
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 6dc2ede42a..eacb06ecb8 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -165,4 +165,17 @@ public interface UserMessageTypeConstant {
      * targetId:article.DRAFT_ID
      */
     String PARTY_VOICE_PUBLISH="party_voice_publish";
+
+
+
+    /**
+     * 爱心互助：通过审核的用户，发送消息
+     * targetId:act_info.id
+     */
+    String HEART_CANCEL_ACT="heart_cancel_act";
+    /**
+     * 活动报名结果通知居民
+     * act_user_relation.id
+     */
+    String HEART_SIGIN_UP_RES="heart_sigin_up_res";
 }

From e9c5ab535fb6391bb53ee2a74975683509d551de Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 18:01:14 +0800
Subject: [PATCH 086/134] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=BB=9E=E7=95=99?=
 =?UTF-8?q?=E8=B6=85=E6=9C=9F=E6=8F=90=E9=86=92=EF=BC=8C=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?targetId=EF=BC=8CmessageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/constant/UserMessageTypeConstant.java    | 6 ++++++
 .../java/com/epmet/service/impl/ProjectServiceImpl.java     | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index eacb06ecb8..0568d85281 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -159,6 +159,12 @@ public interface UserMessageTypeConstant {
      */
     String PROJECT_FROM_RESI_EVENT="project_from_resi_event";
 
+    /**
+     * 项目滞留超期提醒
+     */
+    String PROJECT_REMIND="project_remind";
+
+
 
     /**
      * 发布党建声音
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 e03e78d573..36475ba740 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
@@ -1727,6 +1727,10 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			messageFormDTO.setTitle(title);
 			messageFormDTO.setMessageContent(msg);
 			messageFormDTO.setReadFlag(Constant.UNREAD);
+
+			//21.09.10:记录消息类型和对应的业务id
+			messageFormDTO.setMessageType(UserMessageTypeConstant.PROJECT_REMIND);
+
 			msgList.add(messageFormDTO);
 
 			//10.29 项目滞留提醒添加推送微信消息  sun

From 81ab5393edbb9a7d54b870f5ec28f6ee2ed03d04 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 18:13:31 +0800
Subject: [PATCH 087/134] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=BE=BD=E7=AB=A0?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?messageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/constant/UserMessageTypeConstant.java   |  7 +++++++
 .../epmet/service/impl/UserBadgeServiceImpl.java  | 15 ++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 0568d85281..cb1efc77b5 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -184,4 +184,11 @@ public interface UserMessageTypeConstant {
      * act_user_relation.id
      */
     String HEART_SIGIN_UP_RES="heart_sigin_up_res";
+
+
+    /**
+     * 居民端提交徽章认证申请
+     * user_badge_certificate_record.id todo
+     */
+    String BADGE_AUTH_APPLY="badge_auth_apply";
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
index 0716978c1c..b8f35a0d4a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
@@ -2,6 +2,7 @@ package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
 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.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -12,6 +13,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constant.BadgeConstant;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.SmsTemplateConstant;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dao.*;
 import com.epmet.dto.ResiUserBadgeDTO;
 import com.epmet.dto.UserBadgeCertificateRecordDTO;
@@ -53,8 +55,6 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
     @Autowired
-    private EpmetMessageOpenFeignClient messageFeignClient;
-    @Autowired
     private UserRoleDao userRoleDao;
     @Autowired
     private ResiUserBadgeDao resiUserBadgeDao;
@@ -278,11 +278,10 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         form.setSurname(certificationAddFormDTO.getSurname());
         log.info(JSON.toJSONString(form));
         userBadgeDao.insertUserBadgeCertificateRecord(form);
-
         //TODO 站内信发送
         String badgeName = badgeDao.selectBadgeName(form.getCustomerId(), form.getBadgeId());
         String msg = String.format(BadgeConstant.MESSAGE_CONTENT, userBaseInfoResultDTOS.get(NumConstant.ZERO).getDistrict().concat(userBaseInfoResultDTOS.get(NumConstant.ZERO).getRealName()), badgeName);
-        sendMessage(BadgeConstant.AUTH_TITLE,msg,form.getGridId(),form.getUserId(),form.getCustomerId());
+        sendMessage(BadgeConstant.AUTH_TITLE,msg,form.getGridId(),form.getUserId(),form.getCustomerId(), UserMessageTypeConstant.BADGE_AUTH_APPLY);
 
         return new Result();
     }
@@ -443,7 +442,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
      * @author zxc
      * @date 2020/11/19 上午9:16
      */
-    public void sendMessage(String title,String msg,String gridId,String userId,String customerId){
+    public void sendMessage(String title,String msg,String gridId,String userId,String customerId,String messageType){
         //1.查询加入当前网格下的人员 customer_staff_grid
         CommonGridIdFormDTO commonGridIdFormDTO = new CommonGridIdFormDTO();
         commonGridIdFormDTO.setGridId(gridId);
@@ -474,6 +473,12 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                     msgObj.setReadFlag(ReadFlagConstant.UN_READ);
                     msgObj.setTitle(title);
                     msgObj.setUserId(to);
+
+                    //21.09.10:记录消息类型和对应的业务id
+                    msgObj.setMessageType(messageType);
+                    //todo
+                    msgObj.setTargetId(StrConstant.EPMETY_STR);
+
                     msgList.add(msgObj);
                     //微信订阅
                     WxSubscribeMessageFormDTO subscribeDTO = new WxSubscribeMessageFormDTO();

From e84259fe2b3a8afa7009e64909abf72526ad7cbf Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 10 Sep 2021 22:18:36 +0800
Subject: [PATCH 088/134] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.?=
 =?UTF-8?q?=E3=80=90=E5=B0=8F=E7=BB=84=E6=88=90=E5=B0=B1=E3=80=91=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E"groupLeaderFlag"=E6=A0=87=E8=AE=B0=EF=BC=8C=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=98=AF=E7=BB=84=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/GroupPointRankingResultDTO.java   |  3 +++
 .../epmet/controller/GroupPointController.java   |  8 ++++----
 .../service/BizPointTotalDetailService.java      |  2 +-
 .../impl/BizPointTotalDetailServiceImpl.java     | 16 +++++++++++-----
 .../dto/group/result/GroupDetailResultDTO.java   |  4 ++++
 .../group/service/impl/ResiGroupServiceImpl.java | 11 ++++++++++-
 .../main/resources/mapper/group/ResiGroupDao.xml |  6 +++++-
 7 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
index 2f06640b73..127686b68c 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
@@ -53,4 +53,7 @@ public class GroupPointRankingResultDTO implements Serializable {
 
 	/** 客户下总排名 */
 	private Integer customerRanking;
+
+	/** 我是否是组长 */
+	private String groupLeaderFlag;
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
index 91526bcc16..947741b69d 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
@@ -127,13 +127,13 @@ public class GroupPointController {
 	 * @date 2021.09.07 13:35:45
 	 */
 	@PostMapping("grouppointranking/gridscope")
-	public Result<List<GroupPointRankingResultDTO>> listGroupPointRandingInGridScope(@RequestBody GroupPointFormDTO formDTO) {
+	public Result<List<GroupPointRankingResultDTO>> listGroupPointRandingInGridScope(@RequestBody GroupPointFormDTO formDTO, @LoginUser TokenDto loginUser) {
 		ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.GridScopeRank.class);
 		String gridId = formDTO.getGridId();
 		Integer pageNo = formDTO.getPageNo();
 		Integer pageSize = formDTO.getPageSize();
 
-		List<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.GRID, gridId,pageNo, pageSize);
+		List<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.GRID, gridId,pageNo, pageSize, loginUser.getUserId());
 		return new Result<List<GroupPointRankingResultDTO>>().ok(page);
 	}
 
@@ -146,13 +146,13 @@ public class GroupPointController {
 	 * @date 2021.09.08 09:18:37
 	 */
 	@PostMapping("grouppointranking/customerscope")
-	public Result<List<GroupPointRankingResultDTO>> listGroupPointRandingInCustomerScope(@RequestBody GroupPointFormDTO formDTO) {
+	public Result<List<GroupPointRankingResultDTO>> listGroupPointRandingInCustomerScope(@RequestBody GroupPointFormDTO formDTO, @LoginUser TokenDto loginUser) {
 		ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.CustomerScopeRank.class);
 		String customerId = formDTO.getCustomerId();
 		Integer pageNo = formDTO.getPageNo();
 		Integer pageSize = formDTO.getPageSize();
 
-		List<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.CUSTOMER, customerId, pageNo, pageSize);
+		List<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.CUSTOMER, customerId, pageNo, pageSize, loginUser.getUserId());
 		return new Result<List<GroupPointRankingResultDTO>>().ok(page);
 	}
 
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
index b15043255a..a13fa70708 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
@@ -148,7 +148,7 @@ public interface BizPointTotalDetailService extends BaseService<BizPointTotalDet
 	 * @author wxz
 	 * @date 2021.09.07 14:18:08
 	 */
-	List<GroupPointRankingResultDTO> listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize);
+	List<GroupPointRankingResultDTO> listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize, String currentUserId);
 
 	/**
 	 * @description 【小组排名】- 列出我所在的小组的积分排名
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
index 49732c9d88..95d4bd33df 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
@@ -263,7 +263,9 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
     }
 
     @Override
-    public List<GroupPointRankingResultDTO> listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize) {
+    public List<GroupPointRankingResultDTO> listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId,
+                                                                                 Integer pageNo, Integer pageSize,
+                                                                                 String currentUserId) {
 
         // 1.查询有积分的小组得分排名
         PageInfo<BizPointTotalDetailEntity> entityPageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> {
@@ -283,7 +285,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
         List<String> groupIds = groupList.stream().map(g -> g.getObjectId()).collect(Collectors.toList());
 
         // 2.将列表填充基本信息并且转换为dto
-        List<GroupPointRankingResultDTO> rankingInfoDTOs = convertGroupRankingInfoEntity2DTOs(groupIds, groupList);
+        List<GroupPointRankingResultDTO> rankingInfoDTOs = convertGroupRankingInfoEntity2DTOs(groupIds, groupList, currentUserId);
 
         Page page = new Page(pageNo, pageSize);
 
@@ -304,7 +306,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
             // 不足0的从0开始
             startRow = Math.max(startRow, 0);
             List<GroupPointRankingResultDTO> gap;
-            gap = fillGroupPageGap(existingGroupIds, searchScopeType, searchScopeId, startRow, pageSize - groupList.size());
+            gap = fillGroupPageGap(existingGroupIds, searchScopeType, searchScopeId, startRow, pageSize - groupList.size(), currentUserId);
             rankingInfoDTOs.addAll(gap);
         }
 
@@ -336,7 +338,8 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
      * @author wxz
      * @date 2021.09.07 16:30:28
      */
-    private List<GroupPointRankingResultDTO> fillGroupPageGap(List<String> existingGroupIds, SearchScopeTypeEnum searchScopeType, String searchScopeObjectId, Integer startRow, Integer rowCount) {
+    private List<GroupPointRankingResultDTO> fillGroupPageGap(List<String> existingGroupIds, SearchScopeTypeEnum searchScopeType,
+                                                              String searchScopeObjectId, Integer startRow, Integer rowCount, String currentUserId) {
         GroupFormDTO form = new GroupFormDTO();
         form.setExcludeGroupIds(existingGroupIds);
         form.setOrder(GroupFormDTO.OrderTypeEnum.DESC);
@@ -359,6 +362,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
             dto.setGroupName(g.getGroupName());
             dto.setGroupId(g.getGroupId());
             dto.setGridId(g.getGridId());
+            dto.setGroupLeaderFlag(g.getLeaderId().equals(currentUserId) ? "leader" : "member");
             return dto;
         }).collect(Collectors.toList());
     }
@@ -371,7 +375,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
      * @author wxz
      * @date 2021.09.07 15:52:17
      */
-    private List<GroupPointRankingResultDTO> convertGroupRankingInfoEntity2DTOs(List<String> groupIds, List<BizPointTotalDetailEntity> groupList) {
+    private List<GroupPointRankingResultDTO> convertGroupRankingInfoEntity2DTOs(List<String> groupIds, List<BizPointTotalDetailEntity> groupList, String currentUserId) {
         if (CollectionUtils.isEmpty(groupIds)) {
             return new ArrayList<>();
         }
@@ -394,6 +398,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
             dto.setPoint(g.getTotalPoint().toString());
             dto.setGroupHeadPhoto(groupInfo.getGroupHeadPhoto());
             dto.setGridId(g.getGridId());
+            dto.setGroupLeaderFlag(groupInfo.getLeaderId().equals(currentUserId) ? "leader" : "member");
             return dto;
         }).collect(Collectors.toList());
         return rankingDTOs;
@@ -483,6 +488,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
             dto.setPoint(point.toString());
             dto.setGridRanking(gridRanking);
             dto.setCustomerRanking(customerRanking);
+            dto.setGroupLeaderFlag(g.getGroupLeaderFlag());
             return dto;
         }).collect(Collectors.toList());
         return groupDtoList;
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 fd585419a2..7d08176f31 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
@@ -22,4 +22,8 @@ public class GroupDetailResultDTO {
     /** 群组类型:branch:支部小组，ordinary:楼院小组 */
     private String groupType;
     private String customerId;
+    /** 组长ID */
+    private String leaderId;
+    /** 当前用户是否是群主 */
+    private String groupLeaderFlag;
 }
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 1c85fb903a..a776061593 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
@@ -1786,12 +1786,15 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		query.eq(ResiGroupEntity::getDelFlag, 0);
 		List<ResiGroupEntity> groupEntities = baseDao.selectList(query);
 		List<GroupDetailResultDTO> groupDtos = groupEntities.stream().map(ge -> {
+			ResiGroupMemberDTO leader = resiGroupMemberDao.selectLeaderMember(ge.getId());
+
 			GroupDetailResultDTO dto = new GroupDetailResultDTO();
 			dto.setGroupId(ge.getId());
 			dto.setGroupName(ge.getGroupName());
 			dto.setGroupHeadPhoto(ge.getGroupHeadPhoto());
 			dto.setGroupIntroduction(ge.getGroupIntroduction());
 			dto.setGroupType(ge.getGroupType());
+			dto.setLeaderId(leader.getCustomerUserId());
 			return dto;
 		}).collect(Collectors.toList());
 		return groupDtos;
@@ -1803,9 +1806,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		if (CollectionUtils.isNotEmpty(excludeGroupIds)) {
 			query.notIn(ResiGroupEntity::getId, excludeGroupIds);
 		}
-		// 利用pagehelper计算起始条数
 		query.last(String.format("limit %s, %s", startRow, rowCount));
 
+		// 只显示审核通过且可用的小组
+		query.eq(ResiGroupEntity::getState, "approved");
+
 		SFunction<ResiGroupEntity, ?> sortFieldFun = null;
 		if (GroupFormDTO.SortTypeEnum.CREATE_TIME.getSortField().equals(sortType)) {
 			sortFieldFun = ResiGroupEntity::getCreatedTime;
@@ -1824,6 +1829,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		}
 		List<ResiGroupEntity> groupList = baseDao.selectList(query);
 		return groupList.stream().map(ge -> {
+			// 查询组长id
+			ResiGroupMemberDTO leader = resiGroupMemberDao.selectLeaderMember(ge.getId());
+
 			GroupDetailResultDTO dto = new GroupDetailResultDTO();
 			dto.setGroupId(ge.getId());
 			dto.setGroupName(ge.getGroupName());
@@ -1831,6 +1839,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			dto.setGroupIntroduction(ge.getGroupIntroduction());
 			dto.setGroupType(ge.getGroupType());
 			dto.setGridId(ge.getGridId());
+			dto.setLeaderId(leader.getCustomerUserId());
 			return dto;
 		}).collect(Collectors.toList());
 	}
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 df395ab789..1f18be3a29 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
@@ -1069,10 +1069,14 @@
                resi_group.GROUP_NAME,
                resi_group.GROUP_INTRODUCTION,
                resi_group.GROUP_TYPE,
-               resi_group.CUSTOMER_ID
+               resi_group.CUSTOMER_ID,
+                resi_group_member.GROUP_LEADER_FLAG,
+                g_leader.CUSTOMER_USER_ID leaderId
         from resi_group
                  inner join resi_group_member
                             on (resi_group.ID = resi_group_member.RESI_GROUP_ID and resi_group_member.DEL_FLAG = 0)
+                    inner join resi_group_member g_leader on (g_leader.DEL_FLAG = 0 and g_leader.RESI_GROUP_ID = resi_group.ID and
+                        g_leader.GROUP_LEADER_FLAG = 'leader')
         where resi_group_member.CUSTOMER_USER_ID = #{memberUserId}
           and resi_group.DEL_FLAG = 0
           <if test="gridId != null and gridId.trim() != ''">

From f91d3d5dc48eb78aa15706002793714684783a18 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 13 Sep 2021 09:56:15 +0800
Subject: [PATCH 089/134] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E6=97=B6=E9=95=BF?=
 =?UTF-8?q?=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dataaggre/excel/CustomerDataManageExcel.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java
index 4c2dd81ba0..821a11426f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java
@@ -47,4 +47,9 @@ public class CustomerDataManageExcel {
     @Excel(name = "巡查时长")
     private String patrolDuration;
 
+    /**
+     * 未转换前的巡查时长
+     */
+    private Integer patrolDurationInteger;
+
 }

From 061eaaa4ccf11be24f5d27c48200c6d3b55d9b8e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 13 Sep 2021 10:10:16 +0800
Subject: [PATCH 090/134] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8Cgov-mine=E3=80=81message?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/StaffMessageResultDTO.java  | 12 ++++++++++++
 .../src/main/resources/mapper/UserMessageDao.xml     |  8 ++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/StaffMessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/StaffMessageResultDTO.java
index 43a31a5e00..0e29e1175f 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/StaffMessageResultDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/StaffMessageResultDTO.java
@@ -35,5 +35,17 @@ public class StaffMessageResultDTO implements Serializable {
      * 通知时间
      */
     private Long createdTime;
+
+
+
+
+    /**
+     * 消息分类:info-上传下达消息 详见UserMessageTypeConstant
+     */
+    private String messageType;
+    /**
+     * 消息对应的业务id,比如message_type=info时，此列存储的是消息id,可跳转到消息详情
+     */
+    private String targetId;
 }
 
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml
index fa4266f1e7..7aca569542 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml
@@ -35,7 +35,9 @@
             customer_id,
             created_time,
             grid_id,
-            message_content
+            message_content,
+            message_type,
+            target_id
         FROM
             user_message
         WHERE
@@ -66,7 +68,9 @@
             title,
             message_content as messageContent,
             read_flag as readFlag,
-            unix_timestamp(CREATED_TIME) as createdTime
+            unix_timestamp(CREATED_TIME) as createdTime,
+            message_type AS messageType,
+            target_id AS targetId
         from
             user_message
         where

From b314b9d19d89adf5c8214a62042aa07e10a069d5 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 13 Sep 2021 10:22:17 +0800
Subject: [PATCH 091/134] =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dataaggre/controller/DataStatsController.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
index 25268127cf..62218578b4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -236,7 +237,7 @@ public class DataStatsController {
      * @author sun
      */
     @PostMapping("governratio")
-    public Result<List<CustomerDataManageResultDTO>> operateexport(@RequestBody CustomerDataManageFormDTO formDTO) {
+    public Result<List<CustomerDataManageResultDTO>> operateexport(@RequestBody CustomerDataManageFormDTO formDTO) throws ParseException {
         ValidatorUtils.validateEntity(formDTO, CustomerDataManageFormDTO.CustomerDataManageForm.class);
         return new Result<List<CustomerDataManageResultDTO>>().ok(dataStatsService.operateExport(formDTO));
     }

From c03c83ea7a5b030c82be070ea02af50779ac6837 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 13 Sep 2021 10:36:09 +0800
Subject: [PATCH 092/134] =?UTF-8?q?=E6=96=B0=E6=96=B9=E6=B3=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/utils/ExcelUtils.java |  3 ++-
 .../datastats/impl/DataStatsServiceImpl.java  | 27 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
index 6eef730ad4..bc2659eccc 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
@@ -113,8 +113,9 @@ public class ExcelUtils {
         sheet1.setDefaultRowHeight((short)(2*256));
         response.setCharacterEncoding("UTF-8");
         response.setHeader("content-Type", "application/vnd.ms-excel");
+        fileName = fileName + ".xls";
         response.setHeader("Content-Disposition",
-                "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xls");
+                "attachment;filename=" +fileName);
         ServletOutputStream out = response.getOutputStream();
         workbook.write(out);
         out.flush();
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 062a51d105..2ee14db994 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1870,13 +1870,38 @@ public class DataStatsServiceImpl implements DataStatsService {
             d3.setClosedProjectCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getClosedProjectCount)));
             d3.setPatrolPeopleCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPatrolPeopleCount)));
             d3.setPatrolCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPatrolCount)));
-            d3.setPatrolDuration("");
+            d3.setPatrolDurationInteger(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPatrolDurationInteger)));
+            d3.setPatrolDuration(getHm(d3.getPatrolDurationInteger()));
             l.add(d3);
         }
         String fileName = excelName(formDTO);
         ExcelUtils.exportExcelToTargetDisposeAll(response,fileName,l, CustomerDataManageExcel.class);
     }
 
+    /**
+     * @Description  秒转换时分
+     * @Param seconds
+     * @author zxc
+     * @date 2021/9/13 10:03 上午
+     */
+    public String getHm(Integer seconds){
+        String result = "0分钟";
+        if (seconds >= NumConstant.SIXTY) {
+            Integer hours = seconds / 3600;
+            Integer minutes = seconds % 3600 / 60;
+            result = (hours < NumConstant.ONE ? "" : hours + "小时") + (minutes < NumConstant.ONE ? "" : minutes + "分钟");
+        }else if (seconds < NumConstant.SIXTY && seconds > NumConstant.ZERO){
+            result = "1分钟";
+        }
+        return result;
+    }
+
+    /**
+     * @Description  表头获取
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/13 10:02 上午
+     */
     public String excelName(CustomerDataManageFormDTO formDTO){
         StringBuffer s = new StringBuffer();
         String agencyName = indexService.selectAgencyNameByAgencyId(formDTO.getAgencyId());

From 71179f6cb7bcc942c92396be5358da80dfda6024 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 13 Sep 2021 14:07:24 +0800
Subject: [PATCH 093/134] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/act/service/impl/GroupActInfoServiceImpl.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index 41e77cee6a..9a44da87ea 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -929,17 +929,19 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
 
     /**
      * @Description  折线图构造
+     * 应前端要求，日期格式由 01月，02月 改为 2021-01，2021-02
      * @author zxc
      * @date 2021/9/6 10:55 上午
      */
     public List<OrganizationalLifeLineChartDTO> lineChart(){
+        String year = String.valueOf(LocalDate.now().getYear());
         List<OrganizationalLifeLineChartDTO> lineChart = new ArrayList<>();
         for (int i = NumConstant.ONE; i <= NumConstant.TWELVE; i++) {
             OrganizationalLifeLineChartDTO dto = new OrganizationalLifeLineChartDTO();
             if (i < NumConstant.TEN){
-                dto.setMonth(NumConstant.ZERO + String.valueOf(i) + "月");
+                dto.setMonth(year +"-"+NumConstant.ZERO + String.valueOf(i));
             }else {
-                dto.setMonth(String.valueOf(i) + "月");
+                dto.setMonth(year +"-"+ String.valueOf(i) + "月");
             }
             lineChart.add(dto);
         }

From 773a2d136b903a127c3f28aa4d806d1b7bb1410a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 13 Sep 2021 14:15:32 +0800
Subject: [PATCH 094/134] =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/act/service/impl/GroupActInfoServiceImpl.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index 9a44da87ea..8fedb2b70b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -910,7 +910,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
             }
         }
         // 折线图组装
-        List<OrganizationalLifeLineChartDTO> lineChart = lineChart();
+        List<OrganizationalLifeLineChartDTO> lineChart = lineChart(formDTO.getYearId());
         if (!CollectionUtils.isEmpty(chartResult)){
             Map<String, List<OrganizationalLifeLineChartDTO>> groupByMonth = chartResult.stream().collect(Collectors.groupingBy(OrganizationalLifeLineChartDTO::getMonth));
             groupByMonth.forEach((month,list) -> {
@@ -933,8 +933,8 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
      * @author zxc
      * @date 2021/9/6 10:55 上午
      */
-    public List<OrganizationalLifeLineChartDTO> lineChart(){
-        String year = String.valueOf(LocalDate.now().getYear());
+    public List<OrganizationalLifeLineChartDTO> lineChart(String yearId){
+        String year = yearId.substring(NumConstant.ZERO,NumConstant.FOUR);
         List<OrganizationalLifeLineChartDTO> lineChart = new ArrayList<>();
         for (int i = NumConstant.ONE; i <= NumConstant.TWELVE; i++) {
             OrganizationalLifeLineChartDTO dto = new OrganizationalLifeLineChartDTO();

From a0b75c9ad4631a71a4ef91f02b885d5a613eae50 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 13 Sep 2021 14:20:22 +0800
Subject: [PATCH 095/134] .......

---
 .../epmet/modules/act/service/impl/GroupActInfoServiceImpl.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/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index 8fedb2b70b..326380d48f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -941,7 +941,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
             if (i < NumConstant.TEN){
                 dto.setMonth(year +"-"+NumConstant.ZERO + String.valueOf(i));
             }else {
-                dto.setMonth(year +"-"+ String.valueOf(i) + "月");
+                dto.setMonth(year +"-"+ String.valueOf(i));
             }
             lineChart.add(dto);
         }

From 52318da489b1177caef511e95fb1d5825e1be8b0 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 13 Sep 2021 15:23:15 +0800
Subject: [PATCH 096/134] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=8F=82?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E6=9D=A5=E5=9B=BA=E5=AE=9A=E4=BB=8Etoken?=
 =?UTF-8?q?=E5=8F=96=EF=BC=8C=E6=94=B9=E4=B8=BA=E5=89=8D=E7=AB=AF=E4=BC=A0?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E4=BC=A0=E4=BB=8Etoken=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/GetAgencyListFormDTO.java   | 18 ++++++++++++++++++
 .../controller/CustomerAgencyController.java   |  7 +++++--
 .../epmet/service/CustomerAgencyService.java   |  2 +-
 .../impl/CustomerAgencyServiceImpl.java        |  4 ++--
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java
new file mode 100644
index 0000000000..0d97988fd7
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/13 3:20 下午
+ * @DESC
+ */
+@Data
+public class GetAgencyListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -5846836779036328298L;
+
+    private String customerId;
+}
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 11d5e13542..c3937127ba 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
@@ -332,8 +332,11 @@ public class CustomerAgencyController {
      * @Date 2021/9/8 15:20
      */
     @PostMapping("agencylist")
-    public Result<AgencyTreeResultDTO> getAgencyList(@LoginUser TokenDto tokenDTO) {
-        return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getAgencyList(tokenDTO));
+    public Result<AgencyTreeResultDTO> getAgencyList(@LoginUser TokenDto tokenDTO,@RequestBody GetAgencyListFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getCustomerId())){
+            formDTO.setCustomerId(tokenDTO.getCustomerId());
+        }
+        return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getAgencyList(formDTO));
     }
 
 }
\ No newline at end of file
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 c1a1915a72..b13bae23e7 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
@@ -254,5 +254,5 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @Author zhaoqifeng
      * @Date 2021/9/8 15:21
      */
-    AgencyTreeResultDTO getAgencyList(TokenDto tokenDTO);
+    AgencyTreeResultDTO getAgencyList(GetAgencyListFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index 4f1de1ae91..acacd98237 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
@@ -1099,8 +1099,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
      * @Date 2021/9/8 15:21
      */
     @Override
-    public AgencyTreeResultDTO getAgencyList(TokenDto tokenDTO) {
-        return baseDao.getAllAgency(tokenDTO.getCustomerId());
+    public AgencyTreeResultDTO getAgencyList(GetAgencyListFormDTO formDTO) {
+        return baseDao.getAllAgency(formDTO.getCustomerId());
     }
 
 }
\ No newline at end of file

From 88b5e10ca7cc4210cc72646691298131156e0a12 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 13 Sep 2021 15:41:43 +0800
Subject: [PATCH 097/134] =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dataaggre/controller/DataStatsController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
index 62218578b4..3dd0fc8a8e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
@@ -236,7 +236,7 @@ public class DataStatsController {
      * @Description 运营情况数据查询
      * @author sun
      */
-    @PostMapping("governratio")
+    @PostMapping("operateexport")
     public Result<List<CustomerDataManageResultDTO>> operateexport(@RequestBody CustomerDataManageFormDTO formDTO) throws ParseException {
         ValidatorUtils.validateEntity(formDTO, CustomerDataManageFormDTO.CustomerDataManageForm.class);
         return new Result<List<CustomerDataManageResultDTO>>().ok(dataStatsService.operateExport(formDTO));

From 6878418ec7146bef90c1358e466a425378e11305 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 13 Sep 2021 15:44:54 +0800
Subject: [PATCH 098/134] emm

---
 .../result/CustomerDataManageResultDTO.java   |  2 ++
 .../datastats/impl/DataStatsServiceImpl.java  | 36 +++++++++----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
index 71ed7bf9b1..d7ae66100c 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
@@ -34,4 +34,6 @@ public class CustomerDataManageResultDTO {
     //巡查时长
     private String patrolDuration;
 
+    private Integer patrolDurationInteger;
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 2ee14db994..f62f24156a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1856,26 +1856,26 @@ public class DataStatsServiceImpl implements DataStatsService {
      */
     @Override
     public void CustomerDataManage(CustomerDataManageFormDTO formDTO, HttpServletResponse response) throws Exception {
-        List<CustomerDataManageExcel> l = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(l)){
-            CustomerDataManageExcel d3 = new CustomerDataManageExcel();
-            d3.setOrgName("合计");
-            d3.setUserCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getUserCount)));
-            d3.setResidentCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getResidentCount)));
-            d3.setPartyMemberCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPartyMemberCount)));
-            d3.setGroupCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getGroupCount)));
-            d3.setTopicCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getTopicCount)));
-            d3.setIssueCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getIssueCount)));
-            d3.setProjectCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getProjectCount)));
-            d3.setClosedProjectCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getClosedProjectCount)));
-            d3.setPatrolPeopleCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPatrolPeopleCount)));
-            d3.setPatrolCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPatrolCount)));
-            d3.setPatrolDurationInteger(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPatrolDurationInteger)));
-            d3.setPatrolDuration(getHm(d3.getPatrolDurationInteger()));
-            l.add(d3);
+        List<CustomerDataManageResultDTO> result = operateExport(formDTO);
+        if (!CollectionUtils.isEmpty(result)){
+            CustomerDataManageResultDTO c = new CustomerDataManageResultDTO();
+            c.setOrgName("合计");
+            c.setUserCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getUserCount)));
+            c.setResidentCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getResidentCount)));
+            c.setPartyMemberCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPartyMemberCount)));
+            c.setGroupCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getGroupCount)));
+            c.setTopicCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getTopicCount)));
+            c.setIssueCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getIssueCount)));
+            c.setProjectCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getProjectCount)));
+            c.setClosedProjectCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getClosedProjectCount)));
+            c.setPatrolPeopleCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPatrolPeopleCount)));
+            c.setPatrolCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPatrolCount)));
+            c.setPatrolDurationInteger(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPatrolDurationInteger)));
+            c.setPatrolDuration(getHm(c.getPatrolDurationInteger()));
+            result.add(c);
         }
         String fileName = excelName(formDTO);
-        ExcelUtils.exportExcelToTargetDisposeAll(response,fileName,l, CustomerDataManageExcel.class);
+        ExcelUtils.exportExcelToTargetDisposeAll(response,fileName,result, CustomerDataManageExcel.class);
     }
 
     /**

From 55ef5c34c1c6116af9ffc21b8bd16dfc0e729487 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 13 Sep 2021 15:58:25 +0800
Subject: [PATCH 099/134] =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dataaggre/controller/DataStatsController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
index 3dd0fc8a8e..9f84657fe1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
@@ -236,8 +236,8 @@ public class DataStatsController {
      * @Description 运营情况数据查询
      * @author sun
      */
-    @PostMapping("operateexport")
-    public Result<List<CustomerDataManageResultDTO>> operateexport(@RequestBody CustomerDataManageFormDTO formDTO) throws ParseException {
+    @PostMapping("operatedata")
+    public Result<List<CustomerDataManageResultDTO>> operatedata(@RequestBody CustomerDataManageFormDTO formDTO) throws ParseException {
         ValidatorUtils.validateEntity(formDTO, CustomerDataManageFormDTO.CustomerDataManageForm.class);
         return new Result<List<CustomerDataManageResultDTO>>().ok(dataStatsService.operateExport(formDTO));
     }

From e62e3fd4715a68cfb6b7fda759ee3771b4ceef8b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 13 Sep 2021 16:30:14 +0800
Subject: [PATCH 100/134] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=9D=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/CustomerDataManageFormDTO.java       |   6 +
 .../result/CustomerDataManageResultDTO.java   |  32 ++-
 .../ScreenAgencyOrGridListDTO.java            |  10 +-
 .../dataaggre/dao/datastats/DataStatsDao.java |  27 +++
 .../StatsStaffPatrolRecordDailyDao.java       |   8 +
 .../datastats/impl/DataStatsServiceImpl.java  | 161 ++++++++++++-
 .../StatsStaffPatrolRecordDailyService.java   |   7 +
 ...tatsStaffPatrolRecordDailyServiceImpl.java |  11 +
 .../impl/EvaluationIndexServiceImpl.java      |  15 +-
 .../mapper/datastats/DatsStatsDao.xml         | 216 ++++++++++++++++++
 .../StatsStaffPatrolRecordDailyDao.xml        |  41 ++++
 .../evaluationindex/EvaluationIndexDao.xml    |   2 +
 12 files changed, 503 insertions(+), 33 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
index 9ac1b660fe..d87beecab2 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
@@ -5,6 +5,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Author zxc
@@ -56,4 +57,9 @@ public class CustomerDataManageFormDTO implements Serializable {
      */
     @NotNull(message = "是否分页不能为空",groups = CustomerDataManageForm.class)
     private Boolean isPage;
+
+    //组织或网格Id集合
+    private List<String> idList;
+    //数据类型【组织agency 网格grid】
+    private String dataType;
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
index d7ae66100c..5c0827da7b 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.dataaggre.dto.datastats.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 /**
@@ -9,31 +10,38 @@ import lombok.Data;
 @Data
 public class CustomerDataManageResultDTO {
 
-    //组织
+    //组织、网格Id
+    private String orgId;
+    //组织、网格名称
     private String orgName;
     //用户数
-    private Integer userCount;
+    private Integer userCount = 0;
     //居民数
-    private Integer residentCount;
+    private Integer residentCount = 0;
     //党员数
-    private Integer partyMemberCount;
+    private Integer partyMemberCount = 0;
     //小组数
-    private Integer groupCount;
+    private Integer groupCount = 0;
     //话题数
-    private Integer topicCount;
+    private Integer topicCount = 0;
     //议题数
-    private Integer issueCount;
+    private Integer issueCount = 0;
     //项目数
-    private Integer projectCount;
+    private Integer projectCount = 0;
     //结案项目数
-    private Integer closedProjectCount;
+    private Integer closedProjectCount = 0;
     //巡查人数
-    private Integer patrolPeopleCount;
+    private Integer patrolPeopleCount = 0;
     //巡查次数
-    private Integer patrolCount;
+    private Integer patrolCount = 0;
     //巡查时长
     private String patrolDuration;
+    //未转换前的巡查时长
+    private Integer patrolDurationInteger = 0;
+    //数据对应dateId
+    @JsonIgnore
+    private String dateId;
 
-    private Integer patrolDurationInteger;
+    private String staffId;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenAgencyOrGridListDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenAgencyOrGridListDTO.java
index 07afb7fbb6..02c5c9cbc8 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenAgencyOrGridListDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenAgencyOrGridListDTO.java
@@ -18,14 +18,10 @@ public class ScreenAgencyOrGridListDTO implements Serializable {
     private List<AgencyGrid> agencyGridList;
 
     @Data
-    public class AgencyGrid {
+    public static class AgencyGrid {
         //组织id
-        private String agencyId;
+        private String orgId;
         //组织名称
-        private String agencyName;
-        //网格Id
-        private String gridId;
-        //网格name
-        private String gridName;
+        private String orgName;
     }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index 9cf5a3a6e1..7172164e18 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dataaggre.dao.datastats;
 
 import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
+import com.epmet.dataaggre.dto.datastats.form.CustomerDataManageFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.*;
@@ -308,4 +309,30 @@ public interface DataStatsDao {
      * @author sun
      */
     List<GridMemberPatrolListResultDTO> selectGirdMemberPatrol(GridMemberPatrolListFormDTO formDTO);
+
+    /**
+     * @Description 直属组织或网格下注册用户数据
+     * @author sun
+     */
+    List<CustomerDataManageResultDTO> regUserList(CustomerDataManageFormDTO formDTO);
+    /**
+     * @Description 直属组织或网格下群组数据
+     * @author sun
+     */
+    List<CustomerDataManageResultDTO> groupList(CustomerDataManageFormDTO formDTO);
+    /**
+     * @Description 直属组织或网格下话题数据
+     * @author sun
+     */
+    List<CustomerDataManageResultDTO> topicList(CustomerDataManageFormDTO formDTO);
+    /**
+     * @Description 直属组织或网格下议题数据
+     * @author sun
+     */
+    List<CustomerDataManageResultDTO> issueList(CustomerDataManageFormDTO formDTO);
+    /**
+     * @Description 直属组织或网格下项目数据
+     * @author sun
+     */
+    List<CustomerDataManageResultDTO> projectList(CustomerDataManageFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StatsStaffPatrolRecordDailyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StatsStaffPatrolRecordDailyDao.java
index c7e68c410e..8f01bdda96 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StatsStaffPatrolRecordDailyDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StatsStaffPatrolRecordDailyDao.java
@@ -19,6 +19,8 @@ package com.epmet.dataaggre.dao.epmetuser;
 
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.datastats.form.CustomerDataManageFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.PatrolDailySumResult;
 import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -43,4 +45,10 @@ public interface StatsStaffPatrolRecordDailyDao extends BaseDao<StatsStaffPatrol
      * @return
      */
     List<PatrolDailySumResult> getPatrolSumList(@Param("agencyFullIdList") List<String> agencyFullIdList, @Param("startDateId") String startDateId, @Param("endDateId") String endDateId);
+
+    /**
+     * @Description 直属组织或网格下巡查数据
+     * @author sun
+     */
+    List<CustomerDataManageResultDTO> patrolList(CustomerDataManageFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index f62f24156a..76c49dbcbd 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1934,10 +1934,15 @@ public class DataStatsServiceImpl implements DataStatsService {
      */
     @Override
     public List<CustomerDataManageResultDTO> operateExport(CustomerDataManageFormDTO formDTO) throws ParseException {
+        List<CustomerDataManageResultDTO> resultList = new ArrayList<>();
         //1.必要参数校验及处理
-        if (!"Interval".equals(formDTO.getType()) && StringUtils.isEmpty(formDTO.getStartTime())) {
+        if ("Interval".equals(formDTO.getType()) && StringUtils.isEmpty(formDTO.getStartTime())) {
             throw new RenException("请选择开始时间或查询累计值");
         }
+        if (formDTO.getIsPage()) {
+            int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+            formDTO.setPageNo(pageIndex);
+        }
         //入参有开始时间的则需要减去一天
         if (StringUtils.isNotBlank(formDTO.getStartTime())) {
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
@@ -1946,22 +1951,154 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setStartTime(format.format(yesterday));
         }
 
-        //2.查询组织现在，判断查询下级组织还是网格数据
+        //2.查询组织信息，判断查询下级组织还是网格数据
         ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId());
         if (null == agencyGrid) {
             return new ArrayList<>();
         }
-        List<String> idList;
-        if (!"community".equals(agencyGrid.getLevel())) {
-            //组织层级用户、群组、话题、议题、项目、巡查数据查询
-            idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getAgencyId).collect(Collectors.toList());
-        } else {
-            //网格层级用户、群组、话题、议题、项目、巡查数据查询
-            idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getGridId).collect(Collectors.toList());
+        //组织或网格Id集合
+        List<String> idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getOrgId).collect(Collectors.toList());
+        formDTO.setDataType(!"community".equals(agencyGrid.getLevel()) ? "agency" : "grid");
+        formDTO.setIdList(idList);
+
+        //3.查询截止日期用户、群组、话题、议题、项目、巡查数据
+        List<CustomerDataManageResultDTO> userEnd = dataStatsDao.regUserList(formDTO);
+        List<CustomerDataManageResultDTO> groupEnd = dataStatsDao.groupList(formDTO);
+        List<CustomerDataManageResultDTO> topicEnd = dataStatsDao.topicList(formDTO);
+        List<CustomerDataManageResultDTO> issueEnd = dataStatsDao.issueList(formDTO);
+        List<CustomerDataManageResultDTO> projectEnd = dataStatsDao.projectList(formDTO);
+        List<CustomerDataManageResultDTO> patrolEnd = statsStaffPatrolRecordDailyService.patrolList(formDTO);
+        //4.判断是否需要查询起始日期用户、群组、话题、议题、项目、巡查数据
+        List<CustomerDataManageResultDTO> userStart = new ArrayList<>();
+        List<CustomerDataManageResultDTO> groupStart = new ArrayList<>();
+        List<CustomerDataManageResultDTO> topicStart = new ArrayList<>();
+        List<CustomerDataManageResultDTO> issueStart = new ArrayList<>();
+        List<CustomerDataManageResultDTO> projectStart = new ArrayList<>();
+        if ("Interval".equals(formDTO.getType())) {
+            userStart = dataStatsDao.regUserList(formDTO);
+            groupStart = dataStatsDao.groupList(formDTO);
+            topicStart = dataStatsDao.topicList(formDTO);
+            issueStart = dataStatsDao.issueList(formDTO);
+            projectStart = dataStatsDao.projectList(formDTO);
+        }
+        //5.封装数据并返回
+        List<CustomerDataManageResultDTO> finalUserStart = userStart;
+        List<CustomerDataManageResultDTO> finalGroupStart = groupStart;
+        List<CustomerDataManageResultDTO> finalTopicStart = topicStart;
+        List<CustomerDataManageResultDTO> finalIssueStart = issueStart;
+        List<CustomerDataManageResultDTO> finalProjectStart = projectStart;
+        agencyGrid.getAgencyGridList().forEach(org -> {
+            CustomerDataManageResultDTO dto = new CustomerDataManageResultDTO();
+            dto.setOrgId(org.getOrgId());
+            dto.setOrgName(org.getOrgName());
+            int user = 0;
+            int resi = 0;
+            int part = 0;
+            for (CustomerDataManageResultDTO u : userEnd) {
+                if (org.getOrgId().equals(u.getOrgId())) {
+                    user = u.getUserCount();
+                    resi = u.getResidentCount();
+                    part = u.getPartyMemberCount();
+                    if ("Interval".equals(formDTO.getType())) {
+                        for (CustomerDataManageResultDTO s : finalUserStart) {
+                            if (u.getOrgId().equals(s.getOrgId())) {
+                                user = user - s.getUserCount();
+                                resi = resi - s.getResidentCount();
+                                part = part - s.getPartyMemberCount();
+                            }
+                        }
+                    }
+                }
+            }
+            int group = 0;
+            for (CustomerDataManageResultDTO u : groupEnd) {
+                if (org.getOrgId().equals(u.getOrgId())) {
+                    group = u.getGroupCount();
+                    if ("Interval".equals(formDTO.getType())) {
+                        for (CustomerDataManageResultDTO s : finalGroupStart) {
+                            if (u.getOrgId().equals(s.getOrgId())) {
+                                group = group - s.getGroupCount();
+                            }
+                        }
+                    }
+                }
+            }
+            int topic = 0;
+            for (CustomerDataManageResultDTO u : topicEnd) {
+                if (org.getOrgId().equals(u.getOrgId())) {
+                    topic = u.getTopicCount();
+                    if ("Interval".equals(formDTO.getType())) {
+                        for (CustomerDataManageResultDTO s : finalTopicStart) {
+                            if (u.getOrgId().equals(s.getOrgId())) {
+                                topic = topic - s.getTopicCount();
+                            }
+                        }
+                    }
+                }
+            }
+            int issue = 0;
+            for (CustomerDataManageResultDTO u : issueEnd) {
+                if (org.getOrgId().equals(u.getOrgId())) {
+                    issue = u.getIssueCount();
+                    if ("Interval".equals(formDTO.getType())) {
+                        for (CustomerDataManageResultDTO s : finalIssueStart) {
+                            if (u.getOrgId().equals(s.getOrgId())) {
+                                issue = issue - s.getIssueCount();
+                            }
+                        }
+                    }
+                }
+            }
+            int project = 0;
+            int closed = 0;
+            for (CustomerDataManageResultDTO u : projectEnd) {
+                if (org.getOrgId().equals(u.getOrgId())) {
+                    project = u.getProjectCount();
+                    closed = u.getClosedProjectCount();
+                    if ("Interval".equals(formDTO.getType())) {
+                        for (CustomerDataManageResultDTO s : finalProjectStart) {
+                            if (u.getOrgId().equals(s.getOrgId())) {
+                                project = project - s.getProjectCount();
+                                closed = closed - s.getClosedProjectCount();
+                            }
+                        }
+                    }
+                }
+            }
+            int patro = 0;
+            int patroCount = 0;
+            String patrolDuration = "";
+            int patrolDurationInteger = 0;
+            List<String> list = new ArrayList<>();
+            for (CustomerDataManageResultDTO u : patrolEnd) {
+                if (org.getOrgId().equals(u.getOrgId())) {
+                    patroCount += u.getPatrolCount();
+                    patrolDurationInteger += u.getPatrolDurationInteger();
+                    list.add(u.getStaffId());
+                }
+            }
+            HashSet set = new HashSet(list);
+            patro = set.size();
+            Integer minutes = patrolDurationInteger / 60;
+            patrolDuration = (minutes / 60 > 0 ? minutes / 60 + "小时" : "") + (minutes % 60 > 0 ? minutes % 60 + "分钟" : "0分钟");
+
+            dto.setUserCount(user);
+            dto.setResidentCount(resi);
+            dto.setPartyMemberCount(part);
+            dto.setGroupCount(group);
+            dto.setTopicCount(topic);
+            dto.setIssueCount(issue);
+            dto.setProjectCount(project);
+            dto.setClosedProjectCount(closed);
+            dto.setPatrolPeopleCount(patro);
+            dto.setPatrolCount(patroCount);
+            dto.setPatrolDuration(patrolDuration);
+            dto.setPatrolDurationInteger(patrolDurationInteger);
 
-        }
-        //3.封装数据并返回
-        return null;
+            resultList.add(dto);
+        });
+
+        return resultList;
     }
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StatsStaffPatrolRecordDailyService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StatsStaffPatrolRecordDailyService.java
index e8ec143b3c..bd2e1ccf11 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StatsStaffPatrolRecordDailyService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StatsStaffPatrolRecordDailyService.java
@@ -18,6 +18,8 @@
 package com.epmet.dataaggre.service.epmetuser;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dataaggre.dto.datastats.form.CustomerDataManageFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.PatrolDailySumResult;
 import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity;
 
@@ -40,4 +42,9 @@ public interface StatsStaffPatrolRecordDailyService extends BaseService<StatsSta
      */
 	List<PatrolDailySumResult> getPatrolSumList(List<String> agencyList, String startDateId, String endDateId);
 
+	/**
+	 * @Description 直属组织或网格下巡查数据
+	 * @author sun
+	 */
+	List<CustomerDataManageResultDTO> patrolList(CustomerDataManageFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java
index aad90034f3..22a2496ffe 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java
@@ -4,6 +4,8 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmetuser.StatsStaffPatrolRecordDailyDao;
+import com.epmet.dataaggre.dto.datastats.form.CustomerDataManageFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.PatrolDailySumResult;
 import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity;
 import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
@@ -36,4 +38,13 @@ public class StatsStaffPatrolRecordDailyServiceImpl extends BaseServiceImpl<Stat
         return baseDao.getPatrolSumList(agencyFullIdList,startDateId,endDateId);
     }
 
+    /**
+     * @Description 直属组织或网格下巡查数据
+     * @author sun
+     */
+    @Override
+    public List<CustomerDataManageResultDTO> patrolList(CustomerDataManageFormDTO formDTO) {
+        return baseDao.patrolList(formDTO);
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
index 6e97769b26..ea95c436a8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
@@ -173,6 +173,7 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
         //2.根据组织级别判断查询直属组织或网格列表
         List<ScreenCustomerAgencyDTO> agencyList = new ArrayList<>();
         List<ScreenCustomerGridDTO> gridList = new ArrayList<>();
+        List<ScreenAgencyOrGridListDTO.AgencyGrid> finalAgencyGridList = agencyGridList;
         if (!"community".equals(dto.getLevel())) {
             //2-1.直属下级组织列表
             //2.判断客户是否存在子客户
@@ -183,11 +184,21 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
                 list.add(dto.getCustomerId());
                 agencyList = evaluationIndexDao.getSubAgencyListByAgency(null, dto.getAreaCode(), list);
             }
-            agencyGridList = ConvertUtils.sourceToTarget(agencyList, ScreenAgencyOrGridListDTO.AgencyGrid.class);
+            agencyList.forEach(gr->{
+                ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid();
+                org.setOrgId(gr.getAgencyId());
+                org.setOrgName(gr.getAgencyName());
+                finalAgencyGridList.add(org);
+            });
         } else {
             //2-2.直属下级网格列表
             gridList = evaluationIndexDao.getSubGridList(agencyId);
-            agencyGridList = ConvertUtils.sourceToTarget(gridList, ScreenAgencyOrGridListDTO.AgencyGrid.class);
+            gridList.forEach(gr->{
+                ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid();
+                org.setOrgId(gr.getGridId());
+                org.setOrgName(gr.getGridName());
+                finalAgencyGridList.add(org);
+            });
         }
 
         resultDTO.setLevel(dto.getLevel());
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 9f99415f2b..8df88699ac 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -797,4 +797,220 @@
         GROUP BY staff_id
     </select>
 
+    <select id="regUserList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO">
+        SELECT
+            t.orgId, t.dateId, t.userCount, t.partyMemberCount,t.residentCount
+        FROM
+        (
+            SELECT DISTINCT
+                date_id dateId, reg_total userCount, partymember_total partyMemberCount, (reg_total - partymember_total) residentCount
+            <choose>
+                <when test='dataType == "agency"'>
+                    , agency_id orgId
+                    FROM fact_reg_user_agency_daily
+                    WHERE del_flag = '0'
+                    <foreach collection="idList" item="id" open="AND agency_id IN (" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </when>
+                <otherwise>
+                    , grid_id orgId
+                    FROM fact_reg_user_grid_daily
+                    WHERE del_flag = '0'
+                    <foreach collection="idList" item="id" open="AND grid_id IN (" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
+            <if test='type != "" and type == "Interval" and startTime != "" and startTime != null '>
+                AND date_id <![CDATA[>=]]> #{startTime}
+                ORDER BY date_id ASC
+            </if>
+            <if test='type != "" and type == "end" and endTime != "" and endTime != null '>
+                AND date_id <![CDATA[<=]]> #{endTime}
+                ORDER BY date_id DESC
+            </if>
+            <choose>
+                <when test='dataType == "agency"'>, agency_id ASC</when>
+                <otherwise>, grid_id ASC</otherwise>
+            </choose>
+        ) t
+        GROUP BY t.orgId
+        <if test='isPage == true '>
+            LIMIT #{pageNo}, #{pageSize}
+        </if>
+    </select>
+    <select id="groupList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO">
+        SELECT
+            t.orgId, t.dateId, t.groupCount
+        FROM
+        (
+            SELECT DISTINCT
+                date_id dateId, group_total groupCount
+            <choose>
+                <when test='dataType == "agency"'>
+                    , agency_id orgId
+                    FROM fact_group_total_agency_daily
+                    WHERE del_flag = '0'
+                    <foreach collection="idList" item="id" open="AND agency_id IN (" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </when>
+                <otherwise>
+                    , grid_id orgId
+                    FROM fact_group_total_grid_daily
+                    WHERE del_flag = '0'
+                    <foreach collection="idList" item="id" open="AND grid_id IN (" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
+            <if test='type != "" and type == "Interval" and startTime != "" and startTime != null '>
+                AND date_id <![CDATA[>=]]> #{startTime}
+                ORDER BY date_id ASC
+            </if>
+            <if test='type != "" and type == "end" and endTime != "" and endTime != null '>
+                AND date_id <![CDATA[<=]]> #{endTime}
+                ORDER BY date_id DESC
+            </if>
+            <choose>
+                <when test='dataType == "agency"'>, agency_id ASC</when>
+                <otherwise>, grid_id ASC</otherwise>
+            </choose>
+        ) t
+        GROUP BY t.orgId
+        <if test='isPage == true '>
+            LIMIT #{pageNo}, #{pageSize}
+        </if>
+    </select>
+    <select id="topicList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO">
+        SELECT
+            t.orgId, t.dateId, t.topicCount
+        FROM
+        (
+            SELECT DISTINCT
+                date_id dateId, topic_total topicCount
+            <choose>
+                <when test='dataType == "agency"'>
+                    , agency_id orgId
+                    FROM fact_topic_total_agency_daily
+                    WHERE del_flag = '0'
+                    <foreach collection="idList" item="id" open="AND agency_id IN (" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </when>
+                <otherwise>
+                    , grid_id orgId
+                    FROM fact_topic_total_grid_daily
+                    WHERE del_flag = '0'
+                    <foreach collection="idList" item="id" open="AND grid_id IN (" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
+            <if test='type != "" and type == "Interval" and startTime != "" and startTime != null '>
+                AND date_id <![CDATA[>=]]> #{startTime}
+                ORDER BY date_id ASC
+            </if>
+            <if test='type != "" and type == "end" and endTime != "" and endTime != null '>
+                AND date_id <![CDATA[<=]]> #{endTime}
+                ORDER BY date_id DESC
+            </if>
+            <choose>
+                <when test='dataType == "agency"'>, agency_id ASC</when>
+                <otherwise>, grid_id ASC</otherwise>
+            </choose>
+        ) t
+        GROUP BY t.orgId
+        <if test='isPage == true '>
+            LIMIT #{pageNo}, #{pageSize}
+        </if>
+    </select>
+    <select id="issueList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO">
+        SELECT
+            t.orgId, t.dateId, t.issueCount
+        FROM
+        (
+            SELECT DISTINCT
+                date_id dateId, issue_total issueCount
+            <choose>
+                <when test='dataType == "agency"'>
+                    , agency_id orgId
+                    FROM fact_issue_agency_daily
+                    WHERE del_flag = '0'
+                    <foreach collection="idList" item="id" open="AND agency_id IN (" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </when>
+                <otherwise>
+                    , grid_id orgId
+                    FROM fact_issue_grid_daily
+                    WHERE del_flag = '0'
+                    <foreach collection="idList" item="id" open="AND grid_id IN (" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
+            <if test='type != "" and type == "Interval" and startTime != "" and startTime != null '>
+                AND date_id <![CDATA[>=]]> #{startTime}
+                ORDER BY date_id ASC
+            </if>
+            <if test='type != "" and type == "end" and endTime != "" and endTime != null '>
+                AND date_id <![CDATA[<=]]> #{endTime}
+                ORDER BY date_id DESC
+            </if>
+            <choose>
+                <when test='dataType == "agency"'>, agency_id ASC</when>
+                <otherwise>, grid_id ASC</otherwise>
+            </choose>
+        ) t
+        GROUP BY t.orgId
+        <if test='isPage == true '>
+            LIMIT #{pageNo}, #{pageSize}
+        </if>
+    </select>
+    <select id="projectList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO">
+        SELECT
+            t.orgId, t.dateId, t.projectCount, t.closedProjectCount
+        FROM
+        (
+            SELECT DISTINCT
+                date_id dateId, project_total projectCount, closed_total closedProjectCount
+            <choose>
+                <when test='dataType == "agency"'>
+                    , agency_id orgId
+                    FROM fact_agency_project_daily
+                    WHERE del_flag = '0'
+                    <foreach collection="idList" item="id" open="AND agency_id IN (" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </when>
+                <otherwise>
+                    , grid_id orgId
+                    FROM fact_grid_project_daily
+                    WHERE del_flag = '0'
+                    <foreach collection="idList" item="id" open="AND grid_id IN (" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
+            <if test='type != "" and type == "Interval" and startTime != "" and startTime != null '>
+                AND date_id <![CDATA[>=]]> #{startTime}
+                ORDER BY date_id ASC
+            </if>
+            <if test='type != "" and type == "end" and endTime != "" and endTime != null '>
+                AND date_id <![CDATA[<=]]> #{endTime}
+                ORDER BY date_id DESC
+            </if>
+            <choose>
+                <when test='dataType == "agency"'>, agency_id ASC</when>
+                <otherwise>, grid_id ASC</otherwise>
+            </choose>
+        ) t
+        GROUP BY t.orgId
+        <if test='isPage == true '>
+            LIMIT #{pageNo}, #{pageSize}
+        </if>
+    </select>
+
 </mapper>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
index 5642d17f40..1bcc9ef704 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
@@ -15,4 +15,45 @@
     </foreach>
 
     </select>
+
+    <select id="patrolList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO">
+        SELECT
+            t.dateId, t.orgId, t.staffId, sum(t.patrolCount),SUM(t.patrolDurationInteger)
+        FROM (
+            SELECT
+                date_id dateId, grid_id, staff_id staffId, patrol_total patrolCount, total_time patrolDurationInteger
+                <choose>
+                    <when test='dataType == "agency"'>
+                        , agency_id orgId
+                    </when>
+                    <otherwise>
+                        , grid_id orgId
+                    </otherwise>
+                </choose>
+            FROM
+            stats_staff_patrol_record_daily
+            WHERE del_flag = '0'
+            AND patrol_total > 0
+            <choose>
+                <when test='dataType == "agency"'>
+                    <foreach collection="idList" item="id" open="AND agency_id IN (" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </when>
+                <otherwise>
+                    <foreach collection="idList" item="id" open="AND grid_id IN (" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
+            <if test='type != "" and type == "Interval" and startTime != "" and startTime != null '>
+                AND date_id <![CDATA[>=]]> #{startTime}
+            </if>
+            <if test='endTime != "" and endTime != null '>
+                AND date_id <![CDATA[<=]]> #{endTime}
+            </if>
+        ) t
+        GROUP BY t.grid_id, t.staffId
+    </select>
+
 </mapper>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
index afa7e56c2d..d140a0dbf3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
@@ -76,6 +76,7 @@
         WHERE
             del_flag = '0'
         AND parent_agency_id = #{agencyId}
+        ORDER BY CONVERT(grid_name USING gbk) ASC
     </select>
     <select id="getGovernRankList" resultType="com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO">
         SELECT
@@ -173,6 +174,7 @@
                 customer_id = #{customerId}
             </foreach>
         </if>
+        ORDER BY CONVERT(agency_name USING gbk) ASC
     </select>
 
     <!-- 根据组织ID查询组织名 -->

From d678089b80706169854bf310ff84af7cbbcf4267 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 13 Sep 2021 16:44:52 +0800
Subject: [PATCH 101/134] emm

---
 .../src/main/java/com/epmet/commons/tools/utils/ExcelUtils.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/ExcelUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
index bc2659eccc..773291dfcc 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
@@ -106,7 +106,7 @@ public class ExcelUtils {
             //当前日期
             fileName = DateUtils.format(new Date());
         }
-        ExportParams params = new ExportParams(fileName, "sheet的Name");
+        ExportParams params = new ExportParams(fileName,fileName);
         Workbook workbook = ExcelExportUtil.exportExcel(params, pojoClass, list);
         Sheet sheet1 = workbook.getSheetAt(0);
         sheet1.setDefaultColumnWidth(50*256);

From 797ce8fbd25630848681c239717232f75e6289b7 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 13 Sep 2021 17:07:55 +0800
Subject: [PATCH 102/134] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=9A=82=E4=B8=8D?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/CustomerDataManageResultDTO.java          |  2 +-
 .../service/datastats/impl/DataStatsServiceImpl.java | 12 +++++++++++-
 .../mapper/evaluationindex/EvaluationIndexDao.xml    |  2 --
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
index 5c0827da7b..b5668643a1 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
@@ -41,7 +41,7 @@ public class CustomerDataManageResultDTO {
     //数据对应dateId
     @JsonIgnore
     private String dateId;
-
+    @JsonIgnore
     private String staffId;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 76c49dbcbd..293ae7fc3d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1968,6 +1968,7 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<CustomerDataManageResultDTO> issueEnd = dataStatsDao.issueList(formDTO);
         List<CustomerDataManageResultDTO> projectEnd = dataStatsDao.projectList(formDTO);
         List<CustomerDataManageResultDTO> patrolEnd = statsStaffPatrolRecordDailyService.patrolList(formDTO);
+
         //4.判断是否需要查询起始日期用户、群组、话题、议题、项目、巡查数据
         List<CustomerDataManageResultDTO> userStart = new ArrayList<>();
         List<CustomerDataManageResultDTO> groupStart = new ArrayList<>();
@@ -1981,7 +1982,8 @@ public class DataStatsServiceImpl implements DataStatsService {
             issueStart = dataStatsDao.issueList(formDTO);
             projectStart = dataStatsDao.projectList(formDTO);
         }
-        //5.封装数据并返回
+
+        //5.封装数据
         List<CustomerDataManageResultDTO> finalUserStart = userStart;
         List<CustomerDataManageResultDTO> finalGroupStart = groupStart;
         List<CustomerDataManageResultDTO> finalTopicStart = topicStart;
@@ -2098,6 +2100,14 @@ public class DataStatsServiceImpl implements DataStatsService {
             resultList.add(dto);
         });
 
+        //6.默认按用户总数降序
+        Collections.sort(resultList, new Comparator<CustomerDataManageResultDTO>() {
+            @Override
+            public int compare(CustomerDataManageResultDTO o1, CustomerDataManageResultDTO o2) {
+                return o2.getUserCount().compareTo(o1.getUserCount());
+            }
+        });
+
         return resultList;
     }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
index d140a0dbf3..afa7e56c2d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
@@ -76,7 +76,6 @@
         WHERE
             del_flag = '0'
         AND parent_agency_id = #{agencyId}
-        ORDER BY CONVERT(grid_name USING gbk) ASC
     </select>
     <select id="getGovernRankList" resultType="com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO">
         SELECT
@@ -174,7 +173,6 @@
                 customer_id = #{customerId}
             </foreach>
         </if>
-        ORDER BY CONVERT(agency_name USING gbk) ASC
     </select>
 
     <!-- 根据组织ID查询组织名 -->

From 3485f348812ece35dcf852c88490d93d7182e47e Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 13 Sep 2021 17:13:06 +0800
Subject: [PATCH 103/134] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=20=E7=BB=99?=
 =?UTF-8?q?scan=E6=B7=BB=E5=8A=A0=E5=B9=B3=E9=98=B4=E7=A7=81=E6=9C=89?=
 =?UTF-8?q?=E8=AF=9D=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=9A=84=E5=A4=96=E7=BD=91?=
 =?UTF-8?q?ip=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=B0=86=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=B7=B2=E6=9C=89=E7=9A=84IP=E5=88=97=E8=A1=A8=E6=94=BE?=
 =?UTF-8?q?=E5=88=B0src/resources/readme=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/readme                   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/epmet-openapi/epmet-openapi-scan/src/main/resources/readme b/epmet-openapi/epmet-openapi-scan/src/main/resources/readme
index 384fca6dfc..7957000efc 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/resources/readme
+++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/readme
@@ -4,4 +4,19 @@ sadd epmet:openapi:scan:whitelist "客户端ip地址"
 sadd epmet:openapi:scan:whitelist "\"192.168.1.1\""
 
 #del
-srem 'epmet:openapi:scan:whitelist' "\"116.179.32.197\"" "\"27.219.156.47\""
\ No newline at end of file
+srem 'epmet:openapi:scan:whitelist' "\"116.179.32.197\"" "\"27.219.156.47\""
+
+==========现有的IP白名单列表===========
+"118.190.232.100"
+"47.104.208.104"
+"219.146.91.110"
+"47.104.205.48"
+"47.104.202.209"
+123.168.101.68
+"47.105.75.189"
+"115.28.104.30"
+"124.128.226.254"
+"114.215.146.86"
+
+
+2021-09-13 平阴私有化部署服务器 "124.128.226.254"
\ No newline at end of file

From a27dbf979abb54735b388d72003a5c7d905b10bf Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 14 Sep 2021 09:39:03 +0800
Subject: [PATCH 104/134] mlgb

---
 .../result/CustomerDataManageResultDTO.java   | 76 ++++++++-------
 .../controller/DataStatsController.java       |  4 +-
 .../dataaggre/dao/datastats/DataStatsDao.java | 10 +-
 .../StatsStaffPatrolRecordDailyDao.java       |  2 +-
 .../service/datastats/DataStatsService.java   |  2 +-
 .../datastats/impl/DataStatsServiceImpl.java  | 92 ++++++++++---------
 .../StatsStaffPatrolRecordDailyService.java   |  2 +-
 ...tatsStaffPatrolRecordDailyServiceImpl.java |  2 +-
 .../mapper/datastats/DatsStatsDao.xml         | 25 +----
 .../StatsStaffPatrolRecordDailyDao.xml        |  2 +-
 10 files changed, 110 insertions(+), 107 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
index b5668643a1..2c7391672e 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
@@ -3,6 +3,9 @@ package com.epmet.dataaggre.dto.datastats.result;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description 运营情况数据导出-接口返参
  * @Auth sun
@@ -10,38 +13,45 @@ import lombok.Data;
 @Data
 public class CustomerDataManageResultDTO {
 
-    //组织、网格Id
-    private String orgId;
-    //组织、网格名称
-    private String orgName;
-    //用户数
-    private Integer userCount = 0;
-    //居民数
-    private Integer residentCount = 0;
-    //党员数
-    private Integer partyMemberCount = 0;
-    //小组数
-    private Integer groupCount = 0;
-    //话题数
-    private Integer topicCount = 0;
-    //议题数
-    private Integer issueCount = 0;
-    //项目数
-    private Integer projectCount = 0;
-    //结案项目数
-    private Integer closedProjectCount = 0;
-    //巡查人数
-    private Integer patrolPeopleCount = 0;
-    //巡查次数
-    private Integer patrolCount = 0;
-    //巡查时长
-    private String patrolDuration;
-    //未转换前的巡查时长
-    private Integer patrolDurationInteger = 0;
-    //数据对应dateId
-    @JsonIgnore
-    private String dateId;
-    @JsonIgnore
-    private String staffId;
+    List<CustomerDataManage> dataManageList = new ArrayList<>();
+    private Integer total;
+
+    @Data
+    public static class CustomerDataManage {
+        //组织、网格Id
+        private String orgId;
+        //组织、网格名称
+        private String orgName;
+        //用户数
+        private Integer userCount = 0;
+        //居民数
+        private Integer residentCount = 0;
+        //党员数
+        private Integer partyMemberCount = 0;
+        //小组数
+        private Integer groupCount = 0;
+        //话题数
+        private Integer topicCount = 0;
+        //议题数
+        private Integer issueCount = 0;
+        //项目数
+        private Integer projectCount = 0;
+        //结案项目数
+        private Integer closedProjectCount = 0;
+        //巡查人数
+        private Integer patrolPeopleCount = 0;
+        //巡查次数
+        private Integer patrolCount = 0;
+        //巡查时长
+        private String patrolDuration;
+        //未转换前的巡查时长
+        private Integer patrolDurationInteger = 0;
+        //数据对应dateId
+        @JsonIgnore
+        private String dateId;
+        @JsonIgnore
+        private String staffId;
+    }
+
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
index 9f84657fe1..9e1929056d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
@@ -237,9 +237,9 @@ public class DataStatsController {
      * @author sun
      */
     @PostMapping("operatedata")
-    public Result<List<CustomerDataManageResultDTO>> operatedata(@RequestBody CustomerDataManageFormDTO formDTO) throws ParseException {
+    public Result<CustomerDataManageResultDTO> operatedata(@RequestBody CustomerDataManageFormDTO formDTO) throws ParseException {
         ValidatorUtils.validateEntity(formDTO, CustomerDataManageFormDTO.CustomerDataManageForm.class);
-        return new Result<List<CustomerDataManageResultDTO>>().ok(dataStatsService.operateExport(formDTO));
+        return new Result<CustomerDataManageResultDTO>().ok(dataStatsService.operateExport(formDTO));
     }
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index 7172164e18..8db54dd03b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -314,25 +314,25 @@ public interface DataStatsDao {
      * @Description 直属组织或网格下注册用户数据
      * @author sun
      */
-    List<CustomerDataManageResultDTO> regUserList(CustomerDataManageFormDTO formDTO);
+    List<CustomerDataManageResultDTO.CustomerDataManage> regUserList(CustomerDataManageFormDTO formDTO);
     /**
      * @Description 直属组织或网格下群组数据
      * @author sun
      */
-    List<CustomerDataManageResultDTO> groupList(CustomerDataManageFormDTO formDTO);
+    List<CustomerDataManageResultDTO.CustomerDataManage> groupList(CustomerDataManageFormDTO formDTO);
     /**
      * @Description 直属组织或网格下话题数据
      * @author sun
      */
-    List<CustomerDataManageResultDTO> topicList(CustomerDataManageFormDTO formDTO);
+    List<CustomerDataManageResultDTO.CustomerDataManage> topicList(CustomerDataManageFormDTO formDTO);
     /**
      * @Description 直属组织或网格下议题数据
      * @author sun
      */
-    List<CustomerDataManageResultDTO> issueList(CustomerDataManageFormDTO formDTO);
+    List<CustomerDataManageResultDTO.CustomerDataManage> issueList(CustomerDataManageFormDTO formDTO);
     /**
      * @Description 直属组织或网格下项目数据
      * @author sun
      */
-    List<CustomerDataManageResultDTO> projectList(CustomerDataManageFormDTO formDTO);
+    List<CustomerDataManageResultDTO.CustomerDataManage> projectList(CustomerDataManageFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StatsStaffPatrolRecordDailyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StatsStaffPatrolRecordDailyDao.java
index 8f01bdda96..11ed072080 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StatsStaffPatrolRecordDailyDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StatsStaffPatrolRecordDailyDao.java
@@ -50,5 +50,5 @@ public interface StatsStaffPatrolRecordDailyDao extends BaseDao<StatsStaffPatrol
      * @Description 直属组织或网格下巡查数据
      * @author sun
      */
-    List<CustomerDataManageResultDTO> patrolList(CustomerDataManageFormDTO formDTO);
+    List<CustomerDataManageResultDTO.CustomerDataManage> patrolList(CustomerDataManageFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index 11fd673ceb..36fa24c7b2 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -245,6 +245,6 @@ public interface DataStatsService {
      * @Description 运营情况数据查询
      * @author sun
      */
-    List<CustomerDataManageResultDTO> operateExport(CustomerDataManageFormDTO formDTO) throws ParseException;
+    CustomerDataManageResultDTO operateExport(CustomerDataManageFormDTO formDTO) throws ParseException;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 293ae7fc3d..73e191dec1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1933,16 +1933,13 @@ public class DataStatsServiceImpl implements DataStatsService {
      * @author sun
      */
     @Override
-    public List<CustomerDataManageResultDTO> operateExport(CustomerDataManageFormDTO formDTO) throws ParseException {
-        List<CustomerDataManageResultDTO> resultList = new ArrayList<>();
+    public CustomerDataManageResultDTO operateExport(CustomerDataManageFormDTO formDTO) throws ParseException {
+        CustomerDataManageResultDTO resultDTO = new CustomerDataManageResultDTO();
+        List<CustomerDataManageResultDTO.CustomerDataManage> dataManageList = new ArrayList<>();
         //1.必要参数校验及处理
         if ("Interval".equals(formDTO.getType()) && StringUtils.isEmpty(formDTO.getStartTime())) {
             throw new RenException("请选择开始时间或查询累计值");
         }
-        if (formDTO.getIsPage()) {
-            int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
-            formDTO.setPageNo(pageIndex);
-        }
         //入参有开始时间的则需要减去一天
         if (StringUtils.isNotBlank(formDTO.getStartTime())) {
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
@@ -1954,27 +1951,29 @@ public class DataStatsServiceImpl implements DataStatsService {
         //2.查询组织信息，判断查询下级组织还是网格数据
         ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId());
         if (null == agencyGrid) {
-            return new ArrayList<>();
+            return new CustomerDataManageResultDTO();
         }
         //组织或网格Id集合
         List<String> idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getOrgId).collect(Collectors.toList());
         formDTO.setDataType(!"community".equals(agencyGrid.getLevel()) ? "agency" : "grid");
         formDTO.setIdList(idList);
+        resultDTO.setTotal(idList.size());
 
         //3.查询截止日期用户、群组、话题、议题、项目、巡查数据
-        List<CustomerDataManageResultDTO> userEnd = dataStatsDao.regUserList(formDTO);
-        List<CustomerDataManageResultDTO> groupEnd = dataStatsDao.groupList(formDTO);
-        List<CustomerDataManageResultDTO> topicEnd = dataStatsDao.topicList(formDTO);
-        List<CustomerDataManageResultDTO> issueEnd = dataStatsDao.issueList(formDTO);
-        List<CustomerDataManageResultDTO> projectEnd = dataStatsDao.projectList(formDTO);
-        List<CustomerDataManageResultDTO> patrolEnd = statsStaffPatrolRecordDailyService.patrolList(formDTO);
+        List<CustomerDataManageResultDTO.CustomerDataManage> userEnd = dataStatsDao.regUserList(formDTO);
+        List<CustomerDataManageResultDTO.CustomerDataManage> groupEnd = dataStatsDao.groupList(formDTO);
+        List<CustomerDataManageResultDTO.CustomerDataManage> topicEnd = dataStatsDao.topicList(formDTO);
+        List<CustomerDataManageResultDTO.CustomerDataManage> issueEnd = dataStatsDao.issueList(formDTO);
+        List<CustomerDataManageResultDTO.CustomerDataManage> projectEnd = dataStatsDao.projectList(formDTO);
+        //巡查数据不区分区间差值，只计算累计值，人员做去重处理且是有巡查记录的人员
+        List<CustomerDataManageResultDTO.CustomerDataManage> patrolEnd = statsStaffPatrolRecordDailyService.patrolList(formDTO);
 
         //4.判断是否需要查询起始日期用户、群组、话题、议题、项目、巡查数据
-        List<CustomerDataManageResultDTO> userStart = new ArrayList<>();
-        List<CustomerDataManageResultDTO> groupStart = new ArrayList<>();
-        List<CustomerDataManageResultDTO> topicStart = new ArrayList<>();
-        List<CustomerDataManageResultDTO> issueStart = new ArrayList<>();
-        List<CustomerDataManageResultDTO> projectStart = new ArrayList<>();
+        List<CustomerDataManageResultDTO.CustomerDataManage> userStart = new ArrayList<>();
+        List<CustomerDataManageResultDTO.CustomerDataManage> groupStart = new ArrayList<>();
+        List<CustomerDataManageResultDTO.CustomerDataManage> topicStart = new ArrayList<>();
+        List<CustomerDataManageResultDTO.CustomerDataManage> issueStart = new ArrayList<>();
+        List<CustomerDataManageResultDTO.CustomerDataManage> projectStart = new ArrayList<>();
         if ("Interval".equals(formDTO.getType())) {
             userStart = dataStatsDao.regUserList(formDTO);
             groupStart = dataStatsDao.groupList(formDTO);
@@ -1984,25 +1983,25 @@ public class DataStatsServiceImpl implements DataStatsService {
         }
 
         //5.封装数据
-        List<CustomerDataManageResultDTO> finalUserStart = userStart;
-        List<CustomerDataManageResultDTO> finalGroupStart = groupStart;
-        List<CustomerDataManageResultDTO> finalTopicStart = topicStart;
-        List<CustomerDataManageResultDTO> finalIssueStart = issueStart;
-        List<CustomerDataManageResultDTO> finalProjectStart = projectStart;
+        List<CustomerDataManageResultDTO.CustomerDataManage> finalUserStart = userStart;
+        List<CustomerDataManageResultDTO.CustomerDataManage> finalGroupStart = groupStart;
+        List<CustomerDataManageResultDTO.CustomerDataManage> finalTopicStart = topicStart;
+        List<CustomerDataManageResultDTO.CustomerDataManage> finalIssueStart = issueStart;
+        List<CustomerDataManageResultDTO.CustomerDataManage> finalProjectStart = projectStart;
         agencyGrid.getAgencyGridList().forEach(org -> {
-            CustomerDataManageResultDTO dto = new CustomerDataManageResultDTO();
+            CustomerDataManageResultDTO.CustomerDataManage dto = new CustomerDataManageResultDTO.CustomerDataManage();
             dto.setOrgId(org.getOrgId());
             dto.setOrgName(org.getOrgName());
             int user = 0;
             int resi = 0;
             int part = 0;
-            for (CustomerDataManageResultDTO u : userEnd) {
+            for (CustomerDataManageResultDTO.CustomerDataManage u : userEnd) {
                 if (org.getOrgId().equals(u.getOrgId())) {
                     user = u.getUserCount();
                     resi = u.getResidentCount();
                     part = u.getPartyMemberCount();
                     if ("Interval".equals(formDTO.getType())) {
-                        for (CustomerDataManageResultDTO s : finalUserStart) {
+                        for (CustomerDataManageResultDTO.CustomerDataManage s : finalUserStart) {
                             if (u.getOrgId().equals(s.getOrgId())) {
                                 user = user - s.getUserCount();
                                 resi = resi - s.getResidentCount();
@@ -2013,11 +2012,11 @@ public class DataStatsServiceImpl implements DataStatsService {
                 }
             }
             int group = 0;
-            for (CustomerDataManageResultDTO u : groupEnd) {
+            for (CustomerDataManageResultDTO.CustomerDataManage u : groupEnd) {
                 if (org.getOrgId().equals(u.getOrgId())) {
                     group = u.getGroupCount();
                     if ("Interval".equals(formDTO.getType())) {
-                        for (CustomerDataManageResultDTO s : finalGroupStart) {
+                        for (CustomerDataManageResultDTO.CustomerDataManage s : finalGroupStart) {
                             if (u.getOrgId().equals(s.getOrgId())) {
                                 group = group - s.getGroupCount();
                             }
@@ -2026,11 +2025,11 @@ public class DataStatsServiceImpl implements DataStatsService {
                 }
             }
             int topic = 0;
-            for (CustomerDataManageResultDTO u : topicEnd) {
+            for (CustomerDataManageResultDTO.CustomerDataManage u : topicEnd) {
                 if (org.getOrgId().equals(u.getOrgId())) {
                     topic = u.getTopicCount();
                     if ("Interval".equals(formDTO.getType())) {
-                        for (CustomerDataManageResultDTO s : finalTopicStart) {
+                        for (CustomerDataManageResultDTO.CustomerDataManage s : finalTopicStart) {
                             if (u.getOrgId().equals(s.getOrgId())) {
                                 topic = topic - s.getTopicCount();
                             }
@@ -2039,11 +2038,11 @@ public class DataStatsServiceImpl implements DataStatsService {
                 }
             }
             int issue = 0;
-            for (CustomerDataManageResultDTO u : issueEnd) {
+            for (CustomerDataManageResultDTO.CustomerDataManage u : issueEnd) {
                 if (org.getOrgId().equals(u.getOrgId())) {
                     issue = u.getIssueCount();
                     if ("Interval".equals(formDTO.getType())) {
-                        for (CustomerDataManageResultDTO s : finalIssueStart) {
+                        for (CustomerDataManageResultDTO.CustomerDataManage s : finalIssueStart) {
                             if (u.getOrgId().equals(s.getOrgId())) {
                                 issue = issue - s.getIssueCount();
                             }
@@ -2053,12 +2052,12 @@ public class DataStatsServiceImpl implements DataStatsService {
             }
             int project = 0;
             int closed = 0;
-            for (CustomerDataManageResultDTO u : projectEnd) {
+            for (CustomerDataManageResultDTO.CustomerDataManage u : projectEnd) {
                 if (org.getOrgId().equals(u.getOrgId())) {
                     project = u.getProjectCount();
                     closed = u.getClosedProjectCount();
                     if ("Interval".equals(formDTO.getType())) {
-                        for (CustomerDataManageResultDTO s : finalProjectStart) {
+                        for (CustomerDataManageResultDTO.CustomerDataManage s : finalProjectStart) {
                             if (u.getOrgId().equals(s.getOrgId())) {
                                 project = project - s.getProjectCount();
                                 closed = closed - s.getClosedProjectCount();
@@ -2071,15 +2070,14 @@ public class DataStatsServiceImpl implements DataStatsService {
             int patroCount = 0;
             String patrolDuration = "";
             int patrolDurationInteger = 0;
-            List<String> list = new ArrayList<>();
-            for (CustomerDataManageResultDTO u : patrolEnd) {
+            HashSet set = new HashSet();
+            for (CustomerDataManageResultDTO.CustomerDataManage u : patrolEnd) {
                 if (org.getOrgId().equals(u.getOrgId())) {
                     patroCount += u.getPatrolCount();
                     patrolDurationInteger += u.getPatrolDurationInteger();
-                    list.add(u.getStaffId());
+                    set.add(u.getStaffId());
                 }
             }
-            HashSet set = new HashSet(list);
             patro = set.size();
             Integer minutes = patrolDurationInteger / 60;
             patrolDuration = (minutes / 60 > 0 ? minutes / 60 + "小时" : "") + (minutes % 60 > 0 ? minutes % 60 + "分钟" : "0分钟");
@@ -2097,18 +2095,28 @@ public class DataStatsServiceImpl implements DataStatsService {
             dto.setPatrolDuration(patrolDuration);
             dto.setPatrolDurationInteger(patrolDurationInteger);
 
-            resultList.add(dto);
+            dataManageList.add(dto);
         });
 
         //6.默认按用户总数降序
-        Collections.sort(resultList, new Comparator<CustomerDataManageResultDTO>() {
+        Collections.sort(dataManageList, new Comparator<CustomerDataManageResultDTO.CustomerDataManage>() {
             @Override
-            public int compare(CustomerDataManageResultDTO o1, CustomerDataManageResultDTO o2) {
+            public int compare(CustomerDataManageResultDTO.CustomerDataManage o1, CustomerDataManageResultDTO.CustomerDataManage o2) {
                 return o2.getUserCount().compareTo(o1.getUserCount());
             }
         });
 
-        return resultList;
+        //7.物理分页并返回
+        if (formDTO.getIsPage()) {
+            int firstIndex = (formDTO.getPageNo() - 1) * formDTO.getPageSize();
+            int lastIndex = formDTO.getPageNo() * formDTO.getPageSize();
+            List<CustomerDataManageResultDTO.CustomerDataManage> list = dataManageList.subList((firstIndex > dataManageList.size() ? dataManageList.size() : firstIndex), (lastIndex > dataManageList.size() ? dataManageList.size() : lastIndex));
+            resultDTO.setDataManageList(list);
+            return resultDTO;
+        }
+        resultDTO.setDataManageList(dataManageList);
+        return resultDTO;
     }
 
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StatsStaffPatrolRecordDailyService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StatsStaffPatrolRecordDailyService.java
index bd2e1ccf11..ce49c18f73 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StatsStaffPatrolRecordDailyService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StatsStaffPatrolRecordDailyService.java
@@ -46,5 +46,5 @@ public interface StatsStaffPatrolRecordDailyService extends BaseService<StatsSta
 	 * @Description 直属组织或网格下巡查数据
 	 * @author sun
 	 */
-	List<CustomerDataManageResultDTO> patrolList(CustomerDataManageFormDTO formDTO);
+	List<CustomerDataManageResultDTO.CustomerDataManage> patrolList(CustomerDataManageFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java
index 22a2496ffe..d24dcbe10c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java
@@ -43,7 +43,7 @@ public class StatsStaffPatrolRecordDailyServiceImpl extends BaseServiceImpl<Stat
      * @author sun
      */
     @Override
-    public List<CustomerDataManageResultDTO> patrolList(CustomerDataManageFormDTO formDTO) {
+    public List<CustomerDataManageResultDTO.CustomerDataManage> patrolList(CustomerDataManageFormDTO formDTO) {
         return baseDao.patrolList(formDTO);
     }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 8df88699ac..dc6772b551 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -797,7 +797,7 @@
         GROUP BY staff_id
     </select>
 
-    <select id="regUserList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO">
+    <select id="regUserList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO$CustomerDataManage">
         SELECT
             t.orgId, t.dateId, t.userCount, t.partyMemberCount,t.residentCount
         FROM
@@ -836,11 +836,8 @@
             </choose>
         ) t
         GROUP BY t.orgId
-        <if test='isPage == true '>
-            LIMIT #{pageNo}, #{pageSize}
-        </if>
     </select>
-    <select id="groupList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO">
+    <select id="groupList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO$CustomerDataManage">
         SELECT
             t.orgId, t.dateId, t.groupCount
         FROM
@@ -879,11 +876,8 @@
             </choose>
         ) t
         GROUP BY t.orgId
-        <if test='isPage == true '>
-            LIMIT #{pageNo}, #{pageSize}
-        </if>
     </select>
-    <select id="topicList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO">
+    <select id="topicList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO$CustomerDataManage">
         SELECT
             t.orgId, t.dateId, t.topicCount
         FROM
@@ -922,11 +916,8 @@
             </choose>
         ) t
         GROUP BY t.orgId
-        <if test='isPage == true '>
-            LIMIT #{pageNo}, #{pageSize}
-        </if>
     </select>
-    <select id="issueList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO">
+    <select id="issueList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO$CustomerDataManage">
         SELECT
             t.orgId, t.dateId, t.issueCount
         FROM
@@ -965,11 +956,8 @@
             </choose>
         ) t
         GROUP BY t.orgId
-        <if test='isPage == true '>
-            LIMIT #{pageNo}, #{pageSize}
-        </if>
     </select>
-    <select id="projectList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO">
+    <select id="projectList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO$CustomerDataManage">
         SELECT
             t.orgId, t.dateId, t.projectCount, t.closedProjectCount
         FROM
@@ -1008,9 +996,6 @@
             </choose>
         ) t
         GROUP BY t.orgId
-        <if test='isPage == true '>
-            LIMIT #{pageNo}, #{pageSize}
-        </if>
     </select>
 
 </mapper>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
index 1bcc9ef704..5c9bc40337 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
@@ -16,7 +16,7 @@
 
     </select>
 
-    <select id="patrolList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO">
+    <select id="patrolList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO$CustomerDataManage">
         SELECT
             t.dateId, t.orgId, t.staffId, sum(t.patrolCount),SUM(t.patrolDurationInteger)
         FROM (

From b28b956d34131c2c22cf68df5d42369a8b59d5ce Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 14 Sep 2021 09:42:48 +0800
Subject: [PATCH 105/134] =?UTF-8?q?=E5=BA=94=E5=89=8D=E7=AB=AF=E8=A6=81?=
 =?UTF-8?q?=E6=B1=82=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datastats/impl/DataStatsServiceImpl.java  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 73e191dec1..e2c9ec6ce4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1856,21 +1856,21 @@ public class DataStatsServiceImpl implements DataStatsService {
      */
     @Override
     public void CustomerDataManage(CustomerDataManageFormDTO formDTO, HttpServletResponse response) throws Exception {
-        List<CustomerDataManageResultDTO> result = operateExport(formDTO);
+        List<CustomerDataManageResultDTO.CustomerDataManage> result = operateExport(formDTO).getDataManageList();
         if (!CollectionUtils.isEmpty(result)){
-            CustomerDataManageResultDTO c = new CustomerDataManageResultDTO();
+            CustomerDataManageResultDTO.CustomerDataManage c = new CustomerDataManageResultDTO.CustomerDataManage();
             c.setOrgName("合计");
-            c.setUserCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getUserCount)));
-            c.setResidentCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getResidentCount)));
-            c.setPartyMemberCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPartyMemberCount)));
-            c.setGroupCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getGroupCount)));
-            c.setTopicCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getTopicCount)));
-            c.setIssueCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getIssueCount)));
-            c.setProjectCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getProjectCount)));
-            c.setClosedProjectCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getClosedProjectCount)));
-            c.setPatrolPeopleCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPatrolPeopleCount)));
-            c.setPatrolCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPatrolCount)));
-            c.setPatrolDurationInteger(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPatrolDurationInteger)));
+            c.setUserCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO.CustomerDataManage::getUserCount)));
+            c.setResidentCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO.CustomerDataManage::getResidentCount)));
+            c.setPartyMemberCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO.CustomerDataManage::getPartyMemberCount)));
+            c.setGroupCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO.CustomerDataManage::getGroupCount)));
+            c.setTopicCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO.CustomerDataManage::getTopicCount)));
+            c.setIssueCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO.CustomerDataManage::getIssueCount)));
+            c.setProjectCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO.CustomerDataManage::getProjectCount)));
+            c.setClosedProjectCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO.CustomerDataManage::getClosedProjectCount)));
+            c.setPatrolPeopleCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO.CustomerDataManage::getPatrolPeopleCount)));
+            c.setPatrolCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO.CustomerDataManage::getPatrolCount)));
+            c.setPatrolDurationInteger(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO.CustomerDataManage::getPatrolDurationInteger)));
             c.setPatrolDuration(getHm(c.getPatrolDurationInteger()));
             result.add(c);
         }

From 0b0f9b307df93b1d9876b866f1c6712e660e46b3 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 14 Sep 2021 10:03:35 +0800
Subject: [PATCH 106/134] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=A7=AF=E5=88=86=E6=8E=92=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/GroupPointFormDTO.java   | 3 ++-
 .../main/java/com/epmet/controller/ResiPointController.java   | 4 ++--
 .../service/impl/UserPointStatisticalDailyServiceImpl.java    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
index b727bb5d1b..a90e01a1de 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
@@ -17,8 +17,9 @@ public class GroupPointFormDTO implements Serializable {
 
 	public interface GroupPoint extends CustomerClientShowGroup {}
 	public interface GridRank extends CustomerClientShowGroup {}
+	public interface PointRank extends CustomerClientShowGroup {}
 	@NotBlank(message = "小组Id不能为空", groups = {GroupPoint.class, GridRank.class})
 	private String groupId;
-	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class})
+	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class, PointRank.class})
 	private String gridId;
 }
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 dbef30e35f..795f557449 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
@@ -201,7 +201,7 @@ public class ResiPointController {
      */
     @PostMapping("mypointrank")
     public Result<MyPointRankResultDTO> myPointRank(@LoginUser TokenDto tokenDto, @RequestBody GroupPointFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.GridRank.class);
+        ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.PointRank.class);
         return new Result<MyPointRankResultDTO>().ok(userPointStatisticalDailyService.myPointRank(tokenDto, formDTO));
     }
 
@@ -215,7 +215,7 @@ public class ResiPointController {
      */
     @PostMapping("gridpointrank")
     public Result<GridPointRankResultDTO> gridPointRank(@LoginUser TokenDto tokenDto, @RequestBody GroupPointFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.GridRank.class);
+        ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.PointRank.class);
         return new Result<GridPointRankResultDTO>().ok(userPointStatisticalDailyService.gridPointRank(tokenDto, formDTO));
     }
 
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
index 65f8916512..5842e34bf6 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
@@ -356,7 +356,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         result.setCustomerRank(getRank(list, tokenDto.getUserId()));
         //获取网格用户积分
         List<BizPointUserTotalDetailDTO> gridRankList = getUserPointList(tokenDto.getCustomerId(), null, formDTO.getGridId());
-        result.setCustomerRank(getRank(gridRankList, tokenDto.getUserId()));
+        result.setGridRank(getRank(gridRankList, tokenDto.getUserId()));
         return result;
     }
 

From be58a18db8e01701873856707fc2cf0fcba3dafd Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 14 Sep 2021 10:06:03 +0800
Subject: [PATCH 107/134] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=B8=8D=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/datastats/result/CustomerDataManageResultDTO.java   | 2 +-
 .../service/datastats/impl/DataStatsServiceImpl.java        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
index 2c7391672e..e736309945 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
@@ -13,7 +13,7 @@ import java.util.List;
 @Data
 public class CustomerDataManageResultDTO {
 
-    List<CustomerDataManage> dataManageList = new ArrayList<>();
+    List<CustomerDataManage> list = new ArrayList<>();
     private Integer total;
 
     @Data
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index e2c9ec6ce4..0948ea0f84 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1856,7 +1856,7 @@ public class DataStatsServiceImpl implements DataStatsService {
      */
     @Override
     public void CustomerDataManage(CustomerDataManageFormDTO formDTO, HttpServletResponse response) throws Exception {
-        List<CustomerDataManageResultDTO.CustomerDataManage> result = operateExport(formDTO).getDataManageList();
+        List<CustomerDataManageResultDTO.CustomerDataManage> result = operateExport(formDTO).getList();
         if (!CollectionUtils.isEmpty(result)){
             CustomerDataManageResultDTO.CustomerDataManage c = new CustomerDataManageResultDTO.CustomerDataManage();
             c.setOrgName("合计");
@@ -2111,10 +2111,10 @@ public class DataStatsServiceImpl implements DataStatsService {
             int firstIndex = (formDTO.getPageNo() - 1) * formDTO.getPageSize();
             int lastIndex = formDTO.getPageNo() * formDTO.getPageSize();
             List<CustomerDataManageResultDTO.CustomerDataManage> list = dataManageList.subList((firstIndex > dataManageList.size() ? dataManageList.size() : firstIndex), (lastIndex > dataManageList.size() ? dataManageList.size() : lastIndex));
-            resultDTO.setDataManageList(list);
+            resultDTO.setList(list);
             return resultDTO;
         }
-        resultDTO.setDataManageList(dataManageList);
+        resultDTO.setList(dataManageList);
         return resultDTO;
     }
 

From 4601e5fbc00c74b79bab15e75e9a35f92dc5962f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 14 Sep 2021 13:53:15 +0800
Subject: [PATCH 108/134] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=BE=BD=E7=AB=A0=E8=AE=A4=E8=AF=81=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=B0=E5=BD=95messageType=EF=BC=8CtargetId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/constant/UserMessageTypeConstant.java   |  2 +-
 .../src/main/java/com/epmet/dao/UserBadgeDao.java     |  2 +-
 .../com/epmet/service/impl/UserBadgeServiceImpl.java  | 11 ++++++-----
 .../src/main/resources/mapper/UserBadgeDao.xml        |  7 +++++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index cb1efc77b5..adcea05711 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -188,7 +188,7 @@ public interface UserMessageTypeConstant {
 
     /**
      * 居民端提交徽章认证申请
-     * user_badge_certificate_record.id todo
+     * user_badge_certificate_record.id
      */
     String BADGE_AUTH_APPLY="badge_auth_apply";
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java
index e861249258..0fed169769 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java
@@ -65,7 +65,7 @@ public interface UserBadgeDao {
      * @author zxc
      * @date 2020/11/4 2:13 下午
      */
-    void insertUserBadgeCertificateRecord(UserBadgeCertificateRecordDTO userBadgeCertificateRecordDTO);
+    int insertUserBadgeCertificateRecord(UserBadgeCertificateRecordDTO userBadgeCertificateRecordDTO);
 
     /**
      * @Description  更新认证徽章记录最新
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
index b8f35a0d4a..7a70e3e651 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
@@ -2,7 +2,6 @@ package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
 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.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -281,7 +280,10 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         //TODO 站内信发送
         String badgeName = badgeDao.selectBadgeName(form.getCustomerId(), form.getBadgeId());
         String msg = String.format(BadgeConstant.MESSAGE_CONTENT, userBaseInfoResultDTOS.get(NumConstant.ZERO).getDistrict().concat(userBaseInfoResultDTOS.get(NumConstant.ZERO).getRealName()), badgeName);
-        sendMessage(BadgeConstant.AUTH_TITLE,msg,form.getGridId(),form.getUserId(),form.getCustomerId(), UserMessageTypeConstant.BADGE_AUTH_APPLY);
+        // 记录待审核id，和消息类型
+        sendMessage(BadgeConstant.AUTH_TITLE,msg,form.getGridId(),form.getUserId(),form.getCustomerId(),
+                UserMessageTypeConstant.BADGE_AUTH_APPLY,
+                form.getId());
 
         return new Result();
     }
@@ -442,7 +444,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
      * @author zxc
      * @date 2020/11/19 上午9:16
      */
-    public void sendMessage(String title,String msg,String gridId,String userId,String customerId,String messageType){
+    public void sendMessage(String title,String msg,String gridId,String userId,String customerId,String messageType,String userBadgeCertificateRecordId){
         //1.查询加入当前网格下的人员 customer_staff_grid
         CommonGridIdFormDTO commonGridIdFormDTO = new CommonGridIdFormDTO();
         commonGridIdFormDTO.setGridId(gridId);
@@ -476,8 +478,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
 
                     //21.09.10:记录消息类型和对应的业务id
                     msgObj.setMessageType(messageType);
-                    //todo
-                    msgObj.setTargetId(StrConstant.EPMETY_STR);
+                    msgObj.setTargetId(userBadgeCertificateRecordId);
 
                     msgList.add(msgObj);
                     //微信订阅
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
index 9e00787142..d90ebb3941 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
@@ -170,7 +170,10 @@
     </select>
 
     <!--  徽章审核记录表插入  -->
-    <insert id="insertUserBadgeCertificateRecord">
+    <insert id="insertUserBadgeCertificateRecord" useGeneratedKeys="true" keyColumn="ID" keyProperty="id" parameterType="com.epmet.dto.UserBadgeCertificateRecordDTO">
+        <selectKey keyProperty="id" resultType="java.lang.String" order="BEFORE">
+            select replace(uuid(),'-','') AS ID
+        </selectKey>
         INSERT INTO user_badge_certificate_record (
             ID,
             CUSTOMER_ID,
@@ -197,7 +200,7 @@
         )
         VALUES
         (
-            REPLACE ( UUID(), '-', '' ),
+            #{ID},
             #{customerId},
             #{gridId},
             #{userId},

From 84ce7bf0873b2f5f25e0fdc1dfa234effb85651b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 14 Sep 2021 14:33:51 +0800
Subject: [PATCH 109/134] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/CustomerDataManageFormDTO.java       |   2 +
 .../datastats/impl/DataStatsServiceImpl.java  | 124 ++++++++----------
 .../mapper/datastats/DatsStatsDao.xml         |  20 +--
 3 files changed, 65 insertions(+), 81 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
index d87beecab2..e707ef6d6c 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
@@ -60,6 +60,8 @@ public class CustomerDataManageFormDTO implements Serializable {
 
     //组织或网格Id集合
     private List<String> idList;
+    //按起始时间还是结束时间查数据【start end】
+    private String sourceType;
     //数据类型【组织agency 网格grid】
     private String dataType;
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 0948ea0f84..59be2dfd15 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1960,34 +1960,46 @@ public class DataStatsServiceImpl implements DataStatsService {
         resultDTO.setTotal(idList.size());
 
         //3.查询截止日期用户、群组、话题、议题、项目、巡查数据
+        formDTO.setSourceType("end");
         List<CustomerDataManageResultDTO.CustomerDataManage> userEnd = dataStatsDao.regUserList(formDTO);
+        HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> uEndMap = new HashMap<>();
+        userEnd.stream().forEach(u->uEndMap.put(u.getOrgId(),u));
         List<CustomerDataManageResultDTO.CustomerDataManage> groupEnd = dataStatsDao.groupList(formDTO);
+        HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> gEndMap = new HashMap<>();
+        groupEnd.stream().forEach(u->gEndMap.put(u.getOrgId(),u));
         List<CustomerDataManageResultDTO.CustomerDataManage> topicEnd = dataStatsDao.topicList(formDTO);
+        HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> tEndMap = new HashMap<>();
+        topicEnd.stream().forEach(u->tEndMap.put(u.getOrgId(),u));
         List<CustomerDataManageResultDTO.CustomerDataManage> issueEnd = dataStatsDao.issueList(formDTO);
+        HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> iEndMap = new HashMap<>();
+        issueEnd.stream().forEach(u->iEndMap.put(u.getOrgId(),u));
         List<CustomerDataManageResultDTO.CustomerDataManage> projectEnd = dataStatsDao.projectList(formDTO);
+        HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> pEndMap = new HashMap<>();
+        projectEnd.stream().forEach(u->pEndMap.put(u.getOrgId(),u));
         //巡查数据不区分区间差值，只计算累计值，人员做去重处理且是有巡查记录的人员
         List<CustomerDataManageResultDTO.CustomerDataManage> patrolEnd = statsStaffPatrolRecordDailyService.patrolList(formDTO);
 
         //4.判断是否需要查询起始日期用户、群组、话题、议题、项目、巡查数据
-        List<CustomerDataManageResultDTO.CustomerDataManage> userStart = new ArrayList<>();
-        List<CustomerDataManageResultDTO.CustomerDataManage> groupStart = new ArrayList<>();
-        List<CustomerDataManageResultDTO.CustomerDataManage> topicStart = new ArrayList<>();
-        List<CustomerDataManageResultDTO.CustomerDataManage> issueStart = new ArrayList<>();
-        List<CustomerDataManageResultDTO.CustomerDataManage> projectStart = new ArrayList<>();
+        HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> uStartMap = new HashMap<>();
+        HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> gStartMap = new HashMap<>();
+        HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> tStartMap = new HashMap<>();
+        HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> iStartMap = new HashMap<>();
+        HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> pStartMap = new HashMap<>();
         if ("Interval".equals(formDTO.getType())) {
-            userStart = dataStatsDao.regUserList(formDTO);
-            groupStart = dataStatsDao.groupList(formDTO);
-            topicStart = dataStatsDao.topicList(formDTO);
-            issueStart = dataStatsDao.issueList(formDTO);
-            projectStart = dataStatsDao.projectList(formDTO);
+            formDTO.setSourceType("start");
+            List<CustomerDataManageResultDTO.CustomerDataManage> userStart = dataStatsDao.regUserList(formDTO);
+            userStart.stream().forEach(u->uStartMap.put(u.getOrgId(),u));
+            List<CustomerDataManageResultDTO.CustomerDataManage> groupStart = dataStatsDao.groupList(formDTO);
+            groupStart.stream().forEach(u->gStartMap.put(u.getOrgId(),u));
+            List<CustomerDataManageResultDTO.CustomerDataManage> topicStart = dataStatsDao.topicList(formDTO);
+            topicStart.stream().forEach(u->tStartMap.put(u.getOrgId(),u));
+            List<CustomerDataManageResultDTO.CustomerDataManage> issueStart = dataStatsDao.issueList(formDTO);
+            issueStart.stream().forEach(u->iStartMap.put(u.getOrgId(),u));
+            List<CustomerDataManageResultDTO.CustomerDataManage> projectStart = dataStatsDao.projectList(formDTO);
+            projectStart.stream().forEach(u->pStartMap.put(u.getOrgId(),u));
         }
 
         //5.封装数据
-        List<CustomerDataManageResultDTO.CustomerDataManage> finalUserStart = userStart;
-        List<CustomerDataManageResultDTO.CustomerDataManage> finalGroupStart = groupStart;
-        List<CustomerDataManageResultDTO.CustomerDataManage> finalTopicStart = topicStart;
-        List<CustomerDataManageResultDTO.CustomerDataManage> finalIssueStart = issueStart;
-        List<CustomerDataManageResultDTO.CustomerDataManage> finalProjectStart = projectStart;
         agencyGrid.getAgencyGridList().forEach(org -> {
             CustomerDataManageResultDTO.CustomerDataManage dto = new CustomerDataManageResultDTO.CustomerDataManage();
             dto.setOrgId(org.getOrgId());
@@ -1995,75 +2007,45 @@ public class DataStatsServiceImpl implements DataStatsService {
             int user = 0;
             int resi = 0;
             int part = 0;
-            for (CustomerDataManageResultDTO.CustomerDataManage u : userEnd) {
-                if (org.getOrgId().equals(u.getOrgId())) {
-                    user = u.getUserCount();
-                    resi = u.getResidentCount();
-                    part = u.getPartyMemberCount();
-                    if ("Interval".equals(formDTO.getType())) {
-                        for (CustomerDataManageResultDTO.CustomerDataManage s : finalUserStart) {
-                            if (u.getOrgId().equals(s.getOrgId())) {
-                                user = user - s.getUserCount();
-                                resi = resi - s.getResidentCount();
-                                part = part - s.getPartyMemberCount();
-                            }
-                        }
-                    }
+            if(uEndMap.containsKey(org.getOrgId())){
+                user = uEndMap.get(org.getOrgId()).getUserCount();
+                resi = uEndMap.get(org.getOrgId()).getResidentCount();
+                part = uEndMap.get(org.getOrgId()).getPartyMemberCount();
+                if ("Interval".equals(formDTO.getType())&&uStartMap.containsKey(org.getOrgId())) {
+                    user = user - uStartMap.get(org.getOrgId()).getUserCount();
+                    resi = resi - uStartMap.get(org.getOrgId()).getResidentCount();
+                    part = part - uStartMap.get(org.getOrgId()).getPartyMemberCount();
                 }
             }
             int group = 0;
-            for (CustomerDataManageResultDTO.CustomerDataManage u : groupEnd) {
-                if (org.getOrgId().equals(u.getOrgId())) {
-                    group = u.getGroupCount();
-                    if ("Interval".equals(formDTO.getType())) {
-                        for (CustomerDataManageResultDTO.CustomerDataManage s : finalGroupStart) {
-                            if (u.getOrgId().equals(s.getOrgId())) {
-                                group = group - s.getGroupCount();
-                            }
-                        }
-                    }
+            if(gEndMap.containsKey(org.getOrgId())){
+                group = gEndMap.get(org.getOrgId()).getGroupCount();
+                if ("Interval".equals(formDTO.getType())&&gStartMap.containsKey(org.getOrgId())) {
+                    group = group - gStartMap.get(org.getOrgId()).getGroupCount();
                 }
             }
             int topic = 0;
-            for (CustomerDataManageResultDTO.CustomerDataManage u : topicEnd) {
-                if (org.getOrgId().equals(u.getOrgId())) {
-                    topic = u.getTopicCount();
-                    if ("Interval".equals(formDTO.getType())) {
-                        for (CustomerDataManageResultDTO.CustomerDataManage s : finalTopicStart) {
-                            if (u.getOrgId().equals(s.getOrgId())) {
-                                topic = topic - s.getTopicCount();
-                            }
-                        }
-                    }
+            if(tEndMap.containsKey(org.getOrgId())){
+                topic = tEndMap.get(org.getOrgId()).getTopicCount();
+                if ("Interval".equals(formDTO.getType())&&tStartMap.containsKey(org.getOrgId())) {
+                    topic = topic - tStartMap.get(org.getOrgId()).getTopicCount();
                 }
             }
             int issue = 0;
-            for (CustomerDataManageResultDTO.CustomerDataManage u : issueEnd) {
-                if (org.getOrgId().equals(u.getOrgId())) {
-                    issue = u.getIssueCount();
-                    if ("Interval".equals(formDTO.getType())) {
-                        for (CustomerDataManageResultDTO.CustomerDataManage s : finalIssueStart) {
-                            if (u.getOrgId().equals(s.getOrgId())) {
-                                issue = issue - s.getIssueCount();
-                            }
-                        }
-                    }
+            if(iEndMap.containsKey(org.getOrgId())){
+                issue = iEndMap.get(org.getOrgId()).getIssueCount();
+                if ("Interval".equals(formDTO.getType())&&iStartMap.containsKey(org.getOrgId())) {
+                    issue = issue - iStartMap.get(org.getOrgId()).getIssueCount();
                 }
             }
             int project = 0;
             int closed = 0;
-            for (CustomerDataManageResultDTO.CustomerDataManage u : projectEnd) {
-                if (org.getOrgId().equals(u.getOrgId())) {
-                    project = u.getProjectCount();
-                    closed = u.getClosedProjectCount();
-                    if ("Interval".equals(formDTO.getType())) {
-                        for (CustomerDataManageResultDTO.CustomerDataManage s : finalProjectStart) {
-                            if (u.getOrgId().equals(s.getOrgId())) {
-                                project = project - s.getProjectCount();
-                                closed = closed - s.getClosedProjectCount();
-                            }
-                        }
-                    }
+            if(pEndMap.containsKey(org.getOrgId())){
+                project = pEndMap.get(org.getOrgId()).getProjectCount();
+                closed = pEndMap.get(org.getOrgId()).getClosedProjectCount();
+                if ("Interval".equals(formDTO.getType())&&pStartMap.containsKey(org.getOrgId())) {
+                    project = project - pStartMap.get(org.getOrgId()).getProjectCount();
+                    closed = closed - pStartMap.get(org.getOrgId()).getClosedProjectCount();
                 }
             }
             int patro = 0;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index dc6772b551..0850b865c5 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -822,11 +822,11 @@
                     </foreach>
                 </otherwise>
             </choose>
-            <if test='type != "" and type == "Interval" and startTime != "" and startTime != null '>
+            <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
                 ORDER BY date_id ASC
             </if>
-            <if test='type != "" and type == "end" and endTime != "" and endTime != null '>
+            <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>
@@ -862,11 +862,11 @@
                     </foreach>
                 </otherwise>
             </choose>
-            <if test='type != "" and type == "Interval" and startTime != "" and startTime != null '>
+            <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
                 ORDER BY date_id ASC
             </if>
-            <if test='type != "" and type == "end" and endTime != "" and endTime != null '>
+            <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>
@@ -902,11 +902,11 @@
                     </foreach>
                 </otherwise>
             </choose>
-            <if test='type != "" and type == "Interval" and startTime != "" and startTime != null '>
+            <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
                 ORDER BY date_id ASC
             </if>
-            <if test='type != "" and type == "end" and endTime != "" and endTime != null '>
+            <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>
@@ -942,11 +942,11 @@
                     </foreach>
                 </otherwise>
             </choose>
-            <if test='type != "" and type == "Interval" and startTime != "" and startTime != null '>
+            <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
                 ORDER BY date_id ASC
             </if>
-            <if test='type != "" and type == "end" and endTime != "" and endTime != null '>
+            <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>
@@ -982,11 +982,11 @@
                     </foreach>
                 </otherwise>
             </choose>
-            <if test='type != "" and type == "Interval" and startTime != "" and startTime != null '>
+            <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
                 ORDER BY date_id ASC
             </if>
-            <if test='type != "" and type == "end" and endTime != "" and endTime != null '>
+            <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>

From 1ae7adf0dbc0e104db9e6f07bf6531d2fb095e68 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 14 Sep 2021 14:40:05 +0800
Subject: [PATCH 110/134] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=BE=BD=E7=AB=A0=E8=AE=A4=E8=AF=81=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=B0=E5=BD=95messageType=EF=BC=8CtargetId=20bugfi?=
 =?UTF-8?q?x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserBadgeDao.xml                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
index d90ebb3941..c42a648c62 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
@@ -200,7 +200,7 @@
         )
         VALUES
         (
-            #{ID},
+            #{id},
             #{customerId},
             #{gridId},
             #{userId},

From 4ecde84040dc36a8e89bf603c63a336b0e3ed567 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 14 Sep 2021 15:15:41 +0800
Subject: [PATCH 111/134] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=A7=AF=E5=88=86=E6=8E=92=E8=A1=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/MyPointRankResultDTO.java   | 1 +
 .../impl/UserPointStatisticalDailyServiceImpl.java        | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java
index 484c8f8055..2eb5afc433 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java
@@ -18,4 +18,5 @@ public class MyPointRankResultDTO implements Serializable {
     private String headPhoto;
     private String gridRank;
     private String customerRank;
+    private String userName;
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
index 5842e34bf6..c6a23b59df 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
@@ -23,6 +23,7 @@ import com.epmet.common.enu.AroundPartyConstant;
 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.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -351,6 +352,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         }
         MyPointRankResultDTO result = new MyPointRankResultDTO();
         result.setHeadPhoto(myInfoResult.getData().get(0).getHeadImgUrl());
+        result.setUserName(myInfoResult.getData().get(0).getRealName());
         //获取客户下用户积分
         List<BizPointUserTotalDetailDTO> list = getUserPointList(tokenDto.getCustomerId(), null, null);
         result.setCustomerRank(getRank(list, tokenDto.getUserId()));
@@ -378,7 +380,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         if (!gridInfoResult.success()) {
             throw new RenException(gridInfoResult.getCode());
         }
-        result.setGridName(gridInfoResult.getData().getGridName());
+        result.setGridName(gridInfoResult.getData().getParentAgencyName() + StrConstant.HYPHEN + gridInfoResult.getData().getGridName());
         String agencyId = gridInfoResult.getData().getParentAgencyId();
         //获取客户下用户积分
         List<BizPointUserTotalDetailDTO> list = getGridPointList(tokenDto.getCustomerId(), null);
@@ -453,6 +455,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
 
     private Boolean havePoint(List<BizPointUserTotalDetailDTO> list, String userId) {
         Map<String, Integer> map = list.stream().collect(Collectors.toMap(BizPointUserTotalDetailDTO::getUserId, BizPointUserTotalDetailDTO::getTotalPoint));
+        String point = null == map.get(userId)?"0":Integer.toString(map.get(userId));
+        log.info("userPoint:" + point);
         return null != map.get(userId);
     }
 
@@ -463,6 +467,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         }
         //如果当月网格没有积分变动，则积分为0
         Map<String, Integer> map = list.stream().collect(Collectors.toMap(BizPointUserTotalDetailDTO::getGridId, BizPointUserTotalDetailDTO::getTotalPoint));
+        String points = null == map.get(gridId)?"0":Integer.toString(map.get(gridId));
+        log.info("gridPoint:" + points);
         if (null == map.get(gridId)) {
             BizPointUserTotalDetailDTO dto = new BizPointUserTotalDetailDTO();
             dto.setGridId(gridId);

From 368b4ee98bda530a45a60d2f615ab9637174675f Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 15 Sep 2021 13:55:21 +0800
Subject: [PATCH 112/134] =?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

---
 .../mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
index 5c9bc40337..b9a488a03b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
@@ -18,10 +18,10 @@
 
     <select id="patrolList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO$CustomerDataManage">
         SELECT
-            t.dateId, t.orgId, t.staffId, sum(t.patrolCount),SUM(t.patrolDurationInteger)
+            t.dateId, t.orgId, t.staffId, sum(t.patrol_total) patrolCount, SUM(t.total_time) patrolDurationInteger
         FROM (
             SELECT
-                date_id dateId, grid_id, staff_id staffId, patrol_total patrolCount, total_time patrolDurationInteger
+                date_id dateId, grid_id, staff_id staffId, patrol_total , total_time
                 <choose>
                     <when test='dataType == "agency"'>
                         , agency_id orgId

From 4885c77334c8d109bc613990b97e57a8360ef707 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 15 Sep 2021 14:17:32 +0800
Subject: [PATCH 113/134] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=A7=AF=E5=88=86=E6=8E=92=E8=A1=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/UserPointStatisticalDailyDao.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
index 6bd5f6b76a..69c6148f63 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
@@ -250,9 +250,7 @@
             <if test="null != gridId and gridId != ''">
                 AND a.GRID_ID = #{gridId}
             </if>
-            GROUP BY a.CUSTOMER_ID,
-            a.AGENCY_ID,
-            a.GRID_ID,
+            GROUP BY
             a.USER_ID
     </select>
     <select id="selectGridPointByMonth" resultType="com.epmet.dto.BizPointUserTotalDetailDTO">
@@ -273,8 +271,7 @@
             <if test="null != agencyId and agencyId != ''">
                 AND a.AGENCY_ID = #{agencyId}
             </if>
-            GROUP BY a.CUSTOMER_ID,
-            a.AGENCY_ID,
+            GROUP BY
             a.GRID_ID
     </select>
 </mapper>

From 96f24aa2bb2b169c9fd35c2f7cd8142505ca5449 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 15 Sep 2021 17:25:01 +0800
Subject: [PATCH 114/134] =?UTF-8?q?=E6=BC=8F=E6=8F=90sql=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/notice/service/impl/NoticeCommentServiceImpl.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/notice/service/impl/NoticeCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
index 7556f18444..f676f03433 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
@@ -123,7 +123,7 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
         if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(formDTO.getImageList())){
             List<String> imageList = formDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
             safetyCheck(new ArrayList<>(), imageList);
-        }
+        }ta
 
         //2.判断当前用户是否被禁言、移除、非本组成员
         NoticeDTO notice = noticeService.get(formDTO.getNoticeId());

From 14bdf622ac0251ec51b322ba1fd6dd26ff141544 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 15 Sep 2021 17:26:35 +0800
Subject: [PATCH 115/134] =?UTF-8?q?=E6=BC=8F=E6=8F=90sql=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/NoticeCommentServiceImpl.java        |  2 +-
 .../V0.0.25__comment_attachment_.sql          | 65 +++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.25__comment_attachment_.sql

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
index f676f03433..7556f18444 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
@@ -123,7 +123,7 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
         if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(formDTO.getImageList())){
             List<String> imageList = formDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
             safetyCheck(new ArrayList<>(), imageList);
-        }ta
+        }
 
         //2.判断当前用户是否被禁言、移除、非本组成员
         NoticeDTO notice = noticeService.get(formDTO.getNoticeId());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.25__comment_attachment_.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.25__comment_attachment_.sql
new file mode 100644
index 0000000000..9c60580ac9
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.25__comment_attachment_.sql
@@ -0,0 +1,65 @@
+CREATE TABLE `resi_topic_comment_attachment` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `TOPIC_ID` varchar(64) NOT NULL COMMENT '话题Id',
+  `TOPIC_COMMENT_ID` varchar(64) NOT NULL COMMENT '评论Id',
+  `FILE_NAME` varchar(255) DEFAULT NULL COMMENT '文件名',
+  `ATTACHMENT_NAME` varchar(64) DEFAULT NULL COMMENT '附件名（uuid随机生成）',
+  `ATTACHMENT_SIZE` int(11) DEFAULT NULL COMMENT '文件大小，单位b',
+  `ATTACHMENT_FORMAT` varchar(64) DEFAULT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）',
+  `ATTACHMENT_TYPE` varchar(64) DEFAULT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））',
+  `ATTACHMENT_URL` varchar(255) NOT NULL COMMENT '附件地址',
+  `SORT` int(1) NOT NULL COMMENT '排序字段',
+  `DURATION` int(11) unsigned zerofill DEFAULT '00000000000' COMMENT '语音或视频时长，秒',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='话题评论附件表';
+
+CREATE TABLE `act_comment_attachment` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `GROUP_ACT_ID` varchar(64) NOT NULL COMMENT '活动Id[group_act_info.id]',
+  `ACT_COMMENT_ID` varchar(64) NOT NULL COMMENT '评论Id',
+  `FILE_NAME` varchar(255) DEFAULT NULL COMMENT '文件名',
+  `ATTACHMENT_NAME` varchar(64) DEFAULT NULL COMMENT '附件名（uuid随机生成）',
+  `ATTACHMENT_SIZE` int(11) DEFAULT NULL COMMENT '文件大小，单位b',
+  `ATTACHMENT_FORMAT` varchar(64) DEFAULT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）',
+  `ATTACHMENT_TYPE` varchar(64) DEFAULT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））',
+  `ATTACHMENT_URL` varchar(255) NOT NULL COMMENT '附件地址',
+  `SORT` int(1) NOT NULL COMMENT '排序字段',
+  `DURATION` int(11) unsigned zerofill DEFAULT '00000000000' COMMENT '语音或视频时长，秒',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='活动评论附件表';
+
+CREATE TABLE `notice_comment_attachment` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `NOTICE_ID` varchar(64) NOT NULL COMMENT '通知Id',
+  `NOTICE_COMMENT_ID` varchar(64) NOT NULL COMMENT '评论Id',
+  `FILE_NAME` varchar(255) DEFAULT NULL COMMENT '文件名',
+  `ATTACHMENT_NAME` varchar(64) DEFAULT NULL COMMENT '附件名（uuid随机生成）',
+  `ATTACHMENT_SIZE` int(11) DEFAULT NULL COMMENT '文件大小，单位b',
+  `ATTACHMENT_FORMAT` varchar(64) DEFAULT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）',
+  `ATTACHMENT_TYPE` varchar(64) DEFAULT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））',
+  `ATTACHMENT_URL` varchar(255) NOT NULL COMMENT '附件地址',
+  `SORT` int(1) NOT NULL COMMENT '排序字段',
+  `DURATION` int(11) unsigned zerofill DEFAULT '00000000000' COMMENT '语音或视频时长，秒',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='通知评论附件表';
\ No newline at end of file

From 4527cf75164cff679527cf2af60a3ba1e3457403 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 16 Sep 2021 10:07:37 +0800
Subject: [PATCH 116/134] =?UTF-8?q?=E5=B0=8F=E9=9B=B7=E5=93=A5=E6=8F=90?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E9=9C=80=E6=B1=82=EF=BC=9A=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E9=82=A3=E4=B8=AA?=
 =?UTF-8?q?=E5=B0=8F=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/screen/ScreenCustomerAgencyDao.xml    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index 3e058e209a..16c1b42383 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -282,6 +282,7 @@
             screen_customer_agency sca
         WHERE
             sca.DEL_FLAG = '0'
+            and sca.IS_DISPLAY='1'
         <choose>
             <when test="areaCode != null and areaCode.trim() != ''">
                 AND sca.PARENT_AREA_CODE = #{areaCode}
@@ -296,6 +297,7 @@
         FROM
             screen_customer_grid m
             where m.DEL_FLAG = '0'
+             and m.IS_DISPLAY='1'
             <choose>
                 <when test="areaCode != null and areaCode.trim() != ''">
                     and m.AREA_CODE=#{areaCode}

From 3076bb45b0146cfe1c147ad1cdf6d6796039dbed Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 16 Sep 2021 14:14:06 +0800
Subject: [PATCH 117/134] =?UTF-8?q?pinyin=E5=B7=A5=E5=85=B7=E7=B1=BB=20?=
 =?UTF-8?q?=E9=99=A4=E6=B1=89=E5=AD=90=E5=A4=96=E5=85=B6=E4=BB=96=E5=8E=9F?=
 =?UTF-8?q?=E6=A0=B7=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/util/Pinyin4jUtil.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
index 8d392a2c21..a3e42f4280 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
@@ -139,8 +139,8 @@ public class Pinyin4jUtil {
                 } else if (((int) c >= 65 && (int) c <= 90)
                         || ((int) c >= 97 && (int) c <= 122)) {//英文
                     temp[i] = new String[]{String.valueOf(srcChar[i])};
-                } else {
-                    temp[i] = new String[]{""};
+                } else {//非汉字全盘返回即可
+                    temp[i] = new String[]{String.valueOf(srcChar[i])};
                 }
             }
             String[] pingyinArray = exchange(temp);

From 8f730394138d04510aebf678f630c607ef788da4 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 16 Sep 2021 14:35:50 +0800
Subject: [PATCH 118/134] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/util/Pinyin4jUtil.java              | 2 --
 1 file changed, 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
index a3e42f4280..05295879a0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
@@ -42,7 +42,6 @@ public class Pinyin4jUtil {
      */
     public static String getFirstSpellPinYin(String src, boolean isFullSpell) {
         String targetStr = Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(src, isFullSpell, 1));
-        System.out.println(targetStr);
         String[] split = targetStr.split(",");
         if (split.length > 1) {
             targetStr = split[0];
@@ -59,7 +58,6 @@ public class Pinyin4jUtil {
      */
     public static String getSpellPinYin(String src, boolean isFullSpell,Integer preFont) {
         String targetStr = Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(src, isFullSpell, preFont));
-        System.out.println(targetStr);
         String[] split = targetStr.split(",");
         if (split.length > 1) {
             targetStr = split[0];

From 2dafaba625ee0a12b342439b5dc4b8d675b45ced Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 16 Sep 2021 15:01:03 +0800
Subject: [PATCH 119/134] =?UTF-8?q?=E8=B0=83=E5=8A=A8=E5=A4=9A=E9=9F=B3?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/util/Pinyin4jUtil.java               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
index 05295879a0..c376147122 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
@@ -31,6 +31,7 @@ public class Pinyin4jUtil {
         duoyinMap.put('均',new String[]{"jun"});
         duoyinMap.put('会', new String[]{"hui"});
         duoyinMap.put('属', new String[]{"shu"});
+        duoyinMap.put('调', new String[]{"diao"});
     }
 
     /**

From 455382c55a47e41092970b24f80056d5b0af890d Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 16 Sep 2021 15:35:10 +0800
Subject: [PATCH 120/134] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E3=80=90?=
 =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=8E=92=E5=90=8D=E3=80=91=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E4=B8=8B=E6=8E=92=E5=90=8D=E3=80=81=E5=AE=A2=E6=88=B7=E4=B8=8B?=
 =?UTF-8?q?=E6=8E=92=E5=90=8D=EF=BC=8C=E5=90=8D=E6=AC=A1=E6=96=AD=E5=B1=82?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BizPointTotalDetailServiceImpl.java  | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
index 95d4bd33df..78d6fd7c81 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
@@ -311,7 +311,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
         }
 
         // 4.排名填充。有积分的按照积分排序，分数一样的名次一样
-        Integer ranking = page.getStartRow() + 1;
+        Integer ranking = getStartRanking(rankingInfoDTOs, searchScopeType.getScopeType(), searchScopeId);
         Integer prevPoint = null;
         for (GroupPointRankingResultDTO g : rankingInfoDTOs) {
             Integer point = Integer.valueOf(g.getPoint());
@@ -322,13 +322,42 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
 
             GridInfoCache gridInfo = getGridInfo(g.getGridId());
             g.setGridId(g.getGridId());
-            g.setGridNamePath(gridInfo.getGridNamePath());
+            if (gridInfo != null) {
+                g.setGridNamePath(gridInfo.getGridNamePath());
+            } else {
+                // todo 网格被删除了，应该怎么办？
+                g.setGridNamePath(" ");
+            }
             g.setRanking(String.valueOf(ranking));
             prevPoint = point;
         }
         return rankingInfoDTOs;
     }
 
+    /**
+     * @description 获取起始排名
+     *
+     * @param points 积分信息分页列表
+     * @return
+     * @author wxz
+     * @date 2021.09.16 14:50:11
+     */
+    private Integer getStartRanking(List<GroupPointRankingResultDTO> points, String scopeType, String scopeObjectId) {
+        if (CollectionUtils.isEmpty(points)) {
+            return 0;
+        }
+
+        GroupPointRankingResultDTO firstPoint = points.get(0);
+
+        if (firstPoint.getPoint().equals("0")) {
+            // 如果第一条积分就是0，那么查询出来有积分的组的最低名次+1（注意：point_total表不能有积分为0的记录，否则计算出来的名次会比实际名次+1）
+            Integer minRanking = baseDao.getMinRanking("group", scopeType, scopeObjectId);
+            return minRanking + 1;
+        } else {
+            return baseDao.getRanking("group", firstPoint.getGroupId(), scopeType);
+        }
+    }
+
     /**
      * @description 获取分页缺口group ranking信息
      *

From f43e9813c12fa5f566a2f5ba64f855cdee9460dc Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 17 Sep 2021 14:21:36 +0800
Subject: [PATCH 121/134] =?UTF-8?q?=E6=8C=87=E5=8D=97=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AD=97=E5=85=B8=E8=A1=A8sql=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migration/V0.0.9__insert_default_guide_module.sql  | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.9__insert_default_guide_module.sql

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.9__insert_default_guide_module.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.9__insert_default_guide_module.sql
new file mode 100644
index 0000000000..d6a28ecaf4
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.9__insert_default_guide_module.sql
@@ -0,0 +1,10 @@
+INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10001', 'basic_info', '基本信息', 1, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15');
+INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10002', 'handling_info', '办理信息', 2, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15');
+INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10003', 'setting_basis', '设定依据', 3, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15');
+INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10004', 'handling_process', '办理流程', 4, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15');
+INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10005', 'legal_remedy', '法律救济', 5, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15');
+INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10006', 'accept_condition', '受理条件', 6, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15');
+INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10007', 'material_catalog', '材料目录', 7, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15');
+INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10008', 'consultation_method', '咨询方式', 8, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15');
+INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10009', 'complaint_method', '投诉方式', 9, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15');
+INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10010', 'charging_info', '收费信息', 10, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15');

From 5307a5d09ead5871e6bd7c319e5cafd65ab72dd7 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 17 Sep 2021 17:07:06 +0800
Subject: [PATCH 122/134] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=B0=8F=E7=BB=84V2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/group/ResiGroupDao.xml   | 53 +++++++------------
 1 file changed, 18 insertions(+), 35 deletions(-)

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 82d1531781..fd7e813840 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
@@ -108,41 +108,24 @@
                 topicContent,
                 type
         FROM
-                (
-                        SELECT
-                                a.ID AS textId,
-                                a.TOPIC_CONTENT AS topicContent,
-                                'topic' AS type,
-                                max( a.CREATED_TIME ) AS CREATED_TIME
-                        FROM
-                                resi_topic a
-                        WHERE
-                                a.GROUP_ID = #{groupId}
-                        GROUP BY
-                                a.GROUP_ID UNION ALL
-                        SELECT
-                                a.ID AS textId,
-                                a.TITLE AS topicContent,
-                                'notice' AS type,
-                                max( a.CREATED_TIME ) AS CREATED_TIME
-                        FROM
-                                notice a
-                        WHERE
-                                a.GROUP_ID = #{groupId}
-                        GROUP BY
-                                a.GROUP_ID UNION ALL
-                        SELECT
-                                a.ID AS textId,
-                                a.TITLE AS topicContent,
-                                'activity' AS type,
-                                max( a.CREATED_TIME ) AS CREATED_TIME
-                        FROM
-                                group_act_info a
-                        WHERE
-                                a.GROUP_ID = #{groupId}
-                        GROUP BY
-                                a.GROUP_ID
-                        ) a
+            (
+                SELECT
+                    a.ID AS textId,
+                    a.TOPIC_CONTENT AS topicContent,
+                    'topic' AS type,
+                    a.CREATED_TIME
+                FROM
+                    resi_topic a
+                INNER JOIN (
+                    SELECT max( CREATED_TIME ) AS CREATED_TIME
+                    FROM resi_topic
+                    WHERE GROUP_ID = #{groupId}
+                    AND DEL_FLAG = '0'
+                ) b ON a.CREATED_TIME = b.CREATED_TIME
+                WHERE
+                    a.DEL_FLAG = '0'
+                    AND a.GROUP_ID = #{groupId}
+            ) a
         ORDER BY
                 CREATED_TIME DESC
         LIMIT 1

From d1289da0610277578480a0a381ed087edcb6d69e Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 17 Sep 2021 17:22:33 +0800
Subject: [PATCH 123/134] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E3=80=90?=
 =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=8E=92=E5=90=8D=E3=80=91=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E5=B0=8F=E7=BB=84=EF=BC=8C=E5=A2=9E=E5=8A=A0state=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=8F=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?approved=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/group/ResiGroupDao.xml             | 1 +
 1 file changed, 1 insertion(+)

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 1f18be3a29..88a3d1d9e4 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
@@ -1082,6 +1082,7 @@
           <if test="gridId != null and gridId.trim() != ''">
               and resi_group.GRID_ID=#{gridId}
           </if>
+            and resi_group.STATE = 'approved'
         order by resi_group.CREATED_TIME desc
     </select>
 </mapper>

From ca4efb1610647d3ac678194f39e220ffcea1a05d Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 17 Sep 2021 17:39:50 +0800
Subject: [PATCH 124/134] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=AA=E4=BC=A0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/resi/group/dto/act/form/CommentFormDTO.java     | 4 ++--
 .../resi/group/dto/notice/form/NoticeCommentFormDTO.java      | 4 ++--
 .../resi/group/dto/topic/form/ResiPublishCommentFormDTO.java  | 2 +-
 .../epmet/modules/act/service/impl/ActCommentServiceImpl.java | 4 ++++
 .../modules/notice/service/impl/NoticeCommentServiceImpl.java | 3 +++
 .../topic/service/impl/ResiTopicCommentServiceImpl.java       | 3 +++
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentFormDTO.java
index 8d3cbbcbe1..6645dce753 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentFormDTO.java
@@ -26,8 +26,8 @@ public class CommentFormDTO implements Serializable {
     @NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class)
     private String groupActId;
 
-    @NotBlank(message = "评论内容不能为空", groups = AddUserShowGroup.class)
-    @Length(max = 500, message = "评论内容最多输入500字", groups = AddUserShowGroup.class)
+    //@NotBlank(message = "评论内容不能为空", groups = AddUserShowGroup.class)
+    @Length(max = 500, message = "评论内容最多输入500字")
     private String commentContent;
     /**
      * 图片附件集合
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java
index f6d7488bb4..4269e86262 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java
@@ -22,8 +22,8 @@ public class NoticeCommentFormDTO {
     /**
      * 评论内容300
      */
-    @NotBlank(message = "评论内容不能为空",groups = {NoticeCommentFormDTO.UserShow.class})
-    @Length(max = 300, message = "评论内容不能超过300个字符",groups = {NoticeCommentFormDTO.UserShow.class})
+    //@NotBlank(message = "评论内容不能为空",groups = {NoticeCommentFormDTO.UserShow.class})
+    @Length(max = 300, message = "评论内容不能超过300个字符")
     private String commentContent;
 
     /**
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java
index 9e8b7338cd..179c53c500 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java
@@ -21,7 +21,7 @@ public class ResiPublishCommentFormDTO implements Serializable {
    @NotBlank(message = "话题Id不能为空")
    private String topicId;
 
-   @NotBlank(message = "评论内容不能为空")
+   //@NotBlank(message = "评论内容不能为空")
    private String commentContent;
 
    /**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
index a902a78dc6..422f86d34b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
@@ -43,6 +43,7 @@ import com.epmet.resi.group.dto.act.result.CommentResultDTO;
 import com.epmet.resi.group.dto.group.result.CommentFileDTO;
 import com.epmet.resi.group.dto.notice.form.NoticeFileDTO;
 import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -89,6 +90,9 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void submitComment(CommentFormDTO formDTO) {
+        if(StringUtils.isBlank(formDTO.getCommentContent())&& org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getImageList())){
+            throw new RenException("请至少填写评论内容或上传评论图片！");
+        }
         //1、关闭和已取消不能评论
         GroupActInfoDTO groupActInfoDTO = groupActInfoService.getGroupActInfoDTO(formDTO.getGroupActId());
         if (GroupActConstant.CLOSED.equals(groupActInfoDTO.getStatus())) {
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
index 7556f18444..cc56eb670d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
@@ -100,6 +100,9 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void noticeComment(NoticeCommentFormDTO formDTO) {
+        if(StringUtils.isBlank(formDTO.getCommentContent())&&CollectionUtils.isEmpty(formDTO.getImageList())){
+            throw new RenException("请至少填写评论内容或上传评论图片！");
+        }
         //1.内容安全校验
         String commentContent = formDTO.getCommentContent();
         if (StringUtils.isNotBlank(commentContent)) {
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
index d392e1f3e5..523f81dc49 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
@@ -198,6 +198,9 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result commentTopic(TokenDto tokenDto, ResiPublishCommentFormDTO resiCommentFormDTO) {
+        if(StringUtils.isBlank(resiCommentFormDTO.getCommentContent())&&CollectionUtils.isEmpty(resiCommentFormDTO.getImageList())){
+            throw new RenException("请至少填写评论内容或上传评论图片！");
+        }
         String commentContent = resiCommentFormDTO.getCommentContent();
         if (StringUtils.isNotBlank(commentContent)) {
             //评论话题内容审核

From 407aa7315b66bcf8056a0b8d8f89fa6cc94b4311 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 17 Sep 2021 17:57:05 +0800
Subject: [PATCH 125/134] =?UTF-8?q?point=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/UserPointStatisticalDailyDao.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
index 6bd5f6b76a..d8094a8ad1 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
@@ -186,7 +186,7 @@
     </select>
 
     <select id="selectListGridPartyNewRankByUsablePoint" resultType="com.epmet.dto.result.AllPartyResultDTO">
-        SET @curRank = 0;
+        SET @curRank = #{pageNo};
         SELECT
             @curRank := @curRank + 1 AS ranking,
             @point := IFNULL(p.USABLE_POINT, 0),
@@ -204,7 +204,7 @@
     </select>
 
     <select id="selectListGridPartyNewRankByMonth" resultType="com.epmet.dto.result.AllPartyResultDTO">
-        SET @curRank = 0;
+        SET @curRank = #{pageNo};
         SELECT
             @curRank := @curRank + 1 AS ranking,
             @point := p.point,

From 55ad8f40191b3185b6d4ff3aac20ae092d616756 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Sat, 18 Sep 2021 10:15:12 +0800
Subject: [PATCH 126/134] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=94=9F=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/group/dto/act/LineChartDTO.java      | 25 +++++++++++
 .../modules/act/dao/GroupActInfoDao.java      | 28 ++++++++++++
 .../service/impl/GroupActInfoServiceImpl.java | 44 ++++++++++++++++++-
 .../resources/mapper/act/GroupActInfoDao.xml  | 43 ++++++++++++++++++
 4 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/LineChartDTO.java

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/LineChartDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/LineChartDTO.java
new file mode 100644
index 0000000000..94ac78be16
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/LineChartDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.resi.group.dto.act;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/18 9:37 上午
+ * @DESC
+ */
+@Data
+public class LineChartDTO implements Serializable {
+
+    private static final long serialVersionUID = -8479227864670104465L;
+
+    private Integer value;
+
+    private String month;
+
+    public LineChartDTO() {
+        this.value = NumConstant.ZERO;
+    }
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java
index c4082b67c9..db9e155e6a 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java
@@ -19,6 +19,7 @@ package com.epmet.modules.act.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.act.entity.GroupActInfoEntity;
+import com.epmet.resi.group.dto.act.LineChartDTO;
 import com.epmet.resi.group.dto.act.OrganizationalLifeLineChartDTO;
 import com.epmet.resi.group.dto.act.form.OrganizationalLifeFormDTO;
 import com.epmet.resi.group.dto.act.result.OrganizationalLifeResultDTO;
@@ -67,4 +68,31 @@ public interface GroupActInfoDao extends BaseDao<GroupActInfoEntity> {
     List<OrganizationalLifeLineChartDTO> selectLineChart(@Param("groupIds") List<String> groupId,@Param("leaderFlag")Boolean leaderFlag,
                                                          @Param("yearId")String yearId);
 
+    /**
+     * @Description  查询我创建的活动
+     * @Param userId
+     * @Param yearId
+     * @author zxc
+     * @date 2021/9/18 9:23 上午
+     */
+    List<LineChartDTO> selectMyCreateActTypeMonth(@Param("userId")String userId,@Param("yearId")String yearId);
+
+    /**
+     * @Description  查询应参与的活动
+     * @Param userId
+     * @Param yearId
+     * @author zxc
+     * @date 2021/9/18 9:25 上午
+     */
+    List<LineChartDTO> selectShouldJoinActTypeMonth(@Param("userId")String userId,@Param("yearId")String yearId);
+
+    /**
+     * @Description  查询活动签到次数
+     * @Param userId
+     * @Param yearId
+     * @author zxc
+     * @date 2021/9/18 9:27 上午
+     */
+    List<LineChartDTO> selectSignInTypeMonth(@Param("userId")String userId,@Param("yearId")String yearId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index 326380d48f..a4dc9b400c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -58,6 +58,7 @@ import com.epmet.modules.invitation.service.InvitationRecordService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.resi.group.dto.act.GroupActIdDTO;
 import com.epmet.resi.group.dto.act.GroupActInfoDTO;
+import com.epmet.resi.group.dto.act.LineChartDTO;
 import com.epmet.resi.group.dto.act.OrganizationalLifeLineChartDTO;
 import com.epmet.resi.group.dto.act.form.*;
 import com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO;
@@ -872,7 +873,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
      * @author zxc
      * @date 2021/9/3 2:57 下午
      */
-    @Override
+    /*@Override
     public OrganizationalLifeResultDTO organizationalLife(OrganizationalLifeFormDTO formDTO) {
         OrganizationalLifeResultDTO result = new OrganizationalLifeResultDTO();
         if (StringUtils.isBlank(formDTO.getYearId())){
@@ -925,6 +926,47 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         }
         result.setLineChart(lineChart);
         return result;
+    }*/
+
+    @Override
+    public OrganizationalLifeResultDTO organizationalLife(OrganizationalLifeFormDTO formDTO) {
+        OrganizationalLifeResultDTO result = new OrganizationalLifeResultDTO();
+        if (StringUtils.isBlank(formDTO.getYearId())) {
+            formDTO.setYearId(String.valueOf(LocalDate.now().getYear()));
+        }
+        List<LineChartDTO> myActs = baseDao.selectMyCreateActTypeMonth(formDTO.getUserId(), formDTO.getYearId());
+        List<LineChartDTO> joinActs = baseDao.selectShouldJoinActTypeMonth(formDTO.getUserId(), formDTO.getYearId());
+        List<LineChartDTO> signInActs = baseDao.selectSignInTypeMonth(formDTO.getUserId(), formDTO.getYearId());
+        // 折线图组装
+        List<OrganizationalLifeLineChartDTO> lineChart = lineChart(formDTO.getYearId());
+        lineChart.forEach(l ->{
+            if (!CollectionUtils.isEmpty(myActs)){
+                myActs.forEach(m -> {
+                    if (l.getMonth().equals(m.getMonth())){
+                        l.setOrganizationalActCount(m.getValue());
+                    }
+                });
+            }
+            if (!CollectionUtils.isEmpty(joinActs)){
+                joinActs.forEach(j -> {
+                    if (l.getMonth().equals(j.getMonth())){
+                        l.setShouldJoinActCount(j.getValue());
+                    }
+                });
+            }
+            if (!CollectionUtils.isEmpty(signInActs)){
+                signInActs.forEach(s -> {
+                    if (l.getMonth().equals(s.getMonth())){
+                        l.setActSignCount(s.getValue());
+                    }
+                });
+            }
+        });
+        result.setOrganizationalActCount(CollectionUtils.isEmpty(myActs) ? NumConstant.ZERO : myActs.stream().collect(Collectors.summingInt(LineChartDTO::getValue)));
+        result.setShouldJoinActCount(CollectionUtils.isEmpty(joinActs) ? NumConstant.ZERO : joinActs.stream().collect(Collectors.summingInt(LineChartDTO::getValue)));
+        result.setActSignCount(CollectionUtils.isEmpty(signInActs) ? NumConstant.ZERO : signInActs.stream().collect(Collectors.summingInt(LineChartDTO::getValue)));
+        result.setLineChart(lineChart);
+        return result;
     }
 
     /**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActInfoDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActInfoDao.xml
index 6ebd2be427..dd6534f874 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActInfoDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActInfoDao.xml
@@ -64,4 +64,47 @@
           AND DATE_FORMAT( CREATED_TIME, '%Y' ) = #{yearId}
         GROUP BY month
     </select>
+
+    <!-- 查询我创建的活动 -->
+    <select id="selectMyCreateActTypeMonth" resultType="com.epmet.resi.group.dto.act.LineChartDTO">
+        SELECT
+            COUNT(ai.ID) AS value,
+            DATE_FORMAT(CREATED_TIME,'%Y-%m') AS month
+        FROM group_act_info  ai
+        WHERE
+            ai.DEL_FLAG = '0'
+          AND ai.PUBLISH_USER_ID = #{userId}
+          AND DATE_FORMAT(CREATED_TIME,'%Y') = #{yearId}
+        GROUP BY month
+    </select>
+
+    <!-- 查询应参与的活动 -->
+    <select id="selectShouldJoinActTypeMonth" resultType="com.epmet.resi.group.dto.act.LineChartDTO">
+        SELECT
+            COUNT(DISTINCT GROUP_ACT_ID) AS value,
+            DATE_FORMAT(CREATED_TIME,'%Y-%m') AS month
+        FROM act_read_record
+        WHERE
+            DEL_FLAG = 0
+          AND SHOULD_BE_READ = 'yes'
+          AND USER_ID = #{userId}
+          AND DATE_FORMAT(CREATED_TIME,'%Y') = #{yearId}
+        GROUP BY month
+    </select>
+
+    <!-- 查询活动签到次数 -->
+    <select id="selectSignInTypeMonth" resultType="com.epmet.resi.group.dto.act.LineChartDTO">
+        SELECT
+            COUNT(ID) AS value,
+            DATE_FORMAT(CREATED_TIME,'%Y-%m') AS month
+        FROM act_sign_in_record
+        WHERE DEL_FLAG = '0'
+          AND GROUP_ACT_ID IN (SELECT DISTINCT GROUP_ACT_ID FROM act_read_record
+                               WHERE DEL_FLAG = 0
+                                 AND SHOULD_BE_READ = 'yes'
+                                 AND USER_ID = #{userId}
+                                 AND DATE_FORMAT(CREATED_TIME,'%Y') = #{yearId}
+        )
+        GROUP BY month
+    </select>
 </mapper>
\ No newline at end of file

From 00e51c3851bd4a87d83a8d55c7d7807f0ba6ae36 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Sat, 18 Sep 2021 14:34:09 +0800
Subject: [PATCH 127/134] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=91=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E4=B8=80=E7=BA=A7=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=84=E8=AF=9D=E8=AE=BEnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CustomerAgencyServiceImpl.java       | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index acacd98237..fc9f181a20 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
@@ -25,7 +25,6 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 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.Result;
 import com.epmet.constant.CustomerAgencyConstant;
@@ -1091,16 +1090,38 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
     }
 
     /**
-     * @param tokenDTO
      * @Description 获取客户下组织树
-     * @Param tokenDTO
+     * @Param formDTO
      * @Return {@link AgencyTreeResultDTO}
      * @Author zhaoqifeng
      * @Date 2021/9/8 15:21
      */
     @Override
     public AgencyTreeResultDTO getAgencyList(GetAgencyListFormDTO formDTO) {
-        return baseDao.getAllAgency(formDTO.getCustomerId());
+        AgencyTreeResultDTO agency = baseDao.getAllAgency(formDTO.getCustomerId());
+        if (CollectionUtils.isEmpty(agency.getSubAgencyList())) {
+            agency.setSubAgencyList(null);
+        } else {
+            setAgencyList(agency.getSubAgencyList());
+        }
+        return agency;
+    }
+
+    /**
+     * @Description 组织树最后一级没有数据的话设null
+     * @Param agencyList
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/9/18 14:33
+     */
+    private void setAgencyList(List<AgencyTreeResultDTO> agencyList) {
+        for (AgencyTreeResultDTO dto : agencyList) {
+            if (CollectionUtils.isEmpty(dto.getSubAgencyList())) {
+                dto.setSubAgencyList(null);
+            } else {
+                setAgencyList(dto.getSubAgencyList());
+            }
+        }
     }
 
 }
\ No newline at end of file

From ba396b227f79e4704267ab9c85c3a84313441813 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 18 Sep 2021 15:54:21 +0800
Subject: [PATCH 128/134] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=84=E8=AE=BAbug?=
 =?UTF-8?q?fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ActCommentServiceImpl.java   | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
index 422f86d34b..562d1f1cd7 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
@@ -101,17 +101,19 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
             throw new RenException(EpmetErrorCode.GROUP_ACT_CAN_NOT_COMMENT.getCode(), "当前活动已取消,不能评论");
         }
         //2、评论内容审核
-        TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
-        TextTaskDTO taskDTO = new TextTaskDTO();
-        taskDTO.setContent(formDTO.getCommentContent());
-        taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
-        textScanParamDTO.getTasks().add(taskDTO);
-        Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
-        if (!textSyncScanResult.success()) {
-            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
-        } else {
-            if (!textSyncScanResult.getData().isAllPass()) {
-                throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
+        if(StringUtils.isNotBlank(formDTO.getCommentContent())){
+            TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+            TextTaskDTO taskDTO = new TextTaskDTO();
+            taskDTO.setContent(formDTO.getCommentContent());
+            taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+            textScanParamDTO.getTasks().add(taskDTO);
+            Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+            if (!textSyncScanResult.success()) {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!textSyncScanResult.getData().isAllPass()) {
+                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
+                }
             }
         }
         //图片安全校验

From 712daed9bdbd5109cbad7869ed0d2c321eed7981 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 18 Sep 2021 16:27:16 +0800
Subject: [PATCH 129/134] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BC=93=E5=AD=98use?=
 =?UTF-8?q?rfabu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserBaseInfoServiceImpl.java | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 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 1ce80e7e61..acb101464e 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
@@ -180,25 +180,30 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         }*/
         userIdList.forEach(id -> {
             UserBaseInfoResultDTO baseInfo = userBaseInfoRedis.getUserInfo(id);
-            //为了保证传过来的user数量与返回的一致，就算查出的用户信息为空也要添加进集合里
-            //if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){
-            if (StringUtils.isNotBlank(baseInfo.getStreet()) && StringUtils.isNotBlank(baseInfo.getSurname())) {
-                if ("1".equals(baseInfo.getGender())) {
-                    //    男
-                    baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("先生")));
-                } else if ("2".equals(baseInfo.getGender())) {
-                    //   女
-                    baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("女士")));
+            if(null!=baseInfo){
+                //为了保证传过来的user数量与返回的一致，就算查出的用户信息为空也要添加进集合里
+                //if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){
+                if (StringUtils.isNotBlank(baseInfo.getStreet()) && StringUtils.isNotBlank(baseInfo.getSurname())) {
+                    if ("1".equals(baseInfo.getGender())) {
+                        //    男
+                        baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("先生")));
+                    } else if ("2".equals(baseInfo.getGender())) {
+                        //   女
+                        baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("女士")));
+                    } else {
+                        // 0 未知
+                        baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("女士/先生")));
+                    }
                 } else {
-                    // 0 未知
-                    baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("女士/先生")));
+                    //    社会为微信昵称
+                    baseInfo.setUserShowName(baseInfo.getNickname());
                 }
-            } else {
-                //    社会为微信昵称
-                baseInfo.setUserShowName(baseInfo.getNickname());
+                userBaseInfoList.add(baseInfo);
+                //}
+            }else{
+                logger.error(String.format("userId【%s】,构造UserBaseInfoResultDTO为空",id));
             }
-            userBaseInfoList.add(baseInfo);
-            //}
+
         });
         return userBaseInfoList;
     }

From 5a2343878ca22bd88d68af4405551cc4d35d3618 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Sat, 18 Sep 2021 17:16:04 +0800
Subject: [PATCH 130/134] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8C=87=E5=8D=97?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/GuideModuleDictServiceImpl.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictServiceImpl.java
index 72bfeb9d05..e3fa3ea17b 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictServiceImpl.java
@@ -126,10 +126,11 @@ public class GuideModuleDictServiceImpl extends BaseServiceImpl<GuideModuleDictD
             List<GuideModuleDictDefaultDTO> defaultList =  guideModuleDictDefaultService.getList();
             List<GuideModuleDictEntity> moduleList = ConvertUtils.sourceToTarget(defaultList, GuideModuleDictEntity.class);
             moduleList.forEach(item -> {
+                item.setId(null);
                 item.setCustomerId(customerId);
             });
             insertBatch(moduleList);
-            list = baseDao.selectList(wrapper);
+            list = moduleList;
         }
         return list.stream().map(item -> {
             ModuleDTO dto = new ModuleDTO();

From 1b2f79835d1a2858a51f327592b2ea6954fab76c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 22 Sep 2021 10:16:47 +0800
Subject: [PATCH 131/134] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
index b9a488a03b..22c6b09520 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
@@ -36,8 +36,8 @@
             AND patrol_total > 0
             <choose>
                 <when test='dataType == "agency"'>
-                    <foreach collection="idList" item="id" open="AND agency_id IN (" separator="," close=")">
-                        #{id}
+                    <foreach collection="idList" item="id" open="AND (" close=")" separator=" OR ">
+                        grid_pids like concat('%', #{id}, '%')
                     </foreach>
                 </when>
                 <otherwise>

From 0c3fefd852b04fe6b828f815dc3db97c926a0961 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 22 Sep 2021 13:54:17 +0800
Subject: [PATCH 132/134] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/datastats/impl/DataStatsServiceImpl.java      | 8 +++++++-
 .../mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 59be2dfd15..497ab52715 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -2054,11 +2054,17 @@ public class DataStatsServiceImpl implements DataStatsService {
             int patrolDurationInteger = 0;
             HashSet set = new HashSet();
             for (CustomerDataManageResultDTO.CustomerDataManage u : patrolEnd) {
-                if (org.getOrgId().equals(u.getOrgId())) {
+                if ("community".equals(agencyGrid.getLevel()) && org.getOrgId().equals(u.getOrgId())) {
                     patroCount += u.getPatrolCount();
                     patrolDurationInteger += u.getPatrolDurationInteger();
                     set.add(u.getStaffId());
                 }
+                if (!"community".equals(agencyGrid.getLevel()) && u.getOrgId().contains(org.getOrgId())) {
+                    patroCount += u.getPatrolCount();
+                    patrolDurationInteger += u.getPatrolDurationInteger();
+                    set.add(u.getStaffId());
+                }
+
             }
             patro = set.size();
             Integer minutes = patrolDurationInteger / 60;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
index 22c6b09520..b3f6e59aa9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
@@ -24,7 +24,7 @@
                 date_id dateId, grid_id, staff_id staffId, patrol_total , total_time
                 <choose>
                     <when test='dataType == "agency"'>
-                        , agency_id orgId
+                        , grid_pids orgId
                     </when>
                     <otherwise>
                         , grid_id orgId

From 1d7fc9c6b4688c0a38910db647b7a85e9c6c1946 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 23 Sep 2021 10:08:38 +0800
Subject: [PATCH 133/134] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E4=B8=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=95=B0=E6=8D=AE=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/datastats/DatsStatsDao.xml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 0850b865c5..5c25d1edee 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -887,7 +887,7 @@
             <choose>
                 <when test='dataType == "agency"'>
                     , agency_id orgId
-                    FROM fact_topic_total_agency_daily
+                    FROM fact_topic_hotdiscuss_agency_daily
                     WHERE del_flag = '0'
                     <foreach collection="idList" item="id" open="AND agency_id IN (" separator="," close=")">
                         #{id}
@@ -895,7 +895,7 @@
                 </when>
                 <otherwise>
                     , grid_id orgId
-                    FROM fact_topic_total_grid_daily
+                    FROM fact_topic_hotdiscuss_grid_daily
                     WHERE del_flag = '0'
                     <foreach collection="idList" item="id" open="AND grid_id IN (" separator="," close=")">
                         #{id}

From 3f6337ac9e9c732108bd928e255300f867513426 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 23 Sep 2021 10:13:52 +0800
Subject: [PATCH 134/134] bug#3356

---
 .../service/evaluationindex/screen/impl/AgencyServiceImpl.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
index 8b45ddb6ef..0c27cbc878 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
@@ -464,6 +464,8 @@ public class AgencyServiceImpl implements AgencyService {
                     pidList= Arrays.asList(customerAgencyDTO.getPids().split(StrConstant.COLON));
                 }else if(customerAgencyDTO.getPids().contains(StrConstant.COMMA)){
                     pidList= Arrays.asList(customerAgencyDTO.getPids().split(StrConstant.COMMA));
+                } else if (customerAgencyDTO.getPid().equals(customerAgencyDTO.getPids())) {
+                    pidList.add(customerAgencyDTO.getPids());
                 }
                 if(!CollectionUtils.isEmpty(pidList)){
                     //单客户，存在上级时查询...