ShineKOT 发布系统代码 [后台服务，演示应用]

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US.ts

@@ -23,6 +23,12 @@ export default {
     borrowway: "借阅方式",
     returnlib: "归还图馆",
     borrowerid: "借阅人ID",
+    borrower1: "借阅人1",
+    borrower1_id: "借阅人1_ID",
+    borrower2: "借阅人2",
+    borrower2_id: "借阅人2_ID",
+    borrower3: "借阅人3",
+    borrower3_id: "借阅人3_ID",
   },
 	views: {
 		wizardiwithstateview: {

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN.ts

@@ -22,6 +22,12 @@ export default {
     borrowway: "借阅方式",
     returnlib: "归还图馆",
     borrowerid: "借阅人ID",
+    borrower1: "借阅人1",
+    borrower1_id: "借阅人1_ID",
+    borrower2: "借阅人2",
+    borrower2_id: "借阅人2_ID",
+    borrower3: "借阅人3",
+    borrower3_id: "借阅人3_ID",
   },
 	views: {
 		wizardiwithstateview: {

app_Web/src/pages/ungroup/app-portal-view/app-portal-view-base.vue

 
 <template>
-<div class='view-container appportalview app-portal-view CARDPORTAL'>
+<div class='view-container appportalview app-portal-view '>
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="appportalview"></app-studioaction>
     <card class='view-card   view-no-toolbar' dis-hover :bordered="false">
 <div slot='title' class="header-container">

app_Web/src/widgets/ibizbook/guide-wizardpanel/guide-wizardpanel-model.ts

@@ -102,6 +102,26 @@ export default class GuideModel {
         name: 'borrowerid',
         prop: 'borrowerid',
       },
+      {
+        name: 'borrower1',
+        prop: 'borrower1',
+      },
+      {
+        name: 'borrower1_id',
+        prop: 'borrower1_id',
+      },
+      {
+        name: 'borrower2',
+        prop: 'borrower2',
+      },
+      {
+        name: 'borrower2_id',
+        prop: 'borrower2_id',
+      },
+      {
+        name: 'borrower3',
+        prop: 'borrower3',
+      },
     ]
   }
 

app_Web/src/widgets/ibizbook/inter-func-form-2-form/inter-func-form-2-form-base.vue

@@ -40,8 +40,6 @@
   :localParam ='{ }' 
   :disabled="detailsModel.formitem.disabled"
   name='formitem'
-  deMajorField='ibizcustomername'
-  deKeyField='ibizcustomer'
   valueitem='borrower' 
   :value="data.formitem"
   editortype="pickup-no-ac" 
@@ -65,8 +63,6 @@
   :localParam ='{ }' 
   :disabled="detailsModel.formitem1.disabled"
   name='formitem1'
-  deMajorField='ibizcustomername'
-  deKeyField='ibizcustomer'
   valueitem='borrower' 
   :value="data.formitem1"
   editortype="pickup-no-ac" 
@@ -92,9 +88,7 @@
     :localParam ='{ }' 
     :service="service"
     valueitem='borrower' 
-    deMajorField='ibizcustomername'
-    deKeyField='ibizcustomer'
-    :acParams="{ serviceName: 'IBIZCustomerService', interfaceName: 'FetchDefault'}"
+    :acParams="{ }"
     :pickupView="{ viewname: 'ibizcustomer-mpickup-view', title: $t('entities.ibizcustomer.views.mpickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibizcustomers', parameterName: 'ibizcustomer' }, { pathName: 'mpickupview', parameterName: 'mpickupview' } ], placement:'' }"
     @formitemvaluechange="onFormItemValueChange" 
     style="">

app_Web/src/widgets/ibizbook/inter-func-form-2-form/inter-func-form-2-form-service.ts

@@ -2,7 +2,6 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import IBIZBOOKService from '@/service/ibizbook/ibizbook-service';
 import InterFuncForm_2Model from './inter-func-form-2-form-model';
-import IBIZCustomerService from '@/service/ibizcustomer/ibizcustomer-service';
 
 
 /**
@@ -42,14 +41,6 @@ export default class InterFuncForm_2Service extends ControlService {
         this.model = new InterFuncForm_2Model();
     }
 
-    /**
-     * 客户服务对象
-     *
-     * @type {IBIZCustomerService}
-     * @memberof InterFuncForm_2Service
-     */
-    public ibizcustomerService: IBIZCustomerService = new IBIZCustomerService();
-
     /**
      * 远端数据
      *
@@ -99,9 +90,6 @@ export default class InterFuncForm_2Service extends ControlService {
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
         data.page = data.page ? data.page : 0;
         data.size = data.size ? data.size : 1000;
-        if (Object.is(serviceName, 'IBIZCustomerService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.ibizcustomerService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'ibizcustomerid', 'ibizcustomer');
-        }
 
         return Promise.reject([])
     }

app_Web/src/widgets/ibizbook/main-multieditviewpanel/main-multieditviewpanel-model.ts

@@ -81,6 +81,21 @@ export default class MainModel {
       {
         name: 'borrowerid',
       },
+      {
+        name: 'borrower1',
+      },
+      {
+        name: 'borrower1_id',
+      },
+      {
+        name: 'borrower2',
+      },
+      {
+        name: 'borrower2_id',
+      },
+      {
+        name: 'borrower3',
+      },
     ]
   }
 

app_Web/src/widgets/ibizbook/state-field-guide-wizardpanel/state-field-guide-wizardpanel-model.ts

@@ -102,6 +102,26 @@ export default class StateFieldGuideModel {
         name: 'borrowerid',
         prop: 'borrowerid',
       },
+      {
+        name: 'borrower1',
+        prop: 'borrower1',
+      },
+      {
+        name: 'borrower1_id',
+        prop: 'borrower1_id',
+      },
+      {
+        name: 'borrower2',
+        prop: 'borrower2',
+      },
+      {
+        name: 'borrower2_id',
+        prop: 'borrower2_id',
+      },
+      {
+        name: 'borrower3',
+        prop: 'borrower3',
+      },
     ]
   }
 

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 demosys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd demosys/
-      mvn clean package -Pdemoapi
-      cd demo-provider/demo-provider-demoapi
-      mvn -Pdemoapi docker:build
-      mvn -Pdemoapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-provider-demoapi.yaml iBizDemo --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

demo-core/src/main/java/cn/ibizlab/core/sample/domain/IBIZBOOK.java

@@ -206,6 +206,43 @@ public class IBIZBOOK extends EntityMP implements Serializable {
     @JSONField(name = "borrowerid")
     @JsonProperty("borrowerid")
     private String borrowerid;
+    /**
+     * 借阅人1
+     */
+    @TableField(value = "borrower1")
+    @JSONField(name = "borrower1")
+    @JsonProperty("borrower1")
+    private String borrower1;
+    /**
+     * 借阅人1_ID
+     */
+    @DEField(name = "borrower1_id")
+    @TableField(value = "borrower1_id")
+    @JSONField(name = "borrower1_id")
+    @JsonProperty("borrower1_id")
+    private String borrower1Id;
+    /**
+     * 借阅人2
+     */
+    @TableField(value = "borrower2")
+    @JSONField(name = "borrower2")
+    @JsonProperty("borrower2")
+    private String borrower2;
+    /**
+     * 借阅人2_ID
+     */
+    @DEField(name = "borrower2_id")
+    @TableField(value = "borrower2_id")
+    @JSONField(name = "borrower2_id")
+    @JsonProperty("borrower2_id")
+    private String borrower2Id;
+    /**
+     * 借阅人3
+     */
+    @TableField(value = "borrower3")
+    @JSONField(name = "borrower3")
+    @JsonProperty("borrower3")
+    private String borrower3;
 
 
 
@@ -365,6 +402,46 @@ public class IBIZBOOK extends EntityMP implements Serializable {
         this.modify("borrowerid", borrowerid);
     }
 
+    /**
+     * 设置 [借阅人1]
+     */
+    public void setBorrower1(String borrower1) {
+        this.borrower1 = borrower1;
+        this.modify("borrower1", borrower1);
+    }
+
+    /**
+     * 设置 [借阅人1_ID]
+     */
+    public void setBorrower1Id(String borrower1Id) {
+        this.borrower1Id = borrower1Id;
+        this.modify("borrower1_id", borrower1Id);
+    }
+
+    /**
+     * 设置 [借阅人2]
+     */
+    public void setBorrower2(String borrower2) {
+        this.borrower2 = borrower2;
+        this.modify("borrower2", borrower2);
+    }
+
+    /**
+     * 设置 [借阅人2_ID]
+     */
+    public void setBorrower2Id(String borrower2Id) {
+        this.borrower2Id = borrower2Id;
+        this.modify("borrower2_id", borrower2Id);
+    }
+
+    /**
+     * 设置 [借阅人3]
+     */
+    public void setBorrower3(String borrower3) {
+        this.borrower3 = borrower3;
+        this.modify("borrower3", borrower3);
+    }
+
 
     /**
      * 复制当前对象数据到目标对象(粘贴重置)

demo-core/src/main/resources/liquibase/h2_table.xml

@@ -121,6 +121,16 @@
                 </column>
                 <column name="BORROWERID" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="BORROWER1" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="BORROWER1_ID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="BORROWER2" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="BORROWER2_ID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="BORROWER3" remarks="" type="VARCHAR(100)">
+                </column>
         </createTable>
     </changeSet>
 

demo-core/src/main/resources/mapper/sample/ibizbook/IBIZBOOKMapper.xml

@@ -5,12 +5,14 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="IBIZBOOKResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`BORROWER`, t1.`BORROWERID`, t1.`BORROWSTATUS`, t1.`BORROWWAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`ICON`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNLIB`, t1.`RETURNTIME`, t1.`SAILSTATE`, t1.`STEPSTATUS`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  ) t1 where ibizbookid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`BORROWER`, t1.`BORROWER1`, t1.`BORROWER1_ID`, t1.`BORROWER2`, t1.`BORROWER2_ID`, t1.`BORROWER3`, t1.`BORROWERID`, t1.`BORROWSTATUS`, t1.`BORROWWAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`ICON`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNLIB`, t1.`RETURNTIME`, t1.`SAILSTATE`, t1.`STEPSTATUS`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  ) t1 where ibizbookid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
     <resultMap id="IBIZBOOKResultMap" type="cn.ibizlab.core.sample.domain.IBIZBOOK" autoMapping="true">
 		<id property="ibizbookid" column="ibizbookid" /><!--主键字段映射-->
+		<result property="borrower1Id" column="borrower1_id" />
+		<result property="borrower2Id" column="borrower2_id" />
             
 		
     </resultMap>
@@ -27,12 +29,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`BORROWER`, t1.`BORROWERID`, t1.`BORROWSTATUS`, t1.`BORROWWAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`ICON`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNLIB`, t1.`RETURNTIME`, t1.`SAILSTATE`, t1.`STEPSTATUS`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  
+		<![CDATA[ SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`BORROWER`, t1.`BORROWER1`, t1.`BORROWER1_ID`, t1.`BORROWER2`, t1.`BORROWER2_ID`, t1.`BORROWER3`, t1.`BORROWERID`, t1.`BORROWSTATUS`, t1.`BORROWWAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`ICON`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNLIB`, t1.`RETURNTIME`, t1.`SAILSTATE`, t1.`STEPSTATUS`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`BORROWER`, t1.`BORROWERID`, t1.`BORROWSTATUS`, t1.`BORROWWAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`ICON`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNLIB`, t1.`RETURNTIME`, t1.`SAILSTATE`, t1.`STEPSTATUS`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  
+		<![CDATA[ SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`BORROWER`, t1.`BORROWER1`, t1.`BORROWER1_ID`, t1.`BORROWER2`, t1.`BORROWER2_ID`, t1.`BORROWER3`, t1.`BORROWERID`, t1.`BORROWSTATUS`, t1.`BORROWWAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`ICON`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNLIB`, t1.`RETURNTIME`, t1.`SAILSTATE`, t1.`STEPSTATUS`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  
 			]]>
     </sql>
 </mapper>

demo-core/src/main/resources/sysmodel/DemoSys.json

@@ -731,6 +731,76 @@
     "key_field":0,
     "show_order":1000,
     "major_field":0
+    },
+    {
+    "fieldname":"BORROWER1" ,
+    "codename":"Borrower1",
+    "field_logic_name":"借阅人1",
+    "entity_name":"IBIZBOOK",
+    "field_type":"TEXT",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"BORROWER1_ID" ,
+    "codename":"Borrower1_id",
+    "field_logic_name":"借阅人1_ID",
+    "entity_name":"IBIZBOOK",
+    "field_type":"TEXT",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"BORROWER2" ,
+    "codename":"Borrower2",
+    "field_logic_name":"借阅人2",
+    "entity_name":"IBIZBOOK",
+    "field_type":"TEXT",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"BORROWER2_ID" ,
+    "codename":"Borrower2_id",
+    "field_logic_name":"借阅人2_ID",
+    "entity_name":"IBIZBOOK",
+    "field_type":"TEXT",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"BORROWER3" ,
+    "codename":"Borrower3",
+    "field_logic_name":"借阅人3",
+    "entity_name":"IBIZBOOK",
+    "field_type":"TEXT",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
     }
     ],
     "subEntitys":[

demo-provider/demo-provider-demoapi/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-provider-demoapi.jar
 
-EXPOSE 51000
+EXPOSE 8081
 
 ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar

demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml

@@ -3,24 +3,9 @@ services:
   demo-provider-demoapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
     ports:
-      - "51000:51000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=51000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
-      - SPRING_DATASOURCE_PASSWORD=3d6@460A
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

demo-provider/demo-provider-demoapi/src/main/java/cn/ibizlab/demoapi/dto/IBIZBOOKDTO.java

@@ -227,6 +227,51 @@ public class IBIZBOOKDTO extends DTOBase implements Serializable {
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
     private String borrowerid;
 
+    /**
+     * 属性 [BORROWER1]
+     *
+     */
+    @JSONField(name = "borrower1")
+    @JsonProperty("borrower1")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String borrower1;
+
+    /**
+     * 属性 [BORROWER1_ID]
+     *
+     */
+    @JSONField(name = "borrower1_id")
+    @JsonProperty("borrower1_id")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String borrower1Id;
+
+    /**
+     * 属性 [BORROWER2]
+     *
+     */
+    @JSONField(name = "borrower2")
+    @JsonProperty("borrower2")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String borrower2;
+
+    /**
+     * 属性 [BORROWER2_ID]
+     *
+     */
+    @JSONField(name = "borrower2_id")
+    @JsonProperty("borrower2_id")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String borrower2Id;
+
+    /**
+     * 属性 [BORROWER3]
+     *
+     */
+    @JSONField(name = "borrower3")
+    @JsonProperty("borrower3")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String borrower3;
+
 
     /**
      * 设置 [IBIZBOOKNAME]
@@ -364,6 +409,46 @@ public class IBIZBOOKDTO extends DTOBase implements Serializable {
         this.modify("borrowerid",borrowerid);
     }
 
+    /**
+     * 设置 [BORROWER1]
+     */
+    public void setBorrower1(String  borrower1){
+        this.borrower1 = borrower1 ;
+        this.modify("borrower1",borrower1);
+    }
+
+    /**
+     * 设置 [BORROWER1_ID]
+     */
+    public void setBorrower1Id(String  borrower1Id){
+        this.borrower1Id = borrower1Id ;
+        this.modify("borrower1_id",borrower1Id);
+    }
+
+    /**
+     * 设置 [BORROWER2]
+     */
+    public void setBorrower2(String  borrower2){
+        this.borrower2 = borrower2 ;
+        this.modify("borrower2",borrower2);
+    }
+
+    /**
+     * 设置 [BORROWER2_ID]
+     */
+    public void setBorrower2Id(String  borrower2Id){
+        this.borrower2Id = borrower2Id ;
+        this.modify("borrower2_id",borrower2Id);
+    }
+
+    /**
+     * 设置 [BORROWER3]
+     */
+    public void setBorrower3(String  borrower3){
+        this.borrower3 = borrower3 ;
+        this.modify("borrower3",borrower3);
+    }
+
 
 }