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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerGridEntity.java

@@ -86,4 +86,9 @@ public class CustomerGridEntity extends BaseEpmetEntity {
 	 */
 	private String syncFlag;
 
+	/**
+	 * 弃用标记
+	 */
+	private Integer abandonFlag;
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java

@@ -17,6 +17,7 @@
 
 package com.epmet.entity.stats;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -59,4 +60,10 @@ public class DimGridEntity extends BaseEpmetEntity {
 
 	private String code;
 
+	/**
+	 * 弃用标记
+	 */
+	@TableField(exist = false)
+	private Integer abandonFlag;
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java

@@ -112,6 +112,7 @@ public class StatsDimServiceImpl implements StatsDimService {
                     dimGrid.setAreaCode(updatedGrid.getAreaCode());
                     dimGrid.setCustomerId(updatedGrid.getCustomerId());
                     dimGrid.setCode(updatedGrid.getCode());
+                    dimGrid.setAbandonFlag(updatedGrid.getAbandonFlag());
                     dimGrids.add(dimGrid);
                 }
             }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java

@@ -130,7 +130,7 @@ public class DimGridServiceImpl extends BaseServiceImpl<DimGridDao, DimGridEntit
 
         for (DimGridEntity updatedGridDim : changedGrids) {
             baseDao.updateById(updatedGridDim);
-            if ("1".equals(updatedGridDim.getDelFlag())) {
+            if ("1".equals(updatedGridDim.getDelFlag()) || updatedGridDim.getAbandonFlag().compareTo(1) == 0) {
                 // 如果已经被删除了，那么这里也做删除操作
                 baseDao.deleteById(updatedGridDim.getId());
             }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml

@@ -68,7 +68,8 @@
         manage_district,
         total_user,
         pid,
-        pids
+        pids,
+        ABANDON_FLAG
         FROM customer_grid
         WHERE  SYNC_FLAG='1'
         AND CREATED_TIME <![CDATA[<]]> #{startTime}