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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java

@@ -49,7 +49,7 @@ public interface NumConstant {
     BigDecimal ONE_HUNDRED_DECIMAL = new BigDecimal(100);
     BigDecimal ZERO_DECIMAL = new BigDecimal(0);
     int ONE_THOUSAND = 1000;
-    int TEN_THOUSAND = 10000;
+    int THREE_THOUSAND = 3000;
     int MAX = 99999999;
     int EIGHTY_EIGHT = 88;
     int EIGHTY = 80;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/StrUtil.java

@@ -0,0 +1,29 @@
+package com.epmet.commons.tools.utils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * desc:
+ *
+ * @author: LiuJanJun
+ * @date: 2022/7/22 9:45 下午
+ * @version: 1.0
+ */
+public class StrUtil {
+
+    private static final Pattern emoji = Pattern.compile("[\ud83c\udc00-\ud83c\udfff]|[\ud83d\udc00-\ud83d\udfff]|[\u2600-\u27ff]", Pattern.UNICODE_CASE | Pattern.CASE_INSENSITIVE);
+
+    public static String filterEmoji(String source) {
+
+        if (source != null) {
+            Matcher emojiMatcher = emoji.matcher(source);
+            if (emojiMatcher.find()) {
+                source = emojiMatcher.replaceAll("");
+                return source;
+            }
+            return source;
+        }
+        return source;
+    }
+}

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

@@ -23,9 +23,9 @@ public interface GridInfoPingyinDao extends BaseDao<GridInfoPingyinEntity> {
 
     List<GridInfoPingyinEntity> selectByGridCode(String gridCode);
 
-    int updateSomeCol(@Param("id") Long id,
+    int updateSomeCol(@Param("gridCode") String gridCode,
                        @Param("gridName")String gridName,
                        @Param("gridLevel")Integer gridLevel,
                        @Param("lng")BigDecimal lng,
                        @Param("lat")BigDecimal lat);
-}
+}

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

@@ -11,6 +11,7 @@ import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.StrUtil;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.dto.form.patrol.PatrolQueryFormDTO;
@@ -209,6 +210,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());
@@ -225,12 +227,16 @@ public class BaseGridDailyworkServiceImpl extends BaseServiceImpl<BaseGridDailyw
             data.forEach(d -> {
                 GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(d.getGridId());
                 if (null == gridInfo){
-                    throw new EpmetException("未查询到网格信息："+ d.getGridId());
+                    log.warn("未查询到网格信息："+ d.getGridId());
+                    return;
                 }
+                String s = StrUtil.filterEmoji(d.getWorkContent());
+                d.setWorkContent(s);
                 d.setGridCode(gridInfo.getCode());
                 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

@@ -5,6 +5,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.StrUtil;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
 import com.epmet.dto.basereport.result.EventInfoResultDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
@@ -76,7 +77,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");
@@ -84,7 +84,9 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
             entity.setGridCode(item.getOrgCode());
             entity.setGridName(item.getOrgName());
             entity.setEventCode(("py_").concat(item.getId()));
-            entity.setEventName(item.getEventName());
+
+            String eventName = StrUtil.filterEmoji(item.getEventName());
+            entity.setEventName(eventName);
             entity.setEventCategory(item.getEventCategory());
             entity.setGridUserCardid("");
             entity.setGridUserName("");
@@ -108,17 +110,15 @@ 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());
             String eventDescription = item.getEventDescription();
-            //如果不为空 长度控制1000以内
+            //如果不为空 长度控制3000以内
-            if (StringUtils.isNotBlank(eventDescription) && eventDescription.length() > NumConstant.ONE_THOUSAND) {
+            if (StringUtils.isNotBlank(eventDescription) && eventDescription.length() > NumConstant.THREE_THOUSAND) {
-                eventDescription = eventDescription.substring(NumConstant.ZERO, NumConstant.ONE_THOUSAND);
+                eventDescription = eventDescription.substring(NumConstant.ZERO, NumConstant.THREE_THOUSAND);
             }
+            eventDescription = StrUtil.filterEmoji(eventDescription);
             entity.setEventDescription(eventDescription);
             entity.setWaysOfResolving(item.getWaysOfResolving());
             //业务不确定
@@ -139,7 +139,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
             }
             return entity;
         }).collect(Collectors.toList());
-        log.debug("数据拼装结果" + entityList);
+        log.info("数据拼装结果" + entityList);
         //过滤掉必填字段为空的数据
         entityList = entityList.stream().filter(item ->
                 StringUtils.isNotBlank(item.getGridCode()) && StringUtils.isNotBlank(item.getGridName()) &&
@@ -149,7 +149,7 @@ 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());
+        log.info("数据过滤结果" + entityList.size());
         if (NumConstant.ZERO_STR.equals(initFlag)) {
             entityList.forEach(entity -> {
                 LambdaQueryWrapper<EventreportPingyinEntity> wrapper = new LambdaQueryWrapper<>();
@@ -158,8 +158,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
                 if (null == event) {
                     baseDao.insert(entity);
                 } else {
-                    entity.setId(event.getId());
+                    baseDao.update(entity, wrapper);
-                    baseDao.updateById(entity);
                 }
             });
         } else {
@@ -168,4 +167,4 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
 
 
     }
-}
+}

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

@@ -106,7 +106,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
 
                     // 更新网格名称、网格层级、网格中心点的经度，网格中心点纬度
                     for (GridInfoPingyinEntity oigin : orginList) {
-                        baseDao.updateSomeCol(oigin.getId(), entity.getGridName(), entity.getGridLevel(), entity.getLng(), entity.getLat());
+                        baseDao.updateSomeCol(oigin.getGridCode(), entity.getGridName(), entity.getGridLevel(), entity.getLng(), entity.getLat());
                     }
 
                 } else {
@@ -198,7 +198,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
 
                     // 更新网格名称、网格层级、网格中心点的经度，网格中心点纬度
                     for (GridInfoPingyinEntity oigin : orginList) {
-                        baseDao.updateSomeCol(oigin.getId(), entity.getGridName(), entity.getGridLevel(), entity.getLng(), entity.getLat());
+                        baseDao.updateSomeCol(oigin.getGridCode(), entity.getGridName(), entity.getGridLevel(), entity.getLng(), entity.getLat());
                     }
 
                 } else {
@@ -221,4 +221,4 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
     }
 
 
-}
+}

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

@@ -15,7 +15,6 @@ import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.opendata.dao.GridstaffInfoPingyinDao;
 import com.epmet.opendata.dto.form.GridStaffInfoFormDTO;
 import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
-import com.epmet.opendata.entity.ExUserEntity;
 import com.epmet.opendata.entity.GridstaffInfoPingyinEntity;
 import com.epmet.opendata.service.GridstaffInfoPingyinService;
 import lombok.extern.slf4j.Slf4j;
@@ -118,6 +117,7 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
             entity.setGridName(r.getGridName());
             entity.setUserType("01");
             entity.setIsLeave("N");
+            entity.setGridUserId(r.getStaffId());
             if (!"staff_create".equals(formDTO.getType())) {
                 baseDao.edit(entity);
             }else {
@@ -129,4 +129,4 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
     }
 
 
-}
+}

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

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

@@ -33,7 +33,7 @@
 
     <select id="selectByGridCode" parameterType="java.lang.String" resultType="com.epmet.opendata.entity.GridInfoPingyinEntity">
         select g.* from grid_info_pingyin g
-        where g.grid_code = #{gridCode}
+        where g.grid_code = #{gridCode} and is_del = 'N'
     </select>
 
     <update id="updateSomeCol" parameterType="map">
@@ -42,6 +42,6 @@
            grid_level = #{gridLevel},
            lng = #{lng},
            lat = #{lat}
-        where id = #{id}
+        where grid_code = #{gridCode} and is_del = 'N'
     </update>
-</mapper>
+</mapper>