例行工作 对接中间库

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

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

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

@@ -30,6 +30,8 @@ public class PageFormDTO {
      */
     private Integer offset;
 
+    private boolean isPage = true;
+
     public Integer getOffset() {
         return (pageNo-1)*pageSize;
     }

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

@@ -22,8 +22,8 @@ public class MidPatrolFormDTO extends PageFormDTO implements Serializable {
      */
     private String customerId;
     /**
-     * 巡查记录id 没有则查询全部
+     * 对象id 没有则查询全部
      */
-    private String patrolId;
+    private String objectId;
 
 }

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

@@ -1029,8 +1029,8 @@
             LEFT JOIN staff_patrol_detail d ON m.ID = d.STAFF_PATROL_REC_ID
         WHERE
             1 =1
-            <if test="patrolId != null and patrolId != ''">
+            <if test="objectId != null and objectId != ''">
-                AND  m.ID = #{patrolId}
+                AND  m.ID = #{objectId}
             </if>
             and m.CUSTOMER_ID = #{customerId}
             AND m.DEL_FLAG = '0'
@@ -1044,8 +1044,8 @@
         from staff_patrol_detail
         WHERE
             1=1
-            <if test="patrolId != null and patrolId != ''">
+            <if test="objectId != null and objectId != ''">
-                AND  staff_patrol_rec_id = #{patrolId}
+                AND  staff_patrol_rec_id = #{objectId}
             </if>
             and CUSTOMER_ID = #{customerId}
             AND DEL_FLAG = '0'

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

@@ -18,9 +18,9 @@ public class UpsertPatrolRecordForm extends PageFormDTO {
     private String customerId;
 
     /**
-     * 巡查记录id
+     * 记录id
      */
-    private String patrolId;
+    private String id;
 
     /**
      * 操作类型

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

@@ -18,8 +18,7 @@
 package com.epmet.opendata.controller;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constant.SystemMessageType;
+import com.epmet.opendata.service.PatrolRoutineWorkService;
-import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
 import com.epmet.opendata.service.UserPatrolRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -40,6 +39,8 @@ public class InitDataController {
 
     @Autowired
     private UserPatrolRecordService userPatrolRecordService;
+    @Autowired
+    private PatrolRoutineWorkService patrolRoutineWorkService;
 
     /**
      * @Author sun
@@ -49,4 +50,13 @@ public class InitDataController {
     public Result<Boolean> reloadPatrolData(@PathVariable String customerId) {
         return new Result().ok(userPatrolRecordService.reloadPatrolData(customerId));
     }
+
+    /**
+     * @Author sun
+     * @Description 例行工作中间库同步
+     **/
+    @PostMapping("routineWork/{customerId}")
+    public Result<Boolean> reloadRoutineWorkData(@PathVariable String customerId) {
+        return new Result().ok(patrolRoutineWorkService.reloadPatrolData(customerId));
+    }
 }

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

@@ -0,0 +1,58 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.controller;
+
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
+import com.epmet.opendata.service.PatrolRoutineWorkService;
+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;
+
+
+/**
+ * 巡查例行工作
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-12-24
+ */
+@RestController
+@RequestMapping("patrolroutinework")
+public class PatrolRoutineWorkController {
+
+    @Autowired
+    private PatrolRoutineWorkService patrolRoutineWorkService;
+
+
+    /**
+     * @Author sun
+     * @Description 巡查信息中间库同步 分页
+     **/
+    @PostMapping("sync")
+    public Result getStaffBaseInfo(@RequestBody(required = false) UpsertPatrolRecordForm formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        patrolRoutineWorkService.insertPatrolRecord(formDTO);
+        return new Result();
+    }
+
+
+}

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

@@ -43,7 +43,7 @@ public class UserPatrolRecordController {
 
     /**
      * @Author sun
-     * @Description 网格员信息中间库同步
+     * @Description 巡查信息中间库同步 分页
      **/
     @PostMapping("patrol")
     public Result getStaffBaseInfo(@RequestBody(required = false) UpsertPatrolRecordForm formDTO) {

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/PatrolRoutineWorkDao.java

@@ -0,0 +1,34 @@
+/**
+ * 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.PatrolRoutineWorkEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 巡查例行工作
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-12-24
+ */
+@Mapper
+public interface PatrolRoutineWorkDao extends BaseDao<PatrolRoutineWorkEntity> {
+
+}

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

@@ -0,0 +1,154 @@
+/**
+ * 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 lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 巡查例行工作
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-12-24
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("patrol_routine_work")
+public class PatrolRoutineWorkEntity implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 一级工作类型
+     */
+	private String firstWorkType;
+
+    /**
+     * 二级工作类型
+     */
+	private String secondWorkType;
+
+    /**
+     * 事项名称
+     */
+	private String eventName;
+
+    /**
+     * 发生日期 格式为“YYYY-MM-DD”
+     */
+	private String happenTime;
+
+    /**
+     * 有无变动（异常）Y：是、N：否
+     */
+	private String workResult;
+
+    /**
+     * 工作内容
+     */
+	private String workContent;
+
+    /**
+     * 重点场所类别 字典值
+     */
+	private String keyAreaType;
+
+    /**
+     * 宗教活动规模 字典值
+     */
+	private String regionScale;
+
+    /**
+     * 重点场所是否发生变动 Y;N
+     */
+	private String isKeyareaState;
+
+    /**
+     * 重点人员是否在当地-当事件类型为【特殊人群服务与管理】时必填
+     */
+	private String isKeyPeopleLocate;
+
+    /**
+     * 重点人员现状
+     */
+	private String keyPeopleStatus;
+
+    /**
+     * 发生地
+     */
+	private String happenPlace;
+
+    /**
+     * 经度
+     */
+	private String lng;
+
+    /**
+     * 纬度
+     */
+	private String lat;
+
+    /**
+     * 抽取状态：0是未抽取，1代表已抽取，2是抽取失败
+     */
+	private String flag;
+
+	private String delFlag;
+
+    /**
+     * 创建人
+     */
+	private String createBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+    /**
+     * 更新人
+     */
+	private String updateBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+}

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

@@ -47,7 +47,7 @@ public class UserPatrolRecordEntity extends BaseEpmetEntity {
     /**
      * 网格id
      */
-	private String grid;
+	private String gridId;
 
     /**
      * 网格所有上级id

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

@@ -52,7 +52,7 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr
         }
 
         try {
-            msgs.forEach(msg -> consumeMessage(msg));
+            msgs.forEach(this::consumeMessage);
         } catch (Exception e) {
             logger.error(ExceptionUtils.getErrorStackTrace(e));
             return ConsumeConcurrentlyStatus.RECONSUME_LATER;
@@ -84,7 +84,7 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr
                     30L, 30L, TimeUnit.SECONDS);
             UpsertPatrolRecordForm patrolRecordForm = new UpsertPatrolRecordForm();
             patrolRecordForm.setCustomerId(msgObj.getCustomerId());
-            patrolRecordForm.setPatrolId(msgObj.getPatrolId());
+            patrolRecordForm.setId(msgObj.getObjectId());
             patrolRecordForm.setActionType(tags);
             Boolean aBoolean = false;
             switch (tags) {
@@ -94,6 +94,9 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr
                 case SystemMessageType.USER_PATROL_STOP:
                     aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm);
                     break;
+                case SystemMessageType.PATROL_ROUTINE_WORK_ADD:
+                    aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm);
+                    break;
                 default:
                     log.error("错误的消息类型:{}", tags);
 

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

@@ -18,6 +18,7 @@
 package com.epmet.opendata.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.opendata.dto.ExDeptDTO;
 import com.epmet.opendata.dto.form.ExDeptFormDTO;
 import com.epmet.opendata.entity.ExDeptEntity;
 
@@ -32,7 +33,7 @@ import java.util.Map;
 public interface ExDeptService extends BaseService<ExDeptEntity> {
 
 
-    Map<String, Integer> getDeptMap();
+    Map<String, Integer> getDeptDTOMap();
 
     /**
      * @Author sun
@@ -46,4 +47,5 @@ public interface ExDeptService extends BaseService<ExDeptEntity> {
      **/
     void getGridBaseInfo(ExDeptFormDTO formDTO);
 
+    Map<String, ExDeptDTO> getDeptDTOMap(String customerId);
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.opendata.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.opendata.dto.ExUserDTO;
 import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 import com.epmet.opendata.entity.ExUserEntity;
 
@@ -39,4 +40,5 @@ public interface ExUserService extends BaseService<ExUserEntity> {
      **/
     void getStaffBaseInfo(StaffBaseInfoFormDTO formDTO);
 
+    Map<String, ExUserDTO> getUserDTOMap(String customerId);
 }

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

@@ -0,0 +1,46 @@
+/**
+ * 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.PatrolRoutineWorkEntity;
+
+/**
+ * 用户巡查主记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-14
+ */
+public interface PatrolRoutineWorkService extends BaseService<PatrolRoutineWorkEntity> {
+
+    /**
+     * desc：根据条件插入巡查记录
+     * @param patrolRecordForm
+     * @return
+     */
+    Boolean insertPatrolRecord(UpsertPatrolRecordForm patrolRecordForm);
+
+    /**
+     * desc：重新加载数据
+     * @param customerId
+     * @return
+     */
+    Boolean reloadPatrolData(String customerId);
+
+}

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

@@ -29,7 +29,17 @@ import com.epmet.opendata.entity.UserPatrolDetailEntity;
 public interface UserPatrolDetailService extends BaseService<UserPatrolDetailEntity> {
 
 
+    /**
+     * desc:根据巡查id 删除巡查明细
+     * @param patrolId
+     * @return
+     */
     int deleteByPatrolId(String patrolId);
 
+    /**
+     * desc:根据客户Id 删除明细
+     * @param customerId
+     * @return
+     */
     int deleteByCustomerId(String customerId);
 }

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

@@ -76,7 +76,7 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }
-        Map<String, Integer> deptMap = exDeptService.getDeptMap();
+        Map<String, Integer> deptMap = exDeptService.getDeptDTOMap();
         Map<String, Integer> userMap = exUserService.getUserMap(formDTO.getCustomerId());
         List<EventInfoResultDTO> list = result.getData();
         saveEvent(formDTO, deptMap, userMap, list);

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

@@ -27,6 +27,7 @@ import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerGridDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import com.epmet.opendata.dao.ExDeptDao;
+import com.epmet.opendata.dto.ExDeptDTO;
 import com.epmet.opendata.dto.form.ExDeptFormDTO;
 import com.epmet.opendata.entity.ExDeptEntity;
 import com.epmet.opendata.service.ExDeptService;
@@ -39,6 +40,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -54,7 +56,7 @@ public class ExDeptServiceImpl extends BaseServiceImpl<ExDeptDao, ExDeptEntity>
 
 
     @Override
-    public Map<String, Integer> getDeptMap() {
+    public Map<String, Integer> getDeptDTOMap() {
         LambdaQueryWrapper<ExDeptEntity> wrapper = new LambdaQueryWrapper<>();
         List<ExDeptEntity> entityList = baseDao.selectList(wrapper);
         if (CollectionUtils.isEmpty(entityList)) {
@@ -135,4 +137,15 @@ public class ExDeptServiceImpl extends BaseServiceImpl<ExDeptDao, ExDeptEntity>
 
     }
 
+    @Override
+    public Map<String, ExDeptDTO> getDeptDTOMap(String customerId) {
+        LambdaQueryWrapper<ExDeptEntity> wrapper = new LambdaQueryWrapper<>();
+        List<ExDeptEntity> entityList = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(entityList)) {
+            return Collections.emptyMap();
+        }
+        List<ExDeptDTO> exDeptDTOList = ConvertUtils.sourceToTarget(entityList, ExDeptDTO.class);
+        return exDeptDTOList.stream().collect(Collectors.toMap(ExDeptDTO::getQxDeptId, Function.identity(),(o1,o2)->o1));
+    }
+
 }

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

@@ -25,6 +25,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.user.result.GridUserInfoDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import com.epmet.opendata.dao.ExUserDao;
+import com.epmet.opendata.dto.ExUserDTO;
 import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 import com.epmet.opendata.entity.ExUserEntity;
 import com.epmet.opendata.service.ExUserService;
@@ -37,6 +38,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -98,4 +100,16 @@ public class ExUserServiceImpl extends BaseServiceImpl<ExUserDao, ExUserEntity>
 
     }
 
+    @Override
+    public Map<String, ExUserDTO> getUserDTOMap(String customerId) {
+        LambdaQueryWrapper<ExUserEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ExUserEntity::getQxCustomerId, customerId);
+        List<ExUserEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyMap();
+        }
+        List<ExUserDTO> exUserDTOList = ConvertUtils.sourceToTarget(list, ExUserDTO.class);
+        return exUserDTOList.stream().collect(Collectors.toMap(ExUserDTO::getQxUserId, Function.identity(), (key1, key2) -> key1));
+    }
+
 }

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

@@ -0,0 +1,203 @@
+/**
+ * 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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.patrol.PatrolQueryFormDTO;
+import com.epmet.dto.result.PatrolRoutineWorkResult;
+import com.epmet.dto.user.result.MidPatrolRecordResult;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.opendata.dao.PatrolRoutineWorkDao;
+import com.epmet.opendata.dto.ExDeptDTO;
+import com.epmet.opendata.dto.ExUserDTO;
+import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
+import com.epmet.opendata.entity.PatrolRoutineWorkEntity;
+import com.epmet.opendata.entity.UserPatrolDetailEntity;
+import com.epmet.opendata.service.ExDeptService;
+import com.epmet.opendata.service.ExUserService;
+import com.epmet.opendata.service.PatrolRoutineWorkService;
+import com.epmet.opendata.service.UserPatrolDetailService;
+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.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 用户例行工作主记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-14
+ */
+@Slf4j
+@Service
+public class PatrolRoutingWorkServiceImpl extends BaseServiceImpl<PatrolRoutineWorkDao, PatrolRoutineWorkEntity> implements PatrolRoutineWorkService {
+
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Autowired
+    private UserPatrolDetailService userPatrolDetailService;
+    @Autowired
+    private ExDeptService exDeptService;
+    @Autowired
+    private ExUserService exUserService;
+
+    @Override
+    public Boolean insertPatrolRecord(UpsertPatrolRecordForm patrolRecordForm) {
+        log.info("upsertPatrolRecord param:{}", JSON.toJSONString(patrolRecordForm));
+        ValidatorUtils.validateEntity(patrolRecordForm);
+        PatrolQueryFormDTO midPatrolFormDTO = buildParam(patrolRecordForm);
+        Result<List<PatrolRoutineWorkResult>> record = epmetUserOpenFeignClient.getPatrolRoutineWorkList(midPatrolFormDTO);
+        if (record == null || !record.success()) {
+            log.error("获取例行工作记录失败，param:{}", JSON.toJSONString(midPatrolFormDTO));
+            return false;
+        }
+        Map<String, ExDeptDTO> deptMap = exDeptService.getDeptDTOMap(patrolRecordForm.getCustomerId());
+        Map<String, ExUserDTO> userMap = exUserService.getUserDTOMap(patrolRecordForm.getCustomerId());
+        List<PatrolRoutineWorkResult> data = record.getData();
+        if (CollectionUtils.isEmpty(data)) {
+            //数据已被删除了
+            //暂时设置error 用于排错
+            log.error("获取例行工作记录返回为空，param:{}", JSON.toJSONString(midPatrolFormDTO));
+            int effectRow = baseDao.deleteById(patrolRecordForm.getId());
+            log.warn("del effectRow:{}", effectRow);
+            return true;
+        }
+        insertRecordBatch(data,false, deptMap, userMap);
+        return true;
+    }
+
+    @Override
+    public Boolean reloadPatrolData(String customerId) {
+        int pageNo = NumConstant.ONE;
+        int pageSize = NumConstant.ONE_THOUSAND;
+        List<PatrolRoutineWorkResult> resultList = null;
+        Map<String, ExDeptDTO> deptMap = exDeptService.getDeptDTOMap(customerId);
+        Map<String, ExUserDTO> userMap = exUserService.getUserDTOMap(customerId);
+        do {
+            PatrolQueryFormDTO param = new PatrolQueryFormDTO();
+            param.setCustomerId(customerId);
+            param.setPageNo(pageNo++);
+            param.setPageSize(pageSize);
+            Result<List<PatrolRoutineWorkResult>> record = epmetUserOpenFeignClient.getPatrolRoutineWorkList(param);
+            if (record == null || !record.success()) {
+                log.error("获取例行工作记录失败，param:{}", JSON.toJSONString(param));
+                return false;
+            }
+            resultList = record.getData();
+            if (CollectionUtils.isEmpty(resultList)){
+                log.warn("不存在例行工作记录，param:{}", JSON.toJSONString(param));
+                return false;
+            }
+            insertRecordBatch(resultList,true, deptMap, userMap);
+        }while (!CollectionUtils.isEmpty(resultList) && resultList.size()> pageSize );
+
+        return null;
+    }
+    private Boolean insertRecordBatch(List<PatrolRoutineWorkResult> list, boolean isReload, Map<String, ExDeptDTO> deptMap, Map<String, ExUserDTO> userMap){
+        List<PatrolRoutineWorkEntity> insertList = new ArrayList<>();
+        list.forEach(o-> insertList.add(buildEntity(o, deptMap, userMap)));
+        //insert
+        if (CollectionUtils.isEmpty(insertList)){
+            log.error("构建要插入的数据为空，param:{}", JSON.toJSONString(list));
+            return false;
+        }
+        if (isReload){
+            int i = userPatrolDetailService.deleteByCustomerId(list.get(0).getCustomerId());
+            log.info("insertRecordBatch del patrol effectRow:{}",i);
+        }
+        LambdaQueryWrapper<PatrolRoutineWorkEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(PatrolRoutineWorkEntity::getCustomerId, list.get(0).getCustomerId());
+        int delete = baseDao.delete(wrapper);
+        log.info("insertRecordBatch del patrol effectRow:{}",delete);
+        this.saveOrUpdateBatch(insertList, NumConstant.ONE_HUNDRED);
+
+        return true;
+    }
+
+    @NotNull
+    private UserPatrolDetailEntity buildDetailEntity(MidPatrolRecordResult recordResult) {
+        UserPatrolDetailEntity detailEntity = new UserPatrolDetailEntity();
+        detailEntity.setCustomerId(recordResult.getCustomerId());
+        detailEntity.setStaffPatrolRecId(recordResult.getId());
+        detailEntity.setRoute(recordResult.getRoute());
+        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 PatrolRoutineWorkEntity buildEntity(PatrolRoutineWorkResult record, Map<String, ExDeptDTO> deptMap, Map<String, ExUserDTO> userMap) {
+        PatrolRoutineWorkEntity entity = new PatrolRoutineWorkEntity();
+        entity.setCustomerId(record.getCustomerId());
+
+        ExDeptDTO exDeptDTO = deptMap.getOrDefault(record.getGridId(),new ExDeptDTO());
+        entity.setGridId(exDeptDTO.getDeptId() == null ? "":exDeptDTO.getDeptId().toString());
+        entity.setGridName(exDeptDTO.getDeptName());
+
+
+        entity.setFirstWorkType(record.getWorkTypeFirstCode());
+        entity.setSecondWorkType(record.getWorkTypeSecondCode());
+        entity.setEventName(record.getTitle());
+        entity.setHappenTime(record.getHappenTime());
+        entity.setWorkResult(NumConstant.ONE == record.getIsNormal()? "Y":"N");
+        entity.setWorkContent(record.getWorkContent());
+        //业务暂时不支持
+        entity.setKeyAreaType(StrConstant.EPMETY_STR);
+        entity.setRegionScale(StrConstant.EPMETY_STR);
+        entity.setIsKeyareaState(StrConstant.EPMETY_STR);
+        entity.setIsKeyPeopleLocate(NumConstant.ONE == record.getIsKeyPeopleLocate()?"Y":"N");
+        entity.setKeyPeopleStatus(record.getKeyPeopleStatus());
+        entity.setHappenPlace(record.getHappenTime());
+        entity.setLng(record.getLongitude());
+        entity.setLat(record.getLatitude());
+        entity.setFlag(NumConstant.ZERO_STR);
+        entity.setCreateBy(userMap.getOrDefault(record.getCreatedBy(), new ExUserDTO()).getUserId()+"");
+        entity.setCreateTime(record.getCreatedTime());
+        entity.setUpdateBy(userMap.getOrDefault(record.getUpdatedBy(), new ExUserDTO()).getUserId()+"");
+        entity.setUpdateTime(record.getUpdatedTime());
+        entity.setId(record.getId()+"_PY");
+        entity.setDelFlag(NumConstant.ZERO_STR);
+        return entity;
+    }
+
+    @NotNull
+    private PatrolQueryFormDTO buildParam(UpsertPatrolRecordForm patrolRecordForm) {
+        PatrolQueryFormDTO midPatrolFormDTO = new PatrolQueryFormDTO();
+        midPatrolFormDTO.setCustomerId(patrolRecordForm.getCustomerId());
+        midPatrolFormDTO.setId(patrolRecordForm.getId());
+        midPatrolFormDTO.setPageNo(patrolRecordForm.getPageNo());
+        midPatrolFormDTO.setPageSize(patrolRecordForm.getPageSize());
+        return midPatrolFormDTO;
+    }
+}

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

@@ -72,7 +72,7 @@ public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecor
             //数据已被删除了
             //暂时设置error 用于排错
             log.error("获取巡查记录返回为空，param:{}", JSON.toJSONString(midPatrolFormDTO));
-            int effectRow = baseDao.deleteById(patrolRecordForm.getPatrolId());
+            int effectRow = baseDao.deleteById(patrolRecordForm.getId());
             log.warn("del effectRow:{}", effectRow);
             return true;
         }
@@ -102,7 +102,7 @@ public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecor
             //数据已被删除了
             //暂时设置error 用于排错
             log.error("获取巡查记录返回为空，param:{}", JSON.toJSONString(midPatrolFormDTO));
-            int effectRow = baseDao.deleteById(patrolRecordForm.getPatrolId());
+            int effectRow = baseDao.deleteById(patrolRecordForm.getId());
             log.warn("del effectRow:{}", effectRow);
             return true;
         }
@@ -124,8 +124,8 @@ public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecor
 
     @Override
     public Boolean reloadPatrolData(String customerId) {
-        int pageNo = 1;
+        int pageNo = NumConstant.ONE;
-        int pageSize = 1000;
+        int pageSize = NumConstant.ONE_THOUSAND;
         List<MidPatrolRecordResult> resultList = null;
         do {
             MidPatrolFormDTO param = new MidPatrolFormDTO();
@@ -201,7 +201,7 @@ public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecor
     private UserPatrolRecordEntity buildEntity(MidPatrolRecordResult recordResult) {
         UserPatrolRecordEntity entity = new UserPatrolRecordEntity();
         entity.setCustomerId(recordResult.getCustomerId());
-        entity.setGrid(recordResult.getGrid());
+        entity.setGridId(recordResult.getGrid());
         entity.setGridPids(recordResult.getGridPids());
         entity.setStaffId(recordResult.getStaffId());
         entity.setAgencyId(recordResult.getAgencyId());
@@ -227,7 +227,7 @@ public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecor
     private MidPatrolFormDTO buildParam(UpsertPatrolRecordForm patrolRecordForm) {
         MidPatrolFormDTO midPatrolFormDTO = new MidPatrolFormDTO();
         midPatrolFormDTO.setCustomerId(patrolRecordForm.getCustomerId());
-        midPatrolFormDTO.setPatrolId(patrolRecordForm.getPatrolId());
+        midPatrolFormDTO.setObjectId(patrolRecordForm.getId());
         midPatrolFormDTO.setPageNo(patrolRecordForm.getPageNo());
         midPatrolFormDTO.setPageSize(patrolRecordForm.getPageSize());
         return midPatrolFormDTO;

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

@@ -0,0 +1,35 @@
+<?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.PatrolRoutineWorkDao">
+
+    <resultMap type="com.epmet.opendata.entity.PatrolRoutineWorkEntity" id="patrolRoutineWorkMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="firstWorkType" column="FIRST_WORK_TYPE"/>
+        <result property="secondWorkType" column="SECOND_WORK_TYPE"/>
+        <result property="eventName" column="EVENT_NAME"/>
+        <result property="happenTime" column="HAPPEN_TIME"/>
+        <result property="workResult" column="WORK_RESULT"/>
+        <result property="workContent" column="WORK_CONTENT"/>
+        <result property="keyAreaType" column="KEY_AREA_TYPE"/>
+        <result property="regionScale" column="REGION_SCALE"/>
+        <result property="isKeyareaState" column="IS_KEYAREA_STATE"/>
+        <result property="isKeyPeopleLocate" column="IS_KEY_PEOPLE_LOCATE"/>
+        <result property="keyPeopleStatus" column="KEY_PEOPLE_STATUS"/>
+        <result property="happenPlace" column="HAPPEN_PLACE"/>
+        <result property="lng" column="LNG"/>
+        <result property="lat" column="LAT"/>
+        <result property="flag" column="FLAG"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createBy" column="CREATE_BY"/>
+        <result property="createTime" column="CREATE_TIME"/>
+        <result property="updateBy" column="UPDATE_BY"/>
+        <result property="updateTime" column="UPDATE_TIME"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -6,7 +6,7 @@
     <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="gridId" column="GRID"/>
         <result property="gridPids" column="GRID_PIDS"/>
         <result property="staffId" column="STAFF_ID"/>
         <result property="agencyId" column="AGENCY_ID"/>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/patrol/PatrolQueryFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.form.patrol;
+
+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 PatrolQueryFormDTO extends PageFormDTO implements Serializable {
+    private static final long serialVersionUID = 7585836892408288392L;
+    /**
+     * 客户Id
+     */
+    private String customerId;
+    /**
+     * 对象id 没有则查询全部
+     */
+    private String id;
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java

@@ -0,0 +1,78 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * desc:例行工作结果
+ *
+ * @Author zxc
+ * @DateTime 2021/10/19 10:41 上午
+ * @DESC
+ */
+@Data
+public class PatrolRoutineWorkResult implements Serializable {
+
+    private static final long serialVersionUID = 6508374707998213266L;
+    private String id;
+
+    private String customerId;
+
+    private String gridId;
+
+    private String title;
+
+    /**
+     * 一级工作类型 code
+     */
+    private String workTypeFirstCode;
+
+    /**
+     * 耳机工作类型 code
+     */
+    private String workTypeSecondCode;
+
+    private Integer isNormal;
+
+    private String happenTime;
+
+    private String workContent;
+
+    private String address;
+
+    /**
+     * 当事件类型为【特殊人群服务与管理】时必填 重点人员是否在当地
+     */
+    private Integer isKeyPeopleLocate;
+    /**
+     * 当事件类型为【特殊人群服务与管理】时必填 重点人员现状
+     */
+    private String keyPeopleStatus;
+    /**
+     * 经度
+     */
+    private String longitude;
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    private Integer revision;
+
+
+    private String createdBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createdTime;
+
+
+    private String updatedBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updatedTime;
+
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -7,6 +7,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
+import com.epmet.dto.form.patrol.PatrolQueryFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.EpmetUserOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -681,4 +682,12 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping(value = "/epmetuser/user/findicuser")
     Result<EpmetUserFamilyDTO> findIcUser(@RequestBody FindIcUserFormDTO formDTO);
+
+    /**
+     * desc:获取例行工作 数据 分页
+     * @param patrolQueryFormDTO
+     * @return
+     */
+    @PostMapping(value = "//epmetuser/patrolroutinework/selectList")
+    Result<List<PatrolRoutineWorkResult>> getPatrolRoutineWorkList(@RequestBody PatrolQueryFormDTO patrolQueryFormDTO);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -7,6 +7,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
+import com.epmet.dto.form.patrol.PatrolQueryFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 
@@ -499,11 +500,16 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     /**
      * 查找居民端小程序里的用户对应ic里的人。以及家属们
      *
-     * @param epmetUserIdList
+     * @param formDTO
      * @return
      */
     @Override
     public Result<EpmetUserFamilyDTO> findIcUser(FindIcUserFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findIcUser", formDTO);
     }
+
+    @Override
+    public Result<List<PatrolRoutineWorkResult>> getPatrolRoutineWorkList(PatrolQueryFormDTO patrolQueryFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getPatrolRoutineWorkList", patrolQueryFormDTO);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PatrolRoutineWorkController.java

@@ -4,9 +4,17 @@ import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.PatrolRoutineWorkFormDTO;
+import com.epmet.dto.form.patrol.PatrolQueryFormDTO;
+import com.epmet.dto.result.PatrolRoutineWorkResult;
 import com.epmet.service.PatrolRoutineWorkService;
+import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * 例行工作
@@ -21,6 +29,19 @@ public class PatrolRoutineWorkController {
     @Autowired
     private PatrolRoutineWorkService gridUserWorkService;
 
+    /**
+     * @Description  添加例行工作
+     * @param formDTO
+     * @author zxc
+     * @date 2021/10/19 1:35 下午
+     */
+    @NoRepeatSubmit
+    @PostMapping("selectList")
+    public Result<List<PatrolRoutineWorkResult>> gridUserWork(@RequestBody PatrolQueryFormDTO formDTO){
+        formDTO.setPage(false);
+        Page<PatrolRoutineWorkResult> data = gridUserWorkService.listPage(formDTO);
+        return new Result().ok(data.getResult());
+    }
     /**
      * @Description  添加例行工作
      * @param formDTO

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PatrolRoutineWorkDao.java

@@ -18,9 +18,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.patrol.PatrolQueryFormDTO;
+import com.epmet.dto.result.PatrolRoutineWorkResult;
 import com.epmet.entity.PatrolRoutineWorkEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 巡查例行工作
  *
@@ -30,4 +34,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface PatrolRoutineWorkDao extends BaseDao<PatrolRoutineWorkEntity> {
 
+    List<PatrolRoutineWorkResult> selectList(PatrolQueryFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/PatrolRoutineWorkService.java

@@ -19,7 +19,10 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.form.PatrolRoutineWorkFormDTO;
+import com.epmet.dto.form.patrol.PatrolQueryFormDTO;
+import com.epmet.dto.result.PatrolRoutineWorkResult;
 import com.epmet.entity.PatrolRoutineWorkEntity;
+import com.github.pagehelper.Page;
 
 /**
  * 巡查例行工作
@@ -34,4 +37,11 @@ public interface PatrolRoutineWorkService extends BaseService<PatrolRoutineWorkE
      * @param formDTO
      */
     void add(PatrolRoutineWorkFormDTO formDTO);
+
+    /**
+     * desc:分页获取
+     * @param formDTO
+     * @return
+     */
+    Page<PatrolRoutineWorkResult> listPage(PatrolQueryFormDTO formDTO);
 }

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

@@ -34,6 +34,8 @@ import com.epmet.dao.PatrolRoutineWorkDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.PatrolRoutineWorkFormDTO;
+import com.epmet.dto.form.patrol.PatrolQueryFormDTO;
+import com.epmet.dto.result.PatrolRoutineWorkResult;
 import com.epmet.entity.PatrolRoutineWorkEntity;
 import com.epmet.entity.PatrolRoutineWorkTypeEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
@@ -42,6 +44,8 @@ import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.PatrolRoutineWorkService;
 import com.epmet.service.PatrolRoutineWorkTypeService;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -137,6 +141,12 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
 
     }
 
+    @Override
+    public Page<PatrolRoutineWorkResult> listPage(PatrolQueryFormDTO formDTO) {
+      return PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.isPage())
+              .doSelectPage(() -> baseDao.selectList(formDTO));
+    }
+
     /**
      * desc:递归遍历树形结构 构建pids 根节点pids 为空字符串
      *

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

@@ -287,7 +287,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		//发送巡查消息
 		StaffPatrolMQMsg staffPatrolMQMsg = new StaffPatrolMQMsg();
 		staffPatrolMQMsg.setCustomerId(record.getCustomerId());
-		staffPatrolMQMsg.setPatrolId(record.getId());
+		staffPatrolMQMsg.setObjectId(record.getId());
 
 		boolean b = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendPatrolMqMsg(staffPatrolMQMsg,messageType);
 		if (!b) {

epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml

@@ -22,6 +22,17 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="selectList" resultType="com.epmet.dto.result.PatrolRoutineWorkResult">
+        SELECT
+            id, customer_id, grid_id, pids, user_id, title, happen_time, is_normal, work_content,
+            is_key_people_locate, key_people_status, address, longitude, latitude, del_flag,
+            revision, created_by, created_time, updated_by, updated_time
+        FROM epmet_user.patrol_routine_work
+        WHERE  CUSTOMER_ID = #{customerId}
+        <if test="id != null and id != ''">
+            AND ID = #{id}
+        </if>
+    </select>
 
 
 </mapper>