Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_grid_platform

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

@@ -30,12 +30,17 @@ 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-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml

@@ -134,9 +134,11 @@
         WHERE
             del_flag = '0'
         AND customer_id = #{customerId}
-        <foreach collection="gridIdList" item="gridId" open="AND id IN (" separator="," close=")">
-            #{gridId}
-        </foreach>
+        <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

@@ -212,9 +212,11 @@
         WHERE
             del_flag = '0'
         AND customer_id = #{customerId}
-        <foreach collection="agencyIdList" item="agencyId" open="AND id IN (" separator="," close=")">
-            #{agencyId}
-        </foreach>
+        <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

@@ -1005,9 +1005,11 @@
         AND gsr.del_flag = '0'
         AND gsr.role_name = '网格员'
         AND cs.customer_id = #{customerId}
-        <foreach collection="staffIdList" item="staffId" open="AND cs.USER_ID IN (" separator="," close=")">
-            #{staffId}
-        </foreach>
+        <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>
 
 </mapper>

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

@@ -65,4 +65,14 @@ public interface SystemMessageType {
      */
     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/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/service/impl/SystemMessageServiceImpl.java

@@ -2,7 +2,6 @@ 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.TopicConstants;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -114,6 +113,10 @@ public class SystemMessageServiceImpl implements SystemMessageService {
             case SystemMessageType.STAFF_CHANGE:
                 topic = TopicConstants.STAFF;
                 break;
+            case SystemMessageType.USER_PATROL_START:
+            case SystemMessageType.USER_PATROL_STOP:
+                topic = TopicConstants.PATROL;
+                break;
         }
         return topic;
     }

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/StaffPatrolDetailDao.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.StaffPatrolDetailEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 工作人员巡查记录明细
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-14
+ */
+@Mapper
+public interface StaffPatrolDetailDao extends BaseDao<StaffPatrolDetailEntity> {
+
+}

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/StaffPatrolDetailEntity.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("staff_patrol_detail")
+public class StaffPatrolDetailEntity 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/service/StaffPatrolDetailService.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.StaffPatrolDetailEntity;
+
+/**
+ * 工作人员巡查记录明细
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-14
+ */
+public interface StaffPatrolDetailService extends BaseService<StaffPatrolDetailEntity> {
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/UserPatrolRecordService.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.UserPatrolRecordEntity;
+
+/**
+ * 用户巡查主记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-14
+ */
+public interface UserPatrolRecordService extends BaseService<UserPatrolRecordEntity> {
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/StaffPatrolDetailServiceImpl.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.StaffPatrolDetailDao;
+import com.epmet.opendata.entity.StaffPatrolDetailEntity;
+import com.epmet.opendata.service.StaffPatrolDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 工作人员巡查记录明细
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-14
+ */
+@Service
+public class StaffPatrolDetailServiceImpl extends BaseServiceImpl<StaffPatrolDetailDao, StaffPatrolDetailEntity> implements StaffPatrolDetailService {
+
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/UserPatrolRecordServiceImpl.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.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.opendata.dao.UserPatrolRecordDao;
+import com.epmet.opendata.entity.UserPatrolRecordEntity;
+import com.epmet.opendata.service.UserPatrolRecordService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 用户巡查主记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-14
+ */
+@Service
+public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecordDao, UserPatrolRecordEntity> implements UserPatrolRecordService {
+
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/StaffPatrolDetailDao.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.StaffPatrolDetailDao">
+
+    <resultMap type="com.epmet.opendata.entity.StaffPatrolDetailEntity" 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-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));
+
 	}
 
 	/**