ibiz4j 发布系统代码 [ibiz-task，任务调度]

app_web/src/components/app-data-upload/app-data-upload.vue

@@ -52,6 +52,7 @@ import CodeListService from "@/codelist/codelist-service";
 import EntityService from '@/service/entity-service';
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { Environment } from '@/environments/environment';
+import moment from "moment"; 
 
 @Component({
 })
@@ -395,11 +396,11 @@ export default class AppDataUploadView extends Vue {
        let reader = new FileReader();
        reader.onload = (e:any) => {
            let data = e.target.result;
-           this.workBookData = XLSX.read(data, {type: 'binary'});
+           this.workBookData = XLSX.read(data, {type: 'binary',cellDates: true});
            let xlsxData = XLSX.utils.sheet_to_json(this.workBookData.Sheets[this.workBookData.SheetNames[0]]);
            let list1 = this.getFirstRow(this.workBookData);
            xlsxData = this.AddXlsxData(xlsxData, list1);
-           this.importDataArray = JSON.parse(JSON.stringify(xlsxData));
+           this.importDataArray = this.$util.deepCopy(xlsxData);
            (this.$refs.inputUpLoad as any).value = '';
        };
        reader.readAsBinaryString(f);
@@ -505,6 +506,11 @@ export default class AppDataUploadView extends Vue {
         data.forEach((item:any) =>{
             let curObject:any = {};
             Object.keys(item).forEach((ele:any) => {
+                // todo XLSX读取时间为国际时间(东8区)+8H转为标准时间
+                if (item[ele] instanceof Date){
+                    const tempDate:Date = item[ele];
+                    item[ele] = moment(tempDate).add(8, 'h').format("YYYY-MM-DD HH:mm:ss");
+                }
                 if(this.allFieldMap.get(ele).codelist){
                     let codelistTag:string = this.allFieldMap.get(ele).codelist.tag;
                      let codelistIsNumber:boolean = this.allFieldMap.get(ele).codelist.isnumber;

app_web/src/components/app-message-popover/app-message-popover.vue

@@ -84,140 +84,142 @@
 </template>
 
 <script lang="ts">
-    import {Vue, Component, Prop, Model, Emit} from "vue-property-decorator";
-    import {Subject} from "rxjs";
-    import {Environment} from '@/environments/environment';
-    import moment from 'moment';
+import {Vue, Component, Prop, Model, Emit} from "vue-property-decorator";
+import {Environment} from '@/environments/environment';
+import moment from 'moment';
 
-    @Component({})
-    export default class AppMessagePopover extends Vue {
+@Component({})
+export default class AppMessagePopover extends Vue {
 
-        // 是否显示小圆点
-        public showIsDot: any = false;
-        // 默认显示的tab页
-        public default_tab_pane: any = "first";
-        // 待办列表
-        public myTasks: any = [];
-        // 待办面板标签
-        public myTasksLabel: any = "待办";
-        //  待办面板显示条数
-        public taskShowCnt:number = 0;
-        // 消息列表
-        public myMsgs: any = [];
-        // 消息面板标签
-        public myMsgsLabel: any = "消息";
-        //  信息面板显示条数
-        public msgShowCnt:number = 0;
+    // 是否显示小圆点
+    public showIsDot: any = false;
+    // 默认显示的tab页
+    public default_tab_pane: any = "first";
+    // 待办列表
+    public myTasks: any = [];
+    // 待办面板标签
+    public myTasksLabel: any = "待办";
+    //  待办面板显示条数
+    public taskShowCnt:number = 0;
+    // 消息列表
+    public myMsgs: any = [];
+    // 消息面板标签
+    public myMsgsLabel: any = "消息";
+    //  信息面板显示条数
+    public msgShowCnt:number = 0;
 
-        /**
-         * vue创建
-         */
-        created(): void {}
+    /**
+     * vue创建
+     */
+    created(): void {}
 
-        /**
-         * vue挂载
-         */
-        mounted(): void {
-            // 首次获取待办列表
-            this.getMyTasks();
-            // 定时器:每隔１分钟重新获取待办列表
-            const timer = setInterval(()=>{
-                this.getMyTasks();
-            },60000);
-            // 监听定时器,在vue销毁前清除定时器
-            this.$once('hook:beforeDestroy',()=>{
-                // 清除定时器
-                clearInterval(timer);
-            });
+    /**
+     * vue挂载
+     */
+    mounted(): void {
+        if(!Environment.workflow){
+            return;
         }
+        // 首次获取待办列表
+        this.getMyTasks();
+        // 定时器:每隔１分钟重新获取待办列表
+        const timer = setInterval(()=>{
+            this.getMyTasks();
+        },60000);
+        // 监听定时器,在vue销毁前清除定时器
+        this.$once('hook:beforeDestroy',()=>{
+            // 清除定时器
+            clearInterval(timer);
+        });
+    }
 
-        /**
-         * 获取待办列表
-         */
-        public getMyTasks() {
-            let url: any = '/wfcore/mytasks';
-            this.$http.get(url).then((response: any) => {
-                if (response && response.status == 200) {
-                    const data: any = response.data;
-                    if (data && data.length > 0) {
-                        this.myTasks = data;
-                        this.showIsDot = true;
-                    } else {
-                        this.myTasks = [];
-                    }
-                    // 获取消息列表
-                    this.getMyMsgs();
+    /**
+     * 获取待办列表
+     */
+    public getMyTasks() {
+        let url: any = '/wfcore/mytasks';
+        this.$http.get(url).then((response: any) => {
+            if (response && response.status == 200) {
+                const data: any = response.data;
+                if (data && data.length > 0) {
+                    this.myTasks = data;
+                    this.showIsDot = true;
+                } else {
+                    this.myTasks = [];
                 }
-            }).catch((error: any) => {
-                console.warn("加载数据错误");
-            })
-        }
-
-        /**
-         * 获取消息列表
-         */
-        public getMyMsgs(){
-            // TODO:接口获取消息列表，这里用的待办数据
-            this.myMsgs = this.myTasks;
-            if (this.myMsgs.length > 0 && this.myTasks.length == 0) {
-                // 显示小圆点
-                this.showIsDot = true;
+                // 获取消息列表
+                this.getMyMsgs();
             }
-        }
+        }).catch((error: any) => {
+            console.warn("加载数据错误");
+        })
+    }
 
-        /**
-         * 点击标签事件
-         */
-        public handleTag(data: any) {
-            if (!data)  return this.$message.error("未获取到标签内容");
-            // 拼接要打开的窗口地址
-            const baseUrl:any = Environment.BaseUrl;
-            const openUrl:any = baseUrl + `/wfcore/mytasks/${data.processDefinitionKey}/web/${data.processInstanceBusinessKey}/usertasks/${data.taskDefinitionKey}`;
-            // 打开新窗口
-            window.open(openUrl,'_blank');
+    /**
+     * 获取消息列表
+     */
+    public getMyMsgs(){
+        // TODO:接口获取消息列表，这里用的待办数据
+        this.myMsgs = this.myTasks;
+        if (this.myMsgs.length > 0 && this.myTasks.length == 0) {
+            // 显示小圆点
+            this.showIsDot = true;
         }
+    }
 
-        /**
-         * 销毁之前
-         */
-        beforeDestroy(): void {
-            // 清空数据
-            this.showIsDot = false;
-            this.myTasks = [];
-            this.myMsgs = [];
-        }
+    /**
+     * 点击标签事件
+     */
+    public handleTag(data: any) {
+        if (!data)  return this.$message.error("未获取到标签内容");
+        // 拼接要打开的窗口地址
+        const baseUrl:any = Environment.BaseUrl;
+        const openUrl:any = baseUrl + `/wfcore/mytasks/${data.processDefinitionKey}/web/${data.processInstanceBusinessKey}/usertasks/${data.taskDefinitionKey}`;
+        // 打开新窗口
+        window.open(openUrl,'_blank');
+    }
 
-        /**
-         * 时间格式转换
-         */
-        public formatDate(date: string, format: string) {
-            if(date && format) {
-                return moment(date).format(format);
-            }
-            return date;
-        }
+    /**
+     * 销毁之前
+     */
+    beforeDestroy(): void {
+        // 清空数据
+        this.showIsDot = false;
+        this.myTasks = [];
+        this.myMsgs = [];
+    }
 
-        /**
-         * 加载更多
-         */
-        public showMore(cnt: string) {
-            if(Object.is('taskShowCnt', cnt)) {
-                this.taskShowCnt + 10 < this.myTasks.length ? this.taskShowCnt += 10 : this.taskShowCnt += this.myTasks.length-this.taskShowCnt;
-            }
-            if(Object.is('msgShowCnt', cnt)) {
-                this.msgShowCnt + 10 < this.myMsgs.length ? this.msgShowCnt += 10 : this.msgShowCnt += this.myMsgs.length-this.msgShowCnt;
-            }
+    /**
+     * 时间格式转换
+     */
+    public formatDate(date: string, format: string) {
+        if(date && format) {
+            return moment(date).format(format);
         }
+        return date;
+    }
 
-        /**
-         * 弹出框 显示/隐藏 时显示条数初始化
-         */
-        public initTabCnt() {
-            this.taskShowCnt = this.myTasks.length >= 10 ? 10 : this.myTasks.length;
-            this.msgShowCnt = this.myMsgs.length >= 10 ? 10 : this.myMsgs.length;
+    /**
+     * 加载更多
+     */
+    public showMore(cnt: string) {
+        if(Object.is('taskShowCnt', cnt)) {
+            this.taskShowCnt + 10 < this.myTasks.length ? this.taskShowCnt += 10 : this.taskShowCnt += this.myTasks.length-this.taskShowCnt;
+        }
+        if(Object.is('msgShowCnt', cnt)) {
+            this.msgShowCnt + 10 < this.myMsgs.length ? this.msgShowCnt += 10 : this.msgShowCnt += this.myMsgs.length-this.msgShowCnt;
         }
+    }
 
+    /**
+     * 弹出框 显示/隐藏 时显示条数初始化
+     */
+    public initTabCnt() {
+        this.taskShowCnt = this.myTasks.length >= 10 ? 10 : this.myTasks.length;
+        this.msgShowCnt = this.myMsgs.length >= 10 ? 10 : this.myMsgs.length;
     }
+
+}
 </script>
 
 <style lang='less'>

app_web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue

@@ -12,8 +12,8 @@
             :filterable="filterable"
             @on-open-change="onClick"
             :placeholder="placeholder?placeholder:$t('components.dropDownListMpicker.placeholder')">
-            <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value.toString()" :label="item.text">
-            <Checkbox :value = "(currentVal.indexOf(item.value.toString()))==-1?false:true">
+            <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value ? item.value.toString():''" :label="item.text">
+            <Checkbox :value="(currentVal.indexOf(item.value ? item.value.toString() : '')) == -1 ? false : true">
                 {{Object.is(codelistType,'STATIC') ? $t('codelist.'+tag+'.'+item.value) : item.text}}
             </Checkbox>
             </i-option>

app_web/src/components/dropdown-list/dropdown-list.vue

@@ -394,7 +394,9 @@ export default class DropDownList extends Vue {
                     if(type === 'number'){
                         item.value = item.value.toString();
                     }else{
-                        if(item.value.indexOf('.') == -1){
+                        if(type == "null") {
+                            this.valueType == "number" ? item.value = 0 : item.value = '';
+                        }else if(item.value.indexOf('.') == -1){
                             item.value = parseInt(item.value);
                         }else{
                             item.value = parseFloat(item.value);

app_web/src/environments/environment.ts

@@ -45,6 +45,8 @@ export const Environment = {
     ibizlabtUrl: 'https://www.ibizlab.cn',
     // ibiz论坛地址
     ibizbbstUrl: 'https://bbs.ibizlab.cn',
+    // 是否启用工作流
+    workflow: false,
 };
 // 挂载外部配置文件
 if ((window as any).Environment) {

app_web/src/widgets/jobs-info/main-form/main-form-base.vue

@@ -176,7 +176,7 @@
 <i-col v-show="detailsModel.create_time.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='create_time' :itemRules="this.rules().create_time" class='' :caption="$t('entities.jobsinfo.main_form.details.create_time')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.create_time.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='create_time' :value="data.create_time" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"     :precision="0"
+<app-span name='create_time' :value="data.create_time" dataType="DATETIME" unitName="" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"     :precision="0"
 :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
 </app-span>
 
@@ -186,7 +186,7 @@
 <i-col v-show="detailsModel.update_time.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='update_time' :itemRules="this.rules().update_time" class='' :caption="$t('entities.jobsinfo.main_form.details.update_time')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.update_time.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='update_time' :value="data.update_time" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"     :precision="0"
+<app-span name='update_time' :value="data.update_time" dataType="DATETIME" unitName="" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"     :precision="0"
 :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
 </app-span>
 

app_web/src/widgets/jobs-log/main-form/main-form-base.vue

@@ -106,7 +106,7 @@
 <i-col v-show="detailsModel.create_time.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='create_time' :itemRules="this.rules().create_time" class='' :caption="$t('entities.jobslog.main_form.details.create_time')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.create_time.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='create_time' :value="data.create_time" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"     :precision="0"
+<app-span name='create_time' :value="data.create_time" dataType="DATETIME" unitName="" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"     :precision="0"
 :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
 </app-span>
 

ibztask-app/ibztask-app-web/src/main/resources/application-web-prod.yml

@@ -75,5 +75,9 @@ zuul:
       path: /lite/**
       serviceId: ${ibiz.ref.service.lite:ibzlite-api}
       stripPrefix: false
+    sysauthlog:
+      path: /sysauthlogs
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

ibztask-boot/src/main/resources/application-dev.yml

@@ -56,5 +56,9 @@ zuul:
       path: /lite/**
       serviceId: ${ibiz.ref.service.lite:ibzlite-api}
       stripPrefix: false
+    sysauthlog:
+      path: /sysauthlogs
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

ibztask-core/src/main/java/cn/ibizlab/core/util/config/DroolsAutoConfiguration.java

 package cn.ibizlab.core.util.config;
 
-import org.kie.api.KieBase;
 import org.kie.api.KieServices;
-import org.kie.api.builder.*;
+import org.kie.api.builder.KieFileSystem;
 import org.kie.api.runtime.KieContainer;
-import org.kie.api.runtime.KieSession;
-import org.kie.internal.io.ResourceFactory;
-import org.kie.spring.KModuleBeanFactoryPostProcessor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import java.io.IOException;
-import java.util.List;
 
 @Configuration
 public class DroolsAutoConfiguration {
 
-    private Log logger= LogFactory.getLog(DroolsAutoConfiguration.class);
-    
-    private static final String RULES_PATH = "rules/";
-
-    @Bean
-    @ConditionalOnMissingBean(KieFileSystem.class)
-    public KieFileSystem kieFileSystem() throws IOException {
-        KieFileSystem kieFileSystem = getKieServices().newKieFileSystem();
-        for (Resource file : getRuleFiles()) {
-            kieFileSystem.write(ResourceFactory.newUrlResource(file.getURL()));
-        }
-        return kieFileSystem;
-    }
-
-    private Resource[] getRuleFiles() throws IOException {
-        ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
-        return resourcePatternResolver.getResources("classpath*:" + RULES_PATH + "**/*.*");
-    }
-
     @Bean
     @ConditionalOnMissingBean(KieContainer.class)
-    public KieContainer kieContainer() throws IOException {
-        final KieRepository kieRepository = getKieServices().getRepository();
-
-        kieRepository.addKieModule(new KieModule() {
-            public ReleaseId getReleaseId() {
-                return kieRepository.getDefaultReleaseId();
-            }
-        });
-
-        KieBuilder kieBuilder = getKieServices().newKieBuilder(kieFileSystem());
-        kieBuilder.buildAll();
-
-        if(kieBuilder.getResults().hasMessages(new Message.Level[] { Message.Level.ERROR })){
-            List<Message> errors = kieBuilder.getResults().getMessages(new Message.Level[] { Message.Level.ERROR });
-            StringBuilder stringBuilder = new StringBuilder("Errors:");
-            for (Message msg : errors)
-            {
-                stringBuilder.append(new StringBuilder().append("\n  ").append(prettyBuildMessage(msg)).toString());
-            }
-            logger.error(String.format("初始化处理逻辑发生异常，异常原因为[%s]",stringBuilder.toString()));
-            //忽略处理逻辑
-            getKieServices().newKieBuilder(getKieServices().newKieFileSystem()).buildAll();
-        }
-
-        return getKieServices().newKieContainer(kieRepository.getDefaultReleaseId());
-    }
-
-    private KieServices getKieServices() {
-        return KieServices.Factory.get();
-    }
-
-    @Bean
-    @ConditionalOnMissingBean(KieBase.class)
-    public KieBase kieBase() throws IOException {
-        return kieContainer().getKieBase();
-    }
-
-    @Bean
-    @ConditionalOnMissingBean(KieSession.class)
-    public KieSession kieSession() throws IOException {
-        return kieContainer().newKieSession();
-    }
-
-    @Bean
-    @ConditionalOnMissingBean(KModuleBeanFactoryPostProcessor.class)
-    public KModuleBeanFactoryPostProcessor kiePostProcessor() {
-        return new KModuleBeanFactoryPostProcessor();
-    }
-
-    /**
-    * 输出异常信息
-    * @param msg
-    * @return
-    */
-    public static String prettyBuildMessage(Message msg)
-    {
-        return new StringBuilder().append("Message: {id=").append(msg.getId()).append(", level=").append(msg.getLevel()).append(", path=").append(msg.getPath()).append(", line=").append(msg.getLine())
-        .append(", column=").append(msg.getColumn()).append(", text=\"").append(msg.getText()).append("\"}").toString();
+    public KieContainer kieContainer() {
+        KieServices kieServices = KieServices.get();
+        KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
+        kieServices.newKieBuilder(kieFileSystem).buildAll();
+        return  kieServices.newKieContainer(kieServices.getRepository().getDefaultReleaseId());
     }
 }
\ No newline at end of file

ibztask-dependencies/pom.xml

@@ -85,6 +85,7 @@
 
         <oracle.version>19.8.0.0</oracle.version>
         <postgresql.version>42.2.6</postgresql.version>
+        <flowable-modeler.version>6.4.2</flowable-modeler.version>
     </properties>
 
     <dependencyManagement>
@@ -261,6 +262,16 @@
             </dependency>
 
 
+            <dependency>
+                <groupId>org.flowable</groupId>
+                <artifactId>flowable-json-converter</artifactId>
+                <version>${flowable-modeler.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.flowable</groupId>
+                <artifactId>flowable-ui-modeler-conf</artifactId>
+                <version>${flowable-modeler.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/rest/JobsInfoResource.java

@@ -72,7 +72,7 @@ public class JobsInfoResource {
 		JobsInfo domain  = jobsinfoMapping.toDomain(jobsinfodto);
         domain .setId(jobsinfo_id);
 		jobsinfoService.update(domain );
-		JobsInfoDTO dto = jobsinfoMapping.toDto(domain );
+		JobsInfoDTO dto = jobsinfoMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
@@ -142,8 +142,10 @@ public class JobsInfoResource {
 
     @ApiOperation(value = "保存任务信息", tags = {"任务信息" },  notes = "保存任务信息")
 	@RequestMapping(method = RequestMethod.POST, value = "/jobsinfos/save")
-    public ResponseEntity<Boolean> save(@RequestBody JobsInfoDTO jobsinfodto) {
-        return ResponseEntity.status(HttpStatus.OK).body(jobsinfoService.save(jobsinfoMapping.toDomain(jobsinfodto)));
+    public ResponseEntity<JobsInfoDTO> save(@RequestBody JobsInfoDTO jobsinfodto) {
+        JobsInfo domain = jobsinfoMapping.toDomain(jobsinfodto);
+        jobsinfoService.save(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(jobsinfoMapping.toDto(domain));
     }
 
     @ApiOperation(value = "批量保存任务信息", tags = {"任务信息" },  notes = "批量保存任务信息")

ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/rest/JobsLockResource.java

@@ -72,7 +72,7 @@ public class JobsLockResource {
 		JobsLock domain  = jobslockMapping.toDomain(jobslockdto);
         domain .setId(jobslock_id);
 		jobslockService.update(domain );
-		JobsLockDTO dto = jobslockMapping.toDto(domain );
+		JobsLockDTO dto = jobslockMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
@@ -124,8 +124,10 @@ public class JobsLockResource {
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLock-Save-all')")
     @ApiOperation(value = "保存任务锁", tags = {"任务锁" },  notes = "保存任务锁")
 	@RequestMapping(method = RequestMethod.POST, value = "/jobslocks/save")
-    public ResponseEntity<Boolean> save(@RequestBody JobsLockDTO jobslockdto) {
-        return ResponseEntity.status(HttpStatus.OK).body(jobslockService.save(jobslockMapping.toDomain(jobslockdto)));
+    public ResponseEntity<JobsLockDTO> save(@RequestBody JobsLockDTO jobslockdto) {
+        JobsLock domain = jobslockMapping.toDomain(jobslockdto);
+        jobslockService.save(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(jobslockMapping.toDto(domain));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLock-Save-all')")

ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/rest/JobsLogResource.java

@@ -72,7 +72,7 @@ public class JobsLogResource {
 		JobsLog domain  = jobslogMapping.toDomain(jobslogdto);
         domain .setId(jobslog_id);
 		jobslogService.update(domain );
-		JobsLogDTO dto = jobslogMapping.toDto(domain );
+		JobsLogDTO dto = jobslogMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
@@ -124,8 +124,10 @@ public class JobsLogResource {
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLog-Save-all')")
     @ApiOperation(value = "保存任务调度日志", tags = {"任务调度日志" },  notes = "保存任务调度日志")
 	@RequestMapping(method = RequestMethod.POST, value = "/jobslogs/save")
-    public ResponseEntity<Boolean> save(@RequestBody JobsLogDTO jobslogdto) {
-        return ResponseEntity.status(HttpStatus.OK).body(jobslogService.save(jobslogMapping.toDomain(jobslogdto)));
+    public ResponseEntity<JobsLogDTO> save(@RequestBody JobsLogDTO jobslogdto) {
+        JobsLog domain = jobslogMapping.toDomain(jobslogdto);
+        jobslogService.save(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(jobslogMapping.toDto(domain));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLog-Save-all')")

ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/rest/JobsRegistryResource.java

@@ -72,7 +72,7 @@ public class JobsRegistryResource {
 		JobsRegistry domain  = jobsregistryMapping.toDomain(jobsregistrydto);
         domain .setId(jobsregistry_id);
 		jobsregistryService.update(domain );
-		JobsRegistryDTO dto = jobsregistryMapping.toDto(domain );
+		JobsRegistryDTO dto = jobsregistryMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
@@ -124,8 +124,10 @@ public class JobsRegistryResource {
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsRegistry-Save-all')")
     @ApiOperation(value = "保存任务注册信息", tags = {"任务注册信息" },  notes = "保存任务注册信息")
 	@RequestMapping(method = RequestMethod.POST, value = "/jobsregistries/save")
-    public ResponseEntity<Boolean> save(@RequestBody JobsRegistryDTO jobsregistrydto) {
-        return ResponseEntity.status(HttpStatus.OK).body(jobsregistryService.save(jobsregistryMapping.toDomain(jobsregistrydto)));
+    public ResponseEntity<JobsRegistryDTO> save(@RequestBody JobsRegistryDTO jobsregistrydto) {
+        JobsRegistry domain = jobsregistryMapping.toDomain(jobsregistrydto);
+        jobsregistryService.save(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(jobsregistryMapping.toDto(domain));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsRegistry-Save-all')")

ibztask-util/pom.xml

@@ -90,5 +90,39 @@
             <artifactId>feign-httpclient</artifactId>
         </dependency>
 
+        <!-- drools -->
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-compiler</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.flowable</groupId>
+            <artifactId>flowable-json-converter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.flowable</groupId>
+            <artifactId>flowable-ui-modeler-conf</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-slf4j-impl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
     </dependencies>
 </project>

ibztask-util/src/main/java/cn/ibizlab/util/aspect/DELogicAspect.java

+package cn.ibizlab.util.aspect;
+
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import cn.ibizlab.util.domain.DELogic;
+import cn.ibizlab.util.domain.EntityBase;
+import cn.ibizlab.util.errors.BadRequestAlertException;
+import cn.ibizlab.util.helper.DEFieldCacheMap;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.flowable.bpmn.converter.BpmnXMLConverter;
+import org.flowable.bpmn.model.*;
+import org.flowable.bpmn.model.Process;
+import org.kie.api.KieServices;
+import org.kie.api.builder.KieBuilder;
+import org.kie.api.builder.KieFileSystem;
+import org.kie.api.builder.Message;
+import org.kie.api.builder.Results;
+import org.kie.api.runtime.KieContainer;
+import org.kie.api.runtime.KieSession;
+import org.kie.internal.io.ResourceFactory;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.stereotype.Component;
+import org.springframework.util.DigestUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * 实体处理逻辑切面（前后附加逻辑、实体行为调用处理逻辑）
+ */
+@Aspect
+@Component
+@Slf4j
+public class DELogicAspect {
+
+    private static BpmnXMLConverter bpmnXMLConverter = new BpmnXMLConverter();
+    private final ExpressionParser parser = new SpelExpressionParser();
+    private ConcurrentMap<String, DELogic> deLogicMap = new ConcurrentHashMap<>();
+    private static Map<String, Object> validLogic = new HashMap<>();
+
+    /**
+     * 执行实体行为附加逻辑、实体行为调用处理逻辑
+     *
+     * @param point
+     * @return
+     * @throws Throwable
+     */
+    @Around("execution(* cn.ibizlab.core.*.service.*.*(..)) && !execution(* cn.ibizlab.core.es.service.*.*(..))")
+    public Object executeLogic(ProceedingJoinPoint point) throws Throwable {
+        Object args[] = point.getArgs();
+        if (ObjectUtils.isEmpty(args) || args.length == 0) {
+            return point.proceed();
+        }
+        Object service = point.getTarget();
+        Object arg = args[0];
+        String action = point.getSignature().getName();
+        EntityBase entity = null;
+        if ("remove".equalsIgnoreCase(action) || "get".equalsIgnoreCase(action)) {
+            entity = getEntity(service.getClass());
+            String id = DEFieldCacheMap.getDEKeyField(entity.getClass());
+            if(StringUtils.isEmpty(id)) {
+                log.debug("无法获取实体主键属性[{}]",entity.getClass().getSimpleName());
+                return point.proceed();
+            }
+            entity.set(id, arg);
+        } else if (arg instanceof EntityBase) {
+            entity = (EntityBase) arg;
+        }
+        if (entity != null) {
+            executeBeforeLogic(entity, action);
+            Object result = point.proceed();
+            if("get".equalsIgnoreCase(action) && result instanceof EntityBase){
+                entity = (EntityBase) result;
+            }
+            executeLogic(entity, action);
+            executeAfterLogic(entity, action);
+            return result;
+        }
+        return point.proceed();
+    }
+
+    /**
+     * 前附加逻辑
+     *
+     * @param entity
+     * @param action
+     */
+    private void executeBeforeLogic(EntityBase entity, String action) {
+        File bpmnFile = getLocalModel(entity.getClass().getSimpleName(), action, LogicExecMode.BEFORE);
+        if (bpmnFile != null && bpmnFile.exists() && isValid(bpmnFile, entity, action)) {
+            executeLogic(bpmnFile, entity, action);
+        }
+    }
+
+    /**
+     * 后附加逻辑
+     *
+     * @param entity
+     * @param action
+     */
+    private void executeAfterLogic(EntityBase entity, String action) {
+        File bpmnFile = getLocalModel(entity.getClass().getSimpleName(), action, LogicExecMode.AFTER);
+        if (bpmnFile != null && bpmnFile.exists() && isValid(bpmnFile, entity, action)) {
+            executeLogic(bpmnFile, entity, action);
+        }
+    }
+
+    /**
+     * 实体行为调用处理逻辑
+     *
+     * @param entity
+     * @param action
+     */
+    private void executeLogic(EntityBase entity, String action) {
+        File bpmnFile = getLocalModel(entity.getClass().getSimpleName(), action, LogicExecMode.EXEC);
+        if (bpmnFile != null && bpmnFile.exists() && isValid(bpmnFile, entity, action)) {
+            executeLogic(bpmnFile, entity, action);
+        }
+    }
+
+    /**
+     * 编译并执行规则（bpmn、drl）
+     *
+     * @param bpmnFile
+     * @param entity
+     */
+    private void executeLogic(File bpmnFile, Object entity, String action) {
+        log.debug("开始执行实体处理逻辑[{}:{}:{}:本地模式]", entity.getClass().getSimpleName(), action, bpmnFile.getName());
+        String bpmnId = DigestUtils.md5DigestAsHex(bpmnFile.getPath().getBytes());
+        DELogic logic = getDELogic(bpmnFile);
+        if (logic == null) {
+            return;
+        }
+        if (deLogicMap.containsKey(bpmnId) && logic.getMd5().equals(deLogicMap.get(bpmnId).getMd5())) {
+            logic = deLogicMap.get(bpmnId);
+        } else {
+            reloadLogic(logic);
+            deLogicMap.put(bpmnId, logic);
+        }
+        KieContainer container = logic.getContainer();
+        KieSession kieSession = container.getKieBase().newKieSession();
+        Process mainProcess = logic.getProcess();
+        //主流程参数
+        fillGlobalParam(kieSession, mainProcess, entity);
+        //子流程参数
+        if (!ObjectUtils.isEmpty(logic.getRefLogic())) {
+            for (DELogic subLogic : logic.getRefLogic()) {
+                fillGlobalParam(kieSession, subLogic.getProcess(), entity);
+            }
+        }
+        kieSession.startProcess(mainProcess.getId());
+        log.debug("实体处理逻辑[{}:{}:{}:本地模式]执行结束", entity.getClass().getSimpleName(), action, bpmnFile.getName());
+    }
+
+    /**
+     * 编译规则
+     *
+     * @param logic
+     */
+    private void reloadLogic(DELogic logic) {
+        KieServices kieServices = KieServices.get();
+        KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
+        for (File bpmn : logic.getRefRuleFiles()) {
+            kieFileSystem.write(ResourceFactory.newFileResource(bpmn));
+        }
+        KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem).buildAll();
+        Results results = kieBuilder.getResults();
+        if (results.hasMessages(Message.Level.ERROR)) {
+            throw new BadRequestAlertException(String.format("编译实体处理逻辑 [%s] 发生异常, %s", logic.getName(), results.getMessages()), "LogicAspect", "reloadLogic");
+        }
+        KieContainer kieContainer = kieServices.newKieContainer(kieServices.getRepository().getDefaultReleaseId());
+        logic.setContainer(kieContainer);
+    }
+
+    /**
+     * 填充逻辑参数
+     *
+     * @param kieSession
+     * @param process
+     * @param entity
+     */
+    private void fillGlobalParam(KieSession kieSession, Process process, Object entity) {
+        Map<String, List<ExtensionElement>> params = process.getExtensionElements();
+        for (Map.Entry<String, List<ExtensionElement>> param : params.entrySet()) {
+            if ("metaData".equalsIgnoreCase(param.getKey())) {
+                List<ExtensionElement> globalParams = param.getValue();
+                for (ExtensionElement globalParam : globalParams) {
+                    Object value = null;
+                    Map<String, List<ExtensionAttribute>> globalParamAttr = globalParam.getAttributes();
+                    if (globalParamAttr.containsKey("name") && globalParamAttr.containsKey("type") && globalParamAttr.containsKey("express")) {
+                        ExtensionAttribute name = globalParamAttr.get("name").get(0);
+                        ExtensionAttribute type = globalParamAttr.get("type").get(0);
+                        ExtensionAttribute express = globalParamAttr.get("express").get(0);
+                        String express_value = express.getValue();
+                        EvaluationContext oldContext = new StandardEvaluationContext();
+                        if ("entity".equalsIgnoreCase(type.getValue())) {
+                            value = entity;
+                        }
+                        if (!ObjectUtils.isEmpty(type.getValue()) && ObjectUtils.isEmpty(value)) {
+                            Expression oldExp = parser.parseExpression(express_value);
+                            value = oldExp.getValue(oldContext);
+                        }
+                        if ("entity".equalsIgnoreCase(type.getValue()) || "refentity".equalsIgnoreCase(type.getValue())) {
+                            kieSession.insert(value);
+                        }
+                        kieSession.setGlobal(name.getValue(), value);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 获取逻辑配置
+     *
+     * @param bpmnFile
+     * @return
+     */
+    @SneakyThrows
+    private DELogic getDELogic(File bpmnFile) {
+        DELogic logic = null;
+        XMLStreamReader reader = null;
+        InputStream bpmn = null;
+        try {
+            if (bpmnFile.exists()) {
+                XMLInputFactory factory = XMLInputFactory.newInstance();
+                bpmn = new FileInputStream(bpmnFile);
+                reader = factory.createXMLStreamReader(bpmn);
+                BpmnModel model = bpmnXMLConverter.convertToBpmnModel(reader);
+                Process mainProcess = model.getMainProcess();
+                if (mainProcess == null) {
+                    return null;
+                }
+                List<DELogic> refLogics = new ArrayList<>();
+                List<File> refFiles = new ArrayList<>();
+                //自己 bpmn 及 drl
+                refFiles.add(bpmnFile);
+                File drlFile = getDrl(bpmnFile);
+                if (drlFile != null && drlFile.exists()) {
+                    refFiles.add(drlFile);
+                }
+                //子 bpmn 及 drl
+                if (!ObjectUtils.isEmpty(model.getMainProcess()) && !ObjectUtils.isEmpty(model.getMainProcess().getFlowElementMap())) {
+                    model.getMainProcess().getFlowElementMap().values().forEach(item -> {
+                        if (item instanceof CallActivity) {
+                            CallActivity subBpmn = (CallActivity) item;
+                            String bpmnFileName = subBpmn.getName();
+                            log.debug("正在加载   BPMN:{}", bpmnFileName);
+                            File subBpmnFile = getSubBpmn(bpmnFileName);
+                            if (ObjectUtils.isEmpty(subBpmnFile)) {
+                                log.debug("BPMN:{},缺少文件:{} ", bpmnFileName, subBpmnFile);
+                            }
+                            DELogic refLogic = getDELogic(subBpmnFile);
+                            if (refLogic != null) {
+                                refLogics.add(refLogic);
+                                if (!ObjectUtils.isEmpty(refLogic.getRefRuleFiles())) {
+                                    refFiles.addAll(refLogic.getRefRuleFiles());
+                                }
+                            }
+                        }
+                    });
+                }
+                logic = new DELogic();
+                logic.setId(mainProcess.getId());
+                logic.setName(mainProcess.getName());
+                logic.setProcess(mainProcess);
+                logic.setRefLogic(refLogics);
+                logic.setRefRuleFiles(refFiles);
+                logic.setMd5(getMd5(refFiles));
+            }
+        } catch (Exception e) {
+        } finally {
+            try {
+                if (reader != null) {
+                    reader.close();
+                }
+                if (bpmn != null) {
+                    bpmn.close();
+                }
+            } catch (Exception e) {
+            }
+        }
+        return logic;
+    }
+
+    /**
+     * 获取实体
+     *
+     * @param service
+     * @return
+     */
+    private EntityBase getEntity(Class service) {
+        Method[] methods = service.getDeclaredMethods();
+        for (Method method : methods) {
+            for (Class cls : method.getParameterTypes()) {
+                try {
+                    Object arg = cls.newInstance();
+                    if (arg instanceof EntityBase) {
+                        return (EntityBase) arg;
+                    }
+                } catch (Exception e) {
+                }
+            }
+        }
+        if(!ObjectUtils.isEmpty(service.getSuperclass()) && !service.getSuperclass().getName().equals(Object.class.getName())) {
+            return getEntity(service.getSuperclass());
+        }
+        throw new BadRequestAlertException("获取实体信息失败", "DELogicAspect", "getEntity");
+    }
+
+    /**
+     * 获取bpmn md5
+     *
+     * @param subFiles
+     * @return
+     */
+    private String getMd5(List<File> subFiles) {
+        try {
+            StringBuffer buffer = new StringBuffer();
+            for (File file : subFiles) {
+                InputStream bpmnFile = null;
+                try {
+                    bpmnFile = new FileInputStream(file);
+                    if (!ObjectUtils.isEmpty(bpmnFile)) {
+                        String strBpmn = IOUtils.toString(bpmnFile, "UTF-8");
+                        buffer.append(strBpmn);
+                    }
+                } catch (Exception e) {
+                } finally {
+                    if (bpmnFile != null) {
+                        bpmnFile.close();
+                    }
+                }
+            }
+            if (!StringUtils.isEmpty(buffer.toString())) {
+                return DigestUtils.md5DigestAsHex(buffer.toString().getBytes());
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+   /**
+     * 本地逻辑
+     *
+     * @param entity
+     * @param action
+     * @param logicExecMode
+     * @return
+     */
+    private File getLocalModel(String entity, String action, LogicExecMode logicExecMode) {
+        String logicName = String.format("%s.bpmn", logicExecMode.text);
+        String filePath = File.separator + "rules" + File.separator + entity + File.separator + action.toLowerCase() + File.separator + logicName;
+        return getBpmnFile(filePath);
+    }
+
+    /**
+     * 处理逻辑 bpmn
+     *
+     * @param logicName
+     * @return
+     */
+    private File getSubBpmn(String logicName) {
+        String filePath = String.format("/rules/%s", logicName);
+        return getBpmnFile(filePath);
+    }
+
+    /**
+     * 处理逻辑 drl
+     *
+     * @param bpmn
+     * @return
+     */
+    private File getDrl(File bpmn) {
+        if (bpmn.getPath().endsWith("RuleFlow.bpmn")) {
+            return getBpmnFile(bpmn.getPath().replace("RuleFlow.bpmn", "Rule.drl"));
+        } else {
+            return getBpmnFile(bpmn.getPath().replace(".bpmn", ".drl"));
+        }
+    }
+
+    /**
+     * 获取 bpmn
+     *
+     * @param filePath
+     * @return
+     */
+    private File getBpmnFile(String filePath) {
+        InputStream in = null;
+        File bpmn = null;
+        try {
+            in = this.getClass().getResourceAsStream(filePath.replace("\\", "/"));
+            if (in != null) {
+                bpmn = new File(filePath);
+                FileUtils.copyToFile(in, bpmn);
+            }
+        } catch (IOException e) {
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return bpmn;
+    }
+
+    /**
+     * 逻辑是否有效
+     *
+     * @param bpmn
+     * @param entity
+     * @param action
+     * @return
+     */
+    private boolean isValid(File bpmn, Object entity, Object action) {
+        String logicId = String.format("%s%s%s", entity.getClass().getSimpleName(), action, bpmn.getName()).toLowerCase();
+        if (validLogic.containsKey(logicId)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    static {
+    }
+
+     public enum LogicExecMode {
+        /**
+         * 前附加逻辑
+         */
+        BEFORE("0", "before"),
+        /**
+         * 后附加逻辑
+         */
+        AFTER("1", "after"),
+        /**
+         *
+         */
+        EXEC("2", "exec");
+
+        LogicExecMode(String value, String text) {
+            this.value = value;
+            this.text = text;
+        }
+
+        private String value;
+        private String text;
+    }
+}
+

ibztask-util/src/main/java/cn/ibizlab/util/cache/cache/LayeringCache.java

@@ -59,15 +59,15 @@ public class LayeringCache extends AbstractValueAdaptingCache {
     @Override
     public ValueWrapper get(Object key) {
         ValueWrapper wrapper = caffeineCache.get(key);
-        Object value=ObjectUtils.isEmpty(wrapper)?null:wrapper.get();
-        log.debug("查询一级缓存 key:{} ，value:{}", key,value);
+        Object value = ObjectUtils.isEmpty(wrapper) ? null : wrapper.get();
+        log.debug("查询一级缓存 key:{} ", key, value);
         if (ObjectUtils.isEmpty(value)) {
             wrapper = redisCache.get(key);
-            value=ObjectUtils.isEmpty(wrapper)?null:wrapper.get();
-            log.debug("查询二级缓存 key:{} ，value:{}", key,value);
-            if(!ObjectUtils.isEmpty(value)){
+            value = ObjectUtils.isEmpty(wrapper) ? null : wrapper.get();
+            log.debug("查询二级缓存 key:{} ", key);
+            if (!ObjectUtils.isEmpty(value)) {
                 caffeineCache.put(key, value);
-                log.debug("查询二级缓存，并将数据放到一级缓存。 key:{} ，value:{}", key,value);
+                log.debug("查询二级缓存，并将数据放到一级缓存。 key:{} ", key);
             }
         }
         return wrapper;

ibztask-util/src/main/java/cn/ibizlab/util/domain/DELogic.java

+package cn.ibizlab.util.domain;
+
+import lombok.Data;
+import org.flowable.bpmn.model.Process;
+import org.kie.api.runtime.KieContainer;
+import java.io.File;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class DELogic implements Serializable {
+    String id;
+    String name;
+    Process process;
+    KieContainer container;
+    List<DELogic> refLogic;
+    List<File> refRuleFiles;
+    String md5;
+}