xiejun
2023-07-06 353bc1b8b4650f144a65b9125457253051e68492
集成获取分类接口(包含编码规则码段码值信息)
已修改6个文件
已添加4个文件
1332 ■■■■■ 文件已修改
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionVO.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionValueVO.java 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultCodeRuleVO.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/data.json 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/data.xml 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/result.json 464 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/test.json 488 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/test1.json 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java 100 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 + '\'' +
            '}';
    }
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;
    /***
     * çˆ¶ç æ®µoid
     */
    @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 + '\'' +
            '}';
    }
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 + '\'' +
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"
      ]
    }
  }
}
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>
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
        }
      ],
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"
  }
}
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": ""
  }
}
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");
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);
                });