From 5418ea7855d16dcc0169d5ed554f7a23c4b55532 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 十二月 2025 10:37:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 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..4ed3f1c 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
@@ -18,6 +18,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;
@@ -40,7 +42,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,8 +78,15 @@
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.like(StringUtils.isNotEmpty(zfEconomy.getCompanion()),ZfEconomy::getCompanion,zfEconomy.getCompanion());
+// if (zfEconomy.getYear() != 0) {
+// System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+zfEconomy.getYear());
+// lqw.apply("YEAR(happen_time) = {0}", zfEconomy.getYear());
+// }
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;
}
@@ -425,6 +434,9 @@
@Override
public AjaxResult addData(ZfEconomy zfEconomy) {
+ //娓呴櫎redis涓瓃fEconomy鐨勭紦瀛�
+ clearAllCache();
+
ZInfoUser myself = zInfoUserService.getMyself();
Long familyId = myself.getFamilyId();
@@ -479,6 +491,9 @@
@Override
public AjaxResult updateData(ZfEconomy zfEconomy) {
+ //娓呴櫎redis涓瓃fEconomy鐨勭紦瀛�
+ clearAllCache();
+
ZInfoUser myself = zInfoUserService.getMyself();
Long familyId = myself.getFamilyId();
@@ -600,4 +615,24 @@
}
+ @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);
+ System.out.println("ssssss"+zfEconomy);
+ return selectByCondition(zfEconomy);
+ }
+
+ @CacheEvict(value = "economy_search", allEntries = true)
+ public void clearAllCache() {
+ System.out.println("娓呴櫎鎵�鏈夌粡娴庢悳绱㈢紦瀛�");
+ }
}
--
Gitblit v1.9.1