Skip to content

I
ibznotify
提交 888c368c 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

zoo457790531 发布系统代码 [ibiz-notify，通知消息]

上级 c20d9d46
隐藏空白字符变更
内嵌 并排
正在显示 包含 768 行增加 和 213 行删除
app_web/src/components/app-data-upload/app-data-upload.vue
浏览文件 @ 888c368c
...@@ -52,6 +52,7 @@ import CodeListService from "@/codelist/codelist-service"; ...@@ -52,6 +52,7 @@ import CodeListService from "@/codelist/codelist-service";
import EntityService from '@/service/entity-service'; import EntityService from '@/service/entity-service';
import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator'; import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
import { Environment } from '@/environments/environment'; import { Environment } from '@/environments/environment';
import moment from "moment";
@Component({ @Component({
}) })
...@@ -395,11 +396,11 @@ export default class AppDataUploadView extends Vue { ...@@ -395,11 +396,11 @@ export default class AppDataUploadView extends Vue {
let reader = new FileReader(); let reader = new FileReader();
reader.onload = (e:any) => { reader.onload = (e:any) => {
let data = e.target.result; 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 xlsxData = XLSX.utils.sheet_to_json(this.workBookData.Sheets[this.workBookData.SheetNames[0]]);
let list1 = this.getFirstRow(this.workBookData); let list1 = this.getFirstRow(this.workBookData);
xlsxData = this.AddXlsxData(xlsxData, list1); xlsxData = this.AddXlsxData(xlsxData, list1);
this.importDataArray = JSON.parse(JSON.stringify(xlsxData)); this.importDataArray = this.$util.deepCopy(xlsxData);
(this.$refs.inputUpLoad as any).value = ''; (this.$refs.inputUpLoad as any).value = '';
}; };
reader.readAsBinaryString(f); reader.readAsBinaryString(f);
...@@ -505,6 +506,11 @@ export default class AppDataUploadView extends Vue { ...@@ -505,6 +506,11 @@ export default class AppDataUploadView extends Vue {
data.forEach((item:any) =>{ data.forEach((item:any) =>{
let curObject:any = {}; let curObject:any = {};
Object.keys(item).forEach((ele: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){ if(this.allFieldMap.get(ele).codelist){
let codelistTag:string = this.allFieldMap.get(ele).codelist.tag; let codelistTag:string = this.allFieldMap.get(ele).codelist.tag;
let codelistIsNumber:boolean = this.allFieldMap.get(ele).codelist.isnumber; let codelistIsNumber:boolean = this.allFieldMap.get(ele).codelist.isnumber;
......
app_web/src/components/app-message-popover/app-message-popover.vue
浏览文件 @ 888c368c
...@@ -84,140 +84,142 @@ ...@@ -84,140 +84,142 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import {Vue, Component, Prop, Model, Emit} from "vue-property-decorator"; import {Vue, Component, Prop, Model, Emit} from "vue-property-decorator";
import {Subject} from "rxjs"; import {Environment} from '@/environments/environment';
import {Environment} from '@/environments/environment'; import moment from 'moment';
import moment from 'moment';
@Component({}) @Component({})
export default class AppMessagePopover extends Vue { export default class AppMessagePopover extends Vue {
// 是否显示小圆点 // 是否显示小圆点
public showIsDot: any = false; public showIsDot: any = false;
// 默认显示的tab页 // 默认显示的tab页
public default_tab_pane: any = "first"; public default_tab_pane: any = "first";
// 待办列表 // 待办列表
public myTasks: any = []; public myTasks: any = [];
// 待办面板标签 // 待办面板标签
public myTasksLabel: any = "待办"; public myTasksLabel: any = "待办";
// 待办面板显示条数 // 待办面板显示条数
public taskShowCnt:number = 0; public taskShowCnt:number = 0;
// 消息列表 // 消息列表
public myMsgs: any = []; public myMsgs: any = [];
// 消息面板标签 // 消息面板标签
public myMsgsLabel: any = "消息"; public myMsgsLabel: any = "消息";
// 信息面板显示条数 // 信息面板显示条数
public msgShowCnt:number = 0; public msgShowCnt:number = 0;
/** /**
* vue创建 * vue创建
*/ */
created(): void {} created(): void {}
/** /**
* vue挂载 * vue挂载
*/ */
mounted(): void { mounted(): void {
// 首次获取待办列表 if(!Environment.workflow){
this.getMyTasks(); return;
// 定时器:每隔１分钟重新获取待办列表
const timer = setInterval(()=>{
this.getMyTasks();
},60000);
// 监听定时器,在vue销毁前清除定时器
this.$once('hook:beforeDestroy',()=>{
// 清除定时器
clearInterval(timer);
});
} }
// 首次获取待办列表
this.getMyTasks();
// 定时器:每隔１分钟重新获取待办列表
const timer = setInterval(()=>{
this.getMyTasks();
},60000);
// 监听定时器,在vue销毁前清除定时器
this.$once('hook:beforeDestroy',()=>{
// 清除定时器
clearInterval(timer);
});
}
/** /**
* 获取待办列表 * 获取待办列表
*/ */
public getMyTasks() { public getMyTasks() {
let url: any = '/wfcore/mytasks'; let url: any = '/wfcore/mytasks';
this.$http.get(url).then((response: any) => { this.$http.get(url).then((response: any) => {
if (response && response.status == 200) { if (response && response.status == 200) {
const data: any = response.data; const data: any = response.data;
if (data && data.length > 0) { if (data && data.length > 0) {
this.myTasks = data; this.myTasks = data;
this.showIsDot = true; this.showIsDot = true;
} else { } else {
this.myTasks = []; this.myTasks = [];
}
// 获取消息列表
this.getMyMsgs();
} }
}).catch((error: any) => { // 获取消息列表
console.warn("加载数据错误"); this.getMyMsgs();
})
}
/**
* 获取消息列表
*/
public getMyMsgs(){
// TODO:接口获取消息列表，这里用的待办数据
this.myMsgs = this.myTasks;
if (this.myMsgs.length > 0 && this.myTasks.length == 0) {
// 显示小圆点
this.showIsDot = true;
} }
} }).catch((error: any) => {
console.warn("加载数据错误");
})
}
/** /**
* 点击标签事件 * 获取消息列表
*/ */
public handleTag(data: any) { public getMyMsgs(){
if (!data) return this.$message.error("未获取到标签内容"); // TODO:接口获取消息列表，这里用的待办数据
// 拼接要打开的窗口地址 this.myMsgs = this.myTasks;
const baseUrl:any = Environment.BaseUrl; if (this.myMsgs.length > 0 && this.myTasks.length == 0) {
const openUrl:any = baseUrl + `/wfcore/mytasks/${data.processDefinitionKey}/web/${data.processInstanceBusinessKey}/usertasks/${data.taskDefinitionKey}`; // 显示小圆点
// 打开新窗口 this.showIsDot = true;
window.open(openUrl,'_blank');
} }
}
/** /**
* 销毁之前 * 点击标签事件
*/ */
beforeDestroy(): void { public handleTag(data: any) {
// 清空数据 if (!data) return this.$message.error("未获取到标签内容");
this.showIsDot = false; // 拼接要打开的窗口地址
this.myTasks = []; const baseUrl:any = Environment.BaseUrl;
this.myMsgs = []; const openUrl:any = baseUrl + `/wfcore/mytasks/${data.processDefinitionKey}/web/${data.processInstanceBusinessKey}/usertasks/${data.taskDefinitionKey}`;
} // 打开新窗口
window.open(openUrl,'_blank');
}
/** /**
* 时间格式转换 * 销毁之前
*/ */
public formatDate(date: string, format: string) { beforeDestroy(): void {
if(date && format) { // 清空数据
return moment(date).format(format); this.showIsDot = false;
} this.myTasks = [];
return date; this.myMsgs = [];
} }
/** /**
* 加载更多 * 时间格式转换
*/ */
public showMore(cnt: string) { public formatDate(date: string, format: string) {
if(Object.is('taskShowCnt', cnt)) { if(date && format) {
this.taskShowCnt + 10 < this.myTasks.length ? this.taskShowCnt += 10 : this.taskShowCnt += this.myTasks.length-this.taskShowCnt; return moment(date).format(format);
}
if(Object.is('msgShowCnt', cnt)) {
this.msgShowCnt + 10 < this.myMsgs.length ? this.msgShowCnt += 10 : this.msgShowCnt += this.myMsgs.length-this.msgShowCnt;
}
} }
return date;
}
/** /**
* 弹出框 显示/隐藏 时显示条数初始化 * 加载更多
*/ */
public initTabCnt() { public showMore(cnt: string) {
this.taskShowCnt = this.myTasks.length >= 10 ? 10 : this.myTasks.length; if(Object.is('taskShowCnt', cnt)) {
this.msgShowCnt = this.myMsgs.length >= 10 ? 10 : this.myMsgs.length; 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> </script>
<style lang='less'> <style lang='less'>
......
app_web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue
浏览文件 @ 888c368c
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
:filterable="filterable" :filterable="filterable"
@on-open-change="onClick" @on-open-change="onClick"
:placeholder="placeholder?placeholder:$t('components.dropDownListMpicker.placeholder')"> :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"> <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.toString()))==-1?false:true"> <Checkbox :value="(currentVal.indexOf(item.value ? item.value.toString() : '')) == -1 ? false : true">
{{Object.is(codelistType,'STATIC') ? $t('codelist.'+tag+'.'+item.value) : item.text}} {{Object.is(codelistType,'STATIC') ? $t('codelist.'+tag+'.'+item.value) : item.text}}
</Checkbox> </Checkbox>
</i-option> </i-option>
......
app_web/src/components/dropdown-list/dropdown-list.vue
浏览文件 @ 888c368c
...@@ -394,7 +394,9 @@ export default class DropDownList extends Vue { ...@@ -394,7 +394,9 @@ export default class DropDownList extends Vue {
if(type === 'number'){ if(type === 'number'){
item.value = item.value.toString(); item.value = item.value.toString();
}else{ }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); item.value = parseInt(item.value);
}else{ }else{
item.value = parseFloat(item.value); item.value = parseFloat(item.value);
......
app_web/src/environments/environment.ts
浏览文件 @ 888c368c
...@@ -45,6 +45,8 @@ export const Environment = { ...@@ -45,6 +45,8 @@ export const Environment = {
ibizlabtUrl: 'https://www.ibizlab.cn', ibizlabtUrl: 'https://www.ibizlab.cn',
// ibiz论坛地址 // ibiz论坛地址
ibizbbstUrl: 'https://bbs.ibizlab.cn', ibizbbstUrl: 'https://bbs.ibizlab.cn',
// 是否启用工作流
workflow: false,
}; };
// 挂载外部配置文件 // 挂载外部配置文件
if ((window as any).Environment) { if ((window as any).Environment) {
......
app_web/src/widgets/msg-template/main-form/main-form-base.vue
浏览文件 @ 888c368c
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<i-col v-show="detailsModel.open_type.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.open_type.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='open_type' :itemRules="this.rules().open_type" class='' :caption="$t('entities.msgtemplate.main_form.details.open_type')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.open_type.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='open_type' :itemRules="this.rules().open_type" class='' :caption="$t('entities.msgtemplate.main_form.details.open_type')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.open_type.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='open_type' :value="data.open_type" dataType="PICKUPDATA" :precision="0" <app-span name='open_type' :value="data.open_type" dataType="PICKUPDATA" unitName="" :precision="0"
tag='OpenAccessType' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""> tag='OpenAccessType' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span> </app-span>
......
ibznotify-app/ibznotify-app-web/src/main/resources/application-web-prod.yml
浏览文件 @ 888c368c
...@@ -71,5 +71,9 @@ zuul: ...@@ -71,5 +71,9 @@ zuul:
path: /lite/** path: /lite/**
serviceId: ${ibiz.ref.service.lite:ibzlite-api} serviceId: ${ibiz.ref.service.lite:ibzlite-api}
stripPrefix: false stripPrefix: false
sysauthlog:
path: /sysauthlogs
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false
sensitive-headers: sensitive-headers:
- Cookie,Set-Cookie,Authorization - Cookie,Set-Cookie,Authorization
ibznotify-boot/src/main/resources/application-dev.yml
浏览文件 @ 888c368c
...@@ -56,5 +56,9 @@ zuul: ...@@ -56,5 +56,9 @@ zuul:
path: /lite/** path: /lite/**
serviceId: ${ibiz.ref.service.lite:ibzlite-api} serviceId: ${ibiz.ref.service.lite:ibzlite-api}
stripPrefix: false stripPrefix: false
sysauthlog:
path: /sysauthlogs
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false
sensitive-headers: sensitive-headers:
- Cookie,Set-Cookie,Authorization - Cookie,Set-Cookie,Authorization
ibznotify-core/src/main/java/cn/ibizlab/core/extensions/service/MsgBodyExService.java 0 → 100644
浏览文件 @ 888c368c
package cn.ibizlab.core.extensions.service;
import cn.ibizlab.core.notify.service.impl.MsgBodyServiceImpl;
import lombok.extern.slf4j.Slf4j;
import cn.ibizlab.core.notify.domain.MsgBody;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.context.annotation.Primary;
import java.util.*;
/**
* 实体[消息] 自定义服务对象
*/
@Slf4j
@Primary
@Service("MsgBodyExService")
public class MsgBodyExService extends MsgBodyServiceImpl {
@Override
protected Class currentModelClass() {
return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
}
/**
* [Backlog:催办消息（分页）] 行为扩展：待办消息接口
* @param et
* @return
*/
@Override
@Transactional
public MsgBody backlog(MsgBody et) {
return super.backlog(et);
}
/**
* [BacklogAll:催办消息（全量）] 行为扩展：待办消息全量查询
* @param et
* @return
*/
@Override
@Transactional
public MsgBody backlogAll(MsgBody et) {
return super.backlogAll(et);
}
}
ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/IMsgBodyService.java
浏览文件 @ 888c368c
...@@ -34,6 +34,10 @@ public interface IMsgBodyService extends IService<MsgBody> { ...@@ -34,6 +34,10 @@ public interface IMsgBodyService extends IService<MsgBody> {
void removeBatch(Collection<String> idList); void removeBatch(Collection<String> idList);
MsgBody get(String key); MsgBody get(String key);
MsgBody getDraft(MsgBody et); MsgBody getDraft(MsgBody et);
MsgBody backlog(MsgBody et);
boolean backlogBatch(List<MsgBody> etList);
MsgBody backlogAll(MsgBody et);
boolean backlogAllBatch(List<MsgBody> etList);
boolean checkKey(MsgBody et); boolean checkKey(MsgBody et);
boolean save(MsgBody et); boolean save(MsgBody et);
void saveBatch(List<MsgBody> list); void saveBatch(List<MsgBody> list);
......
ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgBodyServiceImpl.java
浏览文件 @ 888c368c
...@@ -114,6 +114,38 @@ public class MsgBodyServiceImpl extends ServiceImpl<MsgBodyMapper, MsgBody> impl ...@@ -114,6 +114,38 @@ public class MsgBodyServiceImpl extends ServiceImpl<MsgBodyMapper, MsgBody> impl
return et; return et;
} }
@Override
@Transactional
public MsgBody backlog(MsgBody et) {
//自定义代码
return et;
}
@Override
@Transactional
public boolean backlogBatch(List<MsgBody> etList) {
for(MsgBody et : etList) {
backlog(et);
}
return true;
}
@Override
@Transactional
public MsgBody backlogAll(MsgBody et) {
//自定义代码
return et;
}
@Override
@Transactional
public boolean backlogAllBatch(List<MsgBody> etList) {
for(MsgBody et : etList) {
backlogAll(et);
}
return true;
}
@Override @Override
public boolean checkKey(MsgBody et) { public boolean checkKey(MsgBody et) {
return (!ObjectUtils.isEmpty(et.getMsgId())) && (!Objects.isNull(this.getById(et.getMsgId()))); return (!ObjectUtils.isEmpty(et.getMsgId())) && (!Objects.isNull(this.getById(et.getMsgId())));
......
ibznotify-core/src/main/java/cn/ibizlab/core/util/config/DroolsAutoConfiguration.java
浏览文件 @ 888c368c
package cn.ibizlab.core.util.config; package cn.ibizlab.core.util.config;
import org.kie.api.KieBase;
import org.kie.api.KieServices; 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.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.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; 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 @Configuration
public class DroolsAutoConfiguration { 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 @Bean
@ConditionalOnMissingBean(KieContainer.class) @ConditionalOnMissingBean(KieContainer.class)
public KieContainer kieContainer() throws IOException { public KieContainer kieContainer() {
final KieRepository kieRepository = getKieServices().getRepository(); KieServices kieServices = KieServices.get();
KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
kieRepository.addKieModule(new KieModule() { kieServices.newKieBuilder(kieFileSystem).buildAll();
public ReleaseId getReleaseId() { return kieServices.newKieContainer(kieServices.getRepository().getDefaultReleaseId());
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();
} }
} }
\ No newline at end of file
ibznotify-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 888c368c
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!--输出实体[MSG_BODY]数据结构 --> <!--输出实体[MSG_BODY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-msg_body-5-1"> <changeSet author="a_A_5d9d78509" id="tab-msg_body-12-1">
<createTable tableName="IBZMSGBODY"> <createTable tableName="IBZMSGBODY">
<column name="ISERROR" remarks="" type="INT"> <column name="ISERROR" remarks="" type="INT">
</column> </column>
......
ibznotify-core/src/main/resources/permission/systemResource.json
浏览文件 @ 888c368c
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"delogicname":"消息", "delogicname":"消息",
"sysmoudle":{"id":"NOTIFY","name":"notify"}, "sysmoudle":{"id":"NOTIFY","name":"notify"},
"dedataset":[{"id":"Default" , "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":"Backlog" , "name":"催办消息（分页）" , "type":"USERCUSTOM" },{"id":"BacklogAll" , "name":"催办消息（全量）" , "type":"USERCUSTOM" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}] "datascope":[{"id":"all","name":"全部数据"}]
} }
, { , {
......
ibznotify-dependencies/pom.xml
浏览文件 @ 888c368c
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
<oracle.version>19.8.0.0</oracle.version> <oracle.version>19.8.0.0</oracle.version>
<postgresql.version>42.2.6</postgresql.version> <postgresql.version>42.2.6</postgresql.version>
<flowable-modeler.version>6.4.2</flowable-modeler.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
...@@ -261,6 +262,16 @@ ...@@ -261,6 +262,16 @@
</dependency> </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> </dependencies>
</dependencyManagement> </dependencyManagement>
......
ibznotify-util/pom.xml
浏览文件 @ 888c368c
...@@ -90,5 +90,39 @@ ...@@ -90,5 +90,39 @@
<artifactId>feign-httpclient</artifactId> <artifactId>feign-httpclient</artifactId>
</dependency> </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> </dependencies>
</project> </project>
ibznotify-util/src/main/java/cn/ibizlab/util/aspect/DELogicAspect.java 0 → 100644
浏览文件 @ 888c368c
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.*.*(..))")
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();
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;
}
}
ibznotify-util/src/main/java/cn/ibizlab/util/domain/DELogic.java 0 → 100644
浏览文件 @ 888c368c
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;
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或