zhouweidong 部署微服务接口 [后台服务，接口示例]

aa5f43ad · ibizdev · dae12c0d · aa5f43ad · aa5f43ad · aa5f43ad
--- a/.gitignore
+++ b/.gitignore
--- a/demo-boot/src/main/java/cn/ibizlab/BootApplication.java
+++ b/demo-boot/src/main/java/cn/ibizlab/BootApplication.java
--- a/demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZBOOK.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZBOOK.json
@@ -3077,6 +3077,144 @@
    "stringLength" : 1048576,
    "valueFormat" : "%1$s",
    "queryColumn" : false
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "ORGID",
+      "dBType" : "MYSQL5",
+      "name" : "ORGID",
+      "queryCodeExp" : "t1.`ORGID`",
+      "standardColumnName" : "`ORGID`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[ORGID][单位]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[ORGID][单位]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[ORGID][单位]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[ORGID][单位]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "ORGID",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "OrgId",
+    "dEFType" : 1,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "单位",
+    "name" : "ORGID",
+    "predefinedType" : "ORGID",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s"
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "DEPTID",
+      "dBType" : "MYSQL5",
+      "name" : "DEPTID",
+      "queryCodeExp" : "t1.`DEPTID`",
+      "standardColumnName" : "`DEPTID`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[DEPTID][属性]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[DEPTID][属性]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[DEPTID][属性]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[DEPTID][属性]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "DEPTID",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "Deptid",
+    "dEFType" : 1,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "部门",
+    "name" : "DEPTID",
+    "predefinedType" : "ORGSECTORID",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s"
  } ],
  "getAllPSDELogics" : [ {
    "codeName" : "NextAction",
@@ -3539,6 +3677,17 @@
      "type" : "SIMPLE",
      "allowEmpty" : false,
      "readOnly" : true
+    }, {
+      "logicName" : "部门",
+      "name" : "Deptid",
+      "getPSDEField" : {
+        "name" : "DEPTID",
+        "codeName" : "Deptid"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
    }, {
      "logicName" : "图书标识",
      "name" : "IBIZBOOKId",
@@ -3585,6 +3734,17 @@
      "stdDataType" : 5,
      "type" : "SIMPLE",
      "allowEmpty" : false
+    }, {
+      "logicName" : "单位",
+      "name" : "OrgId",
+      "getPSDEField" : {
+        "name" : "ORGID",
+        "codeName" : "OrgId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
    }, {
      "logicName" : "图书出版社",
      "name" : "Press",
@@ -4492,6 +4652,10 @@
    "codeName" : "IBIZBOOKName"
  },
  "name" : "IBIZBOOK",
+  "getOrgIdPSDEField" : {
+    "name" : "ORGID",
+    "codeName" : "OrgId"
+  },
  "getPSSystemModule" : {
    "modelref" : true,
    "path" : "PSMODULES/Sample.json"

--- a/demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZBOOK/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZBOOK/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json
@@ -49,6 +49,9 @@
  }, {
    "expression" : "t1.`CREATEMAN`",
    "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`DEPTID`",
+    "name" : "DEPTID"
  }, {
    "expression" : "t1.`IBIZBOOKID`",
    "name" : "IBIZBOOKID"
@@ -58,6 +61,9 @@
  }, {
    "expression" : "t1.`LENDOUTTIME`",
    "name" : "LENDOUTTIME"
+  }, {
+    "expression" : "t1.`ORGID`",
+    "name" : "ORGID"
  }, {
    "expression" : "t1.`PRESS`",
    "name" : "PRESS"
@@ -89,6 +95,6 @@
    "expression" : "t1.`UPDATEMAN`",
    "name" : "UPDATEMAN"
  } ],
-  "queryCode" : "SELECT\nt1.`AUTHOR`,\nt1.`BOOKNUMBER`,\nt1.`BORROWER`,\nt1.`BORROWER1_ID`,\nt1.`BORROWER2`,\nt1.`BORROWER2_ID`,\nt1.`BORROWER3_ID`,\nt1.`BORROWERID`,\nt1.`BORROWSTATUS`,\nt1.`BORROWWAY`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`IBIZBOOKID`,\nt1.`IBIZBOOKNAME`,\nt1.`LENDOUTTIME`,\nt1.`PRESS`,\nt1.`PRICE`,\nt1.`RETURNLIB`,\nt1.`RETURNTIME`,\nt1.`SAILSTATE`,\nt1.`STEPSTATUS`,\nt1.`SUBTEXT`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_IBIZBOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`AUTHOR`,\nt1.`BOOKNUMBER`,\nt1.`BORROWER`,\nt1.`BORROWER1_ID`,\nt1.`BORROWER2`,\nt1.`BORROWER2_ID`,\nt1.`BORROWER3_ID`,\nt1.`BORROWERID`,\nt1.`BORROWSTATUS`,\nt1.`BORROWWAY`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`IBIZBOOKID`,\nt1.`IBIZBOOKNAME`,\nt1.`LENDOUTTIME`,\nt1.`ORGID`,\nt1.`PRESS`,\nt1.`PRICE`,\nt1.`RETURNLIB`,\nt1.`RETURNTIME`,\nt1.`SAILSTATE`,\nt1.`STEPSTATUS`,\nt1.`SUBTEXT`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_IBIZBOOK` t1 \n",
  "id" : "PSMODULES/Sample/PSDATAENTITIES/IBIZBOOK/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file
--- a/demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZBOOK/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZBOOK/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json
@@ -43,6 +43,9 @@
  }, {
    "expression" : "t1.`CREATEMAN`",
    "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`DEPTID`",
+    "name" : "DEPTID"
  }, {
    "expression" : "t1.`IBIZBOOKID`",
    "name" : "IBIZBOOKID"
@@ -55,6 +58,9 @@
  }, {
    "expression" : "t1.`LENDOUTTIME`",
    "name" : "LENDOUTTIME"
+  }, {
+    "expression" : "t1.`ORGID`",
+    "name" : "ORGID"
  }, {
    "expression" : "t1.`PRESS`",
    "name" : "PRESS"
@@ -89,6 +95,6 @@
    "expression" : "t1.`UPDATEMAN`",
    "name" : "UPDATEMAN"
  } ],
-  "queryCode" : "SELECT\nt1.`AUTHOR`,\nt1.`BOOKNUMBER`,\nt1.`BORROWER`,\nt1.`BORROWER1`,\nt1.`BORROWER1_ID`,\nt1.`BORROWER2`,\nt1.`BORROWER2_ID`,\nt1.`BORROWER3`,\nt1.`BORROWER3_ID`,\nt1.`BORROWERID`,\nt1.`BORROWSTATUS`,\nt1.`BORROWWAY`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`IBIZBOOKID`,\nt1.`IBIZBOOKNAME`,\nt1.`ICON`,\nt1.`LENDOUTTIME`,\nt1.`PRESS`,\nt1.`PRICE`,\nt1.`RETURNLIB`,\nt1.`RETURNTIME`,\nt1.`SAILSTATE`,\nt1.`STEPSTATUS`,\nt1.`SUBTEXT`,\nt1.`TAG`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_IBIZBOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`AUTHOR`,\nt1.`BOOKNUMBER`,\nt1.`BORROWER`,\nt1.`BORROWER1`,\nt1.`BORROWER1_ID`,\nt1.`BORROWER2`,\nt1.`BORROWER2_ID`,\nt1.`BORROWER3`,\nt1.`BORROWER3_ID`,\nt1.`BORROWERID`,\nt1.`BORROWSTATUS`,\nt1.`BORROWWAY`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`IBIZBOOKID`,\nt1.`IBIZBOOKNAME`,\nt1.`ICON`,\nt1.`LENDOUTTIME`,\nt1.`ORGID`,\nt1.`PRESS`,\nt1.`PRICE`,\nt1.`RETURNLIB`,\nt1.`RETURNTIME`,\nt1.`SAILSTATE`,\nt1.`STEPSTATUS`,\nt1.`SUBTEXT`,\nt1.`TAG`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_IBIZBOOK` t1 \n",
  "id" : "PSMODULES/Sample/PSDATAENTITIES/IBIZBOOK/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file
--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json
@@ -834,6 +834,18 @@
    "name" : "TAG",
    "stdDataType" : 21,
    "stringLength" : 1048576
+  }, {
+    "codeName" : "OrgId",
+    "logicName" : "单位",
+    "name" : "ORGID",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
+    "codeName" : "Deptid",
+    "logicName" : "部门",
+    "name" : "DEPTID",
+    "stdDataType" : 25,
+    "stringLength" : 100
  } ],
  "getAllPSAppDELogics" : [ {
    "codeName" : "NextAction",
@@ -1240,6 +1252,18 @@
      "stdDataType" : 25,
      "type" : "SIMPLE",
      "allowEmpty" : false
+    }, {
+      "codeName" : "Deptid",
+      "logicName" : "部门",
+      "name" : "Deptid",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "DEPTID",
+        "codeName" : "Deptid"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
    }, {
      "codeName" : "IBIZBOOKId",
      "logicName" : "图书标识",
@@ -1291,6 +1315,18 @@
      "stdDataType" : 5,
      "type" : "SIMPLE",
      "allowEmpty" : false
+    }, {
+      "codeName" : "OrgId",
+      "logicName" : "单位",
+      "name" : "OrgId",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "ORGID",
+        "codeName" : "OrgId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
    }, {
      "codeName" : "Press",
      "logicName" : "图书出版社",
@@ -3938,6 +3974,10 @@
    "codeName" : "IBIZBOOKName"
  },
  "name" : "IBIZBOOK",
+  "getOrgIdPSAppDEField" : {
+    "name" : "ORGID",
+    "codeName" : "OrgId"
+  },
  "getPSDEName" : "IBIZBOOK",
  "getQuickSearchPSAppDEFields" : [ {
    "name" : "IBIZBOOKNAME",

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSSYSAPP.json
@@ -26006,6 +26006,18 @@
        "name" : "TAG",
        "stdDataType" : 21,
        "stringLength" : 1048576
+      }, {
+        "codeName" : "OrgId",
+        "logicName" : "单位",
+        "name" : "ORGID",
+        "stdDataType" : 25,
+        "stringLength" : 100
+      }, {
+        "codeName" : "Deptid",
+        "logicName" : "部门",
+        "name" : "DEPTID",
+        "stdDataType" : 25,
+        "stringLength" : 100
      } ],
      "getAllPSAppDELogics" : [ {
        "codeName" : "NextAction",
@@ -26412,6 +26424,18 @@
          "stdDataType" : 25,
          "type" : "SIMPLE",
          "allowEmpty" : false
+        }, {
+          "codeName" : "Deptid",
+          "logicName" : "部门",
+          "name" : "Deptid",
+          "orderValue" : 1000,
+          "getPSAppDEField" : {
+            "name" : "DEPTID",
+            "codeName" : "Deptid"
+          },
+          "sourceType" : "DEFIELD",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
        }, {
          "codeName" : "IBIZBOOKId",
          "logicName" : "图书标识",
@@ -26463,6 +26487,18 @@
          "stdDataType" : 5,
          "type" : "SIMPLE",
          "allowEmpty" : false
+        }, {
+          "codeName" : "OrgId",
+          "logicName" : "单位",
+          "name" : "OrgId",
+          "orderValue" : 1000,
+          "getPSAppDEField" : {
+            "name" : "ORGID",
+            "codeName" : "OrgId"
+          },
+          "sourceType" : "DEFIELD",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
        }, {
          "codeName" : "Press",
          "logicName" : "图书出版社",
@@ -29110,6 +29146,10 @@
        "codeName" : "IBIZBOOKName"
      },
      "name" : "IBIZBOOK",
+      "getOrgIdPSAppDEField" : {
+        "name" : "ORGID",
+        "codeName" : "OrgId"
+      },
      "getPSDEName" : "IBIZBOOK",
      "getQuickSearchPSAppDEFields" : [ {
        "name" : "IBIZBOOKNAME",

--- a/demo-core/pom.xml
+++ b/demo-core/pom.xml
@@ -10,8 +10,8 @@
    </parent>

    <artifactId>demo-core</artifactId>
-    <name>Demo Core</name>
-    <description>后台服务 Core，模板生成代码，再次发布会覆盖，建议不要直接修改，修改请在demo-boot项目中继承或覆盖重写</description>
+    <name>后台服务 Core</name>
+    <description>后台服务 Core</description>

    <dependencies>

@@ -20,14 +20,6 @@
 			<artifactId>ibizlab-boot-starter-data</artifactId>
 			<version>2.4.0-SNAPSHOT</version>
 		</dependency>
-
-        <!--  MySQL驱动包 -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-
 	</dependencies>

    <properties>

--- a/demo-core/src/main/resources/liquibase/h2_table.xml
+++ b/demo-core/src/main/resources/liquibase/h2_table.xml
@@ -233,6 +233,10 @@
                </column>
                <column name="TAG" remarks="" type="TEXT(1048576)">
                </column>
+                <column name="ORGID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="DEPTID" remarks="" type="VARCHAR(100)">
+                </column>
        </createTable>
    </changeSet>


--- a/demo-core/src/main/resources/sysmodel/DemoSys.json
+++ b/demo-core/src/main/resources/sysmodel/DemoSys.json
@@ -1419,6 +1419,36 @@
    "key_field":0,
    "show_order":1000,
    "major_field":0
+    },
+    {
+    "fieldname":"ORGID" ,
+    "codename":"OrgId",
+    "field_logic_name":"单位",
+    "entity_name":"IBIZBOOK",
+    "field_type":"TEXT",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "predefined":"ORGID",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"DEPTID" ,
+    "codename":"Deptid",
+    "field_logic_name":"部门",
+    "entity_name":"IBIZBOOK",
+    "field_type":"TEXT",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "predefined":"ORGSECTORID",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
    }
    ],
    "subEntitys":[

--- a/demo-core/src/main/resources/sysmodel/RuntimeDict.json
+++ b/demo-core/src/main/resources/sysmodel/RuntimeDict.json
 [    
+
+
+
+
+
+
+
+
+            
   {
-        "name": "年度",
-        "code": "Years",
-        "group": "",
-        "memo": "",
+        "name":"年度",
+        "code":"Years",
+        "group":"",
+        "memo":"",
+        "enable":"",
   }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ]
--- a/pom.xml
+++ b/pom.xml
@@ -6,8 +6,8 @@
    <artifactId>demo</artifactId>
    <groupId>cn.ibizlab</groupId>
    <version>1.0.0.0</version>
-    <name>Demo</name>
-    <description>后台服务</description>
+    <name>后台服务</name>
+    <description></description>
    <packaging>pom</packaging>

    <parent>