From 931bffdccea5e0c1d87d2531e55ff0bf35df22e5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 28 Jul 2021 18:14:00 +0800
Subject: [PATCH] luojishanchu

---
 .../com/epmet/controller/CustomerFootBarController.java  | 4 ++--
 .../src/main/java/com/epmet/dao/CustomerFootBarDao.java  | 2 ++
 .../java/com/epmet/service/CustomerFootBarService.java   | 2 +-
 .../epmet/service/impl/CustomerFootBarServiceImpl.java   | 9 +++++++--
 .../src/main/resources/mapper/CustomerFootBarDao.xml     | 6 ++++++
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFootBarController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFootBarController.java
index 9013c066fd..892ecb89ab 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFootBarController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFootBarController.java
@@ -256,9 +256,9 @@ public class CustomerFootBarController {
      * @return
      */
     @PostMapping("deletefootbar")
-    public Result deleteFootBar(@RequestBody CustomerFootBarFormDTO form) {
+    public Result deleteFootBar(@LoginUser TokenDto tokenDto, @RequestBody CustomerFootBarFormDTO form) {
         ValidatorUtils.validateEntity(form, CustomerFootBarFormDTO.DeleteFootbarsGroup.class);
-        customerFootBarService.deleteFootBar(form.getId());
+        customerFootBarService.deleteFootBar(form.getId(),tokenDto.getUserId());
         return new Result();
     }
 
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFootBarDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFootBarDao.java
index df8c12eec0..035bc5397f 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFootBarDao.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFootBarDao.java
@@ -119,4 +119,6 @@ public interface CustomerFootBarDao extends BaseDao<CustomerFootBarEntity> {
                                     @Param("iconPath")String iconPath,
                                     @Param("selectedIconPath")String selectedIconPath,
                                     @Param("floatIconPath")String floatIconPath);
+
+    int updateFootBarDel(@Param("id") String id, @Param("userId")String userId);
 }
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFootBarService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFootBarService.java
index aa27acbf8b..c40c5651dd 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFootBarService.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFootBarService.java
@@ -118,7 +118,7 @@ public interface CustomerFootBarService extends BaseService<CustomerFootBarEntit
 
     void addDefault4Customer(String customerId, String appType);
 
-    void deleteFootBar(String id);
+    void deleteFootBar(String id,String userId);
 
     /**
      * 校验当前客户是否可以选择浮起footbar模式
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 c7e957e343..6f1e70db5b 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
@@ -271,11 +271,12 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
 
     @Transactional
     @Override
-    public void deleteFootBar(String id) {
+    public void deleteFootBar(String id,String userId) {
         CustomerFootBarEntity defaultFootbar = baseDao.selectById(id);
         // 注释07.28,暂时不要物理删除
         // baseDao.physicsDeleteByAppTypeAndBarKey(defaultFootbar.getAppType(), defaultFootbar.getBarKey(),id);
-        baseDao.deleteById(id);
+        defaultFootbar.setDelFlag("1");
+        baseDao.updateFootBarDel(id,userId);
         // 删除缓存中的footbar。若缓存删除失败，则事务回滚，db中的不应该成功
         redisUtils.delete(RedisKeys.getCustomerFootbarKey(defaultFootbar.getCustomerId(), defaultFootbar.getAppType()));
     }
@@ -380,6 +381,10 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
                 entity.setCustomerId(form.getCustomerId());
                 entity.setOrderIndex(baseDao.fetchNextOrder(form.getCustomerId(), form.getAppType()));
                 entity.setDisplay(true);
+                entity.setCreatedBy(form.getUserId());
+                entity.setUpdatedBy(form.getUserId());
+                entity.setCreatedTime(new Date());
+                entity.setUpdatedTime(new Date());
                 baseDao.insert(entity);
             });
         }
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 d353f465c0..a549ee1c43 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
@@ -281,4 +281,10 @@
             AND BAR_KEY = #{barKey}
             AND DEL_FLAG = '0'
     </update>
+
+    <update id="updateFootBarDel" parameterType="map">
+        UPDATE customer_foot_bar
+        set DEL_FLAG='1',UPDATED_BY = #{userId}, UPDATED_TIME = NOW()
+        where id=#{id}
+    </update>
 </mapper>
\ No newline at end of file