From 79120a1740872fbb20a79d0cde0a3fa9f55ec285 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 31 七月 2024 17:29:12 +0800
Subject: [PATCH] 版本规则新增、修改接口上传。
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java | 113 +++++++++++++-----
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java | 108 +++++++++++++++---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsRevisionRuleVO.java | 60 +++++-----
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java | 24 ++-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java | 18 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java | 2
8 files changed, 228 insertions(+), 101 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java
index 7fe59b4..926e593 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java
@@ -32,27 +32,27 @@
/**
* 璺宠穬瀛楃
*/
- private String skipCode;
+ private String jumpCharacter;
/**
* 鍒濆鍊�
*/
- private String startCode;
+ private String initialValue;
/**
* 姝ラ暱
*/
- private Integer serialStep;
+ private String stepLength;
/**
* 鍓嶇紑
*/
- private String prefixCode;
+ private String prefixion;
/**
* 鍚庣紑
*/
- private String suffixCode;
+ private String suffix;
/**
* 鎻忚堪
@@ -63,6 +63,59 @@
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
private Date ts;
+
+
+ /**
+ * 鍒涘缓浜�
+ */
+ private String creator;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createTime;
+
+ /**
+ * 鏈�鍚庝慨鏀逛汉
+ */
+ private String lastModifier;
+
+ /**
+ * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
+ */
+ private Date lastModifyTime;
+
+ public void setCreator(String creator) {
+ this.creator = creator;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public void setLastModifier(String lastModifier) {
+ this.lastModifier = lastModifier;
+ }
+
+ public void setLastModifyTime(Date lastModifyTime) {
+ this.lastModifyTime = lastModifyTime;
+ }
+
+ public String getCreator() {
+ return creator;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public String getLastModifier() {
+ return lastModifier;
+ }
+
+ public Date getLastModifyTime() {
+ return lastModifyTime;
+ }
public String getOid() {
return oid;
@@ -88,44 +141,44 @@
this.name = name;
}
- public String getSkipCode() {
- return skipCode;
+ public void setJumpCharacter(String jumpCharacter) {
+ this.jumpCharacter = jumpCharacter;
}
- public void setSkipCode(String skipCode) {
- this.skipCode = skipCode;
+ public String getJumpCharacter() {
+ return jumpCharacter;
}
- public String getStartCode() {
- return startCode;
+ public String getInitialValue() {
+ return initialValue;
}
- public void setStartCode(String startCode) {
- this.startCode = startCode;
+ public void setInitialValue(String initialValue) {
+ this.initialValue = initialValue;
}
- public Integer getSerialStep() {
- return serialStep;
+ public void setStepLength(String stepLength) {
+ this.stepLength = stepLength;
}
- public void setSerialStep(Integer serialStep) {
- this.serialStep = serialStep;
+ public String getStepLength() {
+ return stepLength;
}
- public String getPrefixCode() {
- return prefixCode;
+ public void setPrefixion(String prefixion) {
+ this.prefixion = prefixion;
}
- public void setPrefixCode(String prefixCode) {
- this.prefixCode = prefixCode;
+ public String getPrefixion() {
+ return prefixion;
}
- public String getSuffixCode() {
- return suffixCode;
+ public void setSuffix(String suffix) {
+ this.suffix = suffix;
}
- public void setSuffixCode(String suffixCode) {
- this.suffixCode = suffixCode;
+ public String getSuffix() {
+ return suffix;
}
public String getDescription() {
@@ -150,11 +203,11 @@
"oid='" + oid + '\'' +
", id='" + id + '\'' +
", name='" + name + '\'' +
- ", skipCode='" + skipCode + '\'' +
- ", startCode='" + startCode + '\'' +
- ", serialStep=" + serialStep +
- ", prefixCode='" + prefixCode + '\'' +
- ", suffixCode='" + suffixCode + '\'' +
+ ", jumpCharacter='" + jumpCharacter + '\'' +
+ ", initialValue='" + initialValue + '\'' +
+ ", serialStep=" + stepLength +
+ ", prefixion='" + prefixion + '\'' +
+ ", suffix='" + suffix + '\'' +
", description='" + description + '\'' +
", ts=" + ts +
'}';
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsRevisionRuleVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsRevisionRuleVO.java
index 1144d97..a8d5d67 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsRevisionRuleVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsRevisionRuleVO.java
@@ -32,27 +32,27 @@
/**
* 璺宠穬瀛楃
*/
- private String skipCode;
+ private String jumpCharacter;
/**
* 鍒濆鍊�
*/
- private String startCode;
+ private String initialValue;
/**
* 姝ラ暱
*/
- private Integer serialStep;
+ private Integer stepLength;
/**
* 鍓嶇紑
*/
- private String prefixCode;
+ private String prefixion;
/**
* 鍚庣紑
*/
- private String suffixCode;
+ private String suffix;
/**
* 鎻忚堪
@@ -118,44 +118,44 @@
this.name = name;
}
- public String getSkipCode() {
- return skipCode;
+ public void setJumpCharacter(String jumpCharacter) {
+ this.jumpCharacter = jumpCharacter;
}
- public void setSkipCode(String skipCode) {
- this.skipCode = skipCode;
+ public String getJumpCharacter() {
+ return jumpCharacter;
}
- public String getStartCode() {
- return startCode;
+ public void setInitialValue(String initialValue) {
+ this.initialValue = initialValue;
}
- public void setStartCode(String startCode) {
- this.startCode = startCode;
+ public String getInitialValue() {
+ return initialValue;
}
- public Integer getSerialStep() {
- return serialStep;
+ public Integer getStepLength() {
+ return stepLength;
}
- public void setSerialStep(Integer serialStep) {
- this.serialStep = serialStep;
+ public void setStepLength(Integer stepLength) {
+ this.stepLength = stepLength;
}
- public String getPrefixCode() {
- return prefixCode;
+ public void setPrefixion(String prefixion) {
+ this.prefixion = prefixion;
}
- public void setPrefixCode(String prefixCode) {
- this.prefixCode = prefixCode;
+ public void setSuffix(String suffix) {
+ this.suffix = suffix;
}
- public String getSuffixCode() {
- return suffixCode;
+ public String getSuffix() {
+ return suffix;
}
- public void setSuffixCode(String suffixCode) {
- this.suffixCode = suffixCode;
+ public String getPrefixion() {
+ return prefixion;
}
public String getDescription() {
@@ -228,11 +228,11 @@
"oid='" + oid + '\'' +
", id='" + id + '\'' +
", name='" + name + '\'' +
- ", skipCode='" + skipCode + '\'' +
- ", startCode='" + startCode + '\'' +
- ", serialStep=" + serialStep +
- ", prefixCode='" + prefixCode + '\'' +
- ", suffixCode='" + suffixCode + '\'' +
+ ", jumpCharacter='" + jumpCharacter + '\'' +
+ ", initialValue='" + initialValue + '\'' +
+ ", stepLength=" + stepLength +
+ ", prefixion='" + prefixion + '\'' +
+ ", suffix='" + suffix + '\'' +
", description='" + description + '\'' +
", btmname='" + btmname + '\'' +
", owner='" + owner + '\'' +
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java
index 34e638b..6c3dfb1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java
@@ -40,7 +40,7 @@
* @param osRevisionRuleDTO
* @return
*/
- boolean updateVersionRule(OsRevisionRuleDTO osRevisionRuleDTO);
+ boolean updateVersionRule(OsRevisionRuleDTO osRevisionRuleDTO) throws PLException;
/**
* 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
index 0f92bad..a4e6359 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
@@ -207,14 +207,10 @@
public List<OsAttributeVO> getByAttributeNames(String[] attrNames) throws PLException {
VciBaseUtil.alertNotNull(attrNames,"灞炴�у悕");
List<OsAttributeVO> osAttributeVOS = new ArrayList<>();
- for (int i = 0; i < attrNames.length; i++) {
- AttributeDef[] attributeDefs = platformClientUtil.getAttributeService().getAttributeDefs(attrNames[i].toLowerCase(Locale.ROOT),1,1);
- if(Func.isNotEmpty(attributeDefs)){
- Arrays.stream(attributeDefs).forEach(attributeDef -> {
- osAttributeVOS.add(attributeDO2VO(attributeDef));
- });
- }
- }
+ AttributeDef[] attributeDefs = platformClientUtil.getAttributeService().getAttributeDefsByNames(attrNames);
+ Arrays.stream(attributeDefs).forEach(attr->{
+ osAttributeVOS.add(attributeDO2VO(attr));
+ });
return osAttributeVOS;
}
@@ -906,7 +902,11 @@
excelDataList.add(new WriteExcelData(i+1,0, osAttributeVO.getId()));
excelDataList.add(new WriteExcelData(i+1,1, osAttributeVO.getName()));
excelDataList.add(new WriteExcelData(i+1,2, osAttributeVO.getDescription()));
- excelDataList.add(new WriteExcelData(i+1,3, osAttributeVO.getAttributeDataTypeText()+"("+osAttributeVO.getAttributeDataType()+")"));
+ if(flag){
+ excelDataList.add(new WriteExcelData(i+1,3, osAttributeVO.getAttributeDataType()));
+ }else{
+ excelDataList.add(new WriteExcelData(i+1,3, osAttributeVO.getAttributeDataType()+"("+osAttributeVO.getAttributeDataTypeText()+")"));
+ }
excelDataList.add(new WriteExcelData(i+1,4, osAttributeVO.isNullableFlag()));
excelDataList.add(new WriteExcelData(i+1,5, osAttributeVO.getDefaultValue()));
excelDataList.add(new WriteExcelData(i+1,6, osAttributeVO.getEnumId()));
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 7a59184..08b20db 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
@@ -5,8 +5,10 @@
import com.vci.corba.omd.vrm.VersionRule;
import com.vci.dto.OsRevisionRuleDTO;
import com.vci.starter.web.annotation.log.VciUnLog;
+import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
import com.vci.pagemodel.OsRevisionRuleVO;
+import com.vci.starter.web.util.WebThreadLocalUtil;
import com.vci.web.service.OsRevisionRuleServiceI;
import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
@@ -17,7 +19,9 @@
import org.springframework.stereotype.Service;
import javax.swing.*;
+import java.awt.*;
import java.util.*;
+import java.util.List;
import java.util.stream.Collectors;
/**
@@ -73,20 +77,85 @@
*/
@Override
public boolean addVersionRule(OsRevisionRuleDTO osRevisionRuleDTO) throws PLException {
+ //鍒ょ┖
+ VciBaseUtil.alertNotNull(osRevisionRuleDTO,"鐗堟湰瑙勫垯瀵硅薄",osRevisionRuleDTO.getId(),"鐗堟湰瑙勫垯鍚嶇О");
+ //鐗堟湰瑙勫垯鍚堣妫�楠�
+ this.checkVersionRule(osRevisionRuleDTO);
+ //鏌ラ噸
VersionRule vr = platformClientUtil.getVersionService().getVersionRule(osRevisionRuleDTO.getName());
//name涓嶄负绌�
if(Func.isNotEmpty(vr) && !"".equals(vr.name)){
throw new PLException("500",new String[]{"鍚嶇О閲嶅璇锋洿鎹㈠悕绉�!"});
}
-
- platformClientUtil.getVersionService().addVersionRule(this.dto2VersionRule(osRevisionRuleDTO));
- return false;
+ return platformClientUtil.getVersionService().addVersionRule(this.dto2VersionRule(osRevisionRuleDTO));
}
+ /**
+ * 淇敼鐗堟湰瑙勫垯
+ * @param osRevisionRuleDTO
+ * @return
+ */
@Override
- public boolean updateVersionRule(OsRevisionRuleDTO osRevisionRuleDTO) {
+ public boolean updateVersionRule(OsRevisionRuleDTO osRevisionRuleDTO) throws PLException {
+ //鍒ょ┖
+ VciBaseUtil.alertNotNull(osRevisionRuleDTO,"鐗堟湰瑙勫垯瀵硅薄",osRevisionRuleDTO.getId(),"鐗堟湰瑙勫垯鍚嶇О");
+ //鍒ゆ柇鏄惁鍦ㄧ郴缁熶腑瀛樺湪
+ VersionRule vr = platformClientUtil.getVersionService().getVersionRule(osRevisionRuleDTO.getName());
+ //鐗堟湰瑙勫垯鍚堣妫�楠�
+ this.checkVersionRule(osRevisionRuleDTO);
+ //name涓嶄负绌�
+ if(Func.isEmpty(vr) && !"".equals(vr.name)){
+ throw new PLException("500",new String[]{"淇敼鐨勭増鏈鍒欏湪绯荤粺涓笉瀛樺湪!"});
+ }
+ return platformClientUtil.getVersionService().modifyVersionRule(this.dto2VersionRule(osRevisionRuleDTO));
+ }
- return false;
+ /**
+ * 妫�鏌ョ増鏈鍒欒缃殑鏄惁鍚堢悊
+ * @param dto
+ */
+ private void checkVersionRule(OsRevisionRuleDTO dto) throws PLException {
+ //鐗堟湰瑙勫垯鍚嶇О鍙兘涓鸿嫳鏂囧瓧姣�
+ String regex = "[a-z A-Z]*";
+ if (!dto.getId().matches(regex)) {
+ throw new PLException("500",new String[]{"鍚嶇О鍙兘涓鸿嫳鏂囷紒"});
+ }
+ //璺宠穬瀛楃鍙兘涓烘暟瀛楁垨鑰呭瓧姣�
+ if(Func.isNotBlank(dto.getJumpCharacter()) && (!(dto.getJumpCharacter().matches(regex)))){
+ throw new PLException("500",new String[]{"璺宠穬瀛楃鍙兘涓烘暟瀛楁垨鑰呭瓧姣嶏紒"});
+ }
+ //鍒濆鍊间笉鑳戒负绌轰笖鍙兘涓烘暟瀛楁垨鑰呭瓧姣嶆垨鑻辨枃鐘舵�佷笅鐨勭鍙�
+ String regex1 = "[A-Za-z0-9!@#$%^&*()-_=+{}':|;,.?/]+$";
+ if(Func.isBlank(dto.getInitialValue()) || !dto.getInitialValue().matches(regex1)){
+ throw new PLException("500",new String[]{"鍒濆鍊间笉鑳戒负绌轰笖鍙兘涓烘暟瀛楁垨鑰呭瓧姣嶆垨鑻辨枃鐘舵�佷笅鐨勭鍙凤紒"});
+ }
+ if(dto.getInitialValue().length() + dto.getInitialValue().length() > 32) {
+ throw new PLException("500",new String[]{"鍒濆鍊间笉鑳借秴杩�32涓瓧绗︼紒"});
+ }
+ //姝ラ暱涓嶈兘涓虹┖涓斿繀椤讳负1-9鐨勬鏁存暟
+ String regex2 = "[1-9]";
+ if(Func.isBlank(dto.getStepLength()) || (!dto.getStepLength().matches(regex2))){
+ throw new PLException("500",new String[]{"姝ラ暱涓嶈兘涓虹┖涓斿繀椤讳负1-9鐨勬鏁存暟"});
+ }
+ //鍓嶇紑鐩稿叧鍒ゆ柇
+ String regex3 = "^\\s+.*";
+ if(Func.isNotBlank(dto.getPrefixion()) && (dto.getPrefixion().matches(regex3))){
+ throw new PLException("500",new String[]{"鍓嶇紑涓嶈兘浠ョ┖鏍煎紑澶�"});
+ }
+ if (dto.getPrefixion().length() + dto.getPrefixion().length() > 32) {
+ throw new PLException("500",new String[]{"鍓嶇紑涓嶈兘瓒呰繃32涓瓧绗�"});
+ }
+ //鍚庣紑鐩稿叧鍒ゆ柇
+ String regex4 = "^*.\\s+$";
+ if(Func.isNotBlank(dto.getSuffix()) && (dto.getSuffix().matches(regex4))){
+ throw new PLException("500",new String[]{"鍚庣紑涓嶈兘浠ョ┖鏍肩粨灏�"});
+ }
+ if (dto.getSuffix().length() + dto.getSuffix().length() > 32) {
+ throw new PLException("500",new String[]{"鍚庣紑涓嶈兘瓒呰繃32涓瓧绗�"});
+ }
+ if (dto.getId().length() > 255) {
+ throw new PLException("500",new String[]{"鍚嶇О涓嶈兘瓒呰繃255涓瓧绗�"});
+ }
}
/**
@@ -97,15 +166,18 @@
VersionRule newVR = new VersionRule();
newVR.name = osRevisionRuleDTO.getId();
newVR.tag = osRevisionRuleDTO.getName();
- newVR.jumpCharacter = osRevisionRuleDTO.getPrefixCode();
- /*newVR.initialValue = jtf3.getText();
- newVR.stepLength = jtf4.getText();
- newVR.prefixion = jtf5.getText();
- newVR.suffix = jtf6.getText();
- newVR.description = jta.getText();*/
- String userName = ClientSessionUtility.getCurUserName();
- newVR.creator = userName;
+ newVR.description = osRevisionRuleDTO.getDescription();
+ newVR.jumpCharacter = osRevisionRuleDTO.getJumpCharacter();
+ newVR.initialValue = osRevisionRuleDTO.getInitialValue();
+ newVR.stepLength = osRevisionRuleDTO.getStepLength();
+ newVR.prefixion = osRevisionRuleDTO.getPrefixion();
+ newVR.suffix = osRevisionRuleDTO.getSuffix();
+ String userName = "developer";//WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
+ long timeMillis = System.currentTimeMillis();
+ newVR.creator = Func.isBlank(osRevisionRuleDTO.getCreator()) ? userName:osRevisionRuleDTO.getCreator();
+ newVR.createTime = Func.isEmpty(osRevisionRuleDTO.getCreateTime()) ? timeMillis:osRevisionRuleDTO.getCreateTime().getTime();
newVR.modifier = userName;
+ newVR.modifyTime = timeMillis;
return newVR;
}
@@ -148,11 +220,11 @@
ruleVO.setDescription(versionRule.description);
ruleVO.setId(versionRule.name);
ruleVO.setName(versionRule.tag);
- ruleVO.setSerialStep(WebUtil.getInt(versionRule.stepLength));
- ruleVO.setSkipCode(versionRule.jumpCharacter);
- ruleVO.setPrefixCode(versionRule.prefixion);
- ruleVO.setSuffixCode(versionRule.suffix);
- ruleVO.setStartCode(versionRule.initialValue);
+ ruleVO.setStepLength(WebUtil.getInt(versionRule.stepLength));
+ ruleVO.setJumpCharacter(versionRule.jumpCharacter);
+ ruleVO.setPrefixion(versionRule.prefixion);
+ ruleVO.setSuffix(versionRule.suffix);
+ ruleVO.setInitialValue(versionRule.initialValue);
//associated鏆傛椂娌℃湁浣跨敤
}
return ruleVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
index f8abe1d..13dfada 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
@@ -280,17 +280,19 @@
public boolean addSave(OsStatusDTO statusDTO) throws Exception {
VciBaseUtil.alertNotNull(
statusDTO,"鐘舵�佺殑淇℃伅",
- statusDTO.getId(),"鐘舵�佺殑鑻辨枃鍚嶇О",
- statusDTO.getName(),"鐘舵�佺殑涓枃鍚嶇О"
+ statusDTO.getId(),"鐘舵�佺殑鑻辨枃鍚嶇О"
);
- StatePool dbStatePool = platformClientUtil.getStatePoolService().getStatePool(statusDTO.getId());
- if (Func.isNotEmpty(dbStatePool) && Func.isNotBlank(dbStatePool.oid)) {
- throw new PLException("500",new String[]{"鍚嶇О閲嶅璇锋洿鎹㈠悕绉帮紒"});
+ if (statusDTO.getId().length()>50) {
+ throw new PLException("500",new String[]{"鐘舵�佽嫳鏂囧悕绉颁笉鑳借秴杩�50涓瓧绗︼紒"});
}
// 鐘舵�佹睜鍚嶇О鍙兘涓鸿嫳鏂囧瓧姣�
String regex = "[a-z A-Z]*";
- if ((!statusDTO.getId().matches(regex))) {
+ if (!statusDTO.getId().matches(regex)) {
throw new PLException("500",new String[]{"鍚嶇О鍙兘涓鸿嫳鏂囷紒"});
+ }
+ StatePool dbStatePool = platformClientUtil.getStatePoolService().getStatePool(statusDTO.getId());
+ if (Func.isNotEmpty(dbStatePool) && Func.isNotBlank(dbStatePool.oid)) {
+ throw new PLException("500",new String[]{"鍚嶇О閲嶅璇锋洿鎹㈠悕绉帮紒"});
}
//铏界劧浼氳嚜鍔ㄧ敓鎴恛id锛屼絾鏄繖鍎胯缃富閿紝閬垮厤鏀惧叆缂撳瓨鐨勬暟鎹槸娌℃湁oid鐨�
statusDTO.setOid(VciBaseUtil.getPk().toUpperCase(Locale.ROOT));
@@ -351,21 +353,21 @@
for(OsStatusDTO statusDTO : osStatusDTOS){
//oid鍜宼s鍒ょ┖
String oid = statusDTO.getOid();
- //name涓昏鐢ㄦ潵瀵圭紦瀛樻暟鎹垹闄�
- String name = statusDTO.getName();
+ //id涓昏鐢ㄦ潵瀵圭紦瀛樻暟鎹垹闄�
+ String id = statusDTO.getId();
//鍚庡彴浼氱敤ts杩涜鏁版嵁涓�鑷存�ф牎楠�
Date ts = statusDTO.getTs();
- if(Func.isBlank(oid) || Func.isBlank(name) || Func.isEmpty(ts)){
+ if(Func.isBlank(oid) || Func.isBlank(id) || Func.isEmpty(ts)){
throw new PLException("500",new String[]{"寰呭垹闄ょ殑鐘舵�佸垪琛ㄤ腑涓婚敭銆恛id銆戙�佽皟鏁存椂闂淬�恡s銆戙�佺姸鎬佸悕绉般�恘ame銆戜笉鑳戒负绌猴紒"});
}
StatePool statePool = new StatePool();
statePool.oid = oid;
- statePool.name = name;
+ statePool.name = id;
statePool.ts = Func.format(ts,VciDateUtil.DateTimeMillFormat);
statePoolList.add(statePool);
boolean res = platformClientUtil.getStatePoolService().deleteStatePool(statePool);
if(!res){
- throw new PLException("500",new String[]{"鍒犻櫎鐘舵�佸悕绉颁负銆�" + name + "銆戠殑鏁版嵁鏃跺嚭鐜伴敊璇�!"});
+ throw new PLException("500",new String[]{"鍒犻櫎鐘舵�佸悕绉颁负銆�" + id + "銆戠殑鏁版嵁鏃跺嚭鐜伴敊璇�!"});
}
}
//clearCache();
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
index f2ea563..5d53a0d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
@@ -2042,7 +2042,7 @@
if (ruleVO == null || StringUtils.isBlank(ruleVO.getOid())) {
throw new VciBaseException("{0}閲岀殑鐗堟湰瑙勫垯璁剧疆寰椾笉姝ｇ‘锛屽湪绯荤粺涓病鏈夋壘鍒皗1}杩欎釜鐗堟湰瑙勫垯", new String[]{btmTypeVO.getName(), btmTypeVO.getRevisionRuleId()});
}
- cbo.revisionValue = ruleVO.getStartCode();
+ cbo.revisionValue = ruleVO.getInitialValue();
}
if (StringUtils.isBlank(cbo.nameoid)) {
cbo.nameoid = VciBaseUtil.getPk();
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
index 31f0204..12701d1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
@@ -196,7 +196,7 @@
bo.versionRule = String.valueOf(btmTypeVO.getVersionRule());
if(StringUtils.isNotBlank(btmTypeVO.getRevisionRuleId())){
OsRevisionRuleVO revisionRuleVO = revisionRuleService.getRevisionRuleById(btmTypeVO.getRevisionRuleId());
- bo.revisionValue = revisionRuleVO.getStartCode();
+ bo.revisionValue = revisionRuleVO.getInitialValue();
}
bo.revisionSeq = (short) 1;
--
Gitblit v1.9.3