From a6fe25ede6f964ede26671298816b7239c80130e Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期二, 04 七月 2023 00:41:09 +0800 Subject: [PATCH] 获取分类规则对象 --- Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyRuleData.java | 8 /dev/null | 146 -------------- 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-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultLibraryVO.java | 10 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/CodeSectionValueVO.java | 24 ++ 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-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyRuleVO.java | 21 ++ 8 files changed, 384 insertions(+), 168 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; - /*** - * 鍒嗙被浠e彿 - */ - @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; + /*** + * 鍒嗙被浠e彿 + */ + @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; } -- Gitblit v1.9.3