From 817206bae9cde6bf4f38387f07cd7a69e10fd8f5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 十一月 2024 11:17:07 +0800
Subject: [PATCH] 系统模块配置增加functionType字段
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 10 +++++++---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java | 6 ++++--
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java | 2 +-
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java | 29 +++++++++++++++++++++++++++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java | 2 +-
5 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java
index 2bc25bf..35aa1ce 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java
@@ -126,6 +126,11 @@
private String modeType;
/**
+ * 鍔熻兘绫诲瀷锛�0锛氬姛鑳借彍鍗曡妭鐐癸紝1锛氬垎绫�,3锛氭寜閽�
+ */
+ private int functionType;
+
+ /**
* 鏄ā鍧椾笅瀛愬璞℃槸妯″潡杩樻槸鎿嶄綔锛�0琛ㄧず鏃犲瓙鑺傜偣锛�1琛ㄧず鏄ā鍧楋紝2琛ㄧず鏄搷浣�
*/
private Integer childType;
@@ -166,6 +171,30 @@
return funcId;
}
+ public void setFunctionType(int functionType) {
+ this.functionType = functionType;
+ }
+
+ public void setValid(Boolean valid) {
+ isValid = valid;
+ }
+
+ public void setHavePermission(Integer havePermission) {
+ this.havePermission = havePermission;
+ }
+
+ public int getFunctionType() {
+ return functionType;
+ }
+
+ public Boolean getValid() {
+ return isValid;
+ }
+
+ public Integer getHavePermission() {
+ return havePermission;
+ }
+
public String getOperId() {
return operId;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
index c053571..08ded69 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
@@ -263,7 +263,7 @@
}
MenuVO functionVO = new MenuVO();
functionVO.setId(menu.id);
- functionVO.setSource(menu.icon);
+ functionVO.setSource(menu.image);
//if(StringUtils.isBlank(menu.resourceB)){
// continue;
//}
@@ -341,6 +341,7 @@
menuVO.setIsValid(info.isValid);
menuVO.setHasChildren(false);
menuVO.setCategory(1);
+ menuVO.setFunctionType(2);
menuVOList.add(menuVO);
}
}
@@ -421,6 +422,7 @@
menuVO.setCode(operateInfo.identify);
menuVO.setAlias(operateInfo.alias);
menuVO.setCategory(1);
+ menuVO.setFunctionType(2);
menuVO.setChildType(0);
menuVO.setRemark(operateInfo.desc);
menuVO.getMeta().put("keepAlive",false);
@@ -447,7 +449,8 @@
MenuVO menuVO = new MenuVO();
menuVO.setId(funcInfo.id);
menuVO.setIsValid(funcInfo.isValid);
- menuVO.setSource(funcInfo.icon);
+ menuVO.setSource(funcInfo.image);
+ menuVO.setFunctionType(funcInfo.functionType);
menuVO.setPathC(funcInfo.resourceC);
menuVO.setResourceDotNet(funcInfo.resourceDotNet);
menuVO.setResourceMobile(funcInfo.resourceMobile);
@@ -496,7 +499,8 @@
}
MenuVO functionVO = new MenuVO();
functionVO.setId(menu.id);
- functionVO.setSource(menu.icon);
+ functionVO.setSource(menu.image);
+ functionVO.setFunctionType(menu.functionType);
// if(StringUtils.isBlank(menu.resourceB) ){
// continue;
// }
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java
index f6d733c..4b62737 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java
@@ -1245,7 +1245,8 @@
//info.suffixB = object.getSuffixB() == null ? "" : object.getSuffixB();
info.desc = object.getRemark() == null ? "" : object.getRemark();
info.seq = object.getSort();
- info.icon = object.getSource() == null ? "" : object.getSource();
+ info.image = object.getSource() == null ? "" : object.getSource();
+ info.functionType = object.getFunctionType();
info.isValid = object.getIsValid();
info.aliasName = object.getAlias() == null ? "" : object.getAlias();
info.resourceDotNet = object.getResourceDotNet() == null ? "" : object.getResourceDotNet();
@@ -1312,7 +1313,8 @@
/*obj.suffixC = "";
obj.suffixB = "";*/
obj.seq = sequence;
- obj.icon = menuVO.getSource();
+ obj.image = menuVO.getSource();
+ obj.functionType = menuVO.getFunctionType();
obj.isValid = Func.isNotEmpty(menuVO.getIsValid()) ? menuVO.getIsValid():false;
obj.aliasName = aliasName;
obj.resourceDotNet = resDotNet;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
index df14674..8c2133d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
@@ -1428,7 +1428,7 @@
} catch (PLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- throw new VciBaseException("妫�鏌ュ瘑鐮佺瓥鐣ョ鍚堟儏鍐靛け璐ワ紒2");
+ throw new VciBaseException("妫�鏌ュ瘑鐮佺瓥鐣ョ鍚堟儏鍐靛け璐ワ紒");
}
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java
index 8595212..0388ece 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java
@@ -1469,7 +1469,7 @@
platformClientUtil.getUIService().savePLCommandParameter(plCommandParameter);
} catch (PLException e) {
e.printStackTrace();
- throw new VciBaseException("淇濆瓨鎸夐挳淇℃伅鏃跺彂鐢熷紓甯革細"+ e.getMessage());
+ throw new VciBaseException("淇濆瓨鎸夐挳鍙傛暟鏃跺彂鐢熷紓甯革細"+ e.getMessage());
}
}
}
--
Gitblit v1.9.3