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

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"/>