From 97d313bebeec3dcc1eb0f5e813b1e99757b72cc9 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 20 Dec 2024 16:30:42 +0800
Subject: [PATCH] 顶级机构缓存更新
---
skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/cache/SysCache.java | 11 +++++++++++
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/feign/SysClient.java | 5 +++++
skjcmanager/pom.xml | 6 +++---
skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/feign/ISysClientFallback.java | 5 +++++
skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/feign/ISysClient.java | 4 ++++
5 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/pom.xml b/skjcmanager/pom.xml
index 0a4b113..64ec949 100644
--- a/skjcmanager/pom.xml
+++ b/skjcmanager/pom.xml
@@ -159,12 +159,12 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<!--suppress UnresolvedMavenProperty -->
<copy overwrite="true"
- tofile="${session.executionRootDirectory}/target/${project.artifactId}.jar"
+ tofile="${project.basedir}/target/${project.artifactId}.jar"
file="${project.build.directory}/${project.artifactId}.jar" />
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/cache/SysCache.java b/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/cache/SysCache.java
index 4809e35..5c3c548 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/cache/SysCache.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/cache/SysCache.java
@@ -171,6 +171,17 @@
if (deptId == null) {
return null;
}
+
+// if (deptId == 1840217165872553986L) {
+// List<Dept> depts = getSysClient().getDeptAll().getData();
+// List<Long> deptIdList = new ArrayList<>();
+// for (Dept d:depts
+// ) {
+// deptIdList.add(d.getId());
+// }
+// CacheUtil.put(SYS_CACHE, DEPT_CHILDIDS_ID, deptId, deptIdList);
+// }
+
List<Long> deptIdList = CacheUtil.get(SYS_CACHE, DEPT_CHILDIDS_ID, deptId, List.class);
if (deptIdList == null) {
deptIdList = new ArrayList<>();
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/feign/ISysClient.java b/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/feign/ISysClient.java
index 0c784df..1488817 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/feign/ISysClient.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/feign/ISysClient.java
@@ -28,6 +28,7 @@
String DEPT_NAME = API_PREFIX + "/dept-name";
String DEPT_NAMES = API_PREFIX + "/dept-names";
String DEPT_CHILD = API_PREFIX + "/dept-child";
+ String DEPT_ALL = API_PREFIX + "/dept-all";
String POST = API_PREFIX + "/post";
String POST_IDS = API_PREFIX + "/post-ids";
String POST_IDS_FUZZY = API_PREFIX + "/post-ids-fuzzy";
@@ -114,6 +115,9 @@
@GetMapping(DEPT_CHILD)
R<List<Dept>> getDeptChild(@RequestParam("deptId") Long deptId);
+ @GetMapping(DEPT_ALL)
+ R<List<Dept>> getDeptAll();
+
/**
* 获取岗位
*
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/feign/ISysClientFallback.java b/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/feign/ISysClientFallback.java
index c035a5d..792a608 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/feign/ISysClientFallback.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/feign/ISysClientFallback.java
@@ -66,6 +66,11 @@
}
@Override
+ public R<List<Dept>> getDeptAll() {
+ return R.fail("获取数据失败");
+ }
+
+ @Override
public R<Post> getPost(Long id) {
return R.fail("获取数据失败");
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/feign/SysClient.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/feign/SysClient.java
index 3938665..d84fa57 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/feign/SysClient.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/feign/SysClient.java
@@ -94,6 +94,11 @@
}
@Override
+ public R<List<Dept>> getDeptAll() {
+ return R.data(deptService.list());
+ }
+
+ @Override
public R<Post> getPost(Long id) {
return R.data(postService.getById(id));
}
--
Gitblit v1.9.3