From eb8f40088f0b4ee44da4f7f00674278ce1e21347 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 22 Jul 2022 20:23:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendata/entity/EventreportPingyinEntity.java     |  7 -------
 .../epmet/opendata/entity/GridInfoPingyinEntity.java  |  7 -------
 .../opendata/entity/GridstaffInfoPingyinEntity.java   | 11 ++---------
 .../service/impl/BaseGridDailyworkServiceImpl.java    |  2 ++
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java
index 84cddbe1d3..0dc15d325a 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java
@@ -1,8 +1,6 @@
 package com.epmet.opendata.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -22,11 +20,6 @@ public class EventreportPingyinEntity {
 
 	private static final long serialVersionUID = 1L;
 
-    /**
-     * 数据库主键自增字段，请勿指定
-     */
-	private Long id;
-
     /**
      * 上报区县代码，参照6位行政区划代码
      */
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridInfoPingyinEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridInfoPingyinEntity.java
index 6051db5f01..9f64f9175d 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridInfoPingyinEntity.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridInfoPingyinEntity.java
@@ -1,8 +1,6 @@
 package com.epmet.opendata.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -22,11 +20,6 @@ public class GridInfoPingyinEntity {
 
 	private static final long serialVersionUID = 1L;
 
-    /**
-     * 数据库主键自增字段，请勿指定
-     */
-	private Long id;
-
     /**
      * 上报区县代码，参照6位行政区划代码
      */
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridstaffInfoPingyinEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridstaffInfoPingyinEntity.java
index 0a53873f89..ef5fc9d982 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridstaffInfoPingyinEntity.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridstaffInfoPingyinEntity.java
@@ -1,8 +1,6 @@
 package com.epmet.opendata.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -21,11 +19,6 @@ public class GridstaffInfoPingyinEntity {
 
 	private static final long serialVersionUID = 1L;
 
-    /**
-     * 数据库主键自增字段，请勿指定
-     */
-	private Long id;
-
     /**
      * 上报区县代码，参照6位行政区划代码
      */
@@ -97,7 +90,7 @@ public class GridstaffInfoPingyinEntity {
 	private String education;
 
     /**
-     * 入职时间，格式为“YYYY-MM-DD” 
+     * 入职时间，格式为“YYYY-MM-DD”
      */
 	private Date entryDate;
 
@@ -107,7 +100,7 @@ public class GridstaffInfoPingyinEntity {
 	private String isLeave;
 
     /**
-     * 离职时间，格式为“YYYY-MM-DD” 
+     * 离职时间，格式为“YYYY-MM-DD”
      */
 	private Date leaveDate;
 
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java
index bcb4df6f14..4cc15727fb 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java
@@ -209,6 +209,7 @@ public class BaseGridDailyworkServiceImpl extends BaseServiceImpl<BaseGridDailyw
         List<PatrolRoutineWorkResult> data;
         do {
             Result<List<PatrolRoutineWorkResult>> record = epmetUserOpenFeignClient.getPatrolRoutineWorkListV2(midPatrolFormDTO);
+            midPatrolFormDTO.setPageNo(midPatrolFormDTO.getPageNo() + 1);
             if (record == null || !record.success()) {
                 log.error("获取例行工作记录V2失败，param:{}", JSON.toJSONString(midPatrolFormDTO));
                 throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode());
@@ -231,6 +232,7 @@ public class BaseGridDailyworkServiceImpl extends BaseServiceImpl<BaseGridDailyw
                 d.setGridName(gridInfo.getGridName());
             });
             insertNewRecordBatch(data);
+
         }while (data.size() == NumConstant.ONE_THOUSAND);
         return true;
     }