Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22' into pingyin_master

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位行政区划代码
      */

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位行政区划代码
      */

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;
 

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;
     }

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

@@ -76,7 +76,6 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
             log.warn("no event data to save table base_conflicts_resolve");
             return;
         }
-        log.debug("sql结果" + list.size());
         List<EventreportPingyinEntity> entityList = list.stream().map(item -> {
             EventreportPingyinEntity entity = new EventreportPingyinEntity();
             entity.setQxBm("370124");
@@ -108,9 +107,6 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
                     }
                 }
             }
-            if (StringUtils.isBlank(entity.getGridUserCardid())) {
-                log.warn("项目" + item.getId() + "的网格员没有身份证ID，舍弃该条数据");
-            }
             entity.setReportTime(item.getReportTime());
             entity.setHappenTime(item.getHappenDate());
             entity.setHappenPlace(item.getHappenPlace());
@@ -139,7 +135,6 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
             }
             return entity;
         }).collect(Collectors.toList());
-        log.debug("数据拼装结果" + entityList);
         //过滤掉必填字段为空的数据
         entityList = entityList.stream().filter(item ->
                 StringUtils.isNotBlank(item.getGridCode()) && StringUtils.isNotBlank(item.getGridName()) &&
@@ -149,7 +144,6 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
                 StringUtils.isNotBlank(item.getGridUserCardid()) && StringUtils.isNotBlank(item.getEventDescription()) &&
                 StringUtils.isNotBlank(item.getWaysOfResolving()) && null != item.getLng() && null != item.getLat()
         ).collect(Collectors.toList());
-        log.debug("数据过滤结果" + entityList.size());
         if (NumConstant.ZERO_STR.equals(initFlag)) {
             entityList.forEach(entity -> {
                 LambdaQueryWrapper<EventreportPingyinEntity> wrapper = new LambdaQueryWrapper<>();

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

@@ -188,12 +188,12 @@
     <springProfile name="prod">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.dao" level="DEBUG"/>
+        <logger name="com.epmet.dao" level="INFO"/>
         <!-- 只打印rocketmq client的日志 -->
         <logger name="RocketmqClient" level="INFO" additivity="false">
             <appender-ref ref="RocketmqClientAppender"/>
         </logger>
-        <root level="DEBUG">
+        <root level="INFO">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>