From 316fcdcd25860655c17f1aebf936f5c2b8fd8c81 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 16 Mar 2022 15:20:39 +0800
Subject: [PATCH] dimGrid

---
 .../main/java/com/epmet/entity/org/CustomerGridEntity.java | 5 +++++
 .../main/java/com/epmet/entity/stats/DimGridEntity.java    | 7 +++++++
 .../java/com/epmet/service/impl/StatsDimServiceImpl.java   | 1 +
 .../com/epmet/service/stats/impl/DimGridServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/org/CustomerGridDao.xml      | 3 ++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerGridEntity.java
index ba86713249..76dee40a36 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerGridEntity.java
+++ b/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;
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java
index 2d3fc94740..4db45eaef7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java
+++ b/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;
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
index d9081c7c6f..b1a1511740 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
+++ b/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);
                 }
             }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java
index 0a0fb86ecf..5de49ca847 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java
+++ b/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());
             }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
index adcaf8e50d..830dbbfdf9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
+++ b/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}