From c8668a4a71987199e610781e7ac8cc02faa4f082 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 16 十二月 2025 22:12:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java |   67 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 1 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
index 0b82238..6655de3 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -18,6 +19,8 @@
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -26,6 +29,7 @@
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static com.ruoyi.constant.MenuAuthority.*;
@@ -40,7 +44,7 @@
  */
 @Service
 @Slf4j
-public class ZfEconomyServiceImpl extends ServiceImpl<ZfEconomyMapper, ZfEconomy> implements ZfEconomyService {
+public class ZfEconomyServiceImpl extends ServiceImpl<ZfEconomyMapper, ZfEconomy> implements ZfEconomyService,ModuleSearchable{
     @Resource
     ZfEconomyService zfEconomyService;
 
@@ -76,10 +80,41 @@
         lqw.like(StringUtils.isNotEmpty(zfEconomy.getUsePeople()),ZfEconomy::getUsePeople,zfEconomy.getUsePeople());
         lqw.like(StringUtils.isNotEmpty(zfEconomy.getBalance()),ZfEconomy::getBalance,zfEconomy.getBalance());
         lqw.like(StringUtils.isNotEmpty(zfEconomy.getRemark()),ZfEconomy::getRemark,zfEconomy.getRemark());
+//        lqw.in(StringUtils.isNotEmpty(zfEconomy.getCompanionList()),ZfEconomy::getCompanion,zfEconomy.getCompanionList());
+//        if (zfEconomy.getYear() != 0) {
+//            System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+zfEconomy.getYear());
+//            lqw.apply("YEAR(happen_time) = {0}", zfEconomy.getYear());
+//        }
+
+            if (CollectionUtils.isNotEmpty(zfEconomy.getCompanionList())) {
+                List<String> companionList = zfEconomy.getCompanionList();
+
+                // 娓呯悊鍜屽幓閲�
+                companionList = companionList.stream()
+                    .map(String::trim)
+                    .filter(s -> !s.isEmpty())
+                    .distinct()
+                    .collect(Collectors.toList());
+
+                if (!companionList.isEmpty()) {
+                    // 纭繚鎵�鏈夊弬涓庝汉閮藉湪companion瀛楁涓�
+                    for (String companion : companionList) {
+                        lqw.apply("FIND_IN_SET({0}, REPLACE(REPLACE(companion, ' ', ''), '锛�', ',')) > 0",
+                            companion);
+                    }
+                }
+            }
+
+
+
+
         lqw.eq(zfEconomy.getHappenTime() != null, ZfEconomy::getHappenTime, zfEconomy.getHappenTime());
         lqw.between(zfEconomy.getHappenStartTime() != null && zfEconomy.getHappenEndTime() != null, ZfEconomy::getHappenTime, zfEconomy.getHappenStartTime(), zfEconomy.getHappenEndTime());
+        System.out.println("鏌ヨ鏉′欢: " + lqw.getCustomSqlSegment());
+
         return lqw;
     }
+
 
     private LambdaQueryWrapper<ZfEconomy> uniqueCondition(ZfEconomy zfEconomy) {
         LambdaQueryWrapper<ZfEconomy> lqw = new LambdaQueryWrapper<>();
@@ -425,6 +460,9 @@
 
     @Override
     public AjaxResult addData(ZfEconomy zfEconomy) {
+        //娓呴櫎redis涓瓃fEconomy鐨勭紦瀛�
+        clearAllCache();
+
         ZInfoUser myself = zInfoUserService.getMyself();
         Long familyId = myself.getFamilyId();
 
@@ -479,6 +517,9 @@
 
     @Override
     public AjaxResult updateData(ZfEconomy zfEconomy) {
+        //娓呴櫎redis涓瓃fEconomy鐨勭紦瀛�
+        clearAllCache();
+
         ZInfoUser myself = zInfoUserService.getMyself();
         Long familyId = myself.getFamilyId();
 
@@ -600,4 +641,28 @@
     }
 
 
+    @Override
+    public String getModuleCode() {
+        return "2045";
+    }
+
+    @Override
+    @Cacheable(value = "economy_search", key = "T(String).format('2045_%s_%s_%s',#companion != null ? #companion : 'null',#happenStartTime != null ? #happenStartTime.getTime() : 0,#happenEndTime != null ? #happenEndTime.getTime() : 0)")
+    public List<?> search(String companion, Date happenStartTime,Date happenEndTime) {
+        ZfEconomy zfEconomy = new ZfEconomy();
+        zfEconomy.setCompanion(companion);
+        zfEconomy.setHappenStartTime(happenStartTime);
+        zfEconomy.setHappenEndTime(happenEndTime);
+
+        String[] split = companion.split(",");
+        List<String> list = Arrays.asList(split);
+
+        zfEconomy.setCompanionList(list);
+        return selectByCondition(zfEconomy);
+    }
+
+    @CacheEvict(value = "economy_search", allEntries = true)
+    public void clearAllCache() {
+        System.out.println("娓呴櫎鎵�鏈夌粡娴庢悳绱㈢紦瀛�");
+    }
 }

--
Gitblit v1.9.1