From a03da0bc1df3eee69d28daf4ad3f66f7153e9f8a Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 26 May 2021 16:42:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=9A=E5=8A=A1=E5=BA=93?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AEdel=5Fflag=3D1=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E8=AE=A1=E5=BA=93=E7=9A=84=E7=BB=B4=E5=BA=A6?=
 =?UTF-8?q?=E8=A1=A8del=5Fflag=E6=97=A0=E6=B3=95=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/StatsDimServiceImpl.java | 4 ++++
 .../epmet/service/stats/impl/DimAgencyServiceImpl.java   | 9 +++++++++
 .../epmet/service/stats/impl/DimCustomerServiceImpl.java | 4 ++++
 .../service/stats/impl/DimDepartmentServiceImpl.java     | 6 ++++++
 .../com/epmet/service/stats/impl/DimGridServiceImpl.java | 4 ++++
 5 files changed, 27 insertions(+)

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 09db5e717d..0fd1ff8e36 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
@@ -106,6 +106,10 @@ public class StatsDimServiceImpl implements StatsDimService {
                     dimGrid.setGridName(updatedGrid.getGridName());
                     dimGrid.setUpdatedTime(now);
                     dimGrid.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
+                    dimGrid.setDelFlag(updatedGrid.getDelFlag());
+                    dimGrid.setAgencyId(updatedGrid.getPid());
+                    dimGrid.setAreaCode(updatedGrid.getAreaCode());
+                    dimGrid.setCustomerId(updatedGrid.getCustomerId());
                     dimGrids.add(dimGrid);
                 }
             }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java
index f0f530fa4f..26287ef487 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java
@@ -139,9 +139,18 @@ public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgenc
             if (existsDimAgency != null) {
                 //说明是已存在的，不是新增的
                 existsDimAgency.setAgencyName(agency.getOrganizationName());
+                existsDimAgency.setAllParentName(agency.getAllParentName());
+                existsDimAgency.setCustomerId(agency.getCustomerId());
+                existsDimAgency.setLevel(agency.getLevel());
+                existsDimAgency.setPid(agency.getPid());
+                existsDimAgency.setPids(agency.getPids());
                 existsDimAgency.setUpdatedTime(initTime);
                 existsDimAgency.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
                 baseDao.updateById(existsDimAgency);
+
+                if ("1".equals(agency.getDelFlag())) {
+                    baseDao.deleteById(agency.getId());
+                }
             }
         }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerServiceImpl.java
index feae456fb3..ffc7a465fc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerServiceImpl.java
@@ -146,6 +146,10 @@ public class DimCustomerServiceImpl extends BaseServiceImpl<DimCustomerDao, DimC
                 existsCustomerDim.setUpdatedTime(initTime);
                 existsCustomerDim.setAreaCode(updatedCustomer.getAreaCode());
                 baseDao.updateById(existsCustomerDim);
+
+                if ("1".equals(updatedCustomer.getDelFlag())) {
+                    baseDao.deleteById(updatedCustomer.getId());
+                }
             }
         }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java
index 5b05345a16..28d1026a17 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java
@@ -132,9 +132,15 @@ public class DimDepartmentServiceImpl extends BaseServiceImpl<DimDepartmentDao,
             DimDepartmentEntity dimDepartment = baseDao.selectById(updatedDepartment.getId());
             if (dimDepartment != null) {
                 dimDepartment.setDepartmentName(updatedDepartment.getDepartmentName());
+                dimDepartment.setAgencyId(updatedDepartment.getAgencyId());
+                dimDepartment.setCustomerId(updatedDepartment.getCustomerId());
                 dimDepartment.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
                 dimDepartment.setUpdatedTime(initTime);
                 baseDao.updateById(dimDepartment);
+
+                if ("1".equals(updatedDepartment.getDelFlag())) {
+                    baseDao.deleteById(updatedDepartment.getId());
+                }
             }
         }
 
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 a08e0af4ba..df149feb02 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
@@ -128,6 +128,10 @@ public class DimGridServiceImpl extends BaseServiceImpl<DimGridDao, DimGridEntit
 
         for (DimGridEntity updatedGridDim : changedGrids) {
             baseDao.updateById(updatedGridDim);
+            if ("1".equals(updatedGridDim.getDelFlag())) {
+                // 如果已经被删除了，那么这里也做删除操作
+                baseDao.deleteById(updatedGridDim.getId());
+            }
         }
 
         lastExecRecordDao.updateExecTimeBySubject(new Date(), StatsSubject.DIM_GRID);