From 10c2ee4be4508c62b5980cc7059b1e8e95f7a3cc Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 04 七月 2023 17:22:11 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionVO.java | 163 +++++++++++++
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java | 12
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyVO.java | 145 +++++++++++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeRuleVO.java | 35 ++
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java | 4
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java | 5
Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeMapper.xml | 8
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/LinkTypeClient.java | 4
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultLibraryVO.java | 10
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/ClientBusinessObject.java | 3
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkType.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSysIntHeaderMapper.xml | 39 +++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java | 11
Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml | 4
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyRuleData.java | 8
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 29 +
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionValueVO.java | 24 ++
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 6
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 4
/dev/null | 146 ------------
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LinkTypeVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java | 4
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyRuleVO.java | 21 +
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java | 2
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java | 9
30 files changed, 496 insertions(+), 214 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ClassifyVO.java
deleted file mode 100644
index 794b51f..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ClassifyVO.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.vci.ubcs.code.vo.webserviceModel.coderule;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-@XStreamAlias("classify")
-public class ClassifyVO {
- /**
- * 鍒嗙被id
- */
- @XStreamAsAttribute
- private String id;
- /***
- * 鍒嗙被鍚嶇О
- */
- @XStreamAsAttribute
- private String name;
- /***
- * 鐖惰妭鐐筰d
- */
- @XStreamAsAttribute
- private String pid;
- /***
- * 鍒嗙被浠ｅ彿
- */
- @XStreamAsAttribute
- private String classCode;
- /***
- * 鎻忚堪
- */
- @XStreamAsAttribute
- private String description;
- /***
- * 鍒嗙被閾炬帴璺緞
- */
- @XStreamAsAttribute
- private String fullPathName;
- /***
- * 鍒嗙被鐘舵��
- */
- @XStreamAsAttribute
- private String lcStatus;
- /***
- * 瑙勫垯id
- */
- @XStreamAsAttribute
- private String codeRuleId;
-
- /***
- * 瑙勫垯id
- */
- @XStreamAsAttribute
- private CodeRuleVO codeRuleVO;
- /***
- * 鏄惁涓哄彾瀛愯妭鐐�
- */
- @XStreamAsAttribute
- private boolean isLeaf;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPid() {
- return pid;
- }
-
- public void setPid(String pid) {
- this.pid = pid;
- }
-
- public String getClassCode() {
- return classCode;
- }
-
- public void setClassCode(String classCode) {
- this.classCode = classCode;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getFullPathName() {
- return fullPathName;
- }
-
- public void setFullPathName(String fullPathName) {
- this.fullPathName = fullPathName;
- }
-
- public String getLcStatus() {
- return lcStatus;
- }
-
- public void setLcStatus(String lcStatus) {
- this.lcStatus = lcStatus;
- }
-
- public String getCodeRuleId() {
- return codeRuleId;
- }
-
- public void setCodeRuleId(String codeRuleId) {
- this.codeRuleId = codeRuleId;
- }
-
- public boolean isLeaf() {
- return isLeaf;
- }
-
- public void setLeaf(boolean leaf) {
- isLeaf = leaf;
- }
-
- @Override
- public String toString() {
- return "ClassifyVO{" +
- "id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", pid='" + pid + '\'' +
- ", classCode='" + classCode + '\'' +
- ", description='" + description + '\'' +
- ", fullPathName='" + fullPathName + '\'' +
- ", lcStatus='" + lcStatus + '\'' +
- ", codeRuleId='" + codeRuleId + '\'' +
- ", isLeaf=" + isLeaf +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeRuleVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeRuleVO.java
index 36119a5..489dbe0 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeRuleVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeRuleVO.java
@@ -1,8 +1,39 @@
package com.vci.ubcs.code.vo.webserviceModel.coderule;
-import com.vci.ubcs.code.dto.CodeRuleDTO;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import java.util.List;
+
+@XStreamAlias("codeRule")
public class CodeRuleVO {
-// private String
+ /**
+ * 缂栫爜瑙勫垯鐨勭紪鍙�
+ */
+ @XStreamAsAttribute
+ private String id;
+
+ /**
+ * 瑙勫垯缂栧彿
+ */
+ @XStreamAsAttribute
+ private String num;
+ /**
+ * 缂栫爜瑙勫垯鐨勫悕绉�
+ */
+ @XStreamAsAttribute
+ private String name;
+
+ /**
+ * 瑙勫垯鐨勬弿杩�
+ */
+ @XStreamAsAttribute
+ private String description;
+ /**
+ * 缂栫爜鐨勭爜娈典俊鎭�
+ */
+ @XStreamImplicit
+ private List<CodeSectionVO> secVOList;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionVO.java
new file mode 100644
index 0000000..034594e
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionVO.java
@@ -0,0 +1,163 @@
+package com.vci.ubcs.code.vo.webserviceModel.coderule;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+
+import java.util.List;
+
+@XStreamAlias("codeSection")
+public class CodeSectionVO {
+ /***
+ * 涓婚敭
+ */
+ @XStreamAsAttribute
+ private String id;
+
+ /***
+ * 涓婚敭
+ */
+ @XStreamAsAttribute
+ private String num;
+ /***
+ * 鐮佹鍚嶇О
+ */
+ @XStreamAsAttribute
+ private String name;
+ /**
+ * 鎻忚堪
+ */
+ @XStreamAsAttribute
+ private String description;
+
+
+ /**
+ * 鐮佹绫诲瀷
+ */
+ @XStreamAsAttribute
+ private String secType;
+
+ /**
+ * 鎵�灞炵紪鐮佽鍒�
+ */
+ @XStreamAsAttribute
+ private String pkCodeRule;
+
+
+ /**
+ * 鐮佹闀垮害绫诲瀷
+ */
+ @XStreamAsAttribute
+ private String codeSecLengthType;
+
+
+
+ /**
+ * 鐮佹闀垮害
+ */
+ @XStreamAsAttribute
+ private String codeSecLength;
+
+
+ /**
+ * 鐖跺垎绫荤爜娈典富閿�
+ */
+ @XStreamAsAttribute
+ private String parentClassifySecOid;
+
+ /***
+ * 鐮佹鐮佸��
+ */
+ private List<CodeSectionValueVO> sectionValues;
+ /**
+ * 鏃ユ湡鏍煎紡
+ */
+ @XStreamAsAttribute
+ private String codeDateFormatStr;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getSecType() {
+ return secType;
+ }
+
+ public void setSecType(String secType) {
+ this.secType = secType;
+ }
+
+ public String getPkCodeRule() {
+ return pkCodeRule;
+ }
+
+ public void setPkCodeRule(String pkCodeRule) {
+ this.pkCodeRule = pkCodeRule;
+ }
+
+ public String getCodeSecLengthType() {
+ return codeSecLengthType;
+ }
+
+ public void setCodeSecLengthType(String codeSecLengthType) {
+ this.codeSecLengthType = codeSecLengthType;
+ }
+
+ public String getCodeSecLength() {
+ return codeSecLength;
+ }
+
+ public void setCodeSecLength(String codeSecLength) {
+ this.codeSecLength = codeSecLength;
+ }
+
+ public String getCodeDateFormatStr() {
+ return codeDateFormatStr;
+ }
+
+ public void setCodeDateFormatStr(String codeDateFormatStr) {
+ this.codeDateFormatStr = codeDateFormatStr;
+ }
+
+ @Override
+ public String toString() {
+ return "CodeSectionVO{" +
+ "id='" + id + '\'' +
+ ", num='" + num + '\'' +
+ ", name='" + name + '\'' +
+ ", description='" + description + '\'' +
+ ", secType='" + secType + '\'' +
+ ", pkCodeRule='" + pkCodeRule + '\'' +
+ ", codeSecLengthType='" + codeSecLengthType + '\'' +
+ ", codeSecLength='" + codeSecLength + '\'' +
+ ", codeDateFormatStr='" + codeDateFormatStr + '\'' +
+ '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionValueVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionValueVO.java
new file mode 100644
index 0000000..85f1388
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionValueVO.java
@@ -0,0 +1,24 @@
+package com.vci.ubcs.code.vo.webserviceModel.coderule;
+
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+
+public class CodeSectionValueVO {
+ /***
+ * 鐮佸�间富閿�
+ */
+ private String id;
+ /***
+ * 鐮佸�肩紪鍙�
+ */
+ private String num;
+ /***
+ * 鐮佹鍊�
+ */
+ private String value;
+
+ /**
+ * 鎻忚堪
+ */
+ @XStreamAsAttribute
+ private String description;
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyRuleData.java
similarity index 82%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultData.java
rename to Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyRuleData.java
index 2164004..bd686d0 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyRuleData.java
@@ -3,18 +3,18 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
@XStreamAlias("data")
-public class ResultData {
+public class ResultClassifyRuleData {
@XStreamAlias("errorid")
private String errorid;
@XStreamAlias("msg")
private String msg;
- private LibraryVO library ;
+ private ResultLibraryVO library ;
- public LibraryVO getLibrary() {
+ public ResultLibraryVO getLibrary() {
return library;
}
- public void setLibrary(LibraryVO library) {
+ public void setLibrary(ResultLibraryVO library) {
this.library = library;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyRuleVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyRuleVO.java
new file mode 100644
index 0000000..62581d7
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyRuleVO.java
@@ -0,0 +1,21 @@
+package com.vci.ubcs.code.vo.webserviceModel.coderule;
+
+public class ResultClassifyRuleVO {
+
+ private ResultClassifyRuleData resultData;
+
+ public ResultClassifyRuleData getResultData() {
+ return resultData;
+ }
+
+ public void setResultData(ResultClassifyRuleData resultData) {
+ this.resultData = resultData;
+ }
+
+ @Override
+ public String toString() {
+ return "ResultClassifyVO{" +
+ "resultData=" + resultData +
+ '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyVO.java
index b514fa9..b7d37f5 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyVO.java
@@ -1,21 +1,146 @@
package com.vci.ubcs.code.vo.webserviceModel.coderule;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+
+@XStreamAlias("classify")
public class ResultClassifyVO {
+ /**
+ * 鍒嗙被id
+ */
+ @XStreamAsAttribute
+ private String id;
+ /***
+ * 鍒嗙被鍚嶇О
+ */
+ @XStreamAsAttribute
+ private String name;
+ /***
+ * 鐖惰妭鐐筰d
+ */
+ @XStreamAsAttribute
+ private String pid;
+ /***
+ * 鍒嗙被浠ｅ彿
+ */
+ @XStreamAsAttribute
+ private String classCode;
+ /***
+ * 鎻忚堪
+ */
+ @XStreamAsAttribute
+ private String description;
+ /***
+ * 鍒嗙被閾炬帴璺緞
+ */
+ @XStreamAsAttribute
+ private String fullPathName;
+ /***
+ * 鍒嗙被鐘舵��
+ */
+ @XStreamAsAttribute
+ private String lcStatus;
+ /***
+ * 瑙勫垯id
+ */
+ @XStreamAsAttribute
+ private String codeRuleId;
- private ResultData resultData;
+ /***
+ * 瑙勫垯id
+ */
+ @XStreamAsAttribute
+ private CodeRuleVO codeRuleVO;
+ /***
+ * 鏄惁涓哄彾瀛愯妭鐐�
+ */
+ @XStreamAsAttribute
+ private boolean isLeaf;
- public ResultData getResultData() {
- return resultData;
+ public String getId() {
+ return id;
}
- public void setResultData(ResultData resultData) {
- this.resultData = resultData;
+ public void setId(String id) {
+ this.id = id;
}
- @Override
- public String toString() {
- return "ResultClassifyVO{" +
- "resultData=" + resultData +
- '}';
+ public String getName() {
+ return name;
}
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
+
+ public String getClassCode() {
+ return classCode;
+ }
+
+ public void setClassCode(String classCode) {
+ this.classCode = classCode;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getFullPathName() {
+ return fullPathName;
+ }
+
+ public void setFullPathName(String fullPathName) {
+ this.fullPathName = fullPathName;
+ }
+
+ public String getLcStatus() {
+ return lcStatus;
+ }
+
+ public void setLcStatus(String lcStatus) {
+ this.lcStatus = lcStatus;
+ }
+
+ public String getCodeRuleId() {
+ return codeRuleId;
+ }
+
+ public void setCodeRuleId(String codeRuleId) {
+ this.codeRuleId = codeRuleId;
+ }
+
+ public boolean isLeaf() {
+ return isLeaf;
+ }
+
+ public void setLeaf(boolean leaf) {
+ isLeaf = leaf;
+ }
+
+ @Override
+ public String toString() {
+ return "ClassifyVO{" +
+ "id='" + id + '\'' +
+ ", name='" + name + '\'' +
+ ", pid='" + pid + '\'' +
+ ", classCode='" + classCode + '\'' +
+ ", description='" + description + '\'' +
+ ", fullPathName='" + fullPathName + '\'' +
+ ", lcStatus='" + lcStatus + '\'' +
+ ", codeRuleId='" + codeRuleId + '\'' +
+ ", isLeaf=" + isLeaf +
+ '}';
+ }
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/LibraryVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultLibraryVO.java
similarity index 82%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/LibraryVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultLibraryVO.java
index 14b4b0f..7e1bc7a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/LibraryVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultLibraryVO.java
@@ -7,15 +7,13 @@
import java.util.List;
@XStreamAlias("library ")
-public class LibraryVO {
+public class ResultLibraryVO {
@XStreamAsAttribute
private String id;
@XStreamAsAttribute
private String name;
@XStreamImplicit
- private List<ClassifyVO>classify;
-
- private List<CodeRuleVO> coderule;
+ private List<ResultClassifyVO>classify;
public String getId() {
return id;
@@ -33,11 +31,11 @@
this.name = name;
}
- public List<ClassifyVO> getClassify() {
+ public List<ResultClassifyVO> getClassify() {
return classify;
}
- public void setClassify(List<ClassifyVO> classify) {
+ public void setClassify(List<ResultClassifyVO> classify) {
this.classify = classify;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java
index 74dbcdc..ee499c1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java
@@ -174,8 +174,8 @@
/**
* 涓氬姟绫诲瀷鎵�灞為鍩�
*/
- @TableField("\"DOMAIN\"")
- private String domain;
+// @TableField("\"DOMAIN\"")
+ private String bizDomain;
/**
* 涓�鑷存�ф爣璇�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java
index 8f12d8e..b1cdcbf 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java
@@ -41,6 +41,6 @@
/**
* 鎵�灞為鍩�
*/
- private String domain;
+ private String bizDomain;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
index e3ba056..828545a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
@@ -1,13 +1,10 @@
package com.vci.ubcs.omd.entity;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
-
-import java.util.Date;
/**
*
@@ -48,7 +45,7 @@
/**
* 鎵�灞為鍩�
*/
- private String domain;
+ private String bizDomain;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkType.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkType.java
index 6a409cc..8744b6a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkType.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkType.java
@@ -118,6 +118,6 @@
/**
* 棰嗗煙鍊�
*/
- private String domain;
+ private String bizDomain;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java
index 58a2003..9f56f4b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java
@@ -179,7 +179,7 @@
/**
* 涓氬姟绫诲瀷鎵�灞為鍩�
*/
- private String domain;
+ private String bizDomain;
/**
* 棰嗗煙鏄剧ず瀛楁
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LinkTypeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LinkTypeVO.java
index a47e1e1..7a8b622 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LinkTypeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LinkTypeVO.java
@@ -122,7 +122,7 @@
/**
* 棰嗗煙鍊�
*/
- private String domain;
+ private String bizDomain;
/**
* 棰嗗煙鏄剧ず鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
index a1cac1a..6747ede 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
@@ -24,7 +24,7 @@
@TableId(value = "OID",type = IdType.ASSIGN_UUID)
private String oid;
- @TableField(value = "ID")
+ @TableField(value = "id")
private String id;
private String name;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
index 4f1778a..205389e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
@@ -113,7 +113,7 @@
*/
List<CodeClassify> selectByFieldNamePath(@Param("fieldPath") String fieldPath,@Param("fieldName") String fieldName);
- public List<CodeClassifyVO> getIdPathToNamePathByParentId(@Param("parentId")String parentId);
+ public List<CodeClassify> getIdPathToNamePathByParentId(@Param("parentId")String parentId);
CodeClassify selectByIdRel(@Param("oid") String oid);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 621622b..cc29bf0 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -544,7 +544,9 @@
*/
@Override
public List<CodeClassifyVO> getIdPathToNamePathByParentId(String classifyId, boolean enable) {
- return codeClassifyMapper.getIdPathToNamePathByParentId(classifyId);
+ List<CodeClassify> doList= codeClassifyMapper.getIdPathToNamePathByParentId(classifyId);
+ List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
+ return voList;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index ad6059a..90a9ab3 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -1016,7 +1016,7 @@
thisCbos.stream().forEach(clientBusinessObject -> {
BaseModel baseModel=new BaseModel();
BeanUtil.convert(clientBusinessObject,baseModel);
- baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
+ //baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
dataCBOList.add(baseModel);
dataCBOIdList.add(baseModel);
});
@@ -1030,9 +1030,14 @@
String rowIndex = cbo.getAttributeValue(IMPORT_ROW_INDEX);
errorMap.put(rowIndex, errorMap.getOrDefault(rowIndex, "") + ";绯荤粺閿欒锛屽瓨鍌ㄦ暟鎹殑鏃跺�欏嚭閿欎簡");
});
+
}
}
});
+ if (errorMap.size() > 0) {
+ isExport = true;
+ }
+ createWriteExcelData(rowDataList, errorMap, new ArrayList<>(), titleRowData, shetNameMap, finalTemplateVO);
engineService.batchSaveSelectChar(templateVO, dataCBOIdList);
}
}
@@ -1061,7 +1066,19 @@
return codeImProtRusultVO;
}
+ /*private void converBaseModels(List<ClientBusinessObject> clientBusinessObjects,List<BaseModel>dataCBOList){
+ clientBusinessObjects.stream().forEach(clientBusinessObject -> {
+ BaseModel baseModel=new BaseModel();
+ BeanUtil.convert(clientBusinessObject,baseModel);
+ Map<String,String> dataMap=new HashMap<>();
+ clientBusinessObject.getHisAttrValList()
+ baseModel.setData(VciBaseUtil.objectToMapString(baseModel));
+ AttributeValue[] newAttributeValue= clientBusinessObject.getNewAttrValList();
+ dataCBOList.add(baseModel);
+ });
+
+ }*/
/***
* 浠巈xecl閲屾瀯寤哄璞�
* @param rowDataList
@@ -1338,7 +1355,7 @@
cboList.stream().forEach(clientBusinessObject -> {
BaseModel baseModel=new BaseModel();
BeanUtil.convert(clientBusinessObject,baseModel);
- baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
+ //baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
dataCBOList.add(baseModel);
dataCBOIdList.add(baseModel.getOid());
});
@@ -1528,7 +1545,7 @@
needSaveCboList.stream().forEach(clientBusinessObject -> {
BaseModel baseModel=new BaseModel();
BeanUtil.convert(clientBusinessObject,baseModel);
- baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
+ //baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
dataCBOList.add(baseModel);
// allNeedSaveCboList.add(baseModel);
});
@@ -1802,7 +1819,7 @@
needSaveCboList.stream().forEach(clientBusinessObject -> {
BaseModel baseModel=new BaseModel();
BeanUtil.convert(clientBusinessObject,baseModel);
- baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
+ //(VciBaseUtil.objectToMapString(clientBusinessObject));
dataCBOList.add(baseModel);
allNeedSaveCboList.add(baseModel.getOid());
});
@@ -2004,7 +2021,7 @@
BaseModel baseModel=new BaseModel();
BeanUtil.convert(cbo,baseModel);
- baseModel.setData(VciBaseUtil.objectToMapString(cbo));
+ //baseModel.setData(VciBaseUtil.objectToMapString(cbo));
updateList.add(baseModel);
}else if(operation.equals("delete")){//濡傛灉鍦ㄦ祦绋嬩腑涓嶅厑璁稿垹闄わ紝涓嶅湪娴佺▼涓姸鎬佷负鍙戝竷鎴栬�呭仠鐢ㄧ殑鏁版嵁涓嶅厑璁稿垹闄わ紝灏嗗叾鏇存敼涓哄仠鐢紝鍏朵粬鐨勬儏鍐电洿鎺ュ垹闄�
// if(finalIsProcess){
@@ -2045,7 +2062,7 @@
BaseModel baseModel=new BaseModel();
BeanUtil.convert(cbo,baseModel);
- baseModel.setData(VciBaseUtil.objectToMapString(cbo));
+ //baseModel.setData(VciBaseUtil.objectToMapString(cbo));
updateList.add(baseModel);
}catch (VciBaseException e) {
e.printStackTrace();
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
index f199450..984f76a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -23,6 +23,7 @@
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
+import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.constant.RegExpConstant;
import com.vci.ubcs.starter.web.enumpck.OsCodeFillTypeEnum;
@@ -31,6 +32,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
@@ -73,6 +75,7 @@
private FormulaServiceImpl formulaService;
@Override
+ @Transactional(rollbackFor = VciBaseException.class)
public List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO, CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<BaseModel> dataCBOList) throws Exception {
// BatchCBO batchCBO = new BatchCBO();
// WebUtil.setPersistence(false);
@@ -99,6 +102,8 @@
String code = cbo.getId();
List<String> serialUnitList = new ArrayList<>();
String[] secLengths = cbo.getData().get(CODE_SEC_LENGTH_FIELD).split("#");
+ cbo.getData().remove(CODE_SEC_LENGTH_FIELD);//灏嗘key闄ゅ幓
+ cbo.getData().remove(IMPORT_ROW_INDEX);//灏嗘key闄ゅ幓
List<CodeBasicSecVO> secVOList = ruleVO.getSecVOList().stream().sorted(((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()))).collect(Collectors.toList());
Map<String/**鐮佹鐨勪富閿�**/,String/**鐮佹鐨勫��**/> serialValueMap = new HashMap<>();
Map<String, CodeBasicSecVO> secVOMap = secVOList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
@@ -147,6 +152,7 @@
});
}
CodeAllCode allCodeDO = new CodeAllCode();
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCodeDO, MdmBtmTypeConstant.CODE_ALL_CODE);
allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid());
allCodeDO.setCodeRuleOid(ruleVO.getOid());
allCodeDO.setId(cbo.getId());
@@ -209,7 +215,7 @@
}
//澶勭悊allCode
if(!CollectionUtils.isEmpty(allCodeDOList)){
- Map<String, List<CodeAllCode>> ruleGroup = allCodeDOList.stream().collect(Collectors.groupingBy(s -> s.getCodeRuleOid()));
+ Map<String,List<CodeAllCode>> ruleGroup = allCodeDOList.stream().collect(Collectors.groupingBy(s -> s.getCodeRuleOid()));
Map<String, CodeAllCode> codeDOMap = allCodeDOList.stream().collect(Collectors.toMap(s -> s.getCodeRuleOid() + "${SEP}" + s.getId(), t -> t));
List<CodeAllCode> addCodeDOs = new ArrayList<>();
List<CodeAllCode> editCodeDOs = new ArrayList<>();
@@ -252,13 +258,14 @@
codeAllCodeService.updateBatchById(editCodeDOs);
}
if(!CollectionUtils.isEmpty(addCodeDOs)){
-// batchCBO.copyFromOther(allCodeMapper.batchInsert(addCodeDOs));
+ //batchCBO.copyFromOther(allCodeMapper.batchInsert(addCodeDOs));
Map<String, String> statusMap = addCodeDOs.stream().collect(Collectors.toMap(s -> s.getOid(), s -> s.getLcStatus()));
addCodeDOs.stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmname())).forEach(s -> {
s.setLcStatus(statusMap.get(s.getOid()));
});
codeAllCodeService.saveBatch(addCodeDOs);
}
+ mdmEngineService.insertBatchByType(dataCBOList.get(0).getBtmname(),dataCBOList);
}
// WebUtil.setPersistence(true);
// boService.persistenceBatch(batchCBO);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/ClientBusinessObject.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/ClientBusinessObject.java
index 0bbfd41..f5c59e7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/ClientBusinessObject.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/ClientBusinessObject.java
@@ -69,8 +69,9 @@
attrVal.attrName = attributeName.toUpperCase();
attrVal.attrVal = attributeValue;
attrValList.add(attrVal);
- }
+ }
+ this.getData().put(attributeName,attributeValue);
this.newAttrValList = (AttributeValue[])attrValList.toArray(new AttributeValue[attrValList.size()]);
// }
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index 027e480..a022dc6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -126,6 +126,9 @@
<when test='fieldInPath=="name"'>
SYS_CONNECT_BY_PATH(codeclassify0.name, '#') as path
</when>
+ <when test='fieldInPath=="oid"'>
+ SYS_CONNECT_BY_PATH(codeclassify0.oid, '#') as path
+ </when>
<otherwise>
SYS_CONNECT_BY_PATH(codeclassify0.id, '#') as path
</otherwise>
@@ -194,9 +197,8 @@
SYS_CONNECT_BY_PATH(name, '#') as namePath,
SYS_CONNECT_BY_PATH(id, '#') as idPath
from pl_code_classify plcodeclassify
- START WITH parentCodeClassifyOid is null
+ START WITH oid = #{parentId}
CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
- where codeclassify0.paths =#{fieldPath}
</select>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSysIntHeaderMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSysIntHeaderMapper.xml
new file mode 100644
index 0000000..32aa911
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSysIntHeaderMapper.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.vci.ubcs.code.mapper.DockingSysIntHeaderMapper">
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="plDockingSysIntParamResultMap" type="com.vci.ubcs.code.entity.DockingSysIntHeader">
+ <result column="OID" property="oid"/>
+ <result column="REVISIONOID" property="revisionOid"/>
+ <result column="NAMEOID" property="nameOid"/>
+ <result column="BTMNAME" property="btmname"/>
+ <result column="LASTR" property="lastR"/>
+ <result column="FIRSTR" property="firstR"/>
+ <result column="LASTV" property="lastV"/>
+ <result column="FIRSTV" property="firstV"/>
+ <result column="CREATOR" property="creator"/>
+ <result column="CREATETIME" property="createTime"/>
+ <result column="LASTMODIFIER" property="lastModifier"/>
+ <result column="LASTMODIFYTIME" property="lastModifyTime"/>
+ <result column="REVISIONRULE" property="revisionRule"/>
+ <result column="VERSIONRULE" property="versionRule"/>
+ <result column="REVISIONSEQ" property="revisionSeq"/>
+ <result column="REVISIONVALUE" property="revisionValue"/>
+ <result column="VERSIONSEQ" property="versionSeq"/>
+ <result column="VERSIONVALUE" property="versionValue"/>
+ <result column="LCTID" property="lctid"/>
+ <result column="LCSTATUS" property="lcStatus"/>
+ <result column="TS" property="ts"/>
+ <result column="ID" property="id"/>
+ <result column="NAME" property="name"/>
+ <result column="DESCRIPTION" property="description"/>
+ <result column="OWNER" property="owner"/>
+ <result column="COPYFROMVERSION" property="copyFromVersion"/>
+
+ <result column="INFOOID" property="infoOid"/>
+ <result column="HEADERKEY" property="headerKey"/>
+ <result column="HEADERALUE" property="headerValue"/>
+ <result column="USEDFLAG" property="usedFlag"/>
+ <result column="tenant_id" property="tenantId"/>
+ </resultMap>
+</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
index 3ed8b36..6d62a18 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
@@ -84,7 +84,7 @@
Query query = new Query();
query.setSize(pageHelper.getLimit());
query.setCurrent(pageHelper.getPage());
- IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition,BtmType.class).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
+ IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition,BtmType.class).lambda().eq(BtmType::getBizDomain, domainValue).orderByAsc(BtmType::getId));
if (CollectionUtils.isEmpty(page.getRecords())){
return R.data(null);
}
@@ -116,7 +116,7 @@
conditionMap.remove(DOMAIN);
BtmType queryObj = new BtmType();
BeanMap.create(queryObj).putAll(conditionMap);
- List<BtmType> list = btmTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
+ List<BtmType> list = btmTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getBizDomain, domainValue).orderByAsc(BtmType::getId));
if (CollectionUtils.isEmpty(list)){
return R.data(null);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/LinkTypeClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/LinkTypeClient.java
index e82d50f..2a57a36 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/LinkTypeClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/LinkTypeClient.java
@@ -75,7 +75,7 @@
Query query = new Query();
query.setSize(pageHelper.getLimit());
query.setCurrent(pageHelper.getPage());
- IPage<LinkType> page = linkTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(queryObj).lambda().eq(LinkType::getDomain, domainValue).orderByAsc(LinkType::getId));
+ IPage<LinkType> page = linkTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(queryObj).lambda().eq(LinkType::getBizDomain, domainValue).orderByAsc(LinkType::getId));
Page<LinkTypeVO> pageVO = new Page<>();
BeanUtil.copy(page,pageVO);
pageVO.setRecords(LinkTypeWrapper.build().listEntityVO(page.getRecords(),null));
@@ -108,7 +108,7 @@
conditionMap.remove(DOMAIN);
LinkType queryObj = new LinkType();
BeanMap.create(queryObj).putAll(conditionMap);
- List<LinkType> doList = linkTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(LinkType::getDomain, domainValue).orderByAsc(LinkType::getId));
+ List<LinkType> doList = linkTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(LinkType::getBizDomain, domainValue).orderByAsc(LinkType::getId));
return R.data(LinkTypeWrapper.build().listEntityVO(doList,null));
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
index 56f954b..f947641 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
@@ -387,7 +387,7 @@
ddlDTO.setBtmTypeList(btmTypeVOList);
try {
// 灏嗕互鍓嶇殑checkDifferent鍜宺eflexDifferent缁撳悎浜�
- R result = DomainRepeater.checkDifferent(ddlDTO,btmTypeVO.getDomain());
+ R result = DomainRepeater.checkDifferent(ddlDTO,btmTypeVO.getBizDomain());
if (result.isSuccess()){
List<ModifyAttributeInfo> infoList = new ArrayList<>();
Object data = result.getData();
@@ -494,12 +494,13 @@
}
checkBtmTypeBeforeSave(btmTypeDTO);
BtmType btmTypeDO = Optional.ofNullable(BeanUtil.copy(btmTypeDTO, BtmType.class)).orElseGet(BtmType::new);
+ btmTypeDO.setBizDomain(btmTypeDTO.getDomain());
List<BtmTypeLinkAttributesDTO> attributes = btmTypeDTO.getAttributes();
List<BtmTypeAttributeVO> afterAttributes;
if (StringUtils.isBlank(btmTypeDO.getOid())){
btmTypeDO = BtmTypeWrapper.build().entityBeforeInsert(btmTypeDO);
if (StringUtils.isBlank(btmTypeDO.getTableName())) {
- btmTypeDO.setTableName(getTableName(btmTypeDO.getId(),btmTypeDO.getDomain()));
+ btmTypeDO.setTableName(getTableName(btmTypeDO.getId(),btmTypeDO.getBizDomain()));
}
// 娣诲姞灞炴��
btmTypeDTO.setOid(btmTypeDO.getOid());
@@ -650,7 +651,7 @@
try {
Map<String, String> domain = Optional.ofNullable(DomainRepeater.getDomain()).orElseGet(ArrayList::new).stream().collect(Collectors.toMap(DomainVO::getValue, DomainVO::getLabel));
List<BtmTypeVO> vos = BtmTypeWrapper.build().listEntityVO(baseMapper.selectAll());
- Map<String, List<BtmTypeVO>> domainMap = vos.stream().sorted(Comparator.comparing(BtmTypeVO::getId)).collect(Collectors.groupingBy(BtmTypeVO::getDomain));
+ Map<String, List<BtmTypeVO>> domainMap = vos.stream().sorted(Comparator.comparing(BtmTypeVO::getId)).collect(Collectors.groupingBy(BtmTypeVO::getBizDomain));
List<BtmTreeVO> treeList = new ArrayList<>();
domainMap.forEach((k,v)-> {
if (domain.containsKey(k)){
@@ -733,7 +734,7 @@
btmType.setCreator(user);
btmType.setBtmName(BtmTypeConstant.BTMTYPE);
btmType.setCreateTime(now);
- btmType.setDomain(domain);
+ btmType.setBizDomain(domain);
btmType.setLastModifyTime(now);
btmType.setLastModifier(user);
btmType.setName(dto.getDescription());
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java
index 1451bc7..e2aa9f1 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java
@@ -395,7 +395,7 @@
LinkType linkTypeDO = new LinkType();
BeanUtil.copy(linkTypeVO, linkTypeDO);
if (StringUtils.isBlank(linkTypeDO.getTableName())){
- linkTypeDO.setTableName(getTableName(linkTypeDO.getId(),linkTypeDO.getDomain()));
+ linkTypeDO.setTableName(getTableName(linkTypeDO.getId(),linkTypeDO.getBizDomain()));
}
String creator = AuthUtil.getUserAccount();
Date now = new Date();
@@ -411,7 +411,7 @@
List<LinkTypeAttributeVO> attributes = typeVO.getAttributes();
attributes.addAll(linkTypeAttributeService.getDefaultAttributes(typeVO));
typeVO.setAttributes(attributes);
- R r = DomainRepeater.submitLinkType(typeVO.getDomain(), typeVO);
+ R r = DomainRepeater.submitLinkType(typeVO.getBizDomain(), typeVO);
if (!r.isSuccess()){
dataSourceTransactionManager.rollback(transaction);
}else {
@@ -571,7 +571,7 @@
attributes.addAll(defaultAttributes);
linkTypeVO.setAttributes(attributes);
BtmAndLinkTypeDdlDTO ddlDTO = new BtmAndLinkTypeDdlDTO();
- DomainRepeater.checkDifferent(ddlDTO,linkTypeVO.getDomain());
+ DomainRepeater.checkDifferent(ddlDTO,linkTypeVO.getBizDomain());
dataSourceTransactionManager.commit(transaction);
}
} catch (Throwable e){
@@ -625,10 +625,10 @@
List<TableCheckDTO> checkList = linkTypeDOList.stream().map(linkType -> {
TableCheckDTO tableCheckDTO = new TableCheckDTO();
tableCheckDTO.setBtmName(linkType.getId());
- tableCheckDTO.setTableName(getTableName(linkType.getId(),linkType.getDomain()));
+ tableCheckDTO.setTableName(getTableName(linkType.getId(),linkType.getBizDomain()));
tableCheckDTO.setCheckTableHasData(true);
tableCheckDTO.setNeedDelete(true);
- tableCheckDTO.setDomain(linkType.getDomain());
+ tableCheckDTO.setDomain(linkType.getBizDomain());
return tableCheckDTO;
}).collect(Collectors.toList());
R result = DomainRepeater.checkTableHasDataByTableNameThenDrop(checkList);
@@ -877,7 +877,7 @@
try {
Map<String, String> domain = Optional.ofNullable(DomainRepeater.getDomain()).orElseGet(ArrayList::new).stream().collect(Collectors.toMap(DomainVO::getValue, DomainVO::getLabel));
List<LinkTypeVO> vos = LinkTypeWrapper.build().listEntityVO(baseMapper.selectAll(), null);
- Map<String, List<LinkTypeVO>> domainMap = vos.stream().collect(Collectors.groupingBy(LinkTypeVO::getDomain));
+ Map<String, List<LinkTypeVO>> domainMap = vos.stream().collect(Collectors.groupingBy(LinkTypeVO::getBizDomain));
List<BtmTreeVO> treeList = new ArrayList<>();
domainMap.forEach((k,v)-> {
if (domain.containsKey(k)){
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java
index c4a1391..9331220 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java
@@ -36,7 +36,7 @@
@Override
public BtmTypeVO entityVO(BtmType entity) {
BtmTypeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, BtmTypeVO.class));
- vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getDomain()));
+ vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getBizDomain()));
vo.setTableName(vo.getTableName() == null? "" : vo.getTableName().toUpperCase(Locale.ROOT));
// 鍦ㄨ繖閲岃缃灇涓炬樉绀哄��
vo.setRevisionFlag(BooleanEnum.TRUE.getValue().equals(entity.getRevisionFlag()));
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java
index 47620ec..1acd514 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java
@@ -51,7 +51,7 @@
vo.setToBtmTypes(toBtm);
vo.setTableName(vo.getTableName().toUpperCase(Locale.ROOT));
// 鏋氫妇澶勭悊
- vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getDomain()));
+ vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getBizDomain()));
return vo;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeMapper.xml b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeMapper.xml
index 548cc12..ee86cbd 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeMapper.xml
@@ -33,7 +33,7 @@
<result column="last_modifier" jdbcType="VARCHAR" property="lastModifier" />
<result column="last_modify_time" jdbcType="TIMESTAMP" property="lastModifyTime" />
<result column="ts" jdbcType="TIMESTAMP" property="ts" />
- <result column="domain" jdbcType="VARCHAR" property="domain" />
+ <result column="biz_domain" jdbcType="VARCHAR" property="bizDomain" />
<result column="consistence" jdbcType="VARCHAR" property="consistence" />
</resultMap>
@@ -41,7 +41,7 @@
oid, id, name, description, table_name, revision_rule_id, revision_rule_name,revision_flag,
revision_sep, input_revision_flag, secret_flag, abstract_flag, impl_class, shape,life_cycle_flag, life_cycle_id,life_cycle_name,
version_rule,sub_life_cycle_id,sub_life_cycle_name, view_flag, view_create_sql,btm_name, owner, creator, create_time, last_modifier,
- last_modify_time, ts,domain,consistence
+ last_modify_time, ts,biz_domain,consistence
</sql>
<sql id="tableName">
pl_omd_btm_type
@@ -81,7 +81,7 @@
#{item.lastModifier,jdbcType=VARCHAR},
#{item.lastModifyTime,jdbcType=TIMESTAMP},
#{item.ts,jdbcType=TIMESTAMP},
- #{item.domain,jdbcType=VARCHAR},
+ #{item.bizDomain,jdbcType=VARCHAR},
#{item.consistence,jdbcType=VARCHAR}
from dual
)
@@ -166,7 +166,7 @@
last_modifier = #{lastModifier,jdbcType=VARCHAR},
last_modify_time = #{lastModifyTime,jdbcType=TIMESTAMP},
ts = #{ts,jdbcType=TIMESTAMP},
- domain = #{domain,jdbcType=VARCHAR},
+ biz-domain = #{bizDomain,jdbcType=VARCHAR},
consistence = #{consistence,jdbcType=VARCHAR}
where OID = #{oid,jdbcType=VARCHAR}
</update>
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml
index 0034781..5dd7cba 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml
@@ -19,13 +19,13 @@
<result column="last_modifier" jdbcType="VARCHAR" property="lastModifier" />
<result column="last_modify_time" jdbcType="TIMESTAMP" property="lastModifyTime" />
<result column="ts" jdbcType="TIMESTAMP" property="ts" />
- <result column="domain" jdbcType="VARCHAR" property="domain" />
+ <result column="biz-domain" jdbcType="VARCHAR" property="bizDomain" />
</resultMap>
<sql id="base_query_column">
oid, id, name, description, shape, impl_class, from_btm_type, from_btm_type_name,
to_btm_type, to_btm_type_name, btm_name, owner, creator, create_time, last_modifier, last_modify_time,
- ts, domain
+ ts, biz-domain
</sql>
<sql id="tableName">
--
Gitblit v1.9.3