From d29cce61fb3a38f9f57a64a2a20d276b0d1254bc Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期六, 16 九月 2023 11:54:24 +0800
Subject: [PATCH] es的增加索引和查询已经写好了，可以直接调用了
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 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 66a01c0..7fe58d2 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
@@ -17,6 +17,7 @@
import com.ruoyi.service.ZAuthorityService;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfEconomyService;
+import com.ruoyi.service.ZfLogService;
import com.ruoyi.util.ArraysUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -24,6 +25,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -51,6 +53,9 @@
@Resource
ZAuthorityService zAuthorityService;
+
+ @Resource
+ ZfEconomyMapper zfEconomyMapper;
private LambdaQueryWrapper<ZfEconomy> buildCondition(ZfEconomy zfEconomy,List<Long> familyIdList) {
LambdaQueryWrapper<ZfEconomy> lqw = new LambdaQueryWrapper<>();
@@ -304,7 +309,7 @@
bean.setOwnData(0);
}
}
- ).collect(Collectors.toList());
+ ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList());
}
@@ -402,6 +407,9 @@
}
}
+ @Resource
+ ZfLogService zfLogService;
+
@Override
public AjaxResult updateData(ZfEconomy zfEconomy) {
ZInfoUser myself = zInfoUserService.getMyself();
@@ -417,6 +425,13 @@
if (dataFamilyId!=null && !familyIdList.contains(dataFamilyId)) {
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
+
+ //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+ ZfLog zfLog = new ZfLog();
+ zfLog.setUpdateTime(LocalDateTime.now());
+ zfLog.setModule("瀹跺涵鏀舵敮鍙拌处");
+ zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+ zfLogService.save(zfLog);
if(updateById(zfEconomy)){
return AjaxResult.success();
@@ -449,5 +464,11 @@
}
}
+ @Override
+ public AjaxResult listType() {
+ List<String> result = zfEconomyMapper.listType();
+ return AjaxResult.success(result);
+ }
+
}
--
Gitblit v1.9.1