From 1fe596b17666a7411666b8e45f7c18290584a82d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 28 Jul 2021 17:50:10 +0800
Subject: [PATCH] deletefootbar

---
 .../com/epmet/service/impl/CustomerFootBarServiceImpl.java  | 6 +++---
 .../src/main/resources/mapper/CustomerFootBarDao.xml        | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java
index 45d36b77b1..c7e957e343 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java
@@ -273,9 +273,9 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
     @Override
     public void deleteFootBar(String id) {
         CustomerFootBarEntity defaultFootbar = baseDao.selectById(id);
-        // 注释07.28
-        baseDao.physicsDeleteByAppTypeAndBarKey(defaultFootbar.getAppType(), defaultFootbar.getBarKey(),id);
-
+        // 注释07.28,暂时不要物理删除
+        // baseDao.physicsDeleteByAppTypeAndBarKey(defaultFootbar.getAppType(), defaultFootbar.getBarKey(),id);
+        baseDao.deleteById(id);
         // 删除缓存中的footbar。若缓存删除失败，则事务回滚，db中的不应该成功
         redisUtils.delete(RedisKeys.getCustomerFootbarKey(defaultFootbar.getCustomerId(), defaultFootbar.getAppType()));
     }
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFootBarDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFootBarDao.xml
index 2cc22f7ad0..d353f465c0 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFootBarDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFootBarDao.xml
@@ -26,12 +26,14 @@
         update customer_foot_bar
         set ORDER_INDEX = #{orderIndex}
         where ID = #{id}
+        and DEL_FLAG='0'
     </update>
 
     <update id="updateDisplayStatus">
         update customer_foot_bar
         set DISPLAY=#{display}
         where ID = #{id}
+        and DEL_FLAG='0'
     </update>
 
     <!--物理删除-->
@@ -161,6 +163,7 @@
         where CUSTOMER_ID = #{customerId}
           and APP_TYPE = #{appType}
           and BAR_KEY = #{barKey}
+          and DEL_FLAG='0'
     </select>
 
     <select id="listByAppTypeAndCustomerId" resultType="com.epmet.entity.CustomerFootBarEntity">
@@ -191,6 +194,7 @@
         select distinct CUSTOMER_ID
         from customer_foot_bar fb
         where CUSTOMER_ID != 'default'
+        and DEL_FLAG='0'
     </select>
 
     <select id="getByAppTypeAndBarNameOfCustomer" resultType="com.epmet.entity.CustomerFootBarEntity">
@@ -215,6 +219,7 @@
         where CUSTOMER_ID = #{customerId}
           and APP_TYPE = #{appType}
           and BAR_NAME = #{barName}
+          and DEL_FLAG='0'
     </select>
 
     <select id="selectNotOnlineFootBars" parameterType="map" resultType="com.epmet.entity.CustomerFootBarEntity">