Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into develop

# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java

@@ -2,22 +2,19 @@ package com.epmet.mq.listener.listener;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.auth.constants.AuthOperationEnum;
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.epmet.commons.rocketmq.messages.LoginMQMsg;
-import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
-import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.redis.RedisKeys;
-import com.epmet.commons.tools.utils.IpUtils;
+import com.epmet.commons.tools.redis.RedisUtils;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.SpringContextUtils;
-import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.entity.LogOperationEntity;
-import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.mq.listener.bean.log.LogOperationHelper;
 import com.epmet.mq.listener.bean.log.OperatorInfo;
 import com.epmet.service.LogOperationService;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
 import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
@@ -40,8 +37,15 @@ public class AuthOperationLogListener implements MessageListenerConcurrently {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
 
+    private RedisUtils redisUtils;
+
     @Override
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+
+        if (redisUtils == null) {
+            redisUtils = SpringContextUtils.getBean(RedisUtils.class);
+        }
+
         try {
             msgs.forEach(msg -> consumeMessage(msg));
         } catch (Exception e) {
@@ -54,6 +58,7 @@ public class AuthOperationLogListener implements MessageListenerConcurrently {
     private void consumeMessage(MessageExt messageExt) {
         String tags = messageExt.getTags();
         String msg = new String(messageExt.getBody());
+        String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.PENDING_MSG_LABEL);
         logger.info("认证操作日志监听器-收到消息内容:{}", msg);
         LoginMQMsg msgObj = JSON.parseObject(msg, LoginMQMsg.class);
 
@@ -91,5 +96,27 @@ public class AuthOperationLogListener implements MessageListenerConcurrently {
         } finally {
             distributedLock.unLock(lock);
         }
+
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
+            try {
+                removePendingMqMsgCache(pendingMsgLabel);
+            } catch (Exception e) {
+                logger.error("【登录操作事件监听器】-删除mq滞留消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+        }
+    }
+
+    /**
+     * @description
+     *
+     * @param pendingMsgLabel
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:32:32
+     */
+    private void removePendingMqMsgCache(String pendingMsgLabel) {
+        String key = RedisKeys.pendingMqMsgKey(pendingMsgLabel);
+        redisUtils.delete(key);
+        logger.info("【登录操作事件监听器】删除pendingMsgLabel成功:{}", pendingMsgLabel);
     }
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java

@@ -1,10 +1,13 @@
 package com.epmet.mq.listener.listener;
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.epmet.commons.rocketmq.messages.PointRuleChangedMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.entity.LogOperationEntity;
 import com.epmet.enums.SystemMessageTypeEnum;
@@ -34,8 +37,15 @@ public class PointOperationLogListener implements MessageListenerConcurrently {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
 
+    private RedisUtils redisUtils;
+
     @Override
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+
+        if (redisUtils == null) {
+            redisUtils = SpringContextUtils.getBean(RedisUtils.class);
+        }
+
         try {
             msgs.forEach(msg -> consumeMessage(msg));
         } catch (Exception e) {
@@ -48,6 +58,7 @@ public class PointOperationLogListener implements MessageListenerConcurrently {
     private void consumeMessage(MessageExt messageExt) {
         String opeType = messageExt.getTags();
         String msg = new String(messageExt.getBody());
+        String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.PENDING_MSG_LABEL);
         logger.info("积分操作日志监听器-收到消息内容:{}", msg);
         PointRuleChangedMQMsg msgObj = JSON.parseObject(msg, PointRuleChangedMQMsg.class);
 
@@ -87,5 +98,27 @@ public class PointOperationLogListener implements MessageListenerConcurrently {
         } finally {
             distributedLock.unLock(lock);
         }
+
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
+            try {
+                removePendingMqMsgCache(pendingMsgLabel);
+            } catch (Exception e) {
+                logger.error("【积分操作事件监听器】-删除mq滞留消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+        }
+    }
+
+    /**
+     * @description
+     *
+     * @param pendingMsgLabel
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:32:32
+     */
+    private void removePendingMqMsgCache(String pendingMsgLabel) {
+        String key = RedisKeys.pendingMqMsgKey(pendingMsgLabel);
+        redisUtils.delete(key);
+        logger.info("【积分操作事件监听器】删除pendingMsgLabel成功{}", pendingMsgLabel);
     }
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java

@@ -1,11 +1,14 @@
 package com.epmet.mq.listener.listener;
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.epmet.commons.rocketmq.messages.LoginMQMsg;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.entity.LogOperationEntity;
 import com.epmet.mq.listener.bean.log.LogOperationHelper;
@@ -34,8 +37,15 @@ public class ProjectOperationLogListener implements MessageListenerConcurrently
 
     private Logger logger = LoggerFactory.getLogger(getClass());
 
+    private RedisUtils redisUtils;
+
     @Override
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+
+        if (redisUtils == null) {
+            redisUtils = SpringContextUtils.getBean(RedisUtils.class);
+        }
+
         try {
             msgs.forEach(msg -> consumeMessage(msg));
         } catch (Exception e) {
@@ -48,6 +58,7 @@ public class ProjectOperationLogListener implements MessageListenerConcurrently
     private void consumeMessage(MessageExt messageExt) {
         //String tags = messageExt.getTags();
         String msg = new String(messageExt.getBody());
+        String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.PENDING_MSG_LABEL);
         logger.info("项目变动操作日志监听器-收到消息内容:{}", msg);
         ProjectChangedMQMsg msgObj = JSON.parseObject(msg, ProjectChangedMQMsg.class);
 
@@ -87,6 +98,14 @@ public class ProjectOperationLogListener implements MessageListenerConcurrently
         } finally {
             distributedLock.unLock(lock);
         }
+
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
+            try {
+                removePendingMqMsgCache(pendingMsgLabel);
+            } catch (Exception e) {
+                logger.error("【项目操作事件监听器】-删除mq滞留消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+        }
     }
 
     private String getOperationTypeDisplay(String type) {
@@ -107,4 +126,18 @@ public class ProjectOperationLogListener implements MessageListenerConcurrently
                 return null;
         }
     }
+
+    /**
+     * @description
+     *
+     * @param pendingMsgLabel
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:32:32
+     */
+    private void removePendingMqMsgCache(String pendingMsgLabel) {
+        String key = RedisKeys.pendingMqMsgKey(pendingMsgLabel);
+        redisUtils.delete(key);
+        logger.info("【项目操作事件监听器】删除pendingMsgLabel成功{}", pendingMsgLabel);
+    }
 }

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java

@@ -45,4 +45,19 @@ public interface ConsomerGroupConstants {
      */
     String POINT_OPERATION_LOG_GROUP = "point_operation_log_group";
 
+    /**
+     * 开放的对接数据(中间库) 组织变更事件监听器分组
+     */
+    String OPEN_DATA_ORG_CHANGE_EVENT_LISTENER_GROUP = "open_data_org_change_event_listener_group";
+
+    /**
+     * 开放的对接数据(中间库) 工作人员变更事件监听器分组
+     */
+    String OPEN_DATA_STAFF_CHANGE_EVENT_LISTENER_GROUP = "open_data_staff_change_event_listener_group";
+
+    /**
+     * 开放的对接数据(中间库) 巡查记录变更事件监听器分组
+     */
+    String OPEN_DATA_PATROL_CHANGE_EVENT_LISTENER_GROUP = "open_data_patrol_change_event_listener_group";
+
 }

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/MQUserPropertys.java

@@ -0,0 +1,13 @@
+package com.epmet.commons.rocketmq.constants;
+
+/**
+ * @Description MQ用户自定义属性
+ * @author wxz
+ * @date 2021.10.14 15:47:03
+*/
+public interface MQUserPropertys {
+
+    //堆积消息label
+    String PENDING_MSG_LABEL = "pendingMsgLabel";
+
+}

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java

@@ -13,6 +13,7 @@ public interface TopicConstants {
      * 项目变动
      */
     String PROJECT_CHANGED = "project_changed";
+
     /**
      * 小组成就
      */
@@ -27,4 +28,19 @@ public interface TopicConstants {
      * 积分系统话题
      */
     String POINT = "point";
+
+    /**
+     * 组织信息
+     */
+    String ORG = "org";
+
+    /**
+     * 工作人员
+     */
+    String STAFF = "staff";
+
+    /**
+     * 巡查记录
+     */
+    String PATROL = "patrol";
 }

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/StaffPatrolMQMsg.java

@@ -0,0 +1,28 @@
+package com.epmet.commons.rocketmq.messages;
+
+import lombok.Data;
+
+/**
+ * 用户巡查消息体
+ * @author liujianjun
+ */
+@Data
+public class StaffPatrolMQMsg {
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+    /**
+     * 巡查记录id
+     */
+    private String patrolId;
+
+    /**
+     * 操作类型
+     * SystemMessageType.USER_PATROL_START
+     * SystemMessageTypSTOP
+     */
+    private String actionType;
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java

@@ -44,6 +44,11 @@ public interface StrConstant {
      */
     String COLON = ":";
 
+    /**
+     * 英文分号
+     */
+    String SEMICOLON = ";";
+
     /**
      * 中文顿号
      */

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/PageFormDTO.java

@@ -20,8 +20,17 @@ public class PageFormDTO {
     }
 
     @NotNull(message = "页码不能为空", groups = AddUserInternalGroup.class)
-    private Integer pageNo;
+    private Integer pageNo = 1;
 
     @NotNull(message = "每页数量不能为空", groups = AddUserInternalGroup.class)
-    private Integer pageSize;
+    private Integer pageSize = 20;
+
+    /**
+     * 偏移量 从多少条开始
+     */
+    private Integer offset;
+
+    public Integer getOffset() {
+        return (pageNo-1)*pageSize;
+    }
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -548,4 +548,16 @@ public class RedisKeys {
     public static String getQuestionnaireAccessKey(String userId, String qKey) {
     	return rootPrefix.concat("questionnaire:accesskey:").concat(userId).concat(":").concat(qKey);
 	}
+
+	/**
+	 * @description 检查message MQ滞留消息
+	 *
+	 * @param pendingMsgLabel 滞留消息的label
+	 * @return
+	 * @author wxz
+	 * @date 2021.10.14 14:33:53
+	 */
+	public static String pendingMqMsgKey(String pendingMsgLabel) {
+    	return rootPrefix.concat("message:mq:pending:").concat(pendingMsgLabel);
+	}
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/AgencyBaseInfoFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.org;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @dscription 插叙客户网格基础信息--接口入参
+ * @author sun
+ */
+@Data
+public class AgencyBaseInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3634745091993094743L;
+    /**
+     * 客户Id
+     */
+    @NotBlank(message = "事件标识不能为空", groups = {Agency.class})
+    private String customerId = "";
+    /**
+     * 组织Id
+     */
+    private List<String> agencyIdList;
+    public interface Agency extends CustomerClientShowGroup {}
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/GridBaseInfoFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.org;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @dscription 插叙客户网格基础信息--接口入参
+ * @author sun
+ */
+@Data
+public class GridBaseInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3634745091993094743L;
+    /**
+     * 客户Id
+     */
+    @NotBlank(message = "事件标识不能为空", groups = {Grid.class})
+    private String customerId = "";
+    /**
+     * 网格Id
+     */
+    private List<String> gridIdList;
+    public interface Grid extends CustomerClientShowGroup {}
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerAgencyDTO.java

@@ -0,0 +1,145 @@
+/**
+ * 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.org.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 机关单位信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-04-20
+ */
+@Data
+public class CustomerAgencyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 上级组织机构ID
+     */
+	private String pid;
+
+    /**
+     * 所有上级组织机构ID(以英文:隔开)
+     */
+	private String pids;
+
+    /**
+     * 所有上级名称,以-连接
+     */
+	private String allParentName;
+
+    /**
+     * 组织名称
+     */
+	private String organizationName;
+
+    /**
+     * 机关级别（社区级：community，
+乡（镇、街道）级:street,
+区县级: district,
+市级: city
+省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
+     */
+	private String level;
+
+    /**
+     * 地区编码
+     */
+	private String areaCode;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 总人数
+     */
+	private Integer totalUser;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 区县
+     */
+    private String district;
+
+    /**
+     * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
+     */
+    private String parentAreaCode;
+
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 社区
+     */
+    private String community;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerGridDTO.java

@@ -0,0 +1,129 @@
+/**
+ * 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.org.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 客户网格表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-16
+ */
+@Data
+public class CustomerGridDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+	/** 组织-网格 */
+    private String gridNamePath;
+
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
+
+    /**
+     * 所属地区码（所属组织地区码）
+     */
+    private String areaCode;
+
+    /**
+     * 删除标识:0.未删除 1.已删除
+     */
+    private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+    /**
+     * 管辖区域
+     */
+    private String manageDistrict;
+
+    /**
+     * 当前网格总人数
+     */
+    private Integer totalUser;
+
+    /**
+     * 所属组织机构ID（customer_organization.id）
+     */
+    private String pid;
+
+    /**
+     * 所有上级组织ID
+     */
+    private String pids;
+
+    /**
+     * 所属组织机构名
+     */
+    private String agencyName;
+
+    /**
+     * 所有上级组织名
+     */
+    private String allParentName;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/StaffBaseInfoFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.user;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @dscription 插叙客户网格人员基础信息--接口入参
+ * @author sun
+ */
+@Data
+public class StaffBaseInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3634745091993094743L;
+    /**
+     * 客户Id
+     */
+    @NotBlank(message = "事件标识不能为空", groups = {Staff.class})
+    private String customerId = "";
+    /**
+     * 人员Id
+     */
+    private List<String> staffIdList;
+    public interface Staff extends CustomerClientShowGroup {}
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/param/MidPatrolFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.user.param;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * desc:查询巡查 参数
+ *
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/6/7 16:23
+ */
+@NoArgsConstructor
+@Data
+public class MidPatrolFormDTO extends PageFormDTO implements Serializable {
+    private static final long serialVersionUID = 4411051728689886810L;
+    /**
+     * 客户Id
+     */
+    private String customerId;
+    /**
+     * 巡查记录id 没有则查询全部
+     */
+    private String patrolId;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/MidPatrolDetailResult.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.user.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 工作人员巡查明细记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-06-07
+ */
+@Data
+public class MidPatrolDetailResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 维度
+     */
+    private String latitude;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/MidPatrolRecordResult.java

@@ -0,0 +1,132 @@
+/**
+ * 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.user.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 工作人员巡查主记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-06-07
+ */
+@Data
+public class MidPatrolRecordResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 网格id
+     */
+	private String grid;
+
+    /**
+     * 网格所有上级id
+     */
+	private String gridPids;
+
+    /**
+     * 工作人员用户id
+     */
+	private String staffId;
+
+    /**
+     * 工作人员所属组织id=网格所属的组织id
+     */
+	private String agencyId;
+
+    /**
+     * 巡查开始时间
+     */
+	private Date patrolStartTime;
+
+    /**
+     * 巡查结束时间,前端传入
+     */
+	private Date patrolEndTime;
+
+    /**
+     * 实际结束时间=操作结束巡查的时间
+     */
+	private Date actrualEndTime;
+
+    /**
+     * 本次巡查总耗时，单位秒；结束巡查时写入
+     */
+	private Integer totalTime;
+
+    /**
+     * 正在巡查中：patrolling；结束：end
+     */
+	private String status;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 维度
+     */
+    private String latitude;
+
+    /**
+     * 精度
+     */
+	private String longitude;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -3,17 +3,31 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
-import com.epmet.dto.extract.form.*;
+import com.epmet.dto.extract.form.BizDataFormDTO;
+import com.epmet.dto.extract.form.ExtractIndexFormDTO;
+import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.group.form.GroupTotalFormDTO;
+import com.epmet.dto.org.AgencyBaseInfoFormDTO;
+import com.epmet.dto.org.GridBaseInfoFormDTO;
+import com.epmet.dto.org.result.CustomerAgencyDTO;
+import com.epmet.dto.org.result.CustomerGridDTO;
 import com.epmet.dto.screen.form.InitCustomerIndexForm;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
-import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBack;
+import com.epmet.dto.user.StaffBaseInfoFormDTO;
+import com.epmet.dto.user.param.MidPatrolFormDTO;
+import com.epmet.dto.user.result.CustomerStaffDTO;
+import com.epmet.dto.user.result.MidPatrolDetailResult;
+import com.epmet.dto.user.result.MidPatrolRecordResult;
 import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 /**
  * desc:  数据统计 对外feign client
  *
@@ -274,4 +288,47 @@ public interface DataStatisticalOpenFeignClient {
      */
     @PostMapping("/data/stats/statsgroup/groupandhottopic")
     Result groupAndHotTopicTask(@RequestBody GroupTotalFormDTO formDTO);
+
+    /**
+     * @dscription 批量查询客户组织基础信息
+     * @author sun
+     */
+    @PostMapping("/data/stats/datareporting/agencybaseinfo")
+    Result<List<CustomerAgencyDTO>> getAgencyBaseInfo(@RequestBody AgencyBaseInfoFormDTO formDTO);
+
+    /**
+     * @dscription 批量查询客户网格基础信息
+     * @author sun
+     */
+    @PostMapping("/data/stats/datareporting/gridbaseinfo")
+    Result<List<CustomerGridDTO>> getGridBaseInfo(@RequestBody GridBaseInfoFormDTO formDTO);
+
+    /**
+     * @dscription 批量查询客户网格员基础信息
+     * @author sun
+     */
+    @PostMapping("/data/stats/datareporting/staffbaseinfo")
+    Result<List<CustomerStaffDTO>> getStaffBaseInfo(@RequestBody StaffBaseInfoFormDTO formDTO);
+
+    /**
+     * 根据巡查记录id 获取巡查主记录信息
+     *
+     * @param midPatrolFormDTO
+     * @return
+     * @author yinzuomei
+     * @date 2021/9/10 8:56 上午
+     */
+    @GetMapping(value = "/data/stats/datareporting/getPatrolRecordList")
+    Result<List<MidPatrolRecordResult>> getPatrolRecordList(@RequestBody MidPatrolFormDTO midPatrolFormDTO);
+
+    /**
+     * 根据巡查记录id 获取巡查轨迹（明细）信息
+     *
+     * @param midPatrolFormDTO
+     * @return
+     * @author yinzuomei
+     * @date 2021/9/10 8:56 上午
+     */
+    @GetMapping(value = "/data/stats/datarng/getPatrolDetailList")
+    Result<List<MidPatrolDetailResult>> getPatrolDetailList(@RequestBody MidPatrolFormDTO midPatrolFormDTO);
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@@ -4,13 +4,26 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
-import com.epmet.dto.extract.form.*;
+import com.epmet.dto.extract.form.BizDataFormDTO;
+import com.epmet.dto.extract.form.ExtractIndexFormDTO;
+import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.group.form.GroupTotalFormDTO;
+import com.epmet.dto.org.AgencyBaseInfoFormDTO;
+import com.epmet.dto.org.GridBaseInfoFormDTO;
+import com.epmet.dto.org.result.CustomerAgencyDTO;
+import com.epmet.dto.org.result.CustomerGridDTO;
 import com.epmet.dto.screen.form.InitCustomerIndexForm;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
+import com.epmet.dto.user.StaffBaseInfoFormDTO;
+import com.epmet.dto.user.param.MidPatrolFormDTO;
+import com.epmet.dto.user.result.CustomerStaffDTO;
+import com.epmet.dto.user.result.MidPatrolDetailResult;
+import com.epmet.dto.user.result.MidPatrolRecordResult;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
-import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
  * desc:
@@ -265,4 +278,45 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     public Result groupAndHotTopicTask(GroupTotalFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupAndHotTopic", formDTO);
     }
+
+    @Override
+    public Result<List<CustomerAgencyDTO>> getAgencyBaseInfo(AgencyBaseInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "getAgencyBaseInfo", formDTO);
+    }
+
+    @Override
+    public Result<List<CustomerGridDTO>> getGridBaseInfo(GridBaseInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "getGridBaseInfo", formDTO);
+    }
+
+    @Override
+    public Result<List<CustomerStaffDTO>> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "getStaffBaseInfo", formDTO);
+    }
+
+    /**
+     * 根据巡查记录id 获取巡查主记录信息
+     *
+     * @param midPatrolFormDTO
+     * @return
+     * @author yinzuomei
+     * @date 2021/9/10 8:56 上午
+     */
+    @Override
+    public Result<List<MidPatrolRecordResult>> getPatrolRecordList(MidPatrolFormDTO midPatrolFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "getPatrolRecordList", midPatrolFormDTO);
+    }
+
+    /**
+     * 根据巡查记录id 获取巡查轨迹（明细）信息
+     *
+     * @param midPatrolFormDTO
+     * @return
+     * @author yinzuomei
+     * @date 2021/9/10 8:56 上午
+     */
+    @Override
+    public Result<List<MidPatrolDetailResult>> getPatrolDetailList(MidPatrolFormDTO midPatrolFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "getPatrolDetailList", midPatrolFormDTO);
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DataReportingController.java

@@ -0,0 +1,91 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.org.AgencyBaseInfoFormDTO;
+import com.epmet.dto.org.GridBaseInfoFormDTO;
+import com.epmet.dto.org.result.CustomerAgencyDTO;
+import com.epmet.dto.org.result.CustomerGridDTO;
+import com.epmet.dto.user.StaffBaseInfoFormDTO;
+import com.epmet.dto.user.param.MidPatrolFormDTO;
+import com.epmet.dto.user.result.CustomerStaffDTO;
+import com.epmet.dto.user.result.MidPatrolDetailResult;
+import com.epmet.dto.user.result.MidPatrolRecordResult;
+import com.epmet.service.DataReportingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @dscription 省网格化平台数据上报--数据查询
+ * @author sun
+ */
+@RequestMapping("datareporting")
+@RestController
+public class DataReportingController {
+	@Autowired
+	private DataReportingService dataReportingService;
+
+	/**
+	 * @Author sun
+	 * @Description 批量查询客户组织基础信息
+	 **/
+	@PostMapping("agencybaseinfo")
+	public Result<List<CustomerAgencyDTO>> getAgencyBaseInfo(@RequestBody(required = false) AgencyBaseInfoFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, AgencyBaseInfoFormDTO.Agency.class);
+		return new Result<List<CustomerAgencyDTO>>().ok(dataReportingService.getAgencyBaseInfo(formDTO));
+	}
+
+	/**
+	 * @Author sun
+	 * @Description 批量查询客户网格基础信息
+	 **/
+	@PostMapping("gridbaseinfo")
+	public Result<List<CustomerGridDTO>> getGridBaseInfo(@RequestBody(required = false) GridBaseInfoFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, GridBaseInfoFormDTO.Grid.class);
+		return new Result<List<CustomerGridDTO>>().ok(dataReportingService.getGridBaseInfo(formDTO));
+	}
+
+	/**
+	 * @Author sun
+	 * @Description 批量查询客户网格员基础信息
+	 **/
+	@PostMapping("staffbaseinfo")
+	public Result<List<CustomerStaffDTO>> getStaffBaseInfo(@RequestBody(required = false) StaffBaseInfoFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, StaffBaseInfoFormDTO.Staff.class);
+		return new Result<List<CustomerStaffDTO>>().ok(dataReportingService.getStaffBaseInfo(formDTO));
+	}
+
+	/**
+	 * desc: 条件获取巡查主表信息
+	 *
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.user.result.MidPatrolRecordResult>>
+	 * @author LiuJanJun
+	 * @date 2021/10/15 12:01 下午
+	 */
+	@PostMapping("getPatrolRecordList")
+	public Result<List<MidPatrolRecordResult>> getPatrolRecordList(@RequestBody(required = false) MidPatrolFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, StaffBaseInfoFormDTO.Staff.class);
+		return new Result<List<MidPatrolRecordResult>>().ok(dataReportingService.getPatrolRecordList(formDTO));
+	}
+
+	/**
+	 * desc: 条件获取巡查明细信息
+	 *
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.user.result.CustomerStaffDTO>>
+	 * @author LiuJanJun
+	 * @date 2021/10/15 12:01 下午
+	 */
+	@PostMapping("getPatrolDetailList")
+	public Result<List<MidPatrolDetailResult>> getPatrolDetailList(@RequestBody(required = false) MidPatrolFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, StaffBaseInfoFormDTO.Staff.class);
+		return new Result<List<MidPatrolDetailResult>>().ok(dataReportingService.getPatrolDetailList(formDTO));
+	}
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -61,8 +61,8 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.ArrayList;
 import java.util.Date;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java

@@ -22,7 +22,9 @@ import com.epmet.dto.group.AgencyDTO;
 import com.epmet.dto.group.result.AgencyGridTotalCountResultDTO;
 import com.epmet.dto.group.result.GridIdListByCustomerResultDTO;
 import com.epmet.dto.org.CustomerStaffGridDTO;
+import com.epmet.dto.org.GridBaseInfoFormDTO;
 import com.epmet.dto.org.GridInfoDTO;
+import com.epmet.dto.org.result.CustomerGridDTO;
 import com.epmet.entity.org.CustomerGridEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -95,4 +97,10 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @Description 查询客户已删除网格列表
      **/
     List<String> selectDelGridList(@Param("customerId") String customerId);
+
+    /**
+     * @Author sun
+     * @Description 批量查询客户网格基础信息
+     **/
+    List<CustomerGridDTO> getGridBaseInfo(GridBaseInfoFormDTO formDTO);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java

@@ -2,6 +2,8 @@ package com.epmet.dao.org;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.AgencySubTreeDto;
+import com.epmet.dto.org.AgencyBaseInfoFormDTO;
+import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerAreaCodeResultDTO;
 import com.epmet.dto.org.result.OrgStaffDTO;
 import com.epmet.entity.org.CustomerAgencyEntity;
@@ -71,4 +73,10 @@ public interface StatsCustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
     CustomerAgencyEntity selectByDeptId(String deptId);
 
     CustomerAgencyEntity selecByAreaCode(@Param("customerId")String customerId, @Param("areaCode")String areaCode);
+
+    /**
+     * @Author sun
+     * @Description 批量查询客户组织基础信息
+     **/
+    List<CustomerAgencyDTO> getAgencyBaseInfo(AgencyBaseInfoFormDTO formDTO);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java

@@ -5,6 +5,8 @@ import com.epmet.dto.extract.form.StaffPatrolStatsFormDTO;
 import com.epmet.dto.extract.result.UserPartyResultDTO;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.stats.form.GmUploadEventFormDTO;
+import com.epmet.dto.user.StaffBaseInfoFormDTO;
+import com.epmet.dto.user.param.MidPatrolFormDTO;
 import com.epmet.dto.user.result.*;
 import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -252,5 +254,15 @@ public interface UserDao {
      * @author sun
      */
     int saveOrUpGmUploadEvent(@Param("list") List<GmUploadEventFormDTO.DataList> list);
+
+    /**
+     * @Author sun
+     * @Description 批量查询客户网格员基础信息
+     **/
+    List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO);
+
+    List<MidPatrolRecordResult> getPatrolRecordList(MidPatrolFormDTO formDTO);
+
+    List<MidPatrolDetailResult> getPatrolDetailList(MidPatrolFormDTO formDTO);
 }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java

@@ -1,8 +1,10 @@
 package com.epmet.mq;
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
+import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
@@ -45,12 +47,18 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
 
     @Override
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+
         long start = System.currentTimeMillis();
         try {
-            List<String> msgStrs = msgs.stream().map(messageExt -> new String(messageExt.getBody())).distinct().collect(Collectors.toList());
+            //List<String> msgStrs = msgs.stream().map(messageExt -> new String(messageExt.getBody())).distinct().collect(Collectors.toList());
-            for (String msgStr : msgStrs) {
+            //for (String msgStr : msgStrs) {
-                consumeMessage(msgStr);
+            //    consumeMessage(msgStr);
+            //}
+
+            for (MessageExt msgExt : msgs) {
+                consumeMessage(msgExt);
             }
+
         } catch (Exception e) {
             //失败不重发
             logger.error("consumeMessage fail,msg:{}",e.getMessage());
@@ -60,7 +68,10 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
         return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
     }
 
-    private void consumeMessage(String  msg) {
+    private void consumeMessage(MessageExt  msgExt) {
+        String msg = new String(msgExt.getBody());
+        String pendingMsgLabel = msgExt.getUserProperty(MQUserPropertys.PENDING_MSG_LABEL);
+
         logger.info("receive customerId:{}", JSON.toJSONString(msg));
         ProjectChangedMQMsg msgObj = JSON.parseObject(msg, ProjectChangedMQMsg.class);
         if (msgObj == null){
@@ -87,6 +98,14 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
         } else {
             log.info("该客户的项目变动消息刚刚消费，请等待30秒,customer id:{}", msgObj.getCustomerId());
         }
+
+        if (org.apache.commons.lang.StringUtils.isNotBlank(pendingMsgLabel)) {
+            try {
+                removePendingMqMsgCache(pendingMsgLabel);
+            } catch (Exception e) {
+                logger.error("【项目变动事件监听器】-删除mq滞留消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+        }
     }
 
     public void consumeMessage(ProjectChangedMQMsg msgObj) {
@@ -151,6 +170,20 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
 
     }
 
+    /**
+     * @description
+     *
+     * @param pendingMsgLabel
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:32:32
+     */
+    private void removePendingMqMsgCache(String pendingMsgLabel) {
+        String key = RedisKeys.pendingMqMsgKey(pendingMsgLabel);
+        redisUtils.delete(key);
+        logger.info("【项目变动事件监听器】删除mq滞留消息缓存失败:{}", pendingMsgLabel);
+    }
+
     /*@Override
     public ConsumerConfigProperties getConsumerProperty() {
         ConsumerConfigProperties configProperties = new ConsumerConfigProperties();

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DataReportingService.java

@@ -0,0 +1,61 @@
+package com.epmet.service;
+
+import com.epmet.dto.org.AgencyBaseInfoFormDTO;
+import com.epmet.dto.org.GridBaseInfoFormDTO;
+import com.epmet.dto.org.result.CustomerAgencyDTO;
+import com.epmet.dto.org.result.CustomerGridDTO;
+import com.epmet.dto.user.StaffBaseInfoFormDTO;
+import com.epmet.dto.user.param.MidPatrolFormDTO;
+import com.epmet.dto.user.result.CustomerStaffDTO;
+import com.epmet.dto.user.result.MidPatrolDetailResult;
+import com.epmet.dto.user.result.MidPatrolRecordResult;
+
+import java.util.List;
+
+/**
+ * @dscription 省网格化平台数据上报--数据查询
+ * @author sun
+ */
+public interface DataReportingService {
+	/**
+	 * @Author sun
+	 * @Description 批量查询客户组织基础信息
+	 *
+	 * @return*/
+	List<CustomerAgencyDTO> getAgencyBaseInfo(AgencyBaseInfoFormDTO formDTO);
+
+	/**
+	 * @Author sun
+	 * @Description 批量查询客户网格基础信息
+	 *
+	 * @return*/
+	List<CustomerGridDTO> getGridBaseInfo(GridBaseInfoFormDTO formDTO);
+
+	/**
+	 * @Author sun
+	 * @Description 批量查询客户网格员基础信息
+	 *
+	 * @return*/
+	List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO);
+
+	 /**
+	  * desc: 获取巡查记录列表
+	  *
+	  * @param formDTO
+	  * @return java.util.List<com.epmet.dto.user.result.CustomerStaffDTO>
+	  * @author LiuJanJun
+	  * @date 2021/10/15 1:21 下午
+	  */
+    List<MidPatrolRecordResult> getPatrolRecordList(MidPatrolFormDTO formDTO);
+
+    /**
+     * desc: 获取巡查明细列表
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.user.result.MidPatrolDetailResult>
+     * @author LiuJanJun
+     * @date 2021/10/15 1:22 下午
+     */
+    List<MidPatrolDetailResult> getPatrolDetailList(MidPatrolFormDTO formDTO);
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@@ -0,0 +1,82 @@
+package com.epmet.service.impl;
+
+import com.epmet.dto.org.AgencyBaseInfoFormDTO;
+import com.epmet.dto.org.GridBaseInfoFormDTO;
+import com.epmet.dto.org.result.CustomerAgencyDTO;
+import com.epmet.dto.org.result.CustomerGridDTO;
+import com.epmet.dto.user.StaffBaseInfoFormDTO;
+import com.epmet.dto.user.param.MidPatrolFormDTO;
+import com.epmet.dto.user.result.CustomerStaffDTO;
+import com.epmet.dto.user.result.MidPatrolDetailResult;
+import com.epmet.dto.user.result.MidPatrolRecordResult;
+import com.epmet.service.DataReportingService;
+import com.epmet.service.org.CustomerAgencyService;
+import com.epmet.service.org.CustomerGridService;
+import com.epmet.service.user.StatsStaffPatrolService;
+import com.epmet.service.user.UserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @dscription 省网格化平台数据上报--数据查询
+ * @author sun
+ */
+@Slf4j
+@Service
+public class DataReportingServiceImpl implements DataReportingService {
+	@Autowired
+	private CustomerAgencyService customerAgencyService;
+	@Autowired
+	private CustomerGridService customerGridService;
+	@Autowired
+	private UserService userService;
+	@Autowired
+	private StatsStaffPatrolService statsStaffPatrolService;
+
+	/**
+	 * @Author sun
+	 * @Description 批量查询客户组织基础信息
+	 **/
+	@Override
+	public List<CustomerAgencyDTO> getAgencyBaseInfo(AgencyBaseInfoFormDTO formDTO) {
+		//批量查询客户组织信息
+		List<CustomerAgencyDTO> resultList = customerAgencyService.getAgencyBaseInfo(formDTO);
+		return resultList;
+	}
+
+	/**
+	 * @Author sun
+	 * @Description 批量查询客户网格基础信息
+	 **/
+	@Override
+	public List<CustomerGridDTO> getGridBaseInfo(GridBaseInfoFormDTO formDTO) {
+		//批量查询客户网格信息
+		List<CustomerGridDTO> resultList = customerGridService.getGridBaseInfo(formDTO);
+		return resultList;
+	}
+
+	/**
+	 * @Author sun
+	 * @Description 批量查询客户网格员基础信息
+	 **/
+	@Override
+	public List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO) {
+		//批量查询客户网格员信息
+		List<CustomerStaffDTO> resultList = userService.getStaffBaseInfo(formDTO);
+		return resultList;
+	}
+
+    @Override
+    public List<MidPatrolRecordResult> getPatrolRecordList(MidPatrolFormDTO formDTO) {
+        return userService.getPatrolRecordList(formDTO);
+    }
+
+	@Override
+	public List<MidPatrolDetailResult> getPatrolDetailList(MidPatrolFormDTO formDTO) {
+		return userService.getPatrolDetailList(formDTO);
+	}
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java

@@ -1,5 +1,7 @@
 package com.epmet.service.org;
 
+import com.epmet.dto.org.AgencyBaseInfoFormDTO;
+import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerAreaCodeResultDTO;
 import com.epmet.dto.org.result.OrgStaffDTO;
 import com.epmet.entity.org.CustomerAgencyEntity;
@@ -59,4 +61,9 @@ public interface CustomerAgencyService {
      */
     void sysAgencyInfo(String fromCustomerId, String toCustomerId);
 
+    /**
+     * @Author sun
+     * @Description 批量查询客户组织基础信息
+     **/
+    List<CustomerAgencyDTO> getAgencyBaseInfo(AgencyBaseInfoFormDTO formDTO);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java

@@ -5,7 +5,9 @@ import com.epmet.dto.group.AgencyDTO;
 import com.epmet.dto.group.result.AgencyGridTotalCountResultDTO;
 import com.epmet.dto.group.result.GridIdListByCustomerResultDTO;
 import com.epmet.dto.org.CustomerStaffGridDTO;
+import com.epmet.dto.org.GridBaseInfoFormDTO;
 import com.epmet.dto.org.GridInfoDTO;
+import com.epmet.dto.org.result.CustomerGridDTO;
 import com.epmet.entity.org.CustomerGridEntity;
 
 import java.util.Date;
@@ -77,4 +79,9 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      **/
     List<String> getdelGridProjectIdList(String customerId);
 
+    /**
+     * @Author sun
+     * @Description 批量查询客户网格基础信息
+     **/
+    List<CustomerGridDTO> getGridBaseInfo(GridBaseInfoFormDTO formDTO);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java

@@ -5,6 +5,8 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.org.StatsCustomerAgencyDao;
+import com.epmet.dto.org.AgencyBaseInfoFormDTO;
+import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerAreaCodeResultDTO;
 import com.epmet.dto.org.result.OrgStaffDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity;
@@ -271,4 +273,14 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
             }
         }
     }
+
+    /**
+     * @Author sun
+     * @Description 批量查询客户组织基础信息
+     **/
+    @Override
+    public List<CustomerAgencyDTO> getAgencyBaseInfo(AgencyBaseInfoFormDTO formDTO) {
+        return customerAgencyDao.getAgencyBaseInfo(formDTO);
+    }
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java

@@ -9,7 +9,9 @@ import com.epmet.dto.group.AgencyDTO;
 import com.epmet.dto.group.result.AgencyGridTotalCountResultDTO;
 import com.epmet.dto.group.result.GridIdListByCustomerResultDTO;
 import com.epmet.dto.org.CustomerStaffGridDTO;
+import com.epmet.dto.org.GridBaseInfoFormDTO;
 import com.epmet.dto.org.GridInfoDTO;
+import com.epmet.dto.org.result.CustomerGridDTO;
 import com.epmet.entity.org.CustomerGridEntity;
 import com.epmet.service.Issue.IssueService;
 import com.epmet.service.org.CustomerGridService;
@@ -115,4 +117,13 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         return resultList;
     }
 
+    /**
+     * @Author sun
+     * @Description 批量查询客户网格基础信息
+     **/
+    @Override
+    public List<CustomerGridDTO> getGridBaseInfo(GridBaseInfoFormDTO formDTO) {
+        return customerGridDao.getGridBaseInfo(formDTO);
+    }
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java

@@ -7,10 +7,9 @@ import com.epmet.dto.org.result.OrgStaffDTO;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.stats.form.GmUploadEventFormDTO;
 import com.epmet.dto.stats.user.result.UserStatisticalData;
-import com.epmet.dto.user.result.StaffRoleInfoDTO;
+import com.epmet.dto.user.StaffBaseInfoFormDTO;
-import com.epmet.dto.user.result.CustomerStaffDTO;
+import com.epmet.dto.user.param.MidPatrolFormDTO;
-import com.epmet.dto.user.result.StaffPatrolRecordResult;
+import com.epmet.dto.user.result.*;
-import com.epmet.dto.user.result.StatsStaffPatrolRecordDailyDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
 import com.epmet.util.DimIdGenerator;
 
@@ -137,4 +136,14 @@ public interface UserService {
      * @author sun
      */
     void saveOrUpGmUploadEvent(List<GmUploadEventFormDTO.DataList> list);
+
+    /**
+     * @Author sun
+     * @Description 批量查询客户网格员基础信息
+     **/
+    List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO);
+
+    List<MidPatrolRecordResult> getPatrolRecordList(MidPatrolFormDTO formDTO);
+
+    List<MidPatrolDetailResult> getPatrolDetailList(MidPatrolFormDTO formDTO);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java

@@ -17,6 +17,8 @@ import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.stats.form.GmUploadEventFormDTO;
 import com.epmet.dto.stats.user.*;
 import com.epmet.dto.stats.user.result.UserStatisticalData;
+import com.epmet.dto.user.StaffBaseInfoFormDTO;
+import com.epmet.dto.user.param.MidPatrolFormDTO;
 import com.epmet.dto.user.result.*;
 import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
 import com.epmet.service.user.UserService;
@@ -1088,4 +1090,23 @@ public class UserServiceImpl implements UserService {
         userDao.saveOrUpGmUploadEvent(list);
     }
 
+    /**
+     * @Author sun
+     * @Description 批量查询客户网格员基础信息
+     **/
+    @Override
+    public List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO) {
+        return userDao.getStaffBaseInfo(formDTO);
+    }
+
+    @Override
+    public List<MidPatrolRecordResult> getPatrolRecordList(MidPatrolFormDTO formDTO) {
+       return userDao.getPatrolRecordList(formDTO);
+    }
+
+    @Override
+    public List<MidPatrolDetailResult> getPatrolDetailList(MidPatrolFormDTO formDTO) {
+        return userDao.getPatrolDetailList(formDTO);
+    }
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml

@@ -126,4 +126,19 @@
         AND customer_id = #{customerId}
     </select>
 
+    <select id="getGridBaseInfo" resultType="com.epmet.dto.org.result.CustomerGridDTO">
+        SELECT
+        *
+        FROM
+            customer_grid
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        <if test="gridIdList != null and gridIdList.size() > 0">
+            <foreach collection="gridIdList" item="gridId" open="AND id IN (" separator="," close=")">
+                #{gridId}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml

@@ -203,4 +203,20 @@
             AND ca.CUSTOMER_ID = #{customerId}
             AND ca.AREA_CODE = #{areaCode}
     </select>
+
+    <select id="getAgencyBaseInfo" resultType="com.epmet.dto.org.result.CustomerAgencyDTO">
+        SELECT
+            *
+        FROM
+            customer_agency
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        <if test="agencyIdList != null and agencyIdList.size() > 0">
+            <foreach collection="agencyIdList" item="agencyId" open="AND id IN (" separator="," close=")">
+                #{agencyId}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml

@@ -991,4 +991,52 @@
             updated_time = NOW()
     </insert>
 
+    <select id="getStaffBaseInfo" resultType="com.epmet.dto.user.result.CustomerStaffDTO">
+        SELECT
+            cs.*
+        FROM
+            customer_staff cs
+        INNER JOIN staff_role sr ON cs.user_id = sr.staff_id
+        INNER JOIN gov_staff_role gsr ON sr.role_id = gsr.id
+        WHERE
+            cs.del_flag = '0'
+        AND cs.enable_flag = 'enable'
+        AND sr.del_flag = '0'
+        AND gsr.del_flag = '0'
+        AND gsr.role_name = '网格员'
+        AND cs.customer_id = #{customerId}
+        <if test="staffIdList != null and staffIdList.size() > 0">
+            <foreach collection="staffIdList" item="staffId" open="AND cs.USER_ID IN (" separator="," close=")">
+                #{staffId}
+            </foreach>
+        </if>
+    </select>
+    <select id="getPatrolRecordList" resultType="com.epmet.dto.user.result.MidPatrolRecordResult">
+        SELECT
+            id, customer_id, grid, grid_pids, staff_id, agency_id, patrol_start_time, patrol_end_time,
+             actrual_end_time, total_time, status, del_flag, revision, created_by, created_time, updated_by, updated_time
+        FROM staff_patrol_record
+        WHERE
+            1=1
+        <if test="patrolId != null and patrolId != ''">
+            AND  ID = #{patrolId}
+        </if>
+            and CUSTOMER_ID = #{customerId}
+            AND DEL_FLAG = '0'
+            LIMIT  #{offset},#{pageSize}
+    </select>
+    <select id="getPatrolDetailList" resultType="com.epmet.dto.user.result.MidPatrolDetailResult">
+        select
+            id, customer_id, staff_patrol_rec_id,latitude, longitude, del_flag, revision, created_by, created_time, updated_by, updated_time
+        from staff_patrol_detail
+        WHERE
+            1=1
+        <if test="patrolId != null and patrolId != ''">
+            AND  staff_patrol_rec_id = #{patrolId}
+        </if>
+            and CUSTOMER_ID = #{customerId}
+            AND DEL_FLAG = '0'
+            LIMIT #{offset},#{pageSize}
+    </select>
+
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/service/user/impl/UserServiceImplTest.java

@@ -0,0 +1,46 @@
+package com.epmet.service.user.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.dto.user.param.MidPatrolFormDTO;
+import com.epmet.dto.user.result.MidPatrolRecordResult;
+import com.epmet.service.user.UserService;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+@RunWith(Arquillian.class)
+public class UserServiceImplTest {
+    @Deployment
+    public static JavaArchive createDeployment() {
+        return ShrinkWrap.create(JavaArchive.class)
+                .addClass(UserServiceImpl.class)
+                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+    }
+    @Autowired
+    private UserService userService;
+
+    @Test
+    public void getPatrolRecordList() {
+        MidPatrolFormDTO midPatrolFormDTO = new MidPatrolFormDTO();
+        midPatrolFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        midPatrolFormDTO.setPatrolId("");
+        midPatrolFormDTO.setPageNo(1);
+        midPatrolFormDTO.setPageSize(110);
+
+        List<MidPatrolRecordResult> patrolRecordList = userService.getPatrolRecordList(midPatrolFormDTO);
+        System.out.println(JSON.toJSONString(patrolRecordList));
+    }
+
+    @Test
+    public void getPatrolDetailList() {
+    }
+}

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java

@@ -25,4 +25,54 @@ public interface SystemMessageType {
      */
     String POINT_RULE_CHANGED = "point_rule_changed";
 
+    /**
+     * 网格新增
+     */
+    String GRID_CREATE = "grid_create";
+
+    /**
+     * 网格信息变更
+     */
+    String GRID_CHANGE = "grid_change";
+
+    /**
+     * agency机构新增
+     */
+    String AGENCY_CREATE = "agency_create";
+
+    /**
+     * agency机构信息变更
+     */
+    String AGENCY_CHANGE = "agency_change";
+
+    /**
+     * 部门新增
+     */
+    String DEPARTMENT_CREATE = "department_create";
+
+    /**
+     * 部门信息变更
+     */
+    String DEPARTMENT_CHANGE = "department_change";
+
+    /**
+     * 工作人员新增
+     */
+    String STAFF_CREATE = "staff_create";
+
+    /**
+     * 工作人员变更
+     */
+    String STAFF_CHANGE = "staff_change";
+
+    /**
+     * 用户开始巡查
+     */
+    String USER_PATROL_START = "user_patrol_start";
+
+    /**
+     * 用户结束巡查
+     */
+    String USER_PATROL_STOP = "user_patrol_stop";
+
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SystemMsgFormDTO.java

@@ -7,9 +7,18 @@ import javax.validation.constraints.NotNull;
 @Data
 public class SystemMsgFormDTO {
 
-    @NotNull(message = "消息类型不能为空")
+    // 发送mq消息分组
+    public interface SendMsgByMQ {}
+
+    // 应答mq消息
+    public interface AckMsgByMQ {}
+
+    @NotNull(message = "消息类型不能为空", groups = { SendMsgByMQ.class })
     private String messageType;
 
-    @NotNull(message = "消息内容不能为空")
+    @NotNull(message = "消息内容不能为空", groups = { SendMsgByMQ.class })
     private Object content;
+
+    @NotNull(message = "pendingMsgLabel不能为空", groups = { AckMsgByMQ.class })
+    private String pendingMsgLabel;
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java

@@ -27,7 +27,7 @@ import java.util.List;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:47
  */
-//@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = EpmetMessageOpenFeignClientFallback.class,url = "http://127.0.0.1:8085")
+//@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallbackFactory = EpmetMessageOpenFeignClientFallbackFactory.class, url = "http://127.0.0.1:8085")
 @FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallbackFactory = EpmetMessageOpenFeignClientFallbackFactory.class)
 public interface EpmetMessageOpenFeignClient {
     /**
@@ -107,4 +107,15 @@ public interface EpmetMessageOpenFeignClient {
     */
     @PostMapping("/message/system/send-by-mq")
     Result sendSystemMsgByMQ(@RequestBody SystemMsgFormDTO form);
+
+    /**
+     * @description 应答mq消息
+     *
+     * @param form
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:07:17
+     */
+    @PostMapping("/message/system/ack-mq-msg")
+    Result ackSystemMsgByMQ(@RequestBody SystemMsgFormDTO form);
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java

@@ -69,4 +69,9 @@ public class EpmetMessageOpenFeignClientFallback implements EpmetMessageOpenFeig
     public Result sendSystemMsgByMQ(SystemMsgFormDTO form) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "sendSystemMsgByMQ", form);
     }
+
+    @Override
+    public Result ackSystemMsgByMQ(SystemMsgFormDTO form) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "ackSystemMsgByMQ", form);
+    }
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java

@@ -1,9 +1,10 @@
 package com.epmet.send;
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg;
 import com.epmet.commons.rocketmq.messages.PointRuleChangedMQMsg;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
-import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg;
+import com.epmet.commons.rocketmq.messages.StaffPatrolMQMsg;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.SystemMessageType;
@@ -128,4 +129,33 @@ public class SendMqMsgUtil {
 
     }
 
+    /**
+     * @Description 发送巡查相关消息
+     * @return
+     * @author wxz
+     * @date 2021.06.21 12:46
+     */
+    public boolean sendPatrolMqMsg(StaffPatrolMQMsg msg) {
+        try {
+            SystemMsgFormDTO msgForm = new SystemMsgFormDTO();
+            msgForm.setMessageType(msg.getActionType());
+            msgForm.setContent(msg);
+            Result sendMsgResult = null;
+            log.info("sendPatrolMqMsg param:{}",msgForm);
+            int retryTime = 0;
+            do {
+                sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(msgForm);
+            } while ((sendMsgResult == null || !sendMsgResult.success()) && retryTime++ < NumConstant.TWO);
+
+            if (sendMsgResult != null && sendMsgResult.success()) {
+                return true;
+            }
+            log.error("发送(巡查相关)系统消息到message服务失败:{},msg:{}", JSON.toJSONString(sendMsgResult), JSON.toJSONString(msgForm));
+        } catch (Exception e) {
+            log.error("sendMqMsg exception", e);
+        }
+        return false;
+
+    }
+
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SystemMessageController.java

@@ -17,11 +17,25 @@ public class SystemMessageController {
     @Autowired
     private SystemMessageService systemMessageService;
 
+    /**
+     * @description 发送mq消息
+     *
+     * @param form
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:07:07
+     */
     @PostMapping("send-by-mq")
     public Result sendSystemMsgByMQ(@RequestBody SystemMsgFormDTO form) {
-        ValidatorUtils.validateEntity(form);
+        ValidatorUtils.validateEntity(form, SystemMsgFormDTO.SendMsgByMQ.class);
         systemMessageService.sendMQMessage(form.getMessageType(), form.getContent());
         return new Result();
     }
 
+    @PostMapping("pendding-mq-msg-scan")
+    public Result penddingMqMsgScan() {
+        systemMessageService.penddingMqMsgScan();
+        return new Result();
+    }
+
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SystemMessageService.java

@@ -2,6 +2,24 @@ package com.epmet.service;
 
 public interface SystemMessageService {
 
+    /**
+     * @description 发送mq消息
+     *
+     * @param messageType
+     * @param content
+     * @return
+     * @author wxz
+     * @date 2021.10.14 15:07:02
+     */
     void sendMQMessage(String messageType, Object content);
 
+    /**
+     * @description 扫描滞留消息
+     *
+     * @param
+     * @return
+     * @author wxz
+     * @date 2021.10.15 10:13:37
+     */
+    void penddingMqMsgScan();
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java

@@ -2,16 +2,21 @@ package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.auth.constants.AuthOperationConstants;
-import com.epmet.auth.constants.AuthOperationEnum;
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.epmet.commons.rocketmq.constants.TopicConstants;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.constant.SystemMessageSendApproach;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.dao.SystemMessageDao;
 import com.epmet.entity.SystemMessageEntity;
 import com.epmet.service.SystemMessageService;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.remoting.common.RemotingHelper;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
@@ -21,35 +26,76 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+import java.util.Set;
+import java.util.UUID;
+
 @Service
 public class SystemMessageServiceImpl implements SystemMessageService {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
 
+    // 消息堆积时间阈值，单位s
+    private static final long PENDDING_MQ_MSG_EXEC_THRESHOLD_DELTA_L1 = 1 * 60;
+    private static final long PENDDING_MQ_MSG_EXEC_THRESHOLD_DELTA_L2 = 2 * 60;
+    private static final long PENDDING_MQ_MSG_EXEC_THRESHOLD_DELTA_L3 = 5 * 60;
+    private static final long PENDDING_MQ_MSG_EXEC_THRESHOLD_DELTA_L4 = 10 * 60;
+    private static final long PENDDING_MQ_MSG_EXEC_THRESHOLD_DELTA_L5 = 30 * 60;
+    private static final long PENDDING_MQ_MSG_EXEC_THRESHOLD_DELTA_L6 = 60 * 60;
+
+    // 堆积消息告警间隔时长，单位s
+    public static final long PENDDING_MQ_MSG_ALERT_SECONDS_DELTA = 60 * 60;
+
+    // 各个级别上次告警时间
+    private LocalDateTime l1LastAlertTime;
+    private LocalDateTime l6LastAlertTime;
+
     @Autowired
     private SystemMessageDao systemMessageDao;
 
     @Autowired
     private RocketMQTemplate rocketMQTemplate;
 
+    @Autowired
+    private RedisUtils redisUtils;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void sendMQMessage(String messageType, Object content) {
         String contentStr = JSON.toJSONString(content);
-        //存储消息到表
+        // 1.存储消息到表
         SystemMessageEntity systemMessageEntity = new SystemMessageEntity();
         systemMessageEntity.setMsgType(messageType);
         systemMessageEntity.setSendApproach(SystemMessageSendApproach.MQ);
         systemMessageEntity.setContent(contentStr);
         systemMessageDao.insert(systemMessageEntity);
 
-        //发送mq消息
+        String topic = getTopicByMsgType(messageType);
+
+        // 2.缓存下来，供滞留消息扫描。TTL -1，永不过期
+        String pendingMsgLabel = null;
+        String pendingMsgKey = null;
         try {
-            Message meMessage = new Message(getTopicByMsgType(messageType), messageType, contentStr.getBytes(RemotingHelper.DEFAULT_CHARSET));
+            MessageCacheBean mcb = new MessageCacheBean(LocalDateTime.now(), messageType, topic, contentStr);
+            pendingMsgLabel = UUID.randomUUID().toString().replace("-", "");
+            pendingMsgKey = RedisKeys.pendingMqMsgKey(pendingMsgLabel);
+            redisUtils.set(pendingMsgKey, mcb, -1);
+        } catch (Exception e) {
+            logger.error("将系统MQ消息存储到Redis滞留列表失败，业务继续执行，{}", ExceptionUtils.getThrowableErrorStackTrace(e));
+        }
+
+        // 3.发送mq消息
+        try {
+            Message meMessage = new Message(topic, messageType, contentStr.getBytes(RemotingHelper.DEFAULT_CHARSET));
+            meMessage.putUserProperty(MQUserPropertys.PENDING_MSG_LABEL, pendingMsgLabel);
             rocketMQTemplate.getProducer().send(meMessage);
         } catch (Exception e) {
             String errorStackTrace = ExceptionUtils.getErrorStackTrace(e);
-            logger.error("发送系统消息失败，堆栈信息:{}", errorStackTrace);
+            logger.error("发送系统MQ消息失败，堆栈信息:{}", errorStackTrace);
+
+            // 清理消息缓存
+            redisUtils.delete(pendingMsgKey);
+
             throw new RenException(EpmetErrorCode.SYSTEM_MQ_MSG_SEND_FAIL.getCode());
         }
     }
@@ -79,7 +125,81 @@ public class SystemMessageServiceImpl implements SystemMessageService {
             case SystemMessageType.POINT_RULE_CHANGED:
                 topic = TopicConstants.POINT;
                 break;
+            case SystemMessageType.GRID_CREATE:
+            case SystemMessageType.GRID_CHANGE:
+            case SystemMessageType.AGENCY_CREATE:
+            case SystemMessageType.AGENCY_CHANGE:
+            case SystemMessageType.DEPARTMENT_CREATE:
+            case SystemMessageType.DEPARTMENT_CHANGE:
+                topic = TopicConstants.ORG;
+                break;
+            case SystemMessageType.STAFF_CREATE:
+            case SystemMessageType.STAFF_CHANGE:
+                topic = TopicConstants.STAFF;
+                break;
+            case SystemMessageType.USER_PATROL_START:
+            case SystemMessageType.USER_PATROL_STOP:
+                topic = TopicConstants.PATROL;
+                break;
         }
         return topic;
     }
+
+    @Override
+    public void penddingMqMsgScan() {
+        String scanKey = RedisKeys.pendingMqMsgKey("*");
+        Set<String> keys = redisUtils.keys(scanKey);
+        //System.out.println(keys);
+        for (String key : keys) {
+            MessageCacheBean mcb = (MessageCacheBean) redisUtils.get(key);
+
+            LocalDateTime createTime = mcb.getCreateTime();
+            LocalDateTime now = LocalDateTime.now();
+            //long deltaSeconds = ChronoUnit.SECONDS.between(createTime, now);
+
+            // 此处暂时使用粗粒度的Topic判断，耕细粒度的应该使用SystemMessageType
+            switch (mcb.getTopic()) {
+                case TopicConstants.AUTH:
+                case TopicConstants.GROUP_ACHIEVEMENT:
+                case TopicConstants.INIT_CUSTOMER:
+                case TopicConstants.ORG:
+                case TopicConstants.PATROL:
+                case TopicConstants.POINT:
+                case TopicConstants.STAFF:
+
+                    // 耗时较短。一个小时最多发送一次告警
+                    if (l1LastAlertTime == null || (
+                            createTime.plusSeconds(PENDDING_MQ_MSG_EXEC_THRESHOLD_DELTA_L1).isBefore(now)
+                                    && l1LastAlertTime.plusSeconds(PENDDING_MQ_MSG_ALERT_SECONDS_DELTA).isBefore(now))
+                    ) {
+
+                        logger.error("【MQ堆积消息扫描】Topic:{},messageType:{},redisKey:{},等{}个消息发生堆积", mcb.topic, mcb.messageType, key, keys.size());
+                        l1LastAlertTime = now;
+
+                    }
+                    break;
+
+                case TopicConstants.PROJECT_CHANGED:
+                    // 耗时较长,一个小时最多发送一次告警
+                    if (l1LastAlertTime == null || (
+                            createTime.plusSeconds(PENDDING_MQ_MSG_EXEC_THRESHOLD_DELTA_L6).isBefore(now)
+                                    && l6LastAlertTime.plusSeconds(PENDDING_MQ_MSG_ALERT_SECONDS_DELTA).isBefore(now))
+                    ) {
+                        logger.error("【MQ堆积消息扫描】Topic:{},messageType:{},redisKey:{},等{}个消息发生堆积", mcb.topic, mcb.messageType, key, keys.size());
+                        l1LastAlertTime = now;
+                    }
+                    break;
+            }
+        }
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    static class MessageCacheBean {
+        private LocalDateTime createTime;
+        private String messageType;
+        private String topic;
+        private Object content;
+    }
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/mq/listener/IssueProjectCategoryTagInitListener.java

@@ -1,12 +1,17 @@
 package com.epmet.mq.listener;
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.epmet.commons.rocketmq.messages.InitCustomerMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.dto.form.CategoryTagInitFormDTO;
 import com.epmet.service.IssueProjectCategoryDictService;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
 import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
@@ -32,8 +37,15 @@ public class IssueProjectCategoryTagInitListener implements MessageListenerConcu
     @Autowired
     private DistributedLock distributedLock;
 
+    private RedisUtils redisUtils;
+
     @Override
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+
+        if (redisUtils == null) {
+            redisUtils = SpringContextUtils.getBean(RedisUtils.class);
+        }
+
         try {
             msgs.forEach(msg -> consumeMessage(msg));
         } catch (Exception e) {
@@ -45,6 +57,7 @@ public class IssueProjectCategoryTagInitListener implements MessageListenerConcu
 
     public void consumeMessage(MessageExt messageExt) {
         String msg = new String(messageExt.getBody());
+        String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.PENDING_MSG_LABEL);
         logger.info("初始化客户-初始化议题、项目的分类、标签数据-收到消息内容:{}", msg);
         InitCustomerMQMsg msgObj = JSON.parseObject(msg, InitCustomerMQMsg.class);
 
@@ -66,5 +79,27 @@ public class IssueProjectCategoryTagInitListener implements MessageListenerConcu
         } finally {
             distributedLock.unLock(lock);
         }
+
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
+            try {
+                removePendingMqMsgCache(pendingMsgLabel);
+            } catch (Exception e) {
+                logger.error("【议题/项目分类标签初始化事件监听器】-删除mq滞留消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+        }
+    }
+
+    /**
+     * @description
+     *
+     * @param pendingMsgLabel
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:32:32
+     */
+    private void removePendingMqMsgCache(String pendingMsgLabel) {
+        String key = RedisKeys.pendingMqMsgKey(pendingMsgLabel);
+        redisUtils.delete(key);
+        logger.info("【议题/项目分类标签初始化事件监听器】删除mq滞留消息缓存失败:{}", pendingMsgLabel);
     }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/InitCustomerOrgRolesListener.java

@@ -1,16 +1,20 @@
 package com.epmet.mq.listener;
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.epmet.commons.rocketmq.messages.InitCustomerMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.constant.UserWorkType;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.AddAgencyAndStaffFormDTO;
 import com.epmet.dto.form.AdminStaffFromDTO;
 import com.epmet.service.AgencyService;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
 import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
@@ -32,8 +36,15 @@ public class InitCustomerOrgRolesListener implements MessageListenerConcurrently
 
     private Logger logger = LoggerFactory.getLogger(getClass());
 
+    private RedisUtils redisUtils;
+
     @Override
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+
+        if (redisUtils == null) {
+            redisUtils = SpringContextUtils.getBean(RedisUtils.class);
+        }
+
         try {
             msgs.forEach(msg -> consumeMessage(msg));
         } catch (Exception e) {
@@ -45,6 +56,7 @@ public class InitCustomerOrgRolesListener implements MessageListenerConcurrently
 
     private void consumeMessage(MessageExt messageExt) {
         String msg = new String(messageExt.getBody());
+        String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.PENDING_MSG_LABEL);
         logger.info("初始化客户-初始化组织信息-收到消息内容:{}", msg);
         InitCustomerMQMsg msgObj = JSON.parseObject(msg, InitCustomerMQMsg.class);
 
@@ -65,6 +77,14 @@ public class InitCustomerOrgRolesListener implements MessageListenerConcurrently
         } finally {
             distributedLock.unLock(lock);
         }
+
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
+            try {
+                removePendingMqMsgCache(pendingMsgLabel);
+            } catch (Exception e) {
+                logger.error("【客户初始化事件监听器】-orgRole-删除mq滞留消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+        }
     }
 
     /**
@@ -100,6 +120,20 @@ public class InitCustomerOrgRolesListener implements MessageListenerConcurrently
         return agencyAndStaff;
     }
 
+    /**
+     * @description
+     *
+     * @param pendingMsgLabel
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:32:32
+     */
+    private void removePendingMqMsgCache(String pendingMsgLabel) {
+        String key = RedisKeys.pendingMqMsgKey(pendingMsgLabel);
+        redisUtils.delete(key);
+        logger.info("【客户初始化事件监听器】删除mq滞留消息缓存失败,pendingMsgLabel:{}", pendingMsgLabel);
+    }
+
    /* @Override
     public ConsumerConfigProperties getConsumerProperty() {
         ConsumerConfigProperties configProperties = new ConsumerConfigProperties();

epmet-module/open-data-worker/open-data-worker-client/pom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>open-data-worker</artifactId>
+        <groupId>com.epmet</groupId>
+        <version>2.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>open-data-worker-client</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+    </dependencies>
+</project>

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/UpsertPatrolRecordForm.java

@@ -0,0 +1,33 @@
+package com.epmet.opendata.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * 插入或更新巡查记录主表
+ * @author liujianjun
+ */
+@Data
+public class UpsertPatrolRecordForm {
+    /**
+     * 客户Id
+     */
+    @NotEmpty(message = "customerId不能为空")
+    private String customerId;
+
+    /**
+     * 巡查记录id
+     */
+    @NotEmpty(message = "customerId不能为空")
+    private String patrolId;
+
+    /**
+     * 操作类型
+     * SystemMessageType.USER_PATROL_START
+     * SystemMessageTypSTOP
+     */
+    @NotEmpty(message = "actionType不能为空")
+    private String actionType;
+
+}

epmet-module/open-data-worker/open-data-worker-server/pom.xml

@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>open-data-worker</artifactId>
+        <groupId>com.epmet</groupId>
+        <version>2.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>open-data-worker-server</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-mybatis</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring.boot.admin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        <!-- 替换Feign原生httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>10.3.0</version>
+        </dependency>
+
+        <!--rocketmq-->
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-rocketmq</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-message-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>open-data-worker-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>data-statistical-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+        <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <server.port>8117</server.port>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <!-- 数据库配置-->
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epmet_open_data_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                <!-- redis配置 -->
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.1.140</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>123456</spring.redis.password>
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>192.168.1.140:8848</nacos.server-addr>
+                <nacos.discovery.namespace>1fecc730-5e6e-464c-aae9-7567944e7936</nacos.discovery.namespace>
+                <nacos.config.namespace></nacos.config.namespace>
+                <nacos.config.group></nacos.config.group>
+                <nacos.config-enabled>false</nacos.config-enabled>
+                <nacos.ip/>
+                <!--是否开启服务列表变更监听-->
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
+
+                <!--flyway migration 数据库迁移工具-->
+                <spring.flyway.enabled>false</spring.flyway.enabled>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
+                <rocketmq.nameserver>192.168.1.140:9876;192.168.1.141:9876</rocketmq.nameserver>
+            </properties>
+        </profile>
+        <profile>
+            <id>local</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <server.port>8117</server.port>
+                <spring.profiles.active>local</spring.profiles.active>
+
+                <!-- 数据库配置-->
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epmet_open_data_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                <!-- redis配置 -->
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.1.140</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>123456</spring.redis.password>
+                <!-- nacos -->
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>192.168.1.140:8848</nacos.server-addr>
+                <nacos.discovery.namespace>1fecc730-5e6e-464c-aae9-7567944e7936</nacos.discovery.namespace>
+                <nacos.config.namespace></nacos.config.namespace>
+                <nacos.config.group></nacos.config.group>
+                <nacos.config-enabled>false</nacos.config-enabled>
+                <nacos.ip/>
+                <!--是否开启服务列表变更监听-->
+                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+
+                <!--flyway migration 数据库迁移工具-->
+                <spring.flyway.enabled>false</spring.flyway.enabled>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>false</rocketmq.enable>
+                <rocketmq.nameserver>192.168.1.140:9876;192.168.1.141:9876</rocketmq.nameserver>
+            </properties>
+        </profile>
+        <profile>
+            <id>test</id>
+            <!--<activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>-->
+            <properties>
+                <server.port>8117</server.port>
+                <spring.profiles.active>test</spring.profiles.active>
+
+                <!-- 数据库配置-->
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
+                <!-- redis配置 -->
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
+                <nacos.config.namespace></nacos.config.namespace>
+                <nacos.config.group></nacos.config.group>
+                <nacos.config-enabled>false</nacos.config-enabled>
+                <nacos.ip/>
+                <!--是否开启服务列表变更监听-->
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
+
+                <!--flyway migration 数据库迁移工具-->
+                <spring.flyway.enabled>true</spring.flyway.enabled>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
+                <rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <server.port>8117</server.port>
+                <spring.profiles.active>prod</spring.profiles.active>
+
+                <!-- 数据库配置-->
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epmet_open_data_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                <!-- redis配置 -->
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.config.namespace></nacos.config.namespace>
+                <nacos.config.group></nacos.config.group>
+                <nacos.config-enabled>false</nacos.config-enabled>
+                <nacos.ip/>
+                <!--是否开启服务列表变更监听-->
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
+
+                <!--flyway migration 数据库迁移工具-->
+                <spring.flyway.enabled>true</spring.flyway.enabled>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java

@@ -0,0 +1,26 @@
+package com.epmet;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+
+/**
+ * @Description OpenData服务启动类
+ *      注意：此处要使用@ComponentScan的原因是，启动类处于包com.epmet.opendata下，想用com.epmet.commons包下的一些Spring对象，需要
+ *      手动指定扫描包，否则无法扫描
+ * @author wxz
+ * @date 2021.10.13 15:16:05
+*/
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+@ServletComponentScan
+//@ComponentScan(value = { "com.epmet" })
+public class OpenDataApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(OpenDataApplication.class, args);
+    }
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/config/NacosServiceListListenerRegisterer.java

@@ -0,0 +1,161 @@
+package com.epmet.opendata.config;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.api.naming.NamingService;
+import com.alibaba.nacos.api.naming.listener.Event;
+import com.alibaba.nacos.api.naming.listener.EventListener;
+import com.alibaba.nacos.api.naming.listener.NamingEvent;
+import com.alibaba.nacos.api.naming.pojo.ListView;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.netflix.loadbalancer.DynamicServerListLoadBalancer;
+import com.netflix.loadbalancer.ILoadBalancer;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.*;
+
+/**
+ * @author wxz
+ * @Description Nacos服务列表刷新监听注册器
+ * @date 2021.09.22 14:33:11
+ */
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "spring.cloud.nacos.discovery.serviceListChangedListening", name = "enable", havingValue = "true", matchIfMissing = false)
+public class NacosServiceListListenerRegisterer {
+
+    public static final String REFRESH_SERVER_LIST_METHOD_NAME = "restOfInit";
+    // 服务列表拉取间隔:10s
+    public static final long SERVICE_LIST_PULLING_DELAY_SECONDS = 10;
+
+    private NamingService namingService;
+
+    private ScheduledExecutorService executor;
+
+    @Autowired
+    private NacosDiscoveryProperties discoveryProperties;
+
+    @Autowired
+    private SpringClientFactory springClientFactory;
+
+    // 监听中的服务列表
+    private List<String> observingServers = new ArrayList<>(33);
+
+    @PostConstruct
+    public void init() {
+        namingService = discoveryProperties.namingServiceInstance();
+        // 启动监听
+        executor = new ScheduledThreadPoolExecutor(2, new ThreadFactory() {
+            @Override
+            public Thread newThread(Runnable r) {
+                Thread thread = new Thread(r);
+                thread.setDaemon(true);
+                thread.setName("NacosServiceListWatchingRegisterer");
+                return thread;
+            }
+        });
+
+        // 立即启动，并15s刷新一次服务列表，用于新服务列表的发现
+        ScheduledFuture<?> future = executor.scheduleAtFixedRate(new EpmetNacosServiceListListener(), 0, SERVICE_LIST_PULLING_DELAY_SECONDS, TimeUnit.SECONDS);
+    }
+
+    public class EpmetNacosServiceListListener implements Runnable {
+
+        @Override
+        public void run() {
+            doRefreshServerList();
+        }
+
+        /**
+         * @param
+         * @return
+         * @description 执行刷新
+         * @author wxz
+         * @date 2021.09.22 16:04:49
+         */
+        private synchronized void doRefreshServerList() {
+            ListView<String> serviceListView = null;
+            try {
+                serviceListView = namingService.getServicesOfServer(1, 100);
+                //启动监听
+                if (serviceListView == null || serviceListView.getCount() == 0) {
+                    log.info("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
+                    return;
+                }
+                List<String> serviceList = serviceListView.getData();
+                log.info("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+
+                for (String service : serviceList) {
+                    try {
+
+                        // 如果该服务已经在监听列表中存在了，则不再注册监听。注：不能取消空服务的监听，因为空服务随时可能恢复运行，需要实时监听。
+                        if (observingServers.contains(service)) {
+                            continue;
+                        }
+
+                        namingService.subscribe(service, new EventListener() {
+                            @Override
+                            public void onEvent(Event event) {
+                                if (event instanceof NamingEvent) {
+                                    NamingEvent namingEvent = (NamingEvent) event;
+                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    doRefreshServerList(service);
+                                }
+                            }
+                        });
+
+                        // 将该服务加入到监听列表中
+                        observingServers.add(service);
+                    } catch (NacosException e) {
+                        String errorStackTrace = ExceptionUtils.getErrorStackTrace(e);
+                        log.error("【Nacos服务列表定时刷新】订阅ApplicationContext的刷新事件失败，错误信息:{}", errorStackTrace);
+                    }
+                }
+
+            } catch (NacosException e) {
+                String errorStackTrace = ExceptionUtils.getErrorStackTrace(e);
+                log.error("【Nacos服务列表定时刷新】链接Nacos服务端失败，错误信息:{}", errorStackTrace);
+            }
+        }
+
+        /**
+         * @param serviceName
+         * @return
+         * @description 刷新ServerList
+         * @author wxz
+         * @date 2021.09.22 09:29:16
+         */
+        private void doRefreshServerList(String serviceName) {
+            // 刷新方式1:反射调用DynamicServerListLoadBalancer中的restOfInit()方法。该方法原来只执行一次，此处不推荐用
+            //ILoadBalancer loadBalancer = springClientFactory.getLoadBalancer(serviceName);
+            //if (loadBalancer instanceof ZoneAwareLoadBalancer) {
+            //    ZoneAwareLoadBalancer zaLoadBalancer = (ZoneAwareLoadBalancer) loadBalancer;
+            //    IClientConfig clientConfig = springClientFactory.getClientConfig(serviceName);
+            //    try {
+            //        Method restOfInitMethod = zaLoadBalancer.getClass().getSuperclass().getDeclaredMethod(REFRESH_SERVER_LIST_METHOD_NAME, IClientConfig.class);
+            //        restOfInitMethod.setAccessible(true);
+            //        restOfInitMethod.invoke(zaLoadBalancer, clientConfig);
+            //    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            //        String errorStackTrace = ExceptionUtils.getErrorStackTrace(e);
+            //        log.error("【LoadBalancer刷新服务列表】失败:{}", errorStackTrace);
+            //    }
+            //}
+
+            // 刷新方式2：DynamicServerListLoadBalancer#updateListOfServers()该方法为ribbon定时刷新服务列表的时候真正调用的方法，但是加了@VisibleForTesting
+            //      暂且 1 try
+            ILoadBalancer loadBalancer = springClientFactory.getLoadBalancer(serviceName);
+            if (loadBalancer instanceof DynamicServerListLoadBalancer) {
+                DynamicServerListLoadBalancer dslb = (DynamicServerListLoadBalancer) loadBalancer;
+                dslb.updateListOfServers();
+            }
+        }
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/UserPatrolRecordController.java

@@ -0,0 +1,39 @@
+/**
+ * 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.opendata.controller;
+
+import com.epmet.opendata.service.UserPatrolRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 用户巡查主记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-14
+ */
+@RestController
+@RequestMapping("userpatrolrecord")
+public class UserPatrolRecordController {
+
+    @Autowired
+    private UserPatrolRecordService userPatrolRecordService;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/UserPatrolDetailDao.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.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.UserPatrolDetailEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 工作人员巡查记录明细
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-14
+ */
+@Mapper
+public interface UserPatrolDetailDao extends BaseDao<UserPatrolDetailEntity> {
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/UserPatrolRecordDao.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.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.UserPatrolRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户巡查主记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-14
+ */
+@Mapper
+public interface UserPatrolRecordDao extends BaseDao<UserPatrolRecordEntity> {
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/UserPatrolDetailEntity.java

@@ -0,0 +1,53 @@
+/**
+ * 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.opendata.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-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("user_patrol_detail")
+public class UserPatrolDetailEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * staff_patrol_record.ID
+     */
+	private String staffPatrolRecId;
+
+    /**
+     * 路线
+     */
+	private String route;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/UserPatrolRecordEntity.java

@@ -0,0 +1,106 @@
+/**
+ * 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.opendata.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-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("user_patrol_record")
+public class UserPatrolRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 网格id
+     */
+	private String grid;
+
+    /**
+     * 网格所有上级id
+     */
+	private String gridPids;
+
+    /**
+     * 用户id
+     */
+	private String staffId;
+
+    /**
+     * 工作人员所属组织id=网格所属的组织id
+     */
+	private String agencyId;
+
+    /**
+     * 巡查开始时间
+     */
+	private Date patrolStartTime;
+
+    /**
+     * 巡查结束时间
+     */
+	private Date patrolEndTime;
+
+    /**
+     * 实际结束时间
+     */
+	private Date actrualEndTime;
+
+    /**
+     * 巡查开始地点
+     */
+	private String startLocation;
+
+    /**
+     * 巡查结束地点
+     */
+	private String endLocation;
+
+    /**
+     * 本次巡查总耗时，单位秒
+     */
+	private Integer totalTime;
+
+    /**
+     * 巡查距离，单位米
+     */
+	private Integer distance;
+
+    /**
+     * 正在巡查中：patrolling；结束：end
+     */
+	private String status;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/RocketMQConsumerRegister.java

@@ -0,0 +1,47 @@
+package com.epmet.opendata.mq;
+
+import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
+import com.epmet.commons.rocketmq.constants.TopicConstants;
+import com.epmet.commons.rocketmq.register.MQAbstractRegister;
+import com.epmet.commons.rocketmq.register.MQConsumerProperties;
+import com.epmet.opendata.mq.listener.OpenDataOrgChangeEventListener;
+import com.epmet.opendata.mq.listener.OpenDataPatrolChangeEventListener;
+import com.epmet.opendata.mq.listener.OpenDataStaffChangeEventListener;
+import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 如果rocketmq.enable=true，这里必须实现，且 实例化
+ * @author wxz
+ * @date 2021.07.14 17:13:41
+*/
+@Component
+public class RocketMQConsumerRegister extends MQAbstractRegister {
+
+    @Override
+    public void registerAllListeners(String env, MQConsumerProperties consumerProperties) {
+        // 客户初始化监听器注册
+        register(consumerProperties,
+                ConsomerGroupConstants.OPEN_DATA_ORG_CHANGE_EVENT_LISTENER_GROUP,
+                MessageModel.CLUSTERING,
+                TopicConstants.ORG,
+                "*",
+                new OpenDataOrgChangeEventListener());
+
+        register(consumerProperties,
+                ConsomerGroupConstants.OPEN_DATA_STAFF_CHANGE_EVENT_LISTENER_GROUP,
+                MessageModel.CLUSTERING,
+                TopicConstants.STAFF,
+                "*",
+                new OpenDataStaffChangeEventListener());
+
+        register(consumerProperties,
+                ConsomerGroupConstants.OPEN_DATA_PATROL_CHANGE_EVENT_LISTENER_GROUP,
+                MessageModel.CLUSTERING,
+                TopicConstants.PATROL,
+                "*",
+                new OpenDataPatrolChangeEventListener());
+
+        // ...其他监听器类似
+    }
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java

@@ -0,0 +1,97 @@
+package com.epmet.opendata.mq.listener;
+
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
+import com.epmet.commons.tools.distributedlock.DistributedLock;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
+import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.redisson.api.RLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+/**
+ * @Description 系统对接中间库，组织信息变更监听器
+ * @author wxz
+ * @date 2021.10.13 15:21:48
+*/
+public class OpenDataOrgChangeEventListener implements MessageListenerConcurrently {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    private RedisUtils redisUtils;
+
+    @Override
+    public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+
+        if (redisUtils == null) {
+            redisUtils = SpringContextUtils.getBean(RedisUtils.class);
+        }
+
+        try {
+            msgs.forEach(msg -> consumeMessage(msg));
+        } catch (Exception e) {
+            logger.error(ExceptionUtils.getErrorStackTrace(e));
+            return ConsumeConcurrentlyStatus.RECONSUME_LATER;
+        }
+        return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
+    }
+
+    private void consumeMessage(MessageExt messageExt) {
+        // msg即为消息体
+        // tags为SystemMessageType.java中的项，为具体的操作，此处拿到tags，判断是创建还是变更，来做响应的后续操作即可
+        String msg = new String(messageExt.getBody());
+        String topic = messageExt.getTopic();
+        String tags = messageExt.getTags();
+        String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.PENDING_MSG_LABEL);
+
+        logger.info("【开放数据事件监听器】-组织信息变更-收到消息内容:{},操作:{}", msg, tags);
+
+        DistributedLock distributedLock = null;
+        RLock lock = null;
+        try {
+            //distributedLock = SpringContextUtils.getBean(DistributedLock.class);
+            //lock = distributedLock.getLock(String.format("lock:open_data_org:%s", orgId),
+            //        30L, 30L, TimeUnit.SECONDS);
+        } catch (RenException e) {
+            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
+            logger.error("【开放数据事件监听器】-组织信息变更-同步信息到中间库失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+        } catch (Exception e) {
+            // 不是我们自己抛出的异常，可以让MQ重试
+            logger.error("【开放数据事件监听器】-组织信息变更-同步信息到中间库失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+            throw e;
+        } finally {
+            //distributedLock.unLock(lock);
+        }
+
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
+            try {
+                removePendingMqMsgCache(pendingMsgLabel);
+            } catch (Exception e) {
+                logger.error("【开放数据事件监听器】-删除mq滞留消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+        }
+    }
+
+    /**
+     * @description
+     *
+     * @param pendingMsgLabel
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:32:32
+     */
+    private void removePendingMqMsgCache(String pendingMsgLabel) {
+        String key = RedisKeys.pendingMqMsgKey(pendingMsgLabel);
+        redisUtils.delete(key);
+        logger.info("【开放数据事件监听器】删除mq滞留消息缓存失败,pendingMsgLabel:{}", pendingMsgLabel);
+    }
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java

@@ -0,0 +1,113 @@
+package com.epmet.opendata.mq.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
+import com.epmet.commons.rocketmq.messages.StaffPatrolMQMsg;
+import com.epmet.commons.tools.distributedlock.DistributedLock;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
+import com.epmet.opendata.service.UserPatrolRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
+import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.redisson.api.RLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author wxz
+ * @Description 系统对接中间库，巡查信息变更监听器
+ * @date 2021.10.13 15:21:48
+ */
+@Slf4j
+public class OpenDataPatrolChangeEventListener implements MessageListenerConcurrently {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    private RedisUtils redisUtils;
+
+    @Override
+    public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+
+        if (redisUtils == null) {
+            redisUtils = SpringContextUtils.getBean(RedisUtils.class);
+        }
+
+        try {
+            msgs.forEach(msg -> consumeMessage(msg));
+        } catch (Exception e) {
+            logger.error(ExceptionUtils.getErrorStackTrace(e));
+            return ConsumeConcurrentlyStatus.RECONSUME_LATER;
+        }
+        return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
+    }
+
+    private void consumeMessage(MessageExt messageExt) {
+        // msg即为消息体
+        // tags为SystemMessageType.java中的项，为具体的操作，此处拿到tags，判断是创建还是变更，来做响应的后续操作即可
+        String msg = new String(messageExt.getBody());
+        String topic = messageExt.getTopic();
+        String tags = messageExt.getTags();
+        String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.PENDING_MSG_LABEL);
+
+        logger.info("【开放数据事件监听器】-巡查记录信息变更-收到消息内容:{}, 操作:{}", msg, tags);
+        StaffPatrolMQMsg msgObj = JSON.parseObject(msg, StaffPatrolMQMsg.class);
+        if (msgObj == null) {
+            log.warn("consumeMessage msg body is blank");
+            return;
+        }
+        DistributedLock distributedLock = null;
+        RLock lock = null;
+        try {
+            distributedLock = SpringContextUtils.getBean(DistributedLock.class);
+            lock = distributedLock.getLock(String.format("lock:open_data_patrol:%s", msgObj.getPatrolId()),
+                    30L, 30L, TimeUnit.SECONDS);
+            UpsertPatrolRecordForm patrolRecordForm = new UpsertPatrolRecordForm();
+            patrolRecordForm.setCustomerId(msgObj.getCustomerId());
+            patrolRecordForm.setPatrolId(msgObj.getPatrolId());
+            patrolRecordForm.setActionType(msgObj.getActionType());
+
+            Boolean aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).upsertPatrolRecord(patrolRecordForm);
+        } catch (RenException e) {
+            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
+            logger.error("【开放数据事件监听器】-巡查记录信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+        } catch (Exception e) {
+            // 不是我们自己抛出的异常，可以让MQ重试
+            logger.error("【开放数据事件监听器】-巡查记录信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+            throw e;
+        } finally {
+            distributedLock.unLock(lock);
+        }
+
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
+            try {
+                removePendingMqMsgCache(pendingMsgLabel);
+            } catch (Exception e) {
+                logger.error("【开放数据事件监听器】-巡查-删除mq滞留消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+        }
+    }
+
+    /**
+     * @description
+     *
+     * @param pendingMsgLabel
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:32:32
+     */
+    private void removePendingMqMsgCache(String pendingMsgLabel) {
+        String key = RedisKeys.pendingMqMsgKey(pendingMsgLabel);
+        redisUtils.delete(key);
+    }
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java

@@ -0,0 +1,102 @@
+package com.epmet.opendata.mq.listener;
+
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
+import com.epmet.commons.tools.distributedlock.DistributedLock;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
+import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.redisson.api.RLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+/**
+ * @Description 系统对接中间库，工作人员信息变更监听器
+ * @author wxz
+ * @date 2021.10.13 15:21:48
+*/
+public class OpenDataStaffChangeEventListener implements MessageListenerConcurrently {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    private EpmetMessageOpenFeignClient messageOpenFeignClient;
+
+    private RedisUtils redisUtils;
+
+    @Override
+    public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+
+        if (redisUtils == null) {
+            redisUtils = SpringContextUtils.getBean(RedisUtils.class);
+        }
+
+        try {
+            msgs.forEach(msg -> consumeMessage(msg));
+        } catch (Exception e) {
+            logger.error(ExceptionUtils.getErrorStackTrace(e));
+            return ConsumeConcurrentlyStatus.RECONSUME_LATER;
+        }
+        return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
+    }
+
+    private void consumeMessage(MessageExt messageExt) {
+        // msg即为消息体
+        // tags为SystemMessageType.java中的项，为具体的操作，此处拿到tags，判断是创建还是变更，来做响应的后续操作即可
+        String msg = new String(messageExt.getBody());
+        String topic = messageExt.getTopic();
+        String tags = messageExt.getTags();
+        String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.PENDING_MSG_LABEL);
+
+        //messageExt.propert
+
+        logger.info("【开放数据事件监听器】-工作人员信息变更-收到消息内容:{}, 操作:{}, pendingMsgLabel:{}", msg, tags, pendingMsgLabel);
+
+        DistributedLock distributedLock = null;
+        RLock lock = null;
+        try {
+            //distributedLock = SpringContextUtils.getBean(DistributedLock.class);
+            //lock = distributedLock.getLock(String.format("lock:open_data_staff:%s", staffId),
+            //        30L, 30L, TimeUnit.SECONDS);
+
+        } catch (RenException e) {
+            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
+            logger.error("【开放数据事件监听器】-工作人员信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+        } catch (Exception e) {
+            // 不是我们自己抛出的异常，可以让MQ重试
+            logger.error("【开放数据事件监听器】-工作人员信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+            throw e;
+        } finally {
+            //distributedLock.unLock(lock);
+        }
+
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
+            try {
+                removePendingMqMsgCache(pendingMsgLabel);
+            } catch (Exception e) {
+                logger.error("【开放数据事件监听器】-staff-删除mq滞留消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+        }
+    }
+
+    /**
+     * @description
+     *
+     * @param pendingMsgLabel
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:32:32
+     */
+    private void removePendingMqMsgCache(String pendingMsgLabel) {
+        String key = RedisKeys.pendingMqMsgKey(pendingMsgLabel);
+        redisUtils.delete(key);
+    }
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/UserPatrolDetailService.java

@@ -0,0 +1,32 @@
+/**
+ * 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.opendata.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.opendata.entity.UserPatrolDetailEntity;
+
+/**
+ * 工作人员巡查记录明细
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-14
+ */
+public interface UserPatrolDetailService extends BaseService<UserPatrolDetailEntity> {
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/UserPatrolRecordService.java

@@ -0,0 +1,38 @@
+/**
+ * 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.opendata.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
+import com.epmet.opendata.entity.UserPatrolRecordEntity;
+
+/**
+ * 用户巡查主记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-14
+ */
+public interface UserPatrolRecordService extends BaseService<UserPatrolRecordEntity> {
+
+    /**
+     * desc：根据条件更新或者插入巡查记录
+     * @param patrolRecordForm
+     * @return
+     */
+    Boolean upsertPatrolRecord(UpsertPatrolRecordForm patrolRecordForm);
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/UserPatrolDetailServiceImpl.java

@@ -0,0 +1,37 @@
+/**
+ * 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.opendata.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.opendata.dao.UserPatrolDetailDao;
+import com.epmet.opendata.entity.UserPatrolDetailEntity;
+import com.epmet.opendata.service.UserPatrolDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 工作人员巡查记录明细
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-14
+ */
+@Service
+public class UserPatrolDetailServiceImpl extends BaseServiceImpl<UserPatrolDetailDao, UserPatrolDetailEntity> implements UserPatrolDetailService {
+
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/UserPatrolRecordServiceImpl.java

@@ -0,0 +1,163 @@
+/**
+ * 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.opendata.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.constant.StrConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.constant.SystemMessageType;
+import com.epmet.dto.user.param.MidPatrolFormDTO;
+import com.epmet.dto.user.result.MidPatrolDetailResult;
+import com.epmet.dto.user.result.MidPatrolRecordResult;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
+import com.epmet.opendata.dao.UserPatrolDetailDao;
+import com.epmet.opendata.dao.UserPatrolRecordDao;
+import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
+import com.epmet.opendata.entity.UserPatrolDetailEntity;
+import com.epmet.opendata.entity.UserPatrolRecordEntity;
+import com.epmet.opendata.service.UserPatrolRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+
+/**
+ * 用户巡查主记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-14
+ */
+@Slf4j
+@Service
+public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecordDao, UserPatrolRecordEntity> implements UserPatrolRecordService {
+
+    @Autowired
+    private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
+    @Autowired
+    private UserPatrolDetailDao userPatrolDetailDao;
+
+    @Override
+    public Boolean upsertPatrolRecord(UpsertPatrolRecordForm patrolRecordForm) {
+        ValidatorUtils.validateEntity(patrolRecordForm);
+        boolean delFlag = false;
+        MidPatrolFormDTO midPatrolFormDTO = buildParam(patrolRecordForm);
+        Result<List<MidPatrolRecordResult>> record = dataStatisticalOpenFeignClient.getPatrolRecordList(midPatrolFormDTO);
+        if (record == null || !record.success()){
+            log.error("获取巡查记录失败，param:{}", JSON.toJSONString(midPatrolFormDTO));
+            return false;
+        }
+        List<MidPatrolRecordResult> data = record.getData();
+        if (CollectionUtils.isEmpty(data)){
+            //数据已被删除了
+            delFlag = true;
+            //暂时设置error 用于排错
+            log.error("获取巡查记录返回为空，param:{}", JSON.toJSONString(midPatrolFormDTO));
+            int effectRow = baseDao.deleteById(patrolRecordForm.getPatrolId());
+            log.warn("del effectRow:{}",effectRow);
+            return true;
+        }
+        MidPatrolRecordResult recordResult = data.get(NumConstant.ZERO);
+        switch (patrolRecordForm.getActionType()){
+            case SystemMessageType.USER_PATROL_START:
+                //insert
+                baseDao.insert(buildEntity(recordResult));
+                break;
+            case SystemMessageType.USER_PATROL_STOP:
+                //update
+                baseDao.updateById(buildEntity(recordResult));
+                Result<List<MidPatrolDetailResult>> detailResult = dataStatisticalOpenFeignClient.getPatrolDetailList(midPatrolFormDTO);
+                if (detailResult == null || !detailResult.success()){
+                    log.error("获取巡查记录明细失败，param:{}", JSON.toJSONString(midPatrolFormDTO));
+                    return false;
+                }
+                UserPatrolDetailEntity detailEntity = buildDetailEntity(recordResult, detailResult);
+
+                userPatrolDetailDao.insert(detailEntity);
+                break;
+            default:
+                log.info("======");
+
+        }
+        return true;
+    }
+
+    @NotNull
+    private UserPatrolDetailEntity buildDetailEntity(MidPatrolRecordResult recordResult, Result<List<MidPatrolDetailResult>> detailResult) {
+        UserPatrolDetailEntity detailEntity = new UserPatrolDetailEntity();
+        detailEntity.setCustomerId(recordResult.getCustomerId());
+        detailEntity.setStaffPatrolRecId(recordResult.getId());
+        StringBuilder sb =new StringBuilder();
+        detailResult.getData().forEach(o->{
+            sb.append(o.getLongitude())
+                    .append(StrConstant.COMMA)
+                    .append(o.getLatitude())
+                    .append(StrConstant.SEMICOLON);
+        });
+        detailEntity.setRoute(sb.toString());
+        detailEntity.setId(recordResult.getId());
+        detailEntity.setRevision(recordResult.getRevision());
+        detailEntity.setCreatedBy(recordResult.getCreatedBy());
+        detailEntity.setCreatedTime(recordResult.getCreatedTime());
+        detailEntity.setUpdatedBy(recordResult.getUpdatedBy());
+        detailEntity.setUpdatedTime(recordResult.getUpdatedTime());
+        detailEntity.setDelFlag(String.valueOf(recordResult.getDelFlag()));
+        return detailEntity;
+    }
+
+    private UserPatrolRecordEntity buildEntity(MidPatrolRecordResult recordResult) {
+        UserPatrolRecordEntity entity = new UserPatrolRecordEntity();
+        entity.setCustomerId(recordResult.getCustomerId());
+        entity.setGrid(recordResult.getGrid());
+        entity.setGridPids(recordResult.getGridPids());
+        entity.setStaffId(recordResult.getStaffId());
+        entity.setAgencyId(recordResult.getAgencyId());
+        entity.setPatrolStartTime(recordResult.getPatrolStartTime());
+        entity.setPatrolEndTime(recordResult.getPatrolEndTime());
+        entity.setActrualEndTime(recordResult.getActrualEndTime());
+        entity.setStartLocation("");
+        entity.setEndLocation("");
+        entity.setTotalTime(recordResult.getTotalTime());
+        entity.setDistance(0);
+        entity.setStatus(recordResult.getStatus());
+        entity.setId(recordResult.getId());
+        entity.setRevision(recordResult.getRevision());
+        entity.setCreatedBy(recordResult.getCreatedBy());
+        entity.setCreatedTime(recordResult.getCreatedTime());
+        entity.setUpdatedBy(recordResult.getUpdatedBy());
+        entity.setUpdatedTime(recordResult.getUpdatedTime());
+        entity.setDelFlag(String.valueOf(recordResult.getDelFlag()));
+        return entity;
+    }
+
+    @NotNull
+    private MidPatrolFormDTO buildParam(UpsertPatrolRecordForm patrolRecordForm) {
+        MidPatrolFormDTO midPatrolFormDTO = new MidPatrolFormDTO();
+        midPatrolFormDTO.setCustomerId(patrolRecordForm.getCustomerId());
+        midPatrolFormDTO.setPatrolId(patrolRecordForm.getPatrolId());
+        midPatrolFormDTO.setPageNo(0);
+        midPatrolFormDTO.setPageSize(1);
+        return midPatrolFormDTO;
+    }
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml

@@ -0,0 +1,138 @@
+server:
+  port: @server.port@
+  version: @version@
+  servlet:
+    context-path: /opendata
+
+spring:
+  main:
+    allow-bean-definition-overriding: true
+  application:
+    name: open-data-server
+  #环境 dev|test|prod
+  profiles:
+    active:  @spring.profiles.active@
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  redis:
+    database: @spring.redis.index@
+    host: @spring.redis.host@
+    port: @spring.redis.port@
+    password: @spring.redis.password@
+    timeout: 30s
+  datasource:
+    druid:
+      #MySQL
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        #nacos的命名空间ID，默认是public
+        namespace: @nacos.discovery.namespace@
+        #不把自己注册到注册中心的地址
+        register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+        serviceListChangedListening:
+          enable: @nacos.service-list-changed-listening.enable@
+      config:
+        enabled: @nacos.config-enabled@
+        server-addr: @nacos.server-addr@
+        namespace: @nacos.config.namespace@
+        group: @nacos.config.group@
+        file-extension: yaml
+        #指定共享配置，且支持动态刷新
+#        ext-config:
+#          - data-id: datasource.yaml
+#            group: ${spring.cloud.nacos.config.group}
+#            refresh: true
+#          - data-id: common.yaml
+#            group: ${spring.cloud.nacos.config.group}
+#            refresh: true
+
+  # 数据迁移工具flyway
+  flyway:
+    enabled: @spring.flyway.enabled@
+    locations: classpath:db/migration
+    url: @spring.datasource.druid.url@
+    user: @spring.datasource.druid.username@
+    password: @spring.datasource.druid.password@
+    baseline-on-migrate: true
+    baseline-version: 0
+
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: ALWAYS
+
+mybatis-plus:
+  mapper-locations: classpath:/mapper/**/*.xml
+  #实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: com.epmet.entity
+  global-config:
+    #数据库相关配置
+    db-config:
+      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
+    banner: false
+  #原生配置
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    call-setters-on-nulls: true
+    jdbc-type-for-null: 'null'
+
+feign:
+  hystrix:
+    enabled: true
+  client:
+    config:
+      default:
+        loggerLevel: BASIC
+  okhttp:
+    enabled: true
+
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000 #缺省为1000
+
+ribbon:
+  ReadTimeout: 300000
+  ConnectTimeout: 300000
+
+#pageHelper分页插件
+pagehelper:
+  helper-dialect: mysql
+  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+#feign 日志需要该配置
+logging:
+  level:
+    com.epmet: debug
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@
+
+rocketmq:
+  #  是否开启mq
+  enable: @rocketmq.enable@
+  name-server: @rocketmq.nameserver@

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/init_db.sql

@@ -0,0 +1,14 @@
+create database epmet_open_data default character set utf8mb4 collate utf8mb4_general_ci;
+
+-- 开发环境的脚本
+CREATE USER epmet_open_data_user@'%' IDENTIFIED BY 'EpmEt-db-UsEr';
+GRANT ALL ON `epmet_open_data`.* TO 'epmet_open_data_user'@'%';
+flush privileges;
+
+
+
+-- 测试环境的脚本
+
+
+
+-- 生产环境的数据

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+    <property name="log.path" value="logs/open-data"/>
+
+    <springProperty scope="context" name="appname" source="spring.application.name"/>
+
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
+
+    <!-- 日志上下文名称 -->
+    <contextName>${appname}</contextName>
+
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
+        </filter>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <!--<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>-->
+    </appender>
+
+    <!-- 开发、测试环境 -->
+    <springProfile name="dev,test,local">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.epmet.dao" level="INFO"/>
+        <logger name="com.epmet.dao" level="DEBUG"/>
+        <root level="INFO">
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+    <!-- 生产环境 -->
+    <springProfile name="prod">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.epmet.dao" level="INFO"/>
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+</configuration>

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/UserPatrolDetailDao.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.opendata.dao.UserPatrolDetailDao">
+
+    <resultMap type="com.epmet.opendata.entity.UserPatrolDetailEntity" id="staffPatrolDetailMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="staffPatrolRecId" column="STAFF_PATROL_REC_ID"/>
+        <result property="route" column="ROUTE"/>
+        <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>

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/UserPatrolRecordDao.xml

@@ -0,0 +1,30 @@
+<?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.opendata.dao.UserPatrolRecordDao">
+
+    <resultMap type="com.epmet.opendata.entity.UserPatrolRecordEntity" id="userPatrolRecordMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="grid" column="GRID"/>
+        <result property="gridPids" column="GRID_PIDS"/>
+        <result property="staffId" column="STAFF_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="patrolStartTime" column="PATROL_START_TIME"/>
+        <result property="patrolEndTime" column="PATROL_END_TIME"/>
+        <result property="actrualEndTime" column="ACTRUAL_END_TIME"/>
+        <result property="startLocation" column="START_LOCATION"/>
+        <result property="endLocation" column="END_LOCATION"/>
+        <result property="totalTime" column="TOTAL_TIME"/>
+        <result property="distance" column="DISTANCE"/>
+        <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>

epmet-module/open-data-worker/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epmet-module</artifactId>
+        <groupId>com.epmet</groupId>
+        <version>2.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>open-data-worker</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>open-data-worker-client</module>
+        <module>open-data-worker-server</module>
+    </modules>
+</project>

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/mq/listener/InitCustomerComponentsListener.java

@@ -1,13 +1,17 @@
 package com.epmet.mq.listener;
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.epmet.commons.rocketmq.messages.InitCustomerMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.dto.CustomerHomeDTO;
 import com.epmet.service.CustomerHomeService;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
 import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
@@ -15,7 +19,6 @@ import org.apache.rocketmq.common.message.MessageExt;
 import org.redisson.api.RLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -28,8 +31,15 @@ public class InitCustomerComponentsListener implements MessageListenerConcurrent
 
     private Logger logger = LoggerFactory.getLogger(getClass());
 
+    private RedisUtils redisUtils;
+
     @Override
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+
+        if (redisUtils == null) {
+            redisUtils = SpringContextUtils.getBean(RedisUtils.class);
+        }
+
         try {
             msgs.forEach(msg -> consumeMessage(msg));
         } catch (Exception e) {
@@ -41,6 +51,7 @@ public class InitCustomerComponentsListener implements MessageListenerConcurrent
 
     private void consumeMessage(MessageExt messageExt) {
         String msg = new String(messageExt.getBody());
+        String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.PENDING_MSG_LABEL);
         logger.info("初始化客户-初始化客户自定义信息-收到消息内容:{}", msg);
         InitCustomerMQMsg msgObj = JSON.parseObject(msg, InitCustomerMQMsg.class);
 
@@ -66,6 +77,28 @@ public class InitCustomerComponentsListener implements MessageListenerConcurrent
         } finally {
             distributedLock.unLock(lock);
         }
+
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
+            try {
+                removePendingMqMsgCache(pendingMsgLabel);
+            } catch (Exception e) {
+                logger.error("【开放数据事件监听器】-删除mq滞留消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+        }
+    }
+
+    /**
+     * @description
+     *
+     * @param pendingMsgLabel
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:32:32
+     */
+    private void removePendingMqMsgCache(String pendingMsgLabel) {
+        String key = RedisKeys.pendingMqMsgKey(pendingMsgLabel);
+        redisUtils.delete(key);
+        logger.info("【开放数据事件监听器】删除mq滞留消息缓存失败,pendingMsgLabel:{}", pendingMsgLabel);
     }
 
    /* @Override

epmet-module/pom.xml

@@ -44,6 +44,7 @@
 		<module>epmet-point</module>
 		<module>epmet-ext</module>
 		<module>data-aggregator</module>
-	</modules>
+        <module>open-data-worker</module>
+    </modules>
 
 </project>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/GroupAchievementCustomListener.java

@@ -1,9 +1,13 @@
 package com.epmet.mq;
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
+import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.modules.group.service.StatsAchievementService;
 import lombok.extern.slf4j.Slf4j;
@@ -31,8 +35,15 @@ public class GroupAchievementCustomListener  implements MessageListenerConcurren
 
     private Logger logger = LoggerFactory.getLogger(getClass());
 
+    private RedisUtils redisUtils;
+
     @Override
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+
+        if (redisUtils == null) {
+            redisUtils = SpringContextUtils.getBean(RedisUtils.class);
+        }
+
         long start = System.currentTimeMillis();
         try {
             msgs.forEach(this::consumeMessage);
@@ -48,6 +59,7 @@ public class GroupAchievementCustomListener  implements MessageListenerConcurren
     private void consumeMessage(MessageExt messageExt) {
         logger.info("receive msg:{}", JSON.toJSONString(messageExt));
         String msg = new String(messageExt.getBody());
+        String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.PENDING_MSG_LABEL);
 
         GroupAchievementMQMsg msgObj = JSON.parseObject(msg, GroupAchievementMQMsg.class);
         if (msgObj == null){
@@ -87,9 +99,29 @@ public class GroupAchievementCustomListener  implements MessageListenerConcurren
                 distributedLock.unLock(lock);
             }
         }
-    }
 
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
+            try {
+                removePendingMqMsgCache(pendingMsgLabel);
+            } catch (Exception e) {
+                logger.error("【小组成就事件监听器】-删除mq滞留消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+        }
+    }
 
+    /**
+     * @description
+     *
+     * @param pendingMsgLabel
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:32:32
+     */
+    private void removePendingMqMsgCache(String pendingMsgLabel) {
+        String key = RedisKeys.pendingMqMsgKey(pendingMsgLabel);
+        redisUtils.delete(key);
+        logger.info("【小组成就事件监听器】删除mq滞留消息缓存失败,pendingMsgLabel:{}", pendingMsgLabel);
+    }
 
     /*@Override
     public ConsumerConfigProperties getConsumerProperty() {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java

@@ -3,15 +3,16 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.rocketmq.messages.StaffPatrolMQMsg;
 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.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.PatrolConstant;
+import com.epmet.constant.SystemMessageType;
 import com.epmet.dao.CustomerStaffDao;
 import com.epmet.dao.StaffPatrolDetailDao;
 import com.epmet.dao.StaffPatrolRecordDao;
@@ -23,9 +24,10 @@ import com.epmet.dto.result.*;
 import com.epmet.entity.StaffPatrolDetailEntity;
 import com.epmet.entity.StaffPatrolRecordEntity;
 import com.epmet.entity.StatsStaffPatrolRecordDailyEntity;
-import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.GovProjectOpenFeignClient;
+import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.StaffPatrolDetailService;
 import com.epmet.service.StaffPatrolRecordService;
 import com.epmet.util.DimIdGenerator;
@@ -40,7 +42,6 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -55,25 +56,20 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 
 	@Resource
 	private StaffPatrolDetailService staffPatrolDetailService;
-	@Resource
-	private GovOrgFeignClient govOrgFeignClient;
-	// 这是是来自org-client的，以后都用这个就好了
 	@Autowired
 	private GovOrgOpenFeignClient govOrgOpenFeignClient;
 	@Autowired
 	private CustomerStaffDao customerStaffDao;
-
 	@Autowired
 	private StaffPatrolRecordDao staffPatrolRecordDao;
-
 	@Autowired
 	private StaffPatrolDetailDao staffPatrolDetailDao;
-
 	@Autowired
 	private StatsStaffPatrolRecordDailyDao statsStaffPatrolRecordDailyDao;
-
 	@Autowired
 	private GovProjectOpenFeignClient govProjectOpenFeignClient;
+	@Autowired
+	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
 
 	/**
@@ -187,6 +183,9 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		result.setCarmDown(NumConstant.THIRTY);
 		// 添加巡查统计表逻辑
 		statsPatrolUpdateStart(tokenDto.getUserId(),patrolStartTime,grid);
+
+		//发送巡查消息
+		sendPatrolMsg(record, SystemMessageType.USER_PATROL_START);
 		return result;
 	}
 
@@ -278,6 +277,21 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		staffPatrolDetailService.insert(detailEntity);
 		// 添加巡查统计表逻辑
 		statsPatrolUpdateEnd(tokenDto.getUserId(),totalTime,record.getPatrolStartTime(),patrolEndTime,record.getGrid());
+		sendPatrolMsg(record, SystemMessageType.USER_PATROL_STOP);
+
+	}
+
+	private void sendPatrolMsg(StaffPatrolRecordEntity record, String userPatrolStop) {
+		//发送巡查消息
+		StaffPatrolMQMsg staffPatrolMQMsg = new StaffPatrolMQMsg();
+		staffPatrolMQMsg.setCustomerId(record.getCustomerId());
+		staffPatrolMQMsg.setPatrolId(record.getId());
+		staffPatrolMQMsg.setActionType(userPatrolStop);
+
+		boolean b = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendPatrolMqMsg(staffPatrolMQMsg);
+		if (b) {
+			log.error( "发送{}巡查消息到mq失败，patrolId:{}", userPatrolStop, record.getId());
+		}
 	}
 
 	/**
@@ -310,6 +324,8 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 
 			updateBatchById(list);
 		}
+		list.forEach(e->sendPatrolMsg(e, SystemMessageType.USER_PATROL_STOP));
+
 	}
 
 	/**