gitee/snowy
1
0
Fork 0
mirror of https://gitee.com/xiaonuobase/snowy.git synced 2026-03-22 02:37:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

【更新】机构大数据优化（待完善）

Browse Source
This commit is contained in:
xuyuxiang
2026-02-27 16:56:51 +08:00
parent 23e4ad1cb0
commit 32d9e60fe1
15 changed files with 88 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
snowy-admin-web/src/views/biz/org/form.vue
View File

@@ -192,6 +192,11 @@
}
// 传递设计器需要的API
const selectorApiFunction = {
orgTreeApi: (param) => {
return bizOrgApi.orgTreeLazySelector(param).then((data) => {
return Promise.resolve(data)
})
},
orgTreeLazyApi: (param) => {
return bizOrgApi.orgTreeLazySelector(param).then((data) => {
return Promise.resolve(data)

1
snowy-admin-web/src/views/biz/org/index.vue
View File

@@ -15,6 +15,7 @@
<a-tree
v-else-if="treeData.length > 0"
v-model:expandedKeys="defaultExpandedKeys"
:show-line="{ showLeafIcon: false }"
:tree-data="treeData"
:field-names="treeFieldNames"
:load-data="searchMode ? undefined : onLoadData"

1
snowy-admin-web/src/views/biz/position/index.vue
View File

@@ -15,6 +15,7 @@
<a-tree
v-else-if="treeData.length > 0"
v-model:expandedKeys="defaultExpandedKeys"
:show-line="{ showLeafIcon: false }"
:tree-data="treeData"
:field-names="treeFieldNames"
:load-data="searchMode ? undefined : onLoadData"

15
snowy-admin-web/src/views/biz/user/form.vue
View File

@@ -51,13 +51,10 @@
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
placeholder="请选择机构"
allow-clear
tree-line
:tree-data="treeData"
:tree-default-expanded-keys="treeDefaultExpandedKeys"
:field-names="{
children: 'children',
label: 'name',
value: 'id'
}"
:field-names="treeFieldNames"
:load-data="onLoadData"
@change="selePositionData(formData.orgId, 0)"
/>
@@ -131,12 +128,12 @@
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
placeholder="请选择机构"
allow-clear
tree-default-expand-all
tree-line
:tree-data="treeData"
:tree-default-expanded-keys="treeDefaultExpandedKeys"
:field-names="{ children: 'children', label: 'name', value: 'id' }"
:field-names="treeFieldNames"
:load-data="onLoadData"
@select="childOrgSelect(positionInfo, 0, index)"
@change="childOrgSelect(positionInfo, 0, index)"
/>
</a-form-item>
</a-col>
@@ -320,7 +317,7 @@
const xnChildUserPageSelectRef = ref()
// 表单数据
const formData = ref({})
const treeFieldNames = { children: 'children', title: 'dictLabel', key: 'id' }
const treeFieldNames = { children: 'children', label: 'name', key: 'id', value: 'id' }
// 在树中递归查找节点
const findNodeInTree = (nodes, id) => {

1
snowy-admin-web/src/views/biz/user/index.vue
View File

@@ -15,6 +15,7 @@
<a-tree
v-else-if="treeData.length > 0"
v-model:expandedKeys="defaultExpandedKeys"
:show-line="{ showLeafIcon: false }"
:tree-data="treeData"
:field-names="treeFieldNames"
:load-data="searchMode ? undefined : onLoadData"

5
snowy-admin-web/src/views/sys/org/form.vue
View File

@@ -191,6 +191,11 @@
}
// 传递设计器需要的API
const selectorApiFunction = {
orgTreeApi: (param) => {
return orgApi.orgOrgTreeLazySelector(param).then((data) => {
return Promise.resolve(data)
})
},
orgTreeLazyApi: (param) => {
return orgApi.orgOrgTreeLazySelector(param).then((data) => {
return Promise.resolve(data)

1
snowy-admin-web/src/views/sys/org/index.vue
View File

@@ -15,6 +15,7 @@
<a-tree
v-else-if="treeData.length > 0"
v-model:expandedKeys="defaultExpandedKeys"
:show-line="{ showLeafIcon: false }"
:tree-data="treeData"
:field-names="treeFieldNames"
:load-data="searchMode ? undefined : onLoadData"

1
snowy-admin-web/src/views/sys/position/index.vue
View File

@@ -15,6 +15,7 @@
<a-tree
v-else-if="treeData.length > 0"
v-model:expandedKeys="defaultExpandedKeys"
:show-line="{ showLeafIcon: false }"
:tree-data="treeData"
:field-names="treeFieldNames"
:load-data="searchMode ? undefined : onLoadData"

1
snowy-admin-web/src/views/sys/role/index.vue
View File

@@ -15,6 +15,7 @@
<a-tree
v-else-if="treeData.length > 0"
v-model:expandedKeys="defaultExpandedKeys"
:show-line="{ showLeafIcon: false }"
:tree-data="treeData"
:field-names="treeFieldNames"
:load-data="searchMode ? undefined : onLoadData"

13
snowy-admin-web/src/views/sys/user/form.vue
View File

@@ -51,13 +51,10 @@
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
placeholder="请选择组织"
allow-clear
tree-line
:tree-data="treeData"
:tree-default-expanded-keys="treeDefaultExpandedKeys"
:field-names="{
children: 'children',
label: 'name',
value: 'id'
}"
:field-names="treeFieldNames"
:load-data="onLoadData"
@change="selePositionData(formData.orgId, 0)"
/>
@@ -131,12 +128,12 @@
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
placeholder="请选择组织"
allow-clear
tree-default-expand-all
tree-line
:tree-data="treeData"
:tree-default-expanded-keys="treeDefaultExpandedKeys"
:field-names="treeFieldNames"
:load-data="onLoadData"
@select="childOrgSelect(positionInfo, 0, index)"
@change="childOrgSelect(positionInfo, 0, index)"
/>
</a-form-item>
</a-col>
@@ -320,7 +317,7 @@
const xnChildUserPageSelectRef = ref()
// 表单数据
const formData = ref({})
const treeFieldNames = { children: 'children', title: 'name', key: 'id' }
const treeFieldNames = { children: 'children', label: 'name', key: 'id', value: 'id' }
// 在树中递归查找节点
const findNodeInTree = (nodes, id) => {

1
snowy-admin-web/src/views/sys/user/index.vue
View File

@@ -15,6 +15,7 @@
<a-tree
v-else-if="treeData.length > 0"
v-model:expandedKeys="defaultExpandedKeys"
:show-line="{ showLeafIcon: false }"
:tree-data="treeData"
:field-names="treeFieldNames"
:load-data="searchMode ? undefined : onLoadData"

6
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/core/listener/BizDataChangeListener.java
View File

@@ -37,6 +37,9 @@ public class BizDataChangeListener implements CommonDataChangeListener {
@Override
public void doAddWithDataId(String dataType, String dataId) {
if(dataType.equals(BizDataTypeEnum.ORG.getValue())) {
bizOrgService.clearOrgCache();
}
}
@Override
@@ -56,6 +59,9 @@ public class BizDataChangeListener implements CommonDataChangeListener {
@Override
public void doUpdateWithDataId(String dataType, String dataId) {
if(dataType.equals(BizDataTypeEnum.ORG.getValue())) {
bizOrgService.clearOrgCache();
}
}
@Override

41
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java
View File

@@ -68,6 +68,9 @@ public class BizOrgServiceImpl extends ServiceImpl<BizOrgMapper, BizOrg> impleme
private static final String ORG_ALL_LIST_CACHE_KEY = "biz-org:all-list";
/** 本地内存缓存，避免每次从Redis取出后JSON反序列化大量记录（与SysOrg对齐） */
private volatile List<BizOrg> localOrgListCache;
/** 机构数据版本号缓存key，机构增删改时递增，用于使 visibleOrgIds 缓存自动失效 */
private static final String ORG_CACHE_VERSION_KEY = "biz-org:cache-version";
@@ -246,11 +249,8 @@ public class BizOrgServiceImpl extends ServiceImpl<BizOrgMapper, BizOrg> impleme
this.save(bizOrg);
// 插入扩展信息
bizOrgExtService.createExtInfo(bizOrg.getId(), sourceFromType);
// 发布增加事件
// 发布增加事件（BizDataChangeListener 和 SysDataChangeListener 监听后自动清缓存）
CommonDataChangeEventCenter.doAddWithData(BizDataTypeEnum.ORG.getValue(), JSONUtil.createArray().put(bizOrg));
// 清除缓存
this.invalidateOrgCaches();
sysOrgApi.clearOrgCache();
}
@Transactional(rollbackFor = Exception.class)
@@ -285,11 +285,8 @@ public class BizOrgServiceImpl extends ServiceImpl<BizOrgMapper, BizOrg> impleme
}
// 更新机构
this.updateById(bizOrg);
// 发布更新事件
// 发布更新事件（BizDataChangeListener 和 SysDataChangeListener 监听后自动清缓存）
CommonDataChangeEventCenter.doUpdateWithData(BizDataTypeEnum.ORG.getValue(), JSONUtil.createArray().put(bizOrg));
// 清除缓存
this.invalidateOrgCaches();
sysOrgApi.clearOrgCache();
}
@Transactional(rollbackFor = Exception.class)
@@ -342,11 +339,8 @@ public class BizOrgServiceImpl extends ServiceImpl<BizOrgMapper, BizOrg> impleme
// 执行删除
this.removeByIds(toDeleteOrgIdList);
// 发布删除事件
// 发布删除事件（BizDataChangeListener 和 SysDataChangeListener 监听后自动清缓存）
CommonDataChangeEventCenter.doDeleteWithDataIdList(BizDataTypeEnum.ORG.getValue(), toDeleteOrgIdList);
// 清除缓存
this.invalidateOrgCaches();
sysOrgApi.clearOrgCache();
}
}
@@ -366,12 +360,22 @@ public class BizOrgServiceImpl extends ServiceImpl<BizOrgMapper, BizOrg> impleme
@Override
public List<BizOrg> getAllOrgList() {
// 优先从本地内存缓存获取，避免每次JSON反序列化
List<BizOrg> localCache = localOrgListCache;
if (localCache != null) {
return localCache;
}
// 其次从Redis缓存获取
Object cached = commonCacheOperator.get(ORG_ALL_LIST_CACHE_KEY);
if (cached != null) {
return JSONUtil.toList(JSONUtil.parseArray(cached), BizOrg.class);
List<BizOrg> list = JSONUtil.toList(JSONUtil.parseArray(cached), BizOrg.class);
localOrgListCache = list;
return list;
}
// 最后从数据库查询
List<BizOrg> list = this.list(new LambdaQueryWrapper<BizOrg>().orderByAsc(BizOrg::getSortCode));
commonCacheOperator.put(ORG_ALL_LIST_CACHE_KEY, list);
localOrgListCache = list;
return list;
}
@@ -380,6 +384,7 @@ public class BizOrgServiceImpl extends ServiceImpl<BizOrgMapper, BizOrg> impleme
* 机构增删改时调用，visibleOrgIds 缓存通过版本号自动失效，旧条目由 TTL 自动清理
*/
private void invalidateOrgCaches() {
localOrgListCache = null;
commonCacheOperator.remove(ORG_ALL_LIST_CACHE_KEY);
commonCacheOperator.put(ORG_CACHE_VERSION_KEY, String.valueOf(System.currentTimeMillis()));
}
@@ -483,11 +488,8 @@ public class BizOrgServiceImpl extends ServiceImpl<BizOrgMapper, BizOrg> impleme
bizOrg.setCategory("0".equals(parentId)?BizOrgCategoryEnum.COMPANY.getValue():BizOrgCategoryEnum.DEPT.getValue());
bizOrg.setSortCode(99);
this.save(bizOrg);
// 发布增加事件
// 发布增加事件（BizDataChangeListener 和 SysDataChangeListener 监听后自动清缓存）
CommonDataChangeEventCenter.doAddWithData(BizDataTypeEnum.ORG.getValue(), JSONUtil.createArray().put(bizOrg));
// 清除缓存
this.invalidateOrgCaches();
sysOrgApi.clearOrgCache();
return bizOrg.getId();
}
@@ -625,14 +627,11 @@ public class BizOrgServiceImpl extends ServiceImpl<BizOrgMapper, BizOrg> impleme
this.save(copyBizOrg);
// 插入扩展信息
bizOrgExtService.createExtInfo(copyBizOrg.getId(), BizOrgSourceFromTypeEnum.SYSTEM_ADD.getValue());
// 发布增加事件
// 发布增加事件（BizDataChangeListener 和 SysDataChangeListener 监听后自动清缓存）
CommonDataChangeEventCenter.doAddWithData(BizDataTypeEnum.ORG.getValue(), JSONUtil.createArray().put(copyBizOrg));
}
}
});
// 清除缓存
this.invalidateOrgCaches();
sysOrgApi.clearOrgCache();
}
}

34
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/listener/SysDataChangeListener.java
View File

@@ -21,8 +21,10 @@ import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
import vip.xiaonuo.common.listener.CommonDataChangeListener;
import vip.xiaonuo.sys.core.enums.SysDataTypeEnum;
import vip.xiaonuo.sys.modular.org.service.SysOrgService;
import vip.xiaonuo.sys.modular.org.service.SysUserDataScopeService;
import java.util.Collections;
import java.util.List;
/**
@@ -34,18 +36,35 @@ import java.util.List;
@Component
public class SysDataChangeListener implements CommonDataChangeListener {
@Resource
private SysOrgService sysOrgService;
@Resource
private SysUserDataScopeService sysUserDataScopeService;
@Override
public void doAddWithDataId(String dataType, String dataId) {
// 此处可做额外处理
if(dataType.equals(SysDataTypeEnum.ORG.getValue())) {
List<String> dataIdList = Collections.singletonList(dataId);
// 清除机构缓存
sysOrgService.clearOrgCache();
// 将新机构加入到当前登录用户的数据范围缓存
SaBaseLoginUser saBaseLoginUser = StpLoginUserUtil.getLoginUser();
saBaseLoginUser.getDataScopeList().forEach(dataScope -> dataScope.getDataScope().addAll(dataIdList));
saBaseLoginUser.setDataScopeList(saBaseLoginUser.getDataScopeList());
// 重新缓存当前登录用户信息
StpUtil.getTokenSession().set("loginUser", saBaseLoginUser);
// 同步更新预计算表：为当前用户的所有API追加新机构
sysUserDataScopeService.appendOrgIdsForUser(saBaseLoginUser.getId(), dataIdList);
}
}
@Override
public void doAddWithDataIdList(String dataType, List<String> dataIdList) {
// 如果检测到机构增加，则将该机构加入到当前登录用户的数据范围缓存
if(dataType.equals(SysDataTypeEnum.ORG.getValue())) {
// 清除机构缓存
sysOrgService.clearOrgCache();
// 将新机构加入到当前登录用户的数据范围缓存
SaBaseLoginUser saBaseLoginUser = StpLoginUserUtil.getLoginUser();
saBaseLoginUser.getDataScopeList().forEach(dataScope -> dataScope.getDataScope().addAll(dataIdList));
saBaseLoginUser.setDataScopeList(saBaseLoginUser.getDataScopeList());
@@ -68,12 +87,16 @@ public class SysDataChangeListener implements CommonDataChangeListener {
@Override
public void doUpdateWithDataId(String dataType, String dataId) {
// 此处可做额外处理
if(dataType.equals(SysDataTypeEnum.ORG.getValue())) {
sysOrgService.clearOrgCache();
}
}
@Override
public void doUpdateWithDataIdList(String dataType, List<String> dataIdList) {
// 此处可做额外处理
if(dataType.equals(SysDataTypeEnum.ORG.getValue())) {
sysOrgService.clearOrgCache();
}
}
@Override
@@ -93,8 +116,9 @@ public class SysDataChangeListener implements CommonDataChangeListener {
@Override
public void doDeleteWithDataIdList(String dataType, List<String> dataIdList) {
// 组织删除时，精准删除预计算表中对应的机构记录
if(dataType.equals(SysDataTypeEnum.ORG.getValue())) {
sysOrgService.clearOrgCache();
// 精准删除预计算表中对应的机构记录
sysUserDataScopeService.deleteByOrgIds(dataIdList);
}
}

19
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java
View File

@@ -182,10 +182,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
this.save(sysOrg);
// 插入扩展信息
sysOrgExtService.createExtInfo(sysOrg.getId(), sourceFromType);
// 发布增加事件
// 发布增加事件（SysDataChangeListener 和 BizDataChangeListener 监听后自动清缓存）
CommonDataChangeEventCenter.doAddWithData(SysDataTypeEnum.ORG.getValue(), JSONUtil.createArray().put(sysOrg));
// 清除缓存
clearOrgCache();
}
@Transactional(rollbackFor = Exception.class)
@@ -207,10 +205,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
}
// 更新组织
this.updateById(sysOrg);
// 发布更新事件
// 发布更新事件（SysDataChangeListener 和 BizDataChangeListener 监听后自动清缓存）
CommonDataChangeEventCenter.doUpdateWithData(SysDataTypeEnum.ORG.getValue(), JSONUtil.createArray().put(sysOrg));
// 清除缓存
clearOrgCache();
}
@Transactional(rollbackFor = Exception.class)
@@ -254,10 +250,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
// 执行删除
this.removeByIds(toDeleteOrgIdList);
// 发布删除事件
// 发布删除事件（SysDataChangeListener 和 BizDataChangeListener 监听后自动清缓存）
CommonDataChangeEventCenter.doDeleteWithDataIdList(SysDataTypeEnum.ORG.getValue(), toDeleteOrgIdList);
// 清除缓存
clearOrgCache();
}
}
@@ -302,12 +296,11 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
// 插入扩展信息
sysOrgExtService.createExtInfo(copySysOrg.getId(), SysOrgSourceFromTypeEnum.SYSTEM_ADD.getValue());
// 发布增加事件
// 发布增加事件（SysDataChangeListener 和 BizDataChangeListener 监听后自动清缓存）
CommonDataChangeEventCenter.doAddWithData(SysDataTypeEnum.ORG.getValue(), JSONUtil.createArray().put(copySysOrg));
}
}
});
// 清除缓存
clearOrgCache();
}
}
@@ -429,10 +422,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
this.save(sysOrg);
// 插入扩展信息
sysOrgExtService.createExtInfo(sysOrg.getId(), SysOrgSourceFromTypeEnum.SYSTEM_ADD.getValue());
// 发布增加事件
// 发布增加事件（SysDataChangeListener 和 BizDataChangeListener 监听后自动清缓存）
CommonDataChangeEventCenter.doAddWithData(SysDataTypeEnum.ORG.getValue(), JSONUtil.createArray().put(sysOrg));
// 清除缓存
clearOrgCache();
return sysOrg.getId();
}