mirror of
https://gitee.com/dromara/Jpom.git
synced 2024-12-04 12:58:24 +08:00
fix update get version name,role script npe
This commit is contained in:
bwcx_jzy
parent
c1abaa6fb5
commit
8f5de1be7b
@ -94,7 +94,7 @@ public class JpomManifest {
|
||||
* 根据 jar 文件解析 jpom 版本信息
|
||||
*
|
||||
* @param jarFile 文件
|
||||
* @return 版本 和 打包时间
|
||||
* @return 版本,打包时间, mainClass
|
||||
*/
|
||||
private static Tuple getJarVersion(File jarFile) {
|
||||
Manifest manifest = ManifestUtil.getManifest(jarFile);
|
||||
|
||||
@ -40,44 +40,45 @@ public class SystemUpdateController extends BaseServerController {
|
||||
// return "system/update";
|
||||
// }
|
||||
|
||||
@RequestMapping(value = "info", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
@ResponseBody
|
||||
@SystemPermission
|
||||
public String info() {
|
||||
NodeModel nodeModel = tryGetNode();
|
||||
if (nodeModel != null) {
|
||||
return NodeForward.request(getNode(), getRequest(), NodeUrl.Info).toString();
|
||||
}
|
||||
return JsonMessage.getString(200, "", JpomManifest.getInstance());
|
||||
}
|
||||
@RequestMapping(value = "info", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
@ResponseBody
|
||||
@SystemPermission
|
||||
public String info() {
|
||||
NodeModel nodeModel = tryGetNode();
|
||||
if (nodeModel != null) {
|
||||
return NodeForward.request(getNode(), getRequest(), NodeUrl.Info).toString();
|
||||
}
|
||||
return JsonMessage.getString(200, "", JpomManifest.getInstance());
|
||||
}
|
||||
|
||||
@RequestMapping(value = "uploadJar.json", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
@ResponseBody
|
||||
@OptLog(UserOperateLogV1.OptType.UpdateSys)
|
||||
@SystemPermission
|
||||
public String uploadJar() throws IOException {
|
||||
NodeModel nodeModel = tryGetNode();
|
||||
if (nodeModel != null) {
|
||||
return NodeForward.requestMultipart(getNode(), getMultiRequest(), NodeUrl.SystemUploadJar).toString();
|
||||
}
|
||||
//
|
||||
Objects.requireNonNull(JpomManifest.getScriptFile());
|
||||
MultipartFileBuilder multipartFileBuilder = createMultipart();
|
||||
multipartFileBuilder
|
||||
.setFileExt("jar")
|
||||
.addFieldName("file")
|
||||
.setUseOriginalFilename(true)
|
||||
.setSavePath(ServerConfigBean.getInstance().getUserTempPath().getAbsolutePath());
|
||||
String path = multipartFileBuilder.save();
|
||||
// 基础检查
|
||||
JsonMessage<Tuple> error = JpomManifest.checkJpomJar(path, JpomServerApplication.class);
|
||||
if (error.getCode() != HttpStatus.HTTP_OK) {
|
||||
return error.toString();
|
||||
}
|
||||
String version = error.getMsg();
|
||||
JpomManifest.releaseJar(path, version);
|
||||
//
|
||||
JpomApplication.restart();
|
||||
return JsonMessage.getString(200, "升级中大约需要30秒");
|
||||
}
|
||||
@RequestMapping(value = "uploadJar.json", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
@ResponseBody
|
||||
@OptLog(UserOperateLogV1.OptType.UpdateSys)
|
||||
@SystemPermission
|
||||
public String uploadJar() throws IOException {
|
||||
NodeModel nodeModel = tryGetNode();
|
||||
if (nodeModel != null) {
|
||||
return NodeForward.requestMultipart(getNode(), getMultiRequest(), NodeUrl.SystemUploadJar).toString();
|
||||
}
|
||||
//
|
||||
Objects.requireNonNull(JpomManifest.getScriptFile());
|
||||
MultipartFileBuilder multipartFileBuilder = createMultipart();
|
||||
multipartFileBuilder
|
||||
.setFileExt("jar")
|
||||
.addFieldName("file")
|
||||
.setUseOriginalFilename(true)
|
||||
.setSavePath(ServerConfigBean.getInstance().getUserTempPath().getAbsolutePath());
|
||||
String path = multipartFileBuilder.save();
|
||||
// 基础检查
|
||||
JsonMessage<Tuple> error = JpomManifest.checkJpomJar(path, JpomServerApplication.class);
|
||||
if (error.getCode() != HttpStatus.HTTP_OK) {
|
||||
return error.toString();
|
||||
}
|
||||
Tuple data = error.getData();
|
||||
String version = data.get(0);
|
||||
JpomManifest.releaseJar(path, version);
|
||||
//
|
||||
JpomApplication.restart();
|
||||
return JsonMessage.getString(200, "升级中大约需要30秒");
|
||||
}
|
||||
}
|
||||
|
||||
@ -23,250 +23,250 @@ import java.util.stream.Collectors;
|
||||
*/
|
||||
public interface BaseDynamicService {
|
||||
|
||||
/***
|
||||
* 过滤角色数据
|
||||
* @param jsonArray 原array
|
||||
* @param classFeature 功能
|
||||
* @return 过滤后的，如果当前没有登录信息就不过滤
|
||||
*/
|
||||
default JSONArray filter(JSONArray jsonArray, ClassFeature classFeature) {
|
||||
// 获取当前用户
|
||||
UserModel userModel = BaseServerController.getUserModel();
|
||||
if (jsonArray == null || userModel == null) {
|
||||
return jsonArray;
|
||||
}
|
||||
if (userModel.isSystemUser()) {
|
||||
// 系统管理全部权限
|
||||
return jsonArray;
|
||||
}
|
||||
RoleService bean = SpringUtil.getBean(RoleService.class);
|
||||
String parentId = getParameterValue(classFeature);
|
||||
Set<String> dynamicList = bean.getDynamicList(userModel, classFeature, parentId);
|
||||
if (dynamicList == null) {
|
||||
return null;
|
||||
}
|
||||
List<Object> collect = jsonArray.stream().filter(o -> {
|
||||
JSONObject jsonObject = (JSONObject) o;
|
||||
String id = jsonObject.getString("id");
|
||||
return dynamicList.contains(id);
|
||||
}).collect(Collectors.toList());
|
||||
return (JSONArray) JSONArray.toJSON(collect);
|
||||
}
|
||||
/***
|
||||
* 过滤角色数据
|
||||
* @param jsonArray 原array
|
||||
* @param classFeature 功能
|
||||
* @return 过滤后的，如果当前没有登录信息就不过滤
|
||||
*/
|
||||
default JSONArray filter(JSONArray jsonArray, ClassFeature classFeature) {
|
||||
// 获取当前用户
|
||||
UserModel userModel = BaseServerController.getUserModel();
|
||||
if (jsonArray == null || userModel == null) {
|
||||
return jsonArray;
|
||||
}
|
||||
if (userModel.isSystemUser()) {
|
||||
// 系统管理全部权限
|
||||
return jsonArray;
|
||||
}
|
||||
RoleService bean = SpringUtil.getBean(RoleService.class);
|
||||
String parentId = getParameterValue(classFeature);
|
||||
Set<String> dynamicList = bean.getDynamicList(userModel, classFeature, parentId);
|
||||
if (dynamicList == null) {
|
||||
return null;
|
||||
}
|
||||
List<Object> collect = jsonArray.stream().filter(o -> {
|
||||
JSONObject jsonObject = (JSONObject) o;
|
||||
String id = jsonObject.getString("id");
|
||||
return dynamicList.contains(id);
|
||||
}).collect(Collectors.toList());
|
||||
return (JSONArray) JSONArray.toJSON(collect);
|
||||
}
|
||||
|
||||
/***
|
||||
* 过滤角色数据
|
||||
* @param list 原list
|
||||
* @param classFeature 功能
|
||||
* @return 过滤后的，如果当前没有登录信息就不过滤
|
||||
*/
|
||||
default List<? extends BaseModel> filter(List<? extends BaseModel> list, ClassFeature classFeature) {
|
||||
// 获取当前用户
|
||||
UserModel userModel = BaseServerController.getUserModel();
|
||||
if (list == null || userModel == null) {
|
||||
return list;
|
||||
}
|
||||
if (userModel.isSystemUser()) {
|
||||
// 系统管理全部权限
|
||||
return list;
|
||||
}
|
||||
RoleService bean = SpringUtil.getBean(RoleService.class);
|
||||
String parentId = getParameterValue(classFeature);
|
||||
Set<String> dynamicList = bean.getDynamicList(userModel, classFeature, parentId);
|
||||
if (dynamicList == null) {
|
||||
// 没有角色没有权限
|
||||
return null;
|
||||
}
|
||||
//
|
||||
return list.stream().filter(baseModel -> dynamicList.contains(baseModel.getId())).collect(Collectors.toList());
|
||||
}
|
||||
/***
|
||||
* 过滤角色数据
|
||||
* @param list 原list
|
||||
* @param classFeature 功能
|
||||
* @return 过滤后的，如果当前没有登录信息就不过滤
|
||||
*/
|
||||
default List<? extends BaseModel> filter(List<? extends BaseModel> list, ClassFeature classFeature) {
|
||||
// 获取当前用户
|
||||
UserModel userModel = BaseServerController.getUserModel();
|
||||
if (list == null || userModel == null) {
|
||||
return list;
|
||||
}
|
||||
if (userModel.isSystemUser()) {
|
||||
// 系统管理全部权限
|
||||
return list;
|
||||
}
|
||||
RoleService bean = SpringUtil.getBean(RoleService.class);
|
||||
String parentId = getParameterValue(classFeature);
|
||||
Set<String> dynamicList = bean.getDynamicList(userModel, classFeature, parentId);
|
||||
if (dynamicList == null) {
|
||||
// 没有角色没有权限
|
||||
return null;
|
||||
}
|
||||
//
|
||||
return list.stream().filter(baseModel -> dynamicList.contains(baseModel.getId())).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取参数
|
||||
*
|
||||
* @param classFeature 功能
|
||||
* @return 参数
|
||||
*/
|
||||
default String getParameterValue(ClassFeature classFeature) {
|
||||
ClassFeature parent = classFeature.getParent();
|
||||
if (parent == null) {
|
||||
return null;
|
||||
}
|
||||
DynamicData dynamicData = DynamicData.getDynamicData(parent);
|
||||
if (dynamicData == null) {
|
||||
return null;
|
||||
}
|
||||
String parameterName = dynamicData.getChildrenParameterName();
|
||||
return AbstractController.getRequestAttributes().getRequest().getParameter(parameterName);
|
||||
}
|
||||
/**
|
||||
* 获取参数
|
||||
*
|
||||
* @param classFeature 功能
|
||||
* @return 参数
|
||||
*/
|
||||
default String getParameterValue(ClassFeature classFeature) {
|
||||
ClassFeature parent = classFeature.getParent();
|
||||
if (parent == null) {
|
||||
return null;
|
||||
}
|
||||
DynamicData dynamicData = DynamicData.getDynamicData(parent);
|
||||
if (dynamicData == null) {
|
||||
return null;
|
||||
}
|
||||
String parameterName = dynamicData.getChildrenParameterName();
|
||||
return AbstractController.getRequestAttributes().getRequest().getParameter(parameterName);
|
||||
}
|
||||
|
||||
// -------------------------------------- 转换数据为tree
|
||||
// -------------------------------------- 转换数据为tree
|
||||
|
||||
/**
|
||||
* 查询动态数据的array
|
||||
*
|
||||
* @param dataId 上级数据id
|
||||
* @return array
|
||||
*/
|
||||
JSONArray listToArray(String dataId);
|
||||
/**
|
||||
* 查询动态数据的array
|
||||
*
|
||||
* @param dataId 上级数据id
|
||||
* @return array
|
||||
*/
|
||||
JSONArray listToArray(String dataId);
|
||||
|
||||
/**
|
||||
* 查询功能下面的所有动态数据
|
||||
*
|
||||
* @param classFeature 功能
|
||||
* @param roleId 角色id
|
||||
* @param dataId 上级数据id
|
||||
* @return tree array
|
||||
*/
|
||||
default JSONArray listDynamic(ClassFeature classFeature, String roleId, String dataId) {
|
||||
JSONArray listToArray;
|
||||
try {
|
||||
listToArray = listToArray(dataId);
|
||||
if (listToArray == null || listToArray.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
DefaultSystemLog.getLog().error("拉取动态信息错误, roleId: [{}], dataId: [{}], caused by [{}]", roleId, dataId, e.getMessage());
|
||||
return null;
|
||||
}
|
||||
JSONArray jsonArray = new JSONArray();
|
||||
listToArray.forEach(obj -> {
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
JSONObject data = (JSONObject) obj;
|
||||
String name = data.getString("name");
|
||||
String id = data.getString("id");
|
||||
String group = StrUtil.emptyToDefault(data.getString("group"), StrUtil.EMPTY);
|
||||
jsonObject.put("group", group);
|
||||
//
|
||||
if (StrUtil.isNotEmpty(group)) {
|
||||
group = "【" + group + "】 -> ";
|
||||
}
|
||||
jsonObject.put("title", group + name);
|
||||
jsonObject.put("id", StrUtil.emptyToDefault(dataId, "") + StrUtil.COLON + classFeature.name() + StrUtil.COLON + id);
|
||||
boolean doChildren = this.doChildren(classFeature, roleId, id, jsonObject);
|
||||
if (!doChildren) {
|
||||
// 没有子级
|
||||
RoleService bean = SpringUtil.getBean(RoleService.class);
|
||||
List<String> checkList = bean.listDynamicData(roleId, classFeature, dataId);
|
||||
if (checkList != null && checkList.contains(id)) {
|
||||
jsonObject.put("checked", true);
|
||||
}
|
||||
}
|
||||
jsonArray.add(jsonObject);
|
||||
});
|
||||
// 分组排序
|
||||
jsonArray.sort(new PropertyComparator<>("group"));
|
||||
return jsonArray;
|
||||
}
|
||||
/**
|
||||
* 查询功能下面的所有动态数据
|
||||
*
|
||||
* @param classFeature 功能
|
||||
* @param roleId 角色id
|
||||
* @param dataId 上级数据id
|
||||
* @return tree array
|
||||
*/
|
||||
default JSONArray listDynamic(ClassFeature classFeature, String roleId, String dataId) {
|
||||
JSONArray listToArray;
|
||||
try {
|
||||
listToArray = listToArray(dataId);
|
||||
if (listToArray == null || listToArray.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
DefaultSystemLog.getLog().error("拉取动态信息错误, roleId: [{}], dataId: [{}]", roleId, dataId, e);
|
||||
return null;
|
||||
}
|
||||
JSONArray jsonArray = new JSONArray();
|
||||
listToArray.forEach(obj -> {
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
JSONObject data = (JSONObject) obj;
|
||||
String name = data.getString("name");
|
||||
String id = data.getString("id");
|
||||
String group = StrUtil.emptyToDefault(data.getString("group"), StrUtil.EMPTY);
|
||||
jsonObject.put("group", group);
|
||||
//
|
||||
if (StrUtil.isNotEmpty(group)) {
|
||||
group = "【" + group + "】 -> ";
|
||||
}
|
||||
jsonObject.put("title", group + name);
|
||||
jsonObject.put("id", StrUtil.emptyToDefault(dataId, "") + StrUtil.COLON + classFeature.name() + StrUtil.COLON + id);
|
||||
boolean doChildren = this.doChildren(classFeature, roleId, id, jsonObject);
|
||||
if (!doChildren) {
|
||||
// 没有子级
|
||||
RoleService bean = SpringUtil.getBean(RoleService.class);
|
||||
List<String> checkList = bean.listDynamicData(roleId, classFeature, dataId);
|
||||
if (checkList != null && checkList.contains(id)) {
|
||||
jsonObject.put("checked", true);
|
||||
}
|
||||
}
|
||||
jsonArray.add(jsonObject);
|
||||
});
|
||||
// 分组排序
|
||||
jsonArray.sort(new PropertyComparator<>("group"));
|
||||
return jsonArray;
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理子级数据
|
||||
*
|
||||
* @param classFeature 功能
|
||||
* @param roleId 角色id
|
||||
* @param dataId 数据id
|
||||
* @param jsonObject parent
|
||||
* @return 是否包含子级
|
||||
*/
|
||||
default boolean doChildren(ClassFeature classFeature, String roleId, String dataId, JSONObject jsonObject) {
|
||||
Set<ClassFeature> children = DynamicData.getChildren(classFeature);
|
||||
if (children == null) {
|
||||
return false;
|
||||
}
|
||||
JSONArray childrens = new JSONArray();
|
||||
children.forEach(classFeature1 -> {
|
||||
RoleService bean = SpringUtil.getBean(RoleService.class);
|
||||
JSONArray jsonArray1 = bean.listDynamic(roleId, classFeature1, dataId);
|
||||
if (jsonArray1 == null || jsonArray1.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
JSONObject jsonObject1 = new JSONObject();
|
||||
jsonObject1.put("children", jsonArray1);
|
||||
jsonObject1.put("title", classFeature1.getName());
|
||||
jsonObject1.put("id", classFeature1.name());
|
||||
childrens.add(jsonObject1);
|
||||
});
|
||||
if (!childrens.isEmpty()) {
|
||||
jsonObject.put("children", childrens);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
/**
|
||||
* 处理子级数据
|
||||
*
|
||||
* @param classFeature 功能
|
||||
* @param roleId 角色id
|
||||
* @param dataId 数据id
|
||||
* @param jsonObject parent
|
||||
* @return 是否包含子级
|
||||
*/
|
||||
default boolean doChildren(ClassFeature classFeature, String roleId, String dataId, JSONObject jsonObject) {
|
||||
Set<ClassFeature> children = DynamicData.getChildren(classFeature);
|
||||
if (children == null) {
|
||||
return false;
|
||||
}
|
||||
JSONArray childrens = new JSONArray();
|
||||
children.forEach(classFeature1 -> {
|
||||
RoleService bean = SpringUtil.getBean(RoleService.class);
|
||||
JSONArray jsonArray1 = bean.listDynamic(roleId, classFeature1, dataId);
|
||||
if (jsonArray1 == null || jsonArray1.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
JSONObject jsonObject1 = new JSONObject();
|
||||
jsonObject1.put("children", jsonArray1);
|
||||
jsonObject1.put("title", classFeature1.getName());
|
||||
jsonObject1.put("id", classFeature1.name());
|
||||
childrens.add(jsonObject1);
|
||||
});
|
||||
if (!childrens.isEmpty()) {
|
||||
jsonObject.put("children", childrens);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// -------------------------------------- 转换数据为tree end
|
||||
// -------------------------------------- 转换数据为tree end
|
||||
|
||||
// -------------------------------------- 前端接收选中
|
||||
// -------------------------------------- 前端接收选中
|
||||
|
||||
/**
|
||||
* 接收前端的值
|
||||
*
|
||||
* @param classFeature 功能
|
||||
* @param jsonArray array
|
||||
* @return list
|
||||
*/
|
||||
default List<RoleModel.TreeLevel> parserValue(ClassFeature classFeature, JSONArray jsonArray) {
|
||||
if (jsonArray == null) {
|
||||
return null;
|
||||
}
|
||||
List<RoleModel.TreeLevel> list = new ArrayList<>();
|
||||
jsonArray.forEach(o -> {
|
||||
JSONObject jsonObject = (JSONObject) o;
|
||||
JSONArray children = jsonObject.getJSONArray("children");
|
||||
RoleModel.TreeLevel treeLevel = new RoleModel.TreeLevel();
|
||||
if (children != null && !children.isEmpty()) {
|
||||
treeLevel.setChildren(parserChildren(classFeature, children));
|
||||
}
|
||||
/**
|
||||
* 接收前端的值
|
||||
*
|
||||
* @param classFeature 功能
|
||||
* @param jsonArray array
|
||||
* @return list
|
||||
*/
|
||||
default List<RoleModel.TreeLevel> parserValue(ClassFeature classFeature, JSONArray jsonArray) {
|
||||
if (jsonArray == null) {
|
||||
return null;
|
||||
}
|
||||
List<RoleModel.TreeLevel> list = new ArrayList<>();
|
||||
jsonArray.forEach(o -> {
|
||||
JSONObject jsonObject = (JSONObject) o;
|
||||
JSONArray children = jsonObject.getJSONArray("children");
|
||||
RoleModel.TreeLevel treeLevel = new RoleModel.TreeLevel();
|
||||
if (children != null && !children.isEmpty()) {
|
||||
treeLevel.setChildren(parserChildren(classFeature, children));
|
||||
}
|
||||
|
||||
String id = jsonObject.getString("id");
|
||||
if (id.contains(StrUtil.COLON)) {
|
||||
id = id.split(StrUtil.COLON)[2];
|
||||
}
|
||||
treeLevel.setData(id);
|
||||
treeLevel.setClassFeature(classFeature.name());
|
||||
list.add(treeLevel);
|
||||
});
|
||||
return list;
|
||||
}
|
||||
String id = jsonObject.getString("id");
|
||||
if (id.contains(StrUtil.COLON)) {
|
||||
id = id.split(StrUtil.COLON)[2];
|
||||
}
|
||||
treeLevel.setData(id);
|
||||
treeLevel.setClassFeature(classFeature.name());
|
||||
list.add(treeLevel);
|
||||
});
|
||||
return list;
|
||||
}
|
||||
|
||||
/**
|
||||
* 转换子级
|
||||
*
|
||||
* @param classFeature 功能
|
||||
* @param jsonArray array
|
||||
* @return list
|
||||
*/
|
||||
default List<RoleModel.TreeLevel> parserChildren(ClassFeature classFeature, JSONArray jsonArray) {
|
||||
Set<ClassFeature> children = DynamicData.getChildren(classFeature);
|
||||
if (children == null) {
|
||||
return null;
|
||||
}
|
||||
List<RoleModel.TreeLevel> list = new ArrayList<>();
|
||||
Map<ClassFeature, JSONArray> jsonArrayMap = this.convertArray(jsonArray);
|
||||
for (ClassFeature child : children) {
|
||||
JSONArray jsonArray1 = jsonArrayMap.get(child);
|
||||
List<RoleModel.TreeLevel> lists = parserValue(child, jsonArray1);
|
||||
if (lists != null) {
|
||||
list.addAll(lists);
|
||||
}
|
||||
/**
|
||||
* 转换子级
|
||||
*
|
||||
* @param classFeature 功能
|
||||
* @param jsonArray array
|
||||
* @return list
|
||||
*/
|
||||
default List<RoleModel.TreeLevel> parserChildren(ClassFeature classFeature, JSONArray jsonArray) {
|
||||
Set<ClassFeature> children = DynamicData.getChildren(classFeature);
|
||||
if (children == null) {
|
||||
return null;
|
||||
}
|
||||
List<RoleModel.TreeLevel> list = new ArrayList<>();
|
||||
Map<ClassFeature, JSONArray> jsonArrayMap = this.convertArray(jsonArray);
|
||||
for (ClassFeature child : children) {
|
||||
JSONArray jsonArray1 = jsonArrayMap.get(child);
|
||||
List<RoleModel.TreeLevel> lists = parserValue(child, jsonArray1);
|
||||
if (lists != null) {
|
||||
list.addAll(lists);
|
||||
}
|
||||
// classFeatureListMap.put(child, list);
|
||||
}
|
||||
return list;
|
||||
}
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将二级数据转换为map
|
||||
*
|
||||
* @param jsonArray array
|
||||
* @return map
|
||||
*/
|
||||
default Map<ClassFeature, JSONArray> convertArray(JSONArray jsonArray) {
|
||||
Map<ClassFeature, JSONArray> newMap = new HashMap<>();
|
||||
jsonArray.forEach(o -> {
|
||||
JSONObject jsonObject = (JSONObject) o;
|
||||
String id = jsonObject.getString("id");
|
||||
ClassFeature classFeature = ClassFeature.valueOf(id);
|
||||
newMap.put(classFeature, jsonObject.getJSONArray("children"));
|
||||
});
|
||||
return newMap;
|
||||
}
|
||||
/**
|
||||
* 将二级数据转换为map
|
||||
*
|
||||
* @param jsonArray array
|
||||
* @return map
|
||||
*/
|
||||
default Map<ClassFeature, JSONArray> convertArray(JSONArray jsonArray) {
|
||||
Map<ClassFeature, JSONArray> newMap = new HashMap<>();
|
||||
jsonArray.forEach(o -> {
|
||||
JSONObject jsonObject = (JSONObject) o;
|
||||
String id = jsonObject.getString("id");
|
||||
ClassFeature classFeature = ClassFeature.valueOf(id);
|
||||
newMap.put(classFeature, jsonObject.getJSONArray("children"));
|
||||
});
|
||||
return newMap;
|
||||
}
|
||||
|
||||
// -------------------------------------- 前端接收选中-------------------- end
|
||||
// -------------------------------------- 前端接收选中-------------------- end
|
||||
}
|
||||
|
||||
@ -18,20 +18,20 @@ import javax.annotation.Resource;
|
||||
@Service
|
||||
public class ScriptServer implements BaseDynamicService {
|
||||
|
||||
@Resource
|
||||
private NodeService nodeService;
|
||||
@Resource
|
||||
private NodeService nodeService;
|
||||
|
||||
@Override
|
||||
public JSONArray listToArray(String dataId) {
|
||||
NodeModel item = nodeService.getItem(dataId);
|
||||
if (!item.isOpenStatus()) {
|
||||
return null;
|
||||
}
|
||||
return listToArray(item);
|
||||
}
|
||||
@Override
|
||||
public JSONArray listToArray(String dataId) {
|
||||
NodeModel item = nodeService.getItem(dataId);
|
||||
if (item == null || !item.isOpenStatus()) {
|
||||
return null;
|
||||
}
|
||||
return listToArray(item);
|
||||
}
|
||||
|
||||
public JSONArray listToArray(NodeModel nodeModel) {
|
||||
JSONArray jsonArray = NodeForward.requestData(nodeModel, NodeUrl.Script_List, null, JSONArray.class);
|
||||
return filter(jsonArray, ClassFeature.SCRIPT);
|
||||
}
|
||||
public JSONArray listToArray(NodeModel nodeModel) {
|
||||
JSONArray jsonArray = NodeForward.requestData(nodeModel, NodeUrl.Script_List, null, JSONArray.class);
|
||||
return filter(jsonArray, ClassFeature.SCRIPT);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user