From 3ff6166ea62799068064845fb083d1abb3d902a6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 09 十二月 2024 14:47:42 +0800
Subject: [PATCH] plt-slice属性调整后WEB端引用的旧属性也做了相应的调整
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
index 4d9870d..06dcba4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
@@ -1,17 +1,9 @@
package com.vci.web.service.impl;
-import com.vci.client.mw.ClientSessionUtility;
import com.vci.corba.common.PLException;
-import com.vci.corba.omd.stm.StatePool;
import com.vci.corba.omd.vrm.VersionRule;
-import com.vci.dto.OsAttributeDTO;
import com.vci.dto.OsRevisionRuleDTO;
-import com.vci.dto.OsStatusDTO;
-import com.vci.pagemodel.OsAttributeVO;
-import com.vci.pagemodel.OsEnumVO;
-import com.vci.pagemodel.OsStatusVO;
-import com.vci.po.OsAttributePO;
-import com.vci.po.OsEnumPO;
+import com.vci.pagemodel.OsRevisionRuleVO;
import com.vci.po.OsRevisionRulePO;
import com.vci.starter.poi.bo.ReadExcelOption;
import com.vci.starter.poi.bo.WriteExcelData;
@@ -22,9 +14,8 @@
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.util.*;
-import com.vci.pagemodel.OsRevisionRuleVO;
import com.vci.web.service.OsRevisionRuleServiceI;
-import com.vci.web.util.Func;
+import com.vci.starter.web.util.Lcm.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -36,11 +27,8 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import javax.swing.*;
-import java.awt.*;
import java.io.File;
import java.util.*;
-import java.util.List;
import java.util.stream.Collectors;
/**
@@ -240,7 +228,7 @@
VersionRule newVR = new VersionRule();
newVR.oid = osRevisionRuleDTO.getOid();
newVR.name = osRevisionRuleDTO.getId();
- newVR.tag = osRevisionRuleDTO.getName();
+ newVR.label = osRevisionRuleDTO.getName();
newVR.description = osRevisionRuleDTO.getDescription();
newVR.jumpCharacter = osRevisionRuleDTO.getJumpCharacter();
newVR.initialValue = osRevisionRuleDTO.getInitialValue();
@@ -295,7 +283,7 @@
}
ruleVO.setDescription(versionRule.description);
ruleVO.setId(versionRule.name);
- ruleVO.setName(versionRule.tag);
+ ruleVO.setName(versionRule.label);
ruleVO.setStepLength(WebUtil.getInt(versionRule.stepLength));
ruleVO.setJumpCharacter(versionRule.jumpCharacter);
ruleVO.setPrefixion(versionRule.prefixion);
@@ -539,7 +527,7 @@
});
}catch (Exception e){
if(logger.isErrorEnabled()){
- logger.error("璇诲彇excel鍐呭鏃舵垨淇濆瓨鐢ㄦ埛淇℃伅鏃跺嚭鐜颁簡閿欒锛屽叿浣撳師鍥狅細",VciBaseUtil.getExceptionMessage(e));
+ logger.error("璇诲彇excel鍐呭鏃舵垨淇濆瓨鐗堟湰瑙勫垯鏃跺嚭鐜颁簡閿欒锛屽叿浣撳師鍥狅細",VciBaseUtil.getExceptionMessage(e));
}
e.printStackTrace();
return BaseResult.fail(VciBaseUtil.getExceptionMessage(e),new String[]{},e);
--
Gitblit v1.9.3