liuleizhi 发布系统代码 [ibz-lite，应用]

app_web/src/mock/entity/blade-visuals/blade-visuals.ts

@@ -86,6 +86,44 @@ mock.onDelete(new RegExp(/^\/bladevisuals\/batch$/)).reply((config: any) => {
     return [status, {}];
 });
 
+        
+// Save2
+mock.onPost(new RegExp(/^\/bladevisuals\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:bladevisual 方法: Save2");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['id'];
+    const matchArray:any = new RegExp(/^\/bladevisuals\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    //let items = mockDatas ? mockDatas : [];
+    //let _items = items.find((item: any) => Object.is(item.id, tempValue.id));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['id'] == tempValue['id'] ){
+            for(let value in data){
+              if(item.hasOwnProperty(value)){
+                  item[value] = data[value];
+              }
+            }
+        }
+    })
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(data);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, data];
+});
 
 // Select
 mock.onGet(new RegExp(/^\/bladevisuals\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {

app_web/src/service/blade-visual/blade-visual-service-base.ts

@@ -38,6 +38,20 @@ export default class BladeVisualServiceBase extends EntityService {
 
 // 实体接口
 
+    /**
+     * Save2接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof BladeVisualServiceBase
+     */
+    public async Save2(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().post(`/bladevisuals/${context.bladevisual}`,data,isloading);
+            return res;
+    }
+
     /**
      * Select接口方法
      *

config.xml

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

ibzlite-app/ibzlite-app-web/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 /ibzlite-app-web.jar
 
-EXPOSE 30010
+EXPOSE 8080
 
 ADD ibzlite-app-web.jar /ibzlite-app-web.jar

ibzlite-app/ibzlite-app-web/src/main/docker/ibzlite-app-web.yaml

@@ -3,23 +3,9 @@ services:
   ibzlite-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-app-web:latest
     ports:
-      - "30010:30010"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30010
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.100.243:8848
-      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits:

ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/service/IBladeVisualService.java

@@ -36,6 +36,7 @@ public interface IBladeVisualService extends IService<BladeVisual> {
     boolean checkKey(BladeVisual et);
     boolean save(BladeVisual et);
     void saveBatch(List<BladeVisual> list);
+    BladeVisual save2(BladeVisual et);
     Page<BladeVisual> searchDefault(BladeVisualSearchContext context);
     /**
      *自定义查询SQL

ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/service/impl/BladeVisualServiceImpl.java

@@ -150,6 +150,13 @@ public class BladeVisualServiceImpl extends ServiceImpl<BladeVisualMapper, Blade
         saveOrUpdateBatch(list,batchSize);
     }
 
+    @Override
+    @Transactional
+    public BladeVisual save2(BladeVisual et) {
+        //自定义代码
+        return et;
+    }
+
 
 
     /**

ibzlite-core/src/main/java/cn/ibizlab/core/extensions/service/BladeVisualExService.java

+package cn.ibizlab.core.extensions.service;
+
+import cn.ibizlab.core.avuedata.service.impl.BladeVisualServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import cn.ibizlab.core.avuedata.domain.BladeVisual;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.context.annotation.Primary;
+import java.util.*;
+
+/**
+ * 实体[可视化表] 自定义服务对象
+ */
+@Slf4j
+@Primary
+@Service("BladeVisualExService")
+public class BladeVisualExService extends BladeVisualServiceImpl {
+
+    @Override
+    protected Class currentModelClass() {
+        return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
+    }
+
+    /**
+     * [Save2:Save2] 行为扩展
+     * @param et
+     * @return
+     */
+    @Override
+    @Transactional
+    public BladeVisual save2(BladeVisual et) {
+        return super.save2(et);
+    }
+}
+

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[BLADE_VISUAL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual-52-1">
+    <changeSet author="root" id="tab-blade_visual-54-1">
         <createTable tableName="blade_visual">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_ID"/>
@@ -36,7 +36,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_CATEGORY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_category-23-2">
+    <changeSet author="root" id="tab-blade_visual_category-23-2">
         <createTable tableName="blade_visual_category">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CATEGORY_ID"/>
@@ -52,7 +52,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_CONFIG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_config-18-3">
+    <changeSet author="root" id="tab-blade_visual_config-18-3">
         <createTable tableName="blade_visual_config">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CONFIG_ID"/>
@@ -68,7 +68,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_MAP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_map-18-4">
+    <changeSet author="root" id="tab-blade_visual_map-18-4">
         <createTable tableName="blade_visual_map">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_MAP_ID"/>
@@ -86,7 +86,7 @@
 
 
     <!--输出实体[DST_COMPONENT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_component-56-5">
+    <changeSet author="root" id="tab-dst_component-56-5">
         <createTable tableName="IBZCOMPONENT">
                 <column name="CID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_COMPONENT_CID"/>
@@ -110,7 +110,7 @@
 
 
     <!--输出实体[DST_CONFIG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_config-32-6">
+    <changeSet author="root" id="tab-dst_config-32-6">
         <createTable tableName="IBZCFG">
                 <column name="CFGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_CONFIG_CFGID"/>
@@ -132,7 +132,7 @@
 
 
     <!--输出实体[DST_DATASOURCE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_datasource-39-7">
+    <changeSet author="root" id="tab-dst_datasource-39-7">
         <createTable tableName="IBZDATASOURCE">
                 <column name="DSID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
@@ -150,7 +150,7 @@
 
 
     <!--输出实体[DST_ROUTER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_router-33-8">
+    <changeSet author="root" id="tab-dst_router-33-8">
         <createTable tableName="IBZROUTER">
                 <column name="ROUTERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_ROUTER_ROUTERID"/>
@@ -174,7 +174,7 @@
 
 
     <!--输出实体[DST_SYSTEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_system-37-9">
+    <changeSet author="root" id="tab-dst_system-37-9">
         <createTable tableName="IBZPSSYSTEM">
                 <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
@@ -194,7 +194,7 @@
 
 
     <!--输出实体[DST_VIEW]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_view-43-10">
+    <changeSet author="root" id="tab-dst_view-43-10">
         <createTable tableName="IBZVIEW">
                 <column name="VIEWID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_VIEW_VIEWID"/>
@@ -216,7 +216,7 @@
 
 
     <!--输出实体[META_DATASET]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_dataset-32-11">
+    <changeSet author="root" id="tab-meta_dataset-32-11">
         <createTable tableName="IBZDATASET">
                 <column name="DATASETID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
@@ -238,7 +238,7 @@
 
 
     <!--输出实体[META_ENTITY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_entity-88-12">
+    <changeSet author="root" id="tab-meta_entity-88-12">
         <createTable tableName="IBZENTITY">
                 <column name="ENTITYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
@@ -266,7 +266,7 @@
 
 
     <!--输出实体[META_FIELD]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_field-147-13">
+    <changeSet author="root" id="tab-meta_field-147-13">
         <createTable tableName="IBZFIELD">
                 <column name="FIELDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
@@ -326,7 +326,7 @@
 
 
     <!--输出实体[META_MODEL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_model-26-14">
+    <changeSet author="root" id="tab-meta_model-26-14">
         <createTable tableName="IBZMODEL">
                 <column name="MODELID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
@@ -342,7 +342,7 @@
 
 
     <!--输出实体[META_MODULE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_module-28-15">
+    <changeSet author="root" id="tab-meta_module-28-15">
         <createTable tableName="IBZMODULE">
                 <column name="MODULEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
@@ -360,7 +360,7 @@
 
 
     <!--输出实体[META_RELATION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_relation-90-16">
+    <changeSet author="root" id="tab-meta_relation-90-16">
         <createTable tableName="IBZRELATION">
                 <column name="RELATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>

ibzlite-core/src/main/resources/permission/systemResource.json

@@ -120,7 +120,7 @@
     "delogicname":"可视化表",
     "sysmoudle":{"id":"AVUEDATA","name":"大屏展示"},
     "dedataset":[{"id":"Default" , "name":"数据集"}],
-    "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
+    "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"Save2" , "name":"Save2" , "type":"USERCUSTOM" }],
     "datascope":[{"id":"all","name":"全部数据"}]
      }
     ,    {

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/BladeVisualResource.java

@@ -47,6 +47,17 @@ public class BladeVisualResource {
     @Lazy
     public BladeVisualMapping bladevisualMapping;
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-BladeVisual-Save2-all')")
+    @ApiOperation(value = "Save2", tags = {"可视化表" },  notes = "Save2")
+	@RequestMapping(method = RequestMethod.POST, value = "/bladevisuals/{bladevisual_id}/save2")
+    public ResponseEntity<BladeVisualDTO> save2(@PathVariable("bladevisual_id") Long bladevisual_id, @RequestBody BladeVisualDTO bladevisualdto) {
+        BladeVisual domain = bladevisualMapping.toDomain(bladevisualdto);
+        domain.setId(bladevisual_id);
+        domain = bladevisualService.save2(domain);
+        bladevisualdto = bladevisualMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(bladevisualdto);
+    }
+
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-BladeVisual-Create-all')")
     @ApiOperation(value = "新建可视化表", tags = {"可视化表" },  notes = "新建可视化表")
 	@RequestMapping(method = RequestMethod.POST, value = "/bladevisuals")