From 18975859f0cd4889073b4ea582c175a46e2fcba6 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期三, 06 九月 2023 13:36:12 +0800
Subject: [PATCH] 4238789

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java |   46 +++++++++++++++++++++++++++++-----------------
 1 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
index f5e0788..415f1c4 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
@@ -19,6 +19,7 @@
 import com.ruoyi.service.ZAuthorityService;
 import com.ruoyi.service.ZInfoUserService;
 import com.ruoyi.service.ZfCollectionService;
+import com.ruoyi.service.ZfLogService;
 import com.ruoyi.util.ArraysUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -26,6 +27,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -54,6 +56,9 @@
 
     @Resource
     ZfCollectionMapper zfCollectionMapper;
+
+    @Resource
+    ZfLogService zfLogService;
 
     private LambdaQueryWrapper<ZfCollection> buildCondition(ZfCollection zfCollection,List<Long> familyIdList) {
         LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
@@ -403,24 +408,31 @@
 
         //鍏堣褰曚笅璋佹洿鏂般�佷綍鏃舵洿鏂般�佹洿鏂颁簡鍝噷
 
-        LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(ZfCollection::getId,zfCollection.getId());
-        zfCollectionService.getOne(lqw);
-        ZfCollection oldData = getOne(lqw);
+//        LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
+//        lqw.eq(ZfCollection::getId,zfCollection.getId());
+//        zfCollectionService.getOne(lqw);
+//        ZfCollection oldData = getOne(lqw);
+//
+//        String oldJson = JSONObject.toJSONString(oldData);
+//        String newJson = JSONObject.toJSONString(zfCollection);
+//
+//        Map oldMap = JSONObject.parseObject(oldJson, Map.class);
+//        Map newMap = JSONObject.parseObject(newJson, Map.class);
+//
+//        for (Object key : oldMap.keySet()) {
+//            if(newMap.get(key)!=null && !newMap.get(key).equals(oldMap.get(key))){
+//                System.out.println(newMap.get(key)+"     "+oldMap.get(key));
+//                Date date = new Date();
+//                System.out.println("鐢ㄦ埛"+myself.getNickName()+"鍦�"+date+"杩欎釜鏃堕棿"+"淇敼浜�<鏀惰棌鑽h獕>妯″潡鐨�"+key+"瀛楁");
+//            }
+//        }
 
-        String oldJson = JSONObject.toJSONString(oldData);
-        String newJson = JSONObject.toJSONString(zfCollection);
-
-        Map oldMap = JSONObject.parseObject(oldJson, Map.class);
-        Map newMap = JSONObject.parseObject(newJson, Map.class);
-
-        for (Object key : oldMap.keySet()) {
-            if(newMap.get(key)!=null && !newMap.get(key).equals(oldMap.get(key))){
-                System.out.println(newMap.get(key)+"     "+oldMap.get(key));
-                Date date = new Date();
-                System.out.println("鐢ㄦ埛"+myself.getNickName()+"鍦�"+date+"杩欎釜鏃堕棿"+"淇敼浜�<鏀惰棌鑽h獕>妯″潡鐨�"+key+"瀛楁");
-            }
-        }
+        //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+        ZfLog zfLog = new ZfLog();
+        zfLog.setUpdateTime(LocalDateTime.now());
+        zfLog.setModule("鏀惰棌鑽h獕");
+        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+        zfLogService.save(zfLog);
 
 
         if(updateById(zfCollection)){

--
Gitblit v1.9.1