From 353bc1b8b4650f144a65b9125457253051e68492 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 06 七月 2023 18:44:23 +0800
Subject: [PATCH] 集成获取分类接口（包含编码规则码段码值信息）
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultCodeRuleVO.java | 17
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/test.json | 488 +++++++++++++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 100 +++-
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionVO.java | 33 +
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/result.json | 464 ++++++++++++++++++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/test1.json | 75 +++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/data.xml | 111 ++++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionValueVO.java | 25
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/data.json | 17
10 files changed, 1,258 insertions(+), 74 deletions(-)
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
index 7065cc1..6169481 100644
--- 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
@@ -12,9 +12,13 @@
*/
@XStreamAsAttribute
private String id;
-
/***
- * 涓婚敭
+ * 瑙勫垯鐮佹缂栧彿
+ */
+ @XStreamAsAttribute
+ private String sectionCode;
+ /***
+ * 搴忓彿
*/
@XStreamAsAttribute
private String num;
@@ -35,6 +39,11 @@
*/
@XStreamAsAttribute
private String secType;
+ /***
+ * 鐮佹绫诲瀷鏄剧ず鍊�
+ */
+ @XStreamAsAttribute
+ private String secTypeText;
/**
* 鎵�灞炵紪鐮佽鍒�
@@ -162,17 +171,37 @@
this.sectionValue = sectionValue;
}
+ public String getSectionCode() {
+ return sectionCode;
+ }
+
+ public void setSectionCode(String sectionCode) {
+ this.sectionCode = sectionCode;
+ }
+
+ public String getSecTypeText() {
+ return secTypeText;
+ }
+
+ public void setSecTypeText(String secTypeText) {
+ this.secTypeText = secTypeText;
+ }
+
@Override
public String toString() {
return "CodeSectionVO{" +
"id='" + id + '\'' +
+ ", sectionCode='" + sectionCode + '\'' +
", num='" + num + '\'' +
", name='" + name + '\'' +
", description='" + description + '\'' +
", secType='" + secType + '\'' +
+ ", secTypeText='" + secTypeText + '\'' +
", pkCodeRule='" + pkCodeRule + '\'' +
", codeSecLengthType='" + codeSecLengthType + '\'' +
", codeSecLength='" + codeSecLength + '\'' +
+ ", parentClassifySecOid='" + parentClassifySecOid + '\'' +
+ ", sectionValue=" + sectionValue +
", 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
index 99a9b17..f261f87 100644
--- 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
@@ -8,11 +8,13 @@
public CodeSectionValueVO() {
}
- public CodeSectionValueVO(String id, String num, String value,String name ,String description) {
+ public CodeSectionValueVO(String id, String num, String value,String name ,String pid,String description) {
this.id = id;
this.num = num;
this.value = value;
this.description = description;
+ this.name=name;
+ this.pid=pid;
}
/***
@@ -21,11 +23,13 @@
@XStreamAsAttribute
private String id;
/***
- * 鐮佸�肩紪鍙�
+ * 鐮佸�煎簭鍙�
*/
@XStreamAsAttribute
private String num;
-
+ /***
+ * 鐮佸�兼樉绀哄��
+ */
@XStreamAsAttribute
private String name;
@@ -34,7 +38,11 @@
*/
@XStreamAsAttribute
private String value;
-
+ /***
+ * 鐖剁爜娈祇id
+ */
+ @XStreamAsAttribute
+ private String pid;
/**
* 鎻忚堪
*/
@@ -81,6 +89,14 @@
this.name = name;
}
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
+
@Override
public String toString() {
return "CodeSectionValueVO{" +
@@ -88,6 +104,7 @@
", num='" + num + '\'' +
", name='" + name + '\'' +
", value='" + value + '\'' +
+ ", pid='" + pid + '\'' +
", description='" + description + '\'' +
'}';
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultCodeRuleVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultCodeRuleVO.java
index 38f9eea..5e602d9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultCodeRuleVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultCodeRuleVO.java
@@ -14,7 +14,11 @@
*/
@XStreamAsAttribute
private String id;
-
+ /***
+ * 瑙勫垯缂栫爜
+ */
+ @XStreamAsAttribute
+ private String ruleCode;
/**
* 瑙勫垯缂栧彿
*/
@@ -77,10 +81,19 @@
this.codeSection = codeSection;
}
+ public String getRuleCode() {
+ return ruleCode;
+ }
+
+ public void setRuleCode(String ruleCode) {
+ this.ruleCode = ruleCode;
+ }
+
@Override
public String toString() {
- return "CodeRuleVO{" +
+ return "ResultCodeRuleVO{" +
"id='" + id + '\'' +
+ ", ruleCode='" + ruleCode + '\'' +
", num='" + num + '\'' +
", name='" + name + '\'' +
", description='" + description + '\'' +
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/data.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/data.json
new file mode 100644
index 0000000..9b0e9c6
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/data.json
@@ -0,0 +1,17 @@
+{
+ "data":{
+ "systemId": "MPM",
+ "user": {
+ "userName": "weidy",
+ "trueName": "榄忓ぇ鍕�",
+ "ip": "127.0.0.1"
+ },
+ "library": {
+ "id": "wupin",
+ "classifyid":[
+ "020201",
+ "020202"
+ ]
+ }
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/data.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/data.xml
new file mode 100644
index 0000000..b28867d
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/data.xml
@@ -0,0 +1,111 @@
+
+<?xml version="1.0" encoding="UTF-8"?>
+<data systemId="MPM">
+ <user userName="weidy" trueName="" ip="127.0.0.1"/>
+ <library id="wupin">
+ <classifyid>020201</classifyid>
+ <classifyid>020202</classifyid>
+ </library>
+</data>
+
+<?xml version="1.0" encoding="UTF-8" ?>
+<data>
+ <errorid>0</errorid>
+ <msg>鎴愬姛!</msg>
+ <library id="wupin" name="">
+ <classify id="B6C55202-A224-9098-6A82-E3FC5DEEF790" name="鍙ｇ洊" pid="0C600A6A-6398-FC30-D13E-121201FDA908" classCode="020202" description="鍙ｇ洊" fullPathName="" lcStatus="Enabled" isLeaf="false">
+ <codeRule id="1673234841140858880" ruleCode="csfjl" num="" name="csfjl" description="">
+ <codeSection id="1673235191453323264" sectionCode="gdmd" num="1" name="鍥哄畾鐮佹" description="aaaa" secType="codefixedsec" secTypeText="鍥哄畾鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue>
+ <sectionValue id="1673235273523269632" num="2" name="" value="002" pid="" description=""/>
+ <sectionValue id="1673235247598276608" num="1" name="" value="001" pid="" description=""/>
+ </sectionValue>
+ </codeSection>
+ <codeSection id="1673235394948370432" sectionCode="flmdf" num="2" name="鍒嗙被鐮佹鐖�" description="" secType="codeclassifysec" secTypeText="鍒嗙被鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue>
+ <sectionValue id="1673235471532167168" num="1" name="浜�" value="001" pid="" description=""/>
+ <sectionValue id="1673235449524654080" num="1" name="涓�" value="001" pid="" description=""/>
+ </sectionValue>
+ </codeSection>
+ <codeSection id="1673235616541839360" sectionCode="flmdz" num="3" name="鍒嗙被鐮佹瀛�" description="sss" secType="codeclassifysec" secTypeText="鍒嗙被鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="1673235394948370432" codeDateFormatStr="">
+ <sectionValue>
+ <sectionValue id="1673235791276544000" num="1" name="灏忎簩" value="0012" pid="1673235471532167168" description=""/>
+ <sectionValue id="1673235759584382976" num="1" name="灏忎竴" value="0011" pid="1673235449524654080" description=""/>
+ </sectionValue>
+ </codeSection>
+ <codeSection id="1673235886290112512" sectionCode="kbmd" num="4" name="鍙彉鐮佹" description="sss" secType="codevariablesec" secTypeText="鍙彉鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue/>
+ </codeSection>
+ <codeSection id="1676048203809689600" sectionCode="yy" num="5" name="寮曠敤鐮佹" description="寮曠敤鐮佹" secType="coderefersec" secTypeText="寮曠敤鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue/>
+ </codeSection>
+ <codeSection id="1676052431290634240" sectionCode="ge" num="6" name="灞炴�х爜娈�" description="fes" secType="codeattrsec" secTypeText="灞炴�х爜娈�" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue/>
+ </codeSection>
+ <codeSection id="1676837573571514368" sectionCode="cengji" num="7" name="灞傜骇鐮佹" description="灞傜骇鐮佹" secType="codelevelsec" secTypeText="灞傜骇鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue>
+ <sectionValue id="0C600A6A-6398-FC30-D13E-121201FDA908" num="" name="鏈轰綋鏋勪欢" value="0202" pid="" description="鏈轰綋鏋勪欢"/>
+ </sectionValue>
+ </codeSection>
+ <codeSection id="1676837771429416960" sectionCode="cengj" num="8" name="灞傜骇鐮佹2" description="灞傜骇鐮佹2" secType="codelevelsec" secTypeText="灞傜骇鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue>
+ <sectionValue id="B6C55202-A224-9098-6A82-E3FC5DEEF790" num="" name="鍙ｇ洊" value="020202" pid="" description="鍙ｇ洊"/>
+ </sectionValue>
+ </codeSection>
+ <codeSection id="1676838137894146048" sectionCode="shux" num="9" name="灞炴�х爜娈�" description="" secType="codeattrsec" secTypeText="灞炴�х爜娈�" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue/>
+ </codeSection>
+ <codeSection id="1676838388730302464" sectionCode="riqi" num="10" name="鏃ユ湡鐮佹" description="鏃ユ湡鐮佹" secType="codedatesec" secTypeText="鏃ユ湡鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="YYYY-MM-DD">
+ <sectionValue/>
+ </codeSection>
+ </codeRule>
+ </classify>
+ <classify id="46B5DB5E-F783-DFE9-B48A-C4A367D02AC0" name="閿�" pid="0C600A6A-6398-FC30-D13E-121201FDA908" classCode="020201" description="閿�" fullPathName="" lcStatus="Enabled" isLeaf="false">
+ <codeRule id="1673234841140858880" ruleCode="csfjl" num="" name="csfjl" description="">
+ <codeSection id="1673235191453323264" sectionCode="gdmd" num="1" name="鍥哄畾鐮佹" description="aaaa" secType="codefixedsec" secTypeText="鍥哄畾鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue>
+ <sectionValue id="1673235273523269632" num="2" name="" value="002" pid="" description=""/>
+ <sectionValue id="1673235247598276608" num="1" name="" value="001" pid="" description=""/>
+ </sectionValue>
+ </codeSection>
+ <codeSection id="1673235394948370432" sectionCode="flmdf" num="2" name="鍒嗙被鐮佹鐖�" description="" secType="codeclassifysec" secTypeText="鍒嗙被鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue>
+ <sectionValue id="1673235471532167168" num="1" name="浜�" value="001" pid="" description=""/>
+ <sectionValue id="1673235449524654080" num="1" name="涓�" value="001" pid="" description=""/>
+ </sectionValue>
+ </codeSection>
+ <codeSection id="1673235616541839360" sectionCode="flmdz" num="3" name="鍒嗙被鐮佹瀛�" description="sss" secType="codeclassifysec" secTypeText="鍒嗙被鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="1673235394948370432" codeDateFormatStr="">
+ <sectionValue>
+ <sectionValue id="1673235791276544000" num="1" name="灏忎簩" value="0012" pid="1673235471532167168" description=""/>
+ <sectionValue id="1673235759584382976" num="1" name="灏忎竴" value="0011" pid="1673235449524654080" description=""/>
+ </sectionValue>
+ </codeSection>
+ <codeSection id="1673235886290112512" sectionCode="kbmd" num="4" name="鍙彉鐮佹" description="sss" secType="codevariablesec" secTypeText="鍙彉鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue/>
+ </codeSection>
+ <codeSection id="1676048203809689600" sectionCode="yy" num="5" name="寮曠敤鐮佹" description="寮曠敤鐮佹" secType="coderefersec" secTypeText="寮曠敤鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue/>
+ </codeSection>
+ <codeSection id="1676052431290634240" sectionCode="ge" num="6" name="灞炴�х爜娈�" description="fes" secType="codeattrsec" secTypeText="灞炴�х爜娈�" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue/>
+ </codeSection>
+ <codeSection id="1676837573571514368" sectionCode="cengji" num="7" name="灞傜骇鐮佹" description="灞傜骇鐮佹" secType="codelevelsec" secTypeText="灞傜骇鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue>
+ <sectionValue id="0C600A6A-6398-FC30-D13E-121201FDA908" num="" name="鏈轰綋鏋勪欢" value="0202" pid="" description="鏈轰綋鏋勪欢"/>
+ </sectionValue>
+ </codeSection>
+ <codeSection id="1676837771429416960" sectionCode="cengj" num="8" name="灞傜骇鐮佹2" description="灞傜骇鐮佹2" secType="codelevelsec" secTypeText="灞傜骇鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue>
+ <sectionValue id="46B5DB5E-F783-DFE9-B48A-C4A367D02AC0" num="" name="閿�" value="020201" pid="" description="閿�"/>
+ </sectionValue>
+ </codeSection>
+ <codeSection id="1676838137894146048" sectionCode="shux" num="9" name="灞炴�х爜娈�" description="" secType="codeattrsec" secTypeText="灞炴�х爜娈�" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
+ <sectionValue/>
+ </codeSection>
+ <codeSection id="1676838388730302464" sectionCode="riqi" num="10" name="鏃ユ湡鐮佹" description="鏃ユ湡鐮佹" secType="codedatesec" secTypeText="鏃ユ湡鐮佹" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="YYYY-MM-DD">
+ <sectionValue/>
+ </codeSection>
+ </codeRule>
+ </classify>
+ </library>
+</data>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/result.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/result.json
index 5dfef0e..5d11bf6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/result.json
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/result.json
@@ -1,5 +1,5 @@
{
- "resultData": {
+ "data": {
"msg": "鎴愬姛!",
"library": {
"classify": [
@@ -10,38 +10,235 @@
"description": "鍙ｇ洊",
"pid": "0C600A6A-6398-FC30-D13E-121201FDA908",
"codeRule": {
- "num": "001-copy",
- "description": "鐗╁搧缂栫爜瑙勫垯",
+ "ruleCode": "csfjl",
+ "num": "",
+ "name": "csfjl",
+ "description": "",
"codeSection": [
{
+ "num": "1",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "aaaa",
+ "sectionCode": "gdmd",
+ "secType": "codefixedsec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "",
+ "secTypeText": "鍥哄畾鐮佹",
"sectionValue": [
{
- "num": "0",
+ "num": "2",
+ "name": "",
+ "description": "",
+ "pid": "",
+ "id": "1673235273523269632",
+ "value": "002"
+ },
+ {
+ "num": "1",
+ "name": "",
+ "description": "",
+ "pid": "",
+ "id": "1673235247598276608",
+ "value": "001"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "鍥哄畾鐮佹",
+ "id": "1673235191453323264",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "2",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "",
+ "sectionCode": "flmdf",
+ "secType": "codeclassifysec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "",
+ "secTypeText": "鍒嗙被鐮佹",
+ "sectionValue": [
+ {
+ "num": "1",
+ "name": "浜�",
+ "description": "",
+ "pid": "",
+ "id": "1673235471532167168",
+ "value": "001"
+ },
+ {
+ "num": "1",
+ "name": "涓�",
+ "description": "",
+ "pid": "",
+ "id": "1673235449524654080",
+ "value": "001"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "鍒嗙被鐮佹鐖�",
+ "id": "1673235394948370432",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "3",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "sss",
+ "sectionCode": "flmdz",
+ "secType": "codeclassifysec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "1673235394948370432",
+ "secTypeText": "鍒嗙被鐮佹",
+ "sectionValue": [
+ {
+ "num": "1",
+ "name": "灏忎簩",
+ "description": "",
+ "pid": "1673235471532167168",
+ "id": "1673235791276544000",
+ "value": "0012"
+ },
+ {
+ "num": "1",
+ "name": "灏忎竴",
+ "description": "",
+ "pid": "1673235449524654080",
+ "id": "1673235759584382976",
+ "value": "0011"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "鍒嗙被鐮佹瀛�",
+ "id": "1673235616541839360",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "4",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "sss",
+ "sectionCode": "kbmd",
+ "secType": "codevariablesec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "",
+ "secTypeText": "鍙彉鐮佹",
+ "sectionValue": [],
+ "codeDateFormatStr": "",
+ "name": "鍙彉鐮佹",
+ "id": "1673235886290112512",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "5",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "寮曠敤鐮佹",
+ "sectionCode": "yy",
+ "secType": "coderefersec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "寮曠敤鐮佹",
+ "sectionValue": [],
+ "codeDateFormatStr": "",
+ "name": "寮曠敤鐮佹",
+ "id": "1676048203809689600",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "6",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "fes",
+ "sectionCode": "ge",
+ "secType": "codeattrsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞炴�х爜娈�",
+ "sectionValue": [],
+ "codeDateFormatStr": "",
+ "name": "灞炴�х爜娈�",
+ "id": "1676052431290634240",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "7",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "灞傜骇鐮佹",
+ "sectionCode": "cengji",
+ "secType": "codelevelsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞傜骇鐮佹",
+ "sectionValue": [
+ {
+ "num": "",
+ "name": "鏈轰綋鏋勪欢",
+ "description": "鏈轰綋鏋勪欢",
+ "pid": "",
+ "id": "0C600A6A-6398-FC30-D13E-121201FDA908",
+ "value": "0202"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "灞傜骇鐮佹",
+ "id": "1676837573571514368",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "8",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "灞傜骇鐮佹2",
+ "sectionCode": "cengj",
+ "secType": "codelevelsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞傜骇鐮佹",
+ "sectionValue": [
+ {
+ "num": "",
+ "name": "鍙ｇ洊",
+ "description": "鍙ｇ洊",
+ "pid": "",
"id": "B6C55202-A224-9098-6A82-E3FC5DEEF790",
"value": "020202"
}
],
- "num": "01",
- "codeSecLengthType": "code_sec_length_variable",
- "name": "灞傜骇鐮佹",
- "secType": "codelevelsec",
- "id": "1674682431208296448",
- "pkCodeRule": "9FE2AF3E-2940-BD80-D46F-E3853314673D"
+ "codeDateFormatStr": "",
+ "name": "灞傜骇鐮佹2",
+ "id": "1676837771429416960",
+ "pkCodeRule": "1673234841140858880"
},
{
+ "num": "9",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "",
+ "sectionCode": "shux",
+ "secType": "codeattrsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞炴�х爜娈�",
"sectionValue": [],
- "num": "02",
- "name": "娴佹按鐮佹",
- "description": "娴佹按鐮佹",
- "secType": "codeserialsec",
- "id": "801B6412-E617-214A-08A5-9EDF5821AA66",
- "pkCodeRule": "9FE2AF3E-2940-BD80-D46F-E3853314673D",
- "codeSecLength": "4"
+ "codeDateFormatStr": "",
+ "name": "灞炴�х爜娈�",
+ "id": "1676838137894146048",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "10",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "鏃ユ湡鐮佹",
+ "sectionCode": "riqi",
+ "secType": "codedatesec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "鏃ユ湡鐮佹",
+ "sectionValue": [],
+ "codeDateFormatStr": "YYYY-MM-DD",
+ "name": "鏃ユ湡鐮佹",
+ "id": "1676838388730302464",
+ "pkCodeRule": "1673234841140858880"
}
],
- "id": "9FE2AF3E-2940-BD80-D46F-E3853314673D"
+ "id": "1673234841140858880"
},
"id": "B6C55202-A224-9098-6A82-E3FC5DEEF790",
+ "fullPathName": "",
"leaf": false
},
{
@@ -51,38 +248,235 @@
"description": "閿�",
"pid": "0C600A6A-6398-FC30-D13E-121201FDA908",
"codeRule": {
- "num": "001-copy",
- "description": "鐗╁搧缂栫爜瑙勫垯",
+ "ruleCode": "csfjl",
+ "num": "",
+ "name": "csfjl",
+ "description": "",
"codeSection": [
{
+ "num": "1",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "aaaa",
+ "sectionCode": "gdmd",
+ "secType": "codefixedsec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "",
+ "secTypeText": "鍥哄畾鐮佹",
"sectionValue": [
{
- "num": "0",
+ "num": "2",
+ "name": "",
+ "description": "",
+ "pid": "",
+ "id": "1673235273523269632",
+ "value": "002"
+ },
+ {
+ "num": "1",
+ "name": "",
+ "description": "",
+ "pid": "",
+ "id": "1673235247598276608",
+ "value": "001"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "鍥哄畾鐮佹",
+ "id": "1673235191453323264",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "2",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "",
+ "sectionCode": "flmdf",
+ "secType": "codeclassifysec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "",
+ "secTypeText": "鍒嗙被鐮佹",
+ "sectionValue": [
+ {
+ "num": "1",
+ "name": "浜�",
+ "description": "",
+ "pid": "",
+ "id": "1673235471532167168",
+ "value": "001"
+ },
+ {
+ "num": "1",
+ "name": "涓�",
+ "description": "",
+ "pid": "",
+ "id": "1673235449524654080",
+ "value": "001"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "鍒嗙被鐮佹鐖�",
+ "id": "1673235394948370432",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "3",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "sss",
+ "sectionCode": "flmdz",
+ "secType": "codeclassifysec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "1673235394948370432",
+ "secTypeText": "鍒嗙被鐮佹",
+ "sectionValue": [
+ {
+ "num": "1",
+ "name": "灏忎簩",
+ "description": "",
+ "pid": "1673235471532167168",
+ "id": "1673235791276544000",
+ "value": "0012"
+ },
+ {
+ "num": "1",
+ "name": "灏忎竴",
+ "description": "",
+ "pid": "1673235449524654080",
+ "id": "1673235759584382976",
+ "value": "0011"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "鍒嗙被鐮佹瀛�",
+ "id": "1673235616541839360",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "4",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "sss",
+ "sectionCode": "kbmd",
+ "secType": "codevariablesec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "",
+ "secTypeText": "鍙彉鐮佹",
+ "sectionValue": [],
+ "codeDateFormatStr": "",
+ "name": "鍙彉鐮佹",
+ "id": "1673235886290112512",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "5",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "寮曠敤鐮佹",
+ "sectionCode": "yy",
+ "secType": "coderefersec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "寮曠敤鐮佹",
+ "sectionValue": [],
+ "codeDateFormatStr": "",
+ "name": "寮曠敤鐮佹",
+ "id": "1676048203809689600",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "6",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "fes",
+ "sectionCode": "ge",
+ "secType": "codeattrsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞炴�х爜娈�",
+ "sectionValue": [],
+ "codeDateFormatStr": "",
+ "name": "灞炴�х爜娈�",
+ "id": "1676052431290634240",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "7",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "灞傜骇鐮佹",
+ "sectionCode": "cengji",
+ "secType": "codelevelsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞傜骇鐮佹",
+ "sectionValue": [
+ {
+ "num": "",
+ "name": "鏈轰綋鏋勪欢",
+ "description": "鏈轰綋鏋勪欢",
+ "pid": "",
+ "id": "0C600A6A-6398-FC30-D13E-121201FDA908",
+ "value": "0202"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "灞傜骇鐮佹",
+ "id": "1676837573571514368",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "8",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "灞傜骇鐮佹2",
+ "sectionCode": "cengj",
+ "secType": "codelevelsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞傜骇鐮佹",
+ "sectionValue": [
+ {
+ "num": "",
+ "name": "閿�",
+ "description": "閿�",
+ "pid": "",
"id": "46B5DB5E-F783-DFE9-B48A-C4A367D02AC0",
"value": "020201"
}
],
- "num": "01",
- "codeSecLengthType": "code_sec_length_variable",
- "name": "灞傜骇鐮佹",
- "secType": "codelevelsec",
- "id": "1674682431208296448",
- "pkCodeRule": "9FE2AF3E-2940-BD80-D46F-E3853314673D"
+ "codeDateFormatStr": "",
+ "name": "灞傜骇鐮佹2",
+ "id": "1676837771429416960",
+ "pkCodeRule": "1673234841140858880"
},
{
+ "num": "9",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "",
+ "sectionCode": "shux",
+ "secType": "codeattrsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞炴�х爜娈�",
"sectionValue": [],
- "num": "02",
- "name": "娴佹按鐮佹",
- "description": "娴佹按鐮佹",
- "secType": "codeserialsec",
- "id": "801B6412-E617-214A-08A5-9EDF5821AA66",
- "pkCodeRule": "9FE2AF3E-2940-BD80-D46F-E3853314673D",
- "codeSecLength": "4"
+ "codeDateFormatStr": "",
+ "name": "灞炴�х爜娈�",
+ "id": "1676838137894146048",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "10",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "鏃ユ湡鐮佹",
+ "sectionCode": "riqi",
+ "secType": "codedatesec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "鏃ユ湡鐮佹",
+ "sectionValue": [],
+ "codeDateFormatStr": "YYYY-MM-DD",
+ "name": "鏃ユ湡鐮佹",
+ "id": "1676838388730302464",
+ "pkCodeRule": "1673234841140858880"
}
],
- "id": "9FE2AF3E-2940-BD80-D46F-E3853314673D"
+ "id": "1673234841140858880"
},
"id": "46B5DB5E-F783-DFE9-B48A-C4A367D02AC0",
+ "fullPathName": "",
"leaf": false
}
],
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/test.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/test.json
new file mode 100644
index 0000000..5d11bf6
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/test.json
@@ -0,0 +1,488 @@
+{
+ "data": {
+ "msg": "鎴愬姛!",
+ "library": {
+ "classify": [
+ {
+ "classCode": "020202",
+ "lcStatus": "Enabled",
+ "name": "鍙ｇ洊",
+ "description": "鍙ｇ洊",
+ "pid": "0C600A6A-6398-FC30-D13E-121201FDA908",
+ "codeRule": {
+ "ruleCode": "csfjl",
+ "num": "",
+ "name": "csfjl",
+ "description": "",
+ "codeSection": [
+ {
+ "num": "1",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "aaaa",
+ "sectionCode": "gdmd",
+ "secType": "codefixedsec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "",
+ "secTypeText": "鍥哄畾鐮佹",
+ "sectionValue": [
+ {
+ "num": "2",
+ "name": "",
+ "description": "",
+ "pid": "",
+ "id": "1673235273523269632",
+ "value": "002"
+ },
+ {
+ "num": "1",
+ "name": "",
+ "description": "",
+ "pid": "",
+ "id": "1673235247598276608",
+ "value": "001"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "鍥哄畾鐮佹",
+ "id": "1673235191453323264",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "2",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "",
+ "sectionCode": "flmdf",
+ "secType": "codeclassifysec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "",
+ "secTypeText": "鍒嗙被鐮佹",
+ "sectionValue": [
+ {
+ "num": "1",
+ "name": "浜�",
+ "description": "",
+ "pid": "",
+ "id": "1673235471532167168",
+ "value": "001"
+ },
+ {
+ "num": "1",
+ "name": "涓�",
+ "description": "",
+ "pid": "",
+ "id": "1673235449524654080",
+ "value": "001"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "鍒嗙被鐮佹鐖�",
+ "id": "1673235394948370432",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "3",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "sss",
+ "sectionCode": "flmdz",
+ "secType": "codeclassifysec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "1673235394948370432",
+ "secTypeText": "鍒嗙被鐮佹",
+ "sectionValue": [
+ {
+ "num": "1",
+ "name": "灏忎簩",
+ "description": "",
+ "pid": "1673235471532167168",
+ "id": "1673235791276544000",
+ "value": "0012"
+ },
+ {
+ "num": "1",
+ "name": "灏忎竴",
+ "description": "",
+ "pid": "1673235449524654080",
+ "id": "1673235759584382976",
+ "value": "0011"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "鍒嗙被鐮佹瀛�",
+ "id": "1673235616541839360",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "4",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "sss",
+ "sectionCode": "kbmd",
+ "secType": "codevariablesec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "",
+ "secTypeText": "鍙彉鐮佹",
+ "sectionValue": [],
+ "codeDateFormatStr": "",
+ "name": "鍙彉鐮佹",
+ "id": "1673235886290112512",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "5",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "寮曠敤鐮佹",
+ "sectionCode": "yy",
+ "secType": "coderefersec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "寮曠敤鐮佹",
+ "sectionValue": [],
+ "codeDateFormatStr": "",
+ "name": "寮曠敤鐮佹",
+ "id": "1676048203809689600",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "6",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "fes",
+ "sectionCode": "ge",
+ "secType": "codeattrsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞炴�х爜娈�",
+ "sectionValue": [],
+ "codeDateFormatStr": "",
+ "name": "灞炴�х爜娈�",
+ "id": "1676052431290634240",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "7",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "灞傜骇鐮佹",
+ "sectionCode": "cengji",
+ "secType": "codelevelsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞傜骇鐮佹",
+ "sectionValue": [
+ {
+ "num": "",
+ "name": "鏈轰綋鏋勪欢",
+ "description": "鏈轰綋鏋勪欢",
+ "pid": "",
+ "id": "0C600A6A-6398-FC30-D13E-121201FDA908",
+ "value": "0202"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "灞傜骇鐮佹",
+ "id": "1676837573571514368",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "8",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "灞傜骇鐮佹2",
+ "sectionCode": "cengj",
+ "secType": "codelevelsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞傜骇鐮佹",
+ "sectionValue": [
+ {
+ "num": "",
+ "name": "鍙ｇ洊",
+ "description": "鍙ｇ洊",
+ "pid": "",
+ "id": "B6C55202-A224-9098-6A82-E3FC5DEEF790",
+ "value": "020202"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "灞傜骇鐮佹2",
+ "id": "1676837771429416960",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "9",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "",
+ "sectionCode": "shux",
+ "secType": "codeattrsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞炴�х爜娈�",
+ "sectionValue": [],
+ "codeDateFormatStr": "",
+ "name": "灞炴�х爜娈�",
+ "id": "1676838137894146048",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "10",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "鏃ユ湡鐮佹",
+ "sectionCode": "riqi",
+ "secType": "codedatesec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "鏃ユ湡鐮佹",
+ "sectionValue": [],
+ "codeDateFormatStr": "YYYY-MM-DD",
+ "name": "鏃ユ湡鐮佹",
+ "id": "1676838388730302464",
+ "pkCodeRule": "1673234841140858880"
+ }
+ ],
+ "id": "1673234841140858880"
+ },
+ "id": "B6C55202-A224-9098-6A82-E3FC5DEEF790",
+ "fullPathName": "",
+ "leaf": false
+ },
+ {
+ "classCode": "020201",
+ "lcStatus": "Enabled",
+ "name": "閿�",
+ "description": "閿�",
+ "pid": "0C600A6A-6398-FC30-D13E-121201FDA908",
+ "codeRule": {
+ "ruleCode": "csfjl",
+ "num": "",
+ "name": "csfjl",
+ "description": "",
+ "codeSection": [
+ {
+ "num": "1",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "aaaa",
+ "sectionCode": "gdmd",
+ "secType": "codefixedsec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "",
+ "secTypeText": "鍥哄畾鐮佹",
+ "sectionValue": [
+ {
+ "num": "2",
+ "name": "",
+ "description": "",
+ "pid": "",
+ "id": "1673235273523269632",
+ "value": "002"
+ },
+ {
+ "num": "1",
+ "name": "",
+ "description": "",
+ "pid": "",
+ "id": "1673235247598276608",
+ "value": "001"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "鍥哄畾鐮佹",
+ "id": "1673235191453323264",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "2",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "",
+ "sectionCode": "flmdf",
+ "secType": "codeclassifysec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "",
+ "secTypeText": "鍒嗙被鐮佹",
+ "sectionValue": [
+ {
+ "num": "1",
+ "name": "浜�",
+ "description": "",
+ "pid": "",
+ "id": "1673235471532167168",
+ "value": "001"
+ },
+ {
+ "num": "1",
+ "name": "涓�",
+ "description": "",
+ "pid": "",
+ "id": "1673235449524654080",
+ "value": "001"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "鍒嗙被鐮佹鐖�",
+ "id": "1673235394948370432",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "3",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "sss",
+ "sectionCode": "flmdz",
+ "secType": "codeclassifysec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "1673235394948370432",
+ "secTypeText": "鍒嗙被鐮佹",
+ "sectionValue": [
+ {
+ "num": "1",
+ "name": "灏忎簩",
+ "description": "",
+ "pid": "1673235471532167168",
+ "id": "1673235791276544000",
+ "value": "0012"
+ },
+ {
+ "num": "1",
+ "name": "灏忎竴",
+ "description": "",
+ "pid": "1673235449524654080",
+ "id": "1673235759584382976",
+ "value": "0011"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "鍒嗙被鐮佹瀛�",
+ "id": "1673235616541839360",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "4",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "sss",
+ "sectionCode": "kbmd",
+ "secType": "codevariablesec",
+ "codeSecLength": "10",
+ "parentClassifySecOid": "",
+ "secTypeText": "鍙彉鐮佹",
+ "sectionValue": [],
+ "codeDateFormatStr": "",
+ "name": "鍙彉鐮佹",
+ "id": "1673235886290112512",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "5",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "寮曠敤鐮佹",
+ "sectionCode": "yy",
+ "secType": "coderefersec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "寮曠敤鐮佹",
+ "sectionValue": [],
+ "codeDateFormatStr": "",
+ "name": "寮曠敤鐮佹",
+ "id": "1676048203809689600",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "6",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "fes",
+ "sectionCode": "ge",
+ "secType": "codeattrsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞炴�х爜娈�",
+ "sectionValue": [],
+ "codeDateFormatStr": "",
+ "name": "灞炴�х爜娈�",
+ "id": "1676052431290634240",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "7",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "灞傜骇鐮佹",
+ "sectionCode": "cengji",
+ "secType": "codelevelsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞傜骇鐮佹",
+ "sectionValue": [
+ {
+ "num": "",
+ "name": "鏈轰綋鏋勪欢",
+ "description": "鏈轰綋鏋勪欢",
+ "pid": "",
+ "id": "0C600A6A-6398-FC30-D13E-121201FDA908",
+ "value": "0202"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "灞傜骇鐮佹",
+ "id": "1676837573571514368",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "8",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "灞傜骇鐮佹2",
+ "sectionCode": "cengj",
+ "secType": "codelevelsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞傜骇鐮佹",
+ "sectionValue": [
+ {
+ "num": "",
+ "name": "閿�",
+ "description": "閿�",
+ "pid": "",
+ "id": "46B5DB5E-F783-DFE9-B48A-C4A367D02AC0",
+ "value": "020201"
+ }
+ ],
+ "codeDateFormatStr": "",
+ "name": "灞傜骇鐮佹2",
+ "id": "1676837771429416960",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "9",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "",
+ "sectionCode": "shux",
+ "secType": "codeattrsec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "灞炴�х爜娈�",
+ "sectionValue": [],
+ "codeDateFormatStr": "",
+ "name": "灞炴�х爜娈�",
+ "id": "1676838137894146048",
+ "pkCodeRule": "1673234841140858880"
+ },
+ {
+ "num": "10",
+ "codeSecLengthType": "code_sec_length_variable",
+ "description": "鏃ユ湡鐮佹",
+ "sectionCode": "riqi",
+ "secType": "codedatesec",
+ "codeSecLength": "",
+ "parentClassifySecOid": "",
+ "secTypeText": "鏃ユ湡鐮佹",
+ "sectionValue": [],
+ "codeDateFormatStr": "YYYY-MM-DD",
+ "name": "鏃ユ湡鐮佹",
+ "id": "1676838388730302464",
+ "pkCodeRule": "1673234841140858880"
+ }
+ ],
+ "id": "1673234841140858880"
+ },
+ "id": "46B5DB5E-F783-DFE9-B48A-C4A367D02AC0",
+ "fullPathName": "",
+ "leaf": false
+ }
+ ],
+ "name": "",
+ "id": "wupin"
+ },
+ "errorid": "0"
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/test1.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/test1.json
new file mode 100644
index 0000000..00e232e
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/test1.json
@@ -0,0 +1,75 @@
+{
+ "backPath": "",
+ "mapFields": "",
+ "method": "GET",
+ "muti": false,
+ "onlyLeaf": false,
+ "paramForFormKey": "",
+ "referType": "coderule",
+ "remoteSort": false,
+ "tableConfig": {
+ "cols": [
+ {
+ "field": "id",
+ "fieldType": "text",
+ "fieldTypeText": "鏂囨湰妗�",
+ "isQuery": "true",
+ "sort": "true",
+ "sortField": "id",
+ "title": "缂栧彿",
+ "width": 150
+ },
+ {
+ "field": "name",
+ "fieldType": "text",
+ "fieldTypeText": "鏂囨湰妗�",
+ "isQuery": "true",
+ "sort": "true",
+ "sortField": "name",
+ "title": "鍚嶇О",
+ "width": 180
+ },
+ {
+ "field": "name",
+ "fieldType": "text",
+ "fieldTypeText": "鏂囨湰妗�",
+ "isQuery": "false",
+ "sort": "false",
+ "sortField": "name",
+ "title": "鍚嶇О",
+ "width": 150
+ },
+ {
+ "field": "lastmodifier",
+ "fieldType": "text",
+ "fieldTypeText": "鏂囨湰妗�",
+ "isQuery": "false",
+ "sort": "false",
+ "sortField": "lastmodifier",
+ "title": "鏈�鍚庢椂闂翠汉",
+ "width": 150
+ }
+ ],
+ "page": {
+ "limit": 15,
+ "page": 1
+ },
+ "queryColumns": [
+ {
+ "$ref": "$.tableConfig.cols[0]"
+ },
+ {
+ "$ref": "$.tableConfig.cols[1]"
+ }
+ ]
+ },
+ "textField": "name",
+ "type": "default",
+ "url": "",
+ "valueField": "oid",
+ "where": {
+ "creator_equal": "",
+ "tenant_id_equal": "",
+ "createtime_equal": ""
+ }
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
index ddccbd3..3508401 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
@@ -381,7 +381,7 @@
QueryWrapper<CodeClassifyValue> wrapper = new QueryWrapper<>();
wrapper.eq("codeClassifySecOid",classifySecOid);
if(StringUtils.isNotBlank(parentClassifyValueOid)){
- wrapper.eq("parentClassifyValueOid",parentClassifyValueOid);
+ wrapper.in("parentClassifyValueOid",VciBaseUtil.str2List(parentClassifyValueOid));
}
wrapper.orderByAsc("ordernum");
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index 620cc28..57b99c2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -858,31 +858,57 @@
CodeRuleVO resultClassifyRuleVO1=new CodeRuleVO();
List<CodeBasicSecVO> codeBasicSecVOS= codeRuleVO.getSecVOList();
List<CodeSectionVO> codeSectionVOList=new CopyOnWriteArrayList<>();
+ Map<String,List<String>> secIdTOListValueOidMap=new HashMap<>();
if(!CollectionUtils.isEmpty(codeBasicSecVOS)){
codeBasicSecVOS.stream().forEach(codeBasicSecVO -> {
List<CodeSectionValueVO> codeSectionValueVOList=new ArrayList<>();
String secType= codeBasicSecVO.getSecType();
if(secType.equals("codevariablesec")){//鍙彉鐮佹
- CodeSectionValueVO sectionValueVO=new CodeSectionValueVO("","","","","");
- codeSectionValueVOList.add(sectionValueVO);
+ //绌虹潃锛屽墠绔紶
}else if(secType.equals("codefixedsec")){//鍥哄畾鐮佹
List<CodeFixedValueVO> fixedValueVOList=codeBasicSecVO.getFixedValueVOList();
fixedValueVOList.stream().forEach(codeFixedValueVO -> {
- CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(codeFixedValueVO.getOid(),codeFixedValueVO.getOrderNum()+"",codeFixedValueVO.getId(),codeFixedValueVO.getName(),codeFixedValueVO.getDescription());
+ String id=StringUtils.isBlank(codeFixedValueVO.getOid())?"":codeFixedValueVO.getOid();
+ String value=StringUtils.isBlank(codeFixedValueVO.getId())?"":codeFixedValueVO.getId();
+ String num=StringUtils.isBlank(codeFixedValueVO.getOrderNum()+"")?"":codeFixedValueVO.getOrderNum()+"";
+ String name=StringUtils.isBlank(codeFixedValueVO.getName())?"":codeFixedValueVO.getName();
+ String description=StringUtils.isBlank(codeFixedValueVO.getDescription())?"":codeFixedValueVO.getDescription();
+ CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,name,"",description);
codeSectionValueVOList.add(sectionValueVO);
});
}else if(secType.equals("codeclassifysec")){//鍒嗙被鐮佹
String secOid=codeBasicSecVO.getOid();
String parentClassifySecOid= codeBasicSecVO.getParentClassifySecOid();
- List<CodeClassifyValueVO> codeClassifyValueVOS= this.codeClassifyValueService.listCodeClassifyValueBySecOid(secOid,parentClassifySecOid);
- if(CollectionUtils.isEmpty(codeClassifyValueVOS)){
+ String parentClassifyValueOid="";
+ if(secIdTOListValueOidMap.containsKey(parentClassifySecOid)){
+ List<String> parentClassifyValueList= secIdTOListValueOidMap.get(parentClassifySecOid);
+ parentClassifyValueOid=VciBaseUtil.array2String(parentClassifyValueList.toArray(new String[]{}));
+ }
+ List<CodeClassifyValueVO> codeClassifyValueVOS= this.codeClassifyValueService.listCodeClassifyValueBySecOid(secOid,parentClassifyValueOid);
+ if(!CollectionUtils.isEmpty(codeClassifyValueVOS)){
+ List<String>valueOidList=new ArrayList<>();
+
codeClassifyValueVOS.stream().forEach(codeClassifyValueVO -> {
- CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(codeClassifyValueVO.getOid(),codeClassifyValueVO.getOrderNum()+"",codeClassifyValueVO.getId(),codeClassifyValueVO.getName(),codeClassifyValueVO.getDescription());
+ String id=StringUtils.isBlank(codeClassifyValueVO.getOid())?"":codeClassifyValueVO.getOid();
+ String value=StringUtils.isBlank(codeClassifyValueVO.getId())?"":codeClassifyValueVO.getId();
+ String num=StringUtils.isBlank(codeClassifyValueVO.getOrderNum()+"")?"":codeClassifyValueVO.getOrderNum()+"";
+ String name=StringUtils.isBlank(codeClassifyValueVO.getName())?"":codeClassifyValueVO.getName();
+ String pid=StringUtils.isBlank(codeClassifyValueVO.getParentClassifyValueOid())?"":codeClassifyValueVO.getParentClassifyValueOid();
+ String description=StringUtils.isBlank(codeClassifyValueVO.getDescription())?"":codeClassifyValueVO.getDescription();
+ CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,name,pid,description);
+ codeSectionValueVOList.add(sectionValueVO);
+ valueOidList.add(id);
});
+ secIdTOListValueOidMap.put(secOid,valueOidList);
}
}else if(secType.equals("codedatesec")){//鏃ユ湡鐮佹
-
+ //绌虹潃锛屽墠绔紶
}else if(secType.equals("coderefersec")){//寮曠敤鐮佹
+ codeBasicSecVO.getReferAttributeId();
+ codeBasicSecVO.getReferCodeClassifyOid();
+ codeBasicSecVO.getReferBtmId();
+ codeBasicSecVO.getReferBtmName();
+ //codeBasicSecVO.getReferValueInfo();
}else if(secType.equals("codelevelsec")) {//灞傜骇鐮佹
int level = codeBasicSecVO.getCodeLevelValue();
@@ -896,44 +922,58 @@
}else{//鏈�灏忓眰
levelCodeClassifyVO=codeClassifyDO;
}
- CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(levelCodeClassifyVO.getOid(),"0",levelCodeClassifyVO.getId(),codeBasicSecVO.getName(),codeBasicSecVO.getDescription());
+ String id=StringUtils.isBlank(levelCodeClassifyVO.getOid())?"":levelCodeClassifyVO.getOid();
+ String num="";
+ String value=StringUtils.isBlank(levelCodeClassifyVO.getId())?"":levelCodeClassifyVO.getId();
+ String name=StringUtils.isBlank(levelCodeClassifyVO.getName())?"":levelCodeClassifyVO.getName();
+ String description=StringUtils.isBlank(levelCodeClassifyVO.getDescription())?"":levelCodeClassifyVO.getDescription();
+ CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,name,"",description);
codeSectionValueVOList.add(sectionValueVO);
}else if(secType.equals("codeattrsec")){//灞炴�х爜娈�
-
+ codeBasicSecVO.getReferAttributeId();
+ codeBasicSecVO.getReferCodeClassifyOid();
+ codeBasicSecVO.getReferBtmId();
+ codeBasicSecVO.getReferBtmName();
}else if(secType.equals("codeserialsec")){//娴佹按鐮佹
}
//鏋勫缓瑙勫垯鐮佹
CodeSectionVO codeSectionVO=new CodeSectionVO();
- codeSectionVO.setId(codeBasicSecVO.getOid());//涓婚敭
- codeSectionVO.setName(codeBasicSecVO.getName());//鐮佹鍚嶇О
- codeSectionVO.setCodeSecLength(codeBasicSecVO.getCodeSecLength());//鐮佹闀垮害
- codeSectionVO.setNum(codeBasicSecVO.getId());//鐮佹缂栧彿
- codeSectionVO.setCodeDateFormatStr(codeBasicSecVO.getCodeDateFormatStr());//鏃ユ湡绫诲瀷
- codeSectionVO.setCodeSecLengthType(codeBasicSecVO.getCodeSecLengthType());//鐮佹闀垮害绫诲瀷
- codeSectionVO.setPkCodeRule(codeRuleVO.getOid());
- codeSectionVO.setSecType(codeBasicSecVO.getSecType());//鐮佹绫诲瀷
- codeSectionVO.setDescription(codeBasicSecVO.getDescription());
- codeSectionVO.setParentClassifySecOid(codeBasicSecVO.getParentClassifySecOid());
- codeSectionVO.setSectionValue(codeSectionValueVOList);
+ codeSectionVO.setId(StringUtils.isBlank(codeBasicSecVO.getOid())?"":codeBasicSecVO.getOid());//涓婚敭
+ codeSectionVO.setName(StringUtils.isBlank(codeBasicSecVO.getName())?"":codeBasicSecVO.getName());//鐮佹鍚嶇О
+ codeSectionVO.setCodeSecLength(StringUtils.isBlank(codeBasicSecVO.getCodeSecLength())?"":codeBasicSecVO.getCodeSecLength());//鐮佹闀垮害
+ codeSectionVO.setNum(StringUtils.isBlank(codeBasicSecVO.getOrderNum()+"")?"":codeBasicSecVO.getOrderNum()+"");//鐮佹搴忓彿
+ codeSectionVO.setCodeDateFormatStr(StringUtils.isBlank(codeBasicSecVO.getCodeDateFormatStr())?"":codeBasicSecVO.getCodeDateFormatStr());//鏃ユ湡绫诲瀷
+ codeSectionVO.setCodeSecLengthType(StringUtils.isBlank(codeBasicSecVO.getCodeSecLengthType())?"":codeBasicSecVO.getCodeSecLengthType());//鐮佹闀垮害绫诲瀷
+ codeSectionVO.setPkCodeRule(StringUtils.isBlank(codeRuleVO.getOid())?"":codeRuleVO.getOid());//瑙勫垯涓婚敭
+ codeSectionVO.setSecType(StringUtils.isBlank(codeBasicSecVO.getSecType())?"":codeBasicSecVO.getSecType());//鐮佹绫诲瀷
+ codeSectionVO.setDescription(StringUtils.isBlank(codeBasicSecVO.getDescription())?"":codeBasicSecVO.getDescription());//鎻忚堪
+ codeSectionVO.setParentClassifySecOid(StringUtils.isBlank(codeBasicSecVO.getParentClassifySecOid())?"":codeBasicSecVO.getParentClassifySecOid());//鍒嗙被鐮佹涓婄骇
+ codeSectionVO.setSecTypeText(StringUtils.isBlank(codeBasicSecVO.getSecTypeText())?"":codeBasicSecVO.getSecTypeText());
+ //if(!CollectionUtils.isEmpty(codeSectionValueVOList)) {
+ codeSectionVO.setSectionValue(codeSectionValueVOList);
+ //}
+ codeSectionVO.setSectionCode(codeBasicSecVO.getId());//鐮佹缂栧彿
codeSectionVOList.add(codeSectionVO);
});
}
//鏋勫缓瑙勫垯淇℃伅
- resultCodeRuleVO.setId(codeRuleVO.getOid());
- resultCodeRuleVO.setNum(codeRuleVO.getId());
- resultCodeRuleVO.setDescription(codeRuleVO.getDescription());
+ resultCodeRuleVO.setId(StringUtils.isBlank(codeRuleVO.getOid())?"":codeRuleVO.getOid());//涓婚敭
+ resultCodeRuleVO.setNum("");//搴忓彿
+ resultCodeRuleVO.setName(StringUtils.isBlank(codeRuleVO.getName())?"":codeRuleVO.getName());//鍚嶇О璁剧疆
+ resultCodeRuleVO.setRuleCode(StringUtils.isBlank(codeRuleVO.getId())?"":codeRuleVO.getId());//瑙勫垯缂栧彿
+ resultCodeRuleVO.setDescription(StringUtils.isBlank(codeRuleVO.getDescription())?"":codeRuleVO.getDescription());//鎻忚堪
resultCodeRuleVO.setCodeSection(codeSectionVOList);
}
//鏋勫缓鍒嗙被淇℃伅
com.vci.ubcs.code.vo.webserviceModel.coderule.ResultClassifyVO classifyVO=new com.vci.ubcs.code.vo.webserviceModel.coderule.ResultClassifyVO();
- classifyVO.setId(codeClassifyDO.getOid());
- classifyVO.setLcStatus(codeClassifyDO.getLcStatus());
- classifyVO.setClassCode(codeClassifyDO.getId());
- classifyVO.setDescription(codeClassifyDO.getDescription());
- classifyVO.setName(codeClassifyDO.getName());
- classifyVO.setPid(codeClassifyDO.getParentcodeclassifyoid());
- classifyVO.setFullPathName(codeClassifyDO.getPath());
+ classifyVO.setId(StringUtils.isBlank(codeClassifyDO.getOid())?"":codeClassifyDO.getOid());
+ classifyVO.setLcStatus(StringUtils.isBlank(codeClassifyDO.getLcStatus())?"":codeClassifyDO.getLcStatus());
+ classifyVO.setClassCode(StringUtils.isBlank(codeClassifyDO.getId())?"":codeClassifyDO.getId());
+ classifyVO.setDescription(StringUtils.isBlank(codeClassifyDO.getDescription())?"":codeClassifyDO.getDescription());
+ classifyVO.setName(StringUtils.isBlank(codeClassifyDO.getName())?"":codeClassifyDO.getName());
+ classifyVO.setPid(StringUtils.isBlank(codeClassifyDO.getParentcodeclassifyoid())?"":codeClassifyDO.getParentcodeclassifyoid());
+ classifyVO.setFullPathName(StringUtils.isBlank(codeClassifyDO.getPath())?"":codeClassifyDO.getPath());
classifyVO.setCodeRule(resultCodeRuleVO);
classifyVOList.add(classifyVO);
});
--
Gitblit v1.9.3