hebao1234 发布系统代码 [ibz-dst，应用]

app_web/src/locale/lanres/entities/dabuild/dabuild_en_US_base.ts

@@ -154,6 +154,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("运行",null),
 				tip: commonLogic.appcommonhandle("运行",null),
 			},
+			tbitem1_check: {
+				caption: commonLogic.appcommonhandle("校验",null),
+				tip: commonLogic.appcommonhandle("校验",null),
+			},
 			tbitem2: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),

app_web/src/locale/lanres/entities/dabuild/dabuild_zh_CN_base.ts

@@ -154,6 +154,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("运行",null),
 				tip: commonLogic.appcommonhandle("运行",null),
 			},
+			tbitem1_check: {
+				caption: commonLogic.appcommonhandle("校验",null),
+				tip: commonLogic.appcommonhandle("校验",null),
+			},
 			tbitem2: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),

app_web/src/mock/entity/dabuilds/dabuilds.ts

@@ -195,6 +195,44 @@ mock.onGet(new RegExp(/^\/dabuilds\/getdraft$/)).reply((config: any) => {
     return [status, {}];
 });
         
+// Check
+mock.onPost(new RegExp(/^\/dabuilds\/?([a-zA-Z0-9\-\;]{0,35})\/check$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dabuild 方法: Check");
+    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> = ['build_id'];
+    const matchArray:any = new RegExp(/^\/dabuilds\/([a-zA-Z0-9\-\;]{1,35})\/check$/).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.build_id, tempValue.build_id));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['build_id'] == tempValue['build_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];
+});
+        
 // CheckKey
 mock.onPost(new RegExp(/^\/dabuilds\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
     console.groupCollapsed("实体:dabuild 方法: CheckKey");

app_web/src/pages/analysis/dabuild-edit-view/dabuild-edit-view-base.vue

@@ -13,6 +13,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.dabuild.editviewtoolbar_toolbar.tbitem1_run.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.tbitem1_check.visabled" :disabled="toolBarModels.tbitem1_check.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_check' }, $event)">
+                    <i class=''></i>
+                    <span class='caption'>{{$t('entities.dabuild.editviewtoolbar_toolbar.tbitem1_check.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.dabuild.editviewtoolbar_toolbar.tbitem1_check.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem3.visabled" :disabled="toolBarModels.tbitem3.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem3' }, $event)">
@@ -388,6 +395,8 @@ export default class DABuildEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem1_run: { name: 'tbitem1_run', actiontarget: 'NONE', caption: '运行', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'run', target: 'SINGLEDATA' } },
 
+        tbitem1_check: { name: 'tbitem1_check', actiontarget: 'NONE', caption: '校验', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Check', target: 'SINGLEDATA' } },
+
         tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
@@ -752,6 +761,9 @@ export default class DABuildEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem1_run')) {
             this.toolbar_tbitem1_run_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem1_check')) {
+            this.toolbar_tbitem1_check_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
@@ -863,6 +875,35 @@ export default class DABuildEditViewBase extends Vue {
         curUIService.DABuild_run(datas,contextJO, paramJO,  $event, xData,this,"DABuild");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem1_check_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:DABuildUIService  = new DABuildUIService();
+        curUIService.DABuild_Check(datas,contextJO, paramJO,  $event, xData,this,"DABuild");
+    }
+
     /**
      * 逻辑事件
      *

app_web/src/service/dabuild/dabuild-service-base.ts

@@ -141,6 +141,34 @@ export default class DABuildServiceBase extends EntityService {
         return res;
     }
 
+    /**
+     * Check接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof DABuildServiceBase
+     */
+    public async Check(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().post(`/dabuilds/${context.dabuild}/check`,data,isloading);
+            return res;
+    }
+
+    /**
+     * CheckBatch接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof DABuildServiceBase
+     */
+    public async CheckBatch(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return await Http.getInstance().post(`/dabuild/checkbatch`,tempData,isloading);
+    }
+
     /**
      * CheckKey接口方法
      *

app_web/src/uiservice/dabuild/dabuild-ui-service-base.ts

@@ -135,6 +135,22 @@ export default class DABuildUIServiceBase extends UIService {
         actionContext.$Notice.error({ title: '错误', desc: '不支持单项数据' });
     }
 
+    /**
+     * 校验
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async DABuild_Check(args: any[],context:any = {}, params:any = {}, $event?: any, xData?: any,actionContext?: any,srfParentDeName?:string){
+        actionContext.$Notice.error({ title: '错误', desc: '不支持单项数据' });
+    }
+
 
     /**
      * 获取指定数据的重定向页面

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/IDABuildService.java

@@ -33,6 +33,8 @@ public interface IDABuildService extends IService<DABuild> {
     void removeBatch(Collection<String> idList);
     DABuild get(String key);
     DABuild getDraft(DABuild et);
+    DABuild check(DABuild et);
+    boolean checkBatch(List<DABuild> etList);
     boolean checkKey(DABuild et);
     DABuild exportFile(DABuild et);
     boolean exportFileBatch(List<DABuild> etList);

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DABuildServiceImpl.java

@@ -129,6 +129,22 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
         return et;
     }
 
+    @Override
+    @Transactional
+    public DABuild check(DABuild et) {
+        //自定义代码
+        return et;
+    }
+
+    @Override
+    @Transactional
+    public boolean checkBatch(List<DABuild> etList) {
+        for(DABuild et : etList) {
+            check(et);
+        }
+        return true;
+    }
+
     @Override
     public boolean checkKey(DABuild et) {
         return (!ObjectUtils.isEmpty(et.getBuildId())) && (!Objects.isNull(this.getById(et.getBuildId())));

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/DABuildExService.java

@@ -21,6 +21,16 @@ public class DABuildExService extends DABuildServiceImpl {
         return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
     }
 
+    /**
+     * [Check:校验] 行为扩展
+     * @param et
+     * @return
+     */
+    @Override
+    @Transactional
+    public DABuild check(DABuild et) {
+        return super.check(et);
+    }
     /**
      * [ExportFile:导出文件] 行为扩展：导出模型的文件
      * @param et

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[DA_BUILD]数据结构 -->
-    <changeSet author="root" id="tab-da_build-71-1">
+    <changeSet author="root" id="tab-da_build-73-1">
         <createTable tableName="IBZDABUILD">
                 <column name="BUILDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_BUILD_BUILDID"/>

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

@@ -8,7 +8,7 @@
     "delogicname":"分析",
     "sysmoudle":{"id":"ANALYSIS","name":"analysis"},
     "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":"ExportFile" , "name":"导出文件" , "type":"USERCUSTOM" },{"id":"Run" , "name":"运行" , "type":"USERCUSTOM" },{"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":"Check" , "name":"校验" , "type":"USERCUSTOM" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"ExportFile" , "name":"导出文件" , "type":"USERCUSTOM" },{"id":"Run" , "name":"运行" , "type":"USERCUSTOM" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
     "datascope":[{"id":"all","name":"全部数据"}]
     }
     ,    {

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DABuildResource.java

@@ -114,6 +114,25 @@ public class DABuildResource {
         return ResponseEntity.status(HttpStatus.OK).body(dabuildMapping.toDto(dabuildService.getDraft(new DABuild())));
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-DABuild-Check-all')")
+    @ApiOperation(value = "校验", tags = {"分析" },  notes = "校验")
+	@RequestMapping(method = RequestMethod.POST, value = "/dabuilds/{dabuild_id}/check")
+    public ResponseEntity<DABuildDTO> check(@PathVariable("dabuild_id") String dabuild_id, @RequestBody DABuildDTO dabuilddto) {
+        DABuild domain = dabuildMapping.toDomain(dabuilddto);
+        domain.setBuildId(dabuild_id);
+        domain = dabuildService.check(domain);
+        dabuilddto = dabuildMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(dabuilddto);
+    }
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-DABuild-Check-all')")
+    @ApiOperation(value = "批量处理[校验]", tags = {"分析" },  notes = "批量处理[校验]")
+	@RequestMapping(method = RequestMethod.POST, value = "/dabuilds/checkbatch")
+    public ResponseEntity<Boolean> checkBatch(@RequestBody List<DABuildDTO> dabuilddtos) {
+        List<DABuild> domains = dabuildMapping.toDomain(dabuilddtos);
+        boolean result = dabuildService.checkBatch(domains);
+        return ResponseEntity.status(HttpStatus.OK).body(result);
+    }
+
     @ApiOperation(value = "检查分析", tags = {"分析" },  notes = "检查分析")
 	@RequestMapping(method = RequestMethod.POST, value = "/dabuilds/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody DABuildDTO dabuilddto) {