Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

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

@@ -17,6 +17,8 @@
 
 package com.epmet.opendata.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -50,4 +52,10 @@ public class UserPatrolDetailEntity extends BaseEpmetEntity {
      */
 	private String route;
 
+	/**
+	 * 是否已删除(0-未删除，1-已删除)
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String delFlag;
+
 }

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

@@ -17,8 +17,9 @@
 
 package com.epmet.opendata.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -103,4 +104,10 @@ public class UserPatrolRecordEntity extends BaseEpmetEntity {
      */
 	private String status;
 
+	/**
+	 * 是否已删除(0-未删除，1-已删除)
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String delFlag;
+
 }

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

@@ -18,6 +18,7 @@
 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.utils.Result;
@@ -165,8 +166,13 @@ public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecor
             return false;
         }
         if (isReload){
-            userPatrolDetailService.deleteByCustomerId(list.get(0).getCustomerId());
+            int i = userPatrolDetailService.deleteByCustomerId(list.get(0).getCustomerId());
+            log.info("insertRecordBatch del patrol effectRow:{}",i);
         }
+        LambdaQueryWrapper<UserPatrolRecordEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(UserPatrolRecordEntity::getCustomerId, list.get(0).getCustomerId());
+        int delete = baseDao.delete(wrapper);
+        log.info("insertRecordBatch del patrol effectRow:{}",delete);
         this.insertBatch(insertList, NumConstant.ONE_HUNDRED);
         List<UserPatrolDetailEntity> insertDetailList = new ArrayList<>();
         list.forEach(o-> {