From 6f7f3834f66b08bed7af331ce1a168d6cd89292d Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期五, 03 一月 2025 18:14:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionDTO.java | 4 ++
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OperateVO.java | 23 +++++++++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java | 7 ++-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java | 3 +
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java | 1
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java | 34 +++++++++++++++--
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java | 13 +++---
7 files changed, 72 insertions(+), 13 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionDTO.java
index a631dd8..0a20719 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionDTO.java
@@ -67,4 +67,8 @@
* 鐖惰妭鐐筰d
*/
private String plActionCls;
+ /**
+ * 鍥炬爣
+ */
+ private String plImage;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OperateVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OperateVO.java
new file mode 100644
index 0000000..3f46b36
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OperateVO.java
@@ -0,0 +1,23 @@
+
+package com.vci.pagemodel;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 鎿嶄綔绫诲瀷灞炴��
+ */
+@Data
+public class OperateVO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private String id;
+ private String name;// 鍚嶇О
+ private String identify;// 鏍囪瘑
+ private String alias;//鍒悕
+ private String desc;// 鎻忚堪
+ private long seq;//椤哄簭
+ private String source;//鍥炬爣
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
index 3cce295..feedbf5 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
@@ -8,6 +8,7 @@
import com.vci.dto.RoleInfoDTO;
import com.vci.dto.RoleRightParamDTO;
import com.vci.dto.RoleRightParamDTOS;
+import com.vci.pagemodel.OperateVO;
import com.vci.web.service.ISmFunctionQueryService;
import com.vci.web.service.SmHMSysModConfigServiceI;
import com.vci.pagemodel.AppConfigDetailInfoVO;
@@ -253,13 +254,13 @@
/**
* 娣诲姞鎿嶄綔绫诲瀷
- * @param operateInfo
+ * @param operateVO
* @return
*/
@PostMapping("/addOperationType")
- public BaseResult addOperationType(@RequestBody OperateInfo operateInfo) {
+ public BaseResult addOperationType(@RequestBody OperateVO operateVO) {
try {
- return BaseResult.success(hmSysModConfigService.addOperationType(operateInfo),"娣诲姞鎿嶄綔绫诲瀷鎴愬姛");
+ return BaseResult.success(hmSysModConfigService.addOperationType(operateVO),"娣诲姞鎿嶄綔绫诲瀷鎴愬姛");
}catch (Exception e){
e.printStackTrace();
String errorMsg = "娣诲姞鎿嶄綔绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
@@ -270,13 +271,13 @@
/**
* 淇敼鎿嶄綔绫诲瀷
- * @param operateInfo
+ * @param operateVO
* @return
*/
@PutMapping("/updateOperationType")
- public BaseResult updateOperationType(@RequestBody OperateInfo operateInfo) {
+ public BaseResult updateOperationType(@RequestBody OperateVO operateVO) {
try {
- return BaseResult.success(hmSysModConfigService.updateOperationType(operateInfo),"淇敼鎿嶄綔绫诲瀷鎴愬姛");
+ return BaseResult.success(hmSysModConfigService.updateOperationType(operateVO),"淇敼鎿嶄綔绫诲瀷鎴愬姛");
}catch (Exception e){
e.printStackTrace();
String errorMsg = "淇敼鎿嶄綔绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java
index b6e5542..bedcaea 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java
@@ -5,6 +5,7 @@
import com.vci.corba.framework.data.*;
import com.vci.pagemodel.ExpExcelConditionVO;
import com.vci.pagemodel.MenuVO;
+import com.vci.pagemodel.OperateVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
@@ -59,14 +60,14 @@
* 澧炲姞鎿嶄綔绫诲瀷
* @return
*/
- OperateInfo addOperationType(OperateInfo operateInfo);
+ OperateInfo addOperationType(OperateVO operateVO);
/**
* 淇敼鎿嶄綔绫诲瀷
- * @param operateInfo
+ * @param operateVO
* @return
*/
- OperateInfo updateOperationType(OperateInfo operateInfo) throws VciBaseException;
+ OperateInfo updateOperationType(OperateVO operateVO) throws VciBaseException;
/**
* 鍒犻櫎鎿嶄綔绫诲瀷
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
index 0a8fec3..6661629 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
@@ -241,6 +241,7 @@
plAction.plModifyUser = WebUtil.getCurrentUserId();
plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
+ plAction.plImage = StringUtils.defaultString(dto.getPlImage());
boolean b = platformClientUtil.getUIService().savePLAction(plAction);
if(!b){
throw new PLException("500", new String[]{"淇濆瓨澶辫触锛侊紒"});
@@ -274,6 +275,7 @@
plAction.plModifyUser = WebUtil.getCurrentUserId();
plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
+ plAction.plImage = StringUtils.defaultString(dto.getPlImage());
boolean b = platformClientUtil.getUIService().updatePLAction(plAction);
if(!b){
throw new PLException("500", new String[]{"淇敼澶辫触锛侊紒"});
@@ -299,6 +301,7 @@
plAction.plModifyUser = WebUtil.getCurrentUserId();
plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
+ plAction.plImage = StringUtils.defaultString(dto.getPlImage());
boolean b = platformClientUtil.getUIService().deletePLAction(plAction);
if(!b){
throw new PLException("500", new String[]{"鍒犻櫎澶辫触锛侊紒"});
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
index 8aa0539..00490d5 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
@@ -575,6 +575,7 @@
menuVO.setSort((int) operateInfo.seq);
menuVO.setModeType("operateObject");
menuVO.setHasChildren(false);
+ menuVO.setSource(operateInfo.image);
menuVOList.add(menuVO);
}
}catch (PLException e) {
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
index 0a8e9b1..00e1816 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
@@ -7,6 +7,7 @@
import com.vci.corba.framework.data.*;
import com.vci.pagemodel.ExpExcelConditionVO;
import com.vci.pagemodel.MenuVO;
+import com.vci.pagemodel.OperateVO;
import com.vci.starter.poi.bo.SheetDataSet;
import com.vci.starter.poi.bo.SheetRowData;
import com.vci.starter.poi.bo.WriteExcelData;
@@ -25,6 +26,7 @@
import com.vci.web.util.PlatformClientUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -116,6 +118,9 @@
VciBaseUtil.alertNotNull(menuVO,"淇敼鐨勬ā鍧楀璞�");
try {
String res = "";
+ if(!menuVO.getAlias().matches("[a-z A-Z \\p{Punct}+]*")){
+ throw new VciBaseException("娉ㄦ剰锛氬睘鎬у悕鍙兘涓鸿嫳鏂囧瓧姣�!");
+ }
//鏇存柊鏁版嵁搴�
res = foDelegate.updateMod(menuVO);
/**
@@ -224,12 +229,30 @@
}
/**
+ * 鎿嶄綔瀵硅薄澶嶅埗
+ * @param operateVO 鎿嶄綔浼犺緭瀵硅薄
+ * @param operateInfo 鎿嶄綔淇℃伅
+ */
+ private void copyOperationProperties(OperateVO operateVO, OperateInfo operateInfo){
+ operateInfo.id = operateVO.getId();
+ operateInfo.name = operateVO.getName();
+ operateInfo.alias = operateVO.getAlias();
+ operateInfo.image = operateVO.getSource();
+ operateInfo.desc = operateVO.getDesc();
+ operateInfo.identify = operateVO.getIdentify();
+ operateInfo.seq = operateVO.getSeq();
+ }
+
+ /**
* 澧炲姞鎿嶄綔绫诲瀷
* @return
*/
@Override
- public OperateInfo addOperationType(OperateInfo operateInfo) throws VciBaseException {
+ public OperateInfo addOperationType(OperateVO operateVO) throws VciBaseException {
try {
+ OperateInfo operateInfo = new OperateInfo();
+ copyOperationProperties(operateVO,operateInfo);
+ operateInfo.image = operateVO.getSource();
//鏍￠獙
this.checkItem(operateInfo);
String s = foDelegate.saveOperate(operateInfo);
@@ -253,13 +276,16 @@
/**
* 淇敼鎿嶄綔绫诲瀷
- * @param operateInfo
+ * @param operateVO
* @return
*/
@Override
- public OperateInfo updateOperationType(OperateInfo operateInfo) throws VciBaseException {
+ public OperateInfo updateOperationType(OperateVO operateVO) throws VciBaseException {
try {
+ OperateInfo operateInfo = new OperateInfo();
+ copyOperationProperties(operateVO, operateInfo);
this.checkItem(operateInfo);
+ operateInfo.image = operateVO.getSource();
String res = foDelegate.updateOperate(operateInfo);
/**杩斿洖1琛ㄧず鍚嶇О鏈夐噸澶嶏紝杩斿洖2琛ㄧず鏍囪瘑鏈夐噸澶�,杩斿洖3琛ㄧず椤哄簭鏈夐噸澶�**/
if (res.equals("1")) {
@@ -329,7 +355,7 @@
if (operateInfo.name.length() > 128) {
throw new VciBaseException("鍚嶇О闀垮害涓嶈兘瓒呰繃128锛�");
}
- if (operateInfo.desc.length() > 255) {
+ if (operateInfo.desc != null &&operateInfo.desc.length() > 255) {
throw new VciBaseException("鎻忚堪闀垮害涓嶈兘瓒呰繃255锛�");
}
if (operateInfo.alias.length() > 128) {
--
Gitblit v1.9.3