Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzdst
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzdst
提交
c5692772
提交
c5692772
编写于
12月 18, 2020
作者:
hebao@lab.ibiz5.com
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
引擎构建处理逻辑相关调整
上级
bc028771
变更
9
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
124 行增加
和
64 行删除
+124
-64
EngineMQMsg.java
...n/java/cn/ibizlab/core/extensions/domain/EngineMQMsg.java
+1
-0
DbEntityMapper.java
...ava/cn/ibizlab/core/extensions/mapper/DbEntityMapper.java
+1
-0
RuleEngineExService.java
.../ibizlab/core/extensions/service/RuleEngineExService.java
+76
-63
EntityModel.java
...a/cn/ibizlab/core/lite/extensions/domain/EntityModel.java
+4
-0
CommonEntityService.java
...lab/core/lite/extensions/service/CommonEntityService.java
+1
-0
DbEntityService.java
...ibizlab/core/lite/extensions/service/DbEntityService.java
+29
-0
MongoEntityService.java
...zlab/core/lite/extensions/service/MongoEntityService.java
+6
-0
MQConsumerConfigure.java
...java/cn/ibizlab/core/util/config/MQConsumerConfigure.java
+1
-1
DbEntityMapper.xml
...rc/main/resources/mapper/lite/dbentity/DbEntityMapper.xml
+5
-0
未找到文件。
ibzdst-core/src/main/java/cn/ibizlab/core/extensions/domain/EngineMQMsg.java
浏览文件 @
c5692772
...
@@ -11,5 +11,6 @@ public class EngineMQMsg {
...
@@ -11,5 +11,6 @@ public class EngineMQMsg {
private
String
engineId
;
private
String
engineId
;
private
String
batch
;
private
String
batch
;
private
Timestamp
runTime
;
private
Timestamp
runTime
;
private
Integer
count
;
private
List
<
EntityObj
>
datas
;
private
List
<
EntityObj
>
datas
;
}
}
ibzdst-core/src/main/java/cn/ibizlab/core/extensions/mapper/DbEntityMapper.java
浏览文件 @
c5692772
...
@@ -11,6 +11,7 @@ import java.util.List;
...
@@ -11,6 +11,7 @@ import java.util.List;
public
interface
DbEntityMapper
extends
BaseMapper
<
EntityObj
>{
public
interface
DbEntityMapper
extends
BaseMapper
<
EntityObj
>{
List
<
EntityObj
>
search
(
@Param
(
"sql"
)
String
sql
,
@Param
(
"ew"
)
Wrapper
<
EntityObj
>
wrapper
);
List
<
EntityObj
>
search
(
@Param
(
"sql"
)
String
sql
,
@Param
(
"ew"
)
Wrapper
<
EntityObj
>
wrapper
);
Integer
searchCount
(
@Param
(
"sql"
)
String
sql
,
@Param
(
"ew"
)
Wrapper
<
EntityObj
>
wrapper
);
int
replaceBatch
(
List
<
ExecResult
>
var1
);
int
replaceBatch
(
List
<
ExecResult
>
var1
);
int
clearBatch
(
List
<
ExecResult
>
var1
);
int
clearBatch
(
List
<
ExecResult
>
var1
);
...
...
ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/RuleEngineExService.java
浏览文件 @
c5692772
此差异已折叠。
点击以展开。
ibzdst-core/src/main/java/cn/ibizlab/core/lite/extensions/domain/EntityModel.java
浏览文件 @
c5692772
...
@@ -213,6 +213,10 @@ public class EntityModel {
...
@@ -213,6 +213,10 @@ public class EntityModel {
return
"select "
+
columnSet
+
" from "
+
this
.
getTableName
()+
" "
;
return
"select "
+
columnSet
+
" from "
+
this
.
getTableName
()+
" "
;
}
}
else
if
(
"COUNT"
.
equalsIgnoreCase
(
dataSet
))
{
return
"select count(1) from "
+
this
.
getTableName
()+
" "
;
}
else
else
{
{
if
(
dataSets
!=
null
)
if
(
dataSets
!=
null
)
...
...
ibzdst-core/src/main/java/cn/ibizlab/core/lite/extensions/service/CommonEntityService.java
浏览文件 @
c5692772
...
@@ -14,6 +14,7 @@ public interface CommonEntityService {
...
@@ -14,6 +14,7 @@ public interface CommonEntityService {
List
<
EntityObj
>
selectBase
(
EntityModel
entityModel
,
QueryFilter
filter
);
List
<
EntityObj
>
selectBase
(
EntityModel
entityModel
,
QueryFilter
filter
);
List
<
EntityObj
>
selectCore
(
EntityModel
entityModel
,
QueryFilter
filter
);
List
<
EntityObj
>
selectCore
(
EntityModel
entityModel
,
QueryFilter
filter
);
Integer
selectCount
(
EntityModel
entityModel
,
QueryFilter
filter
);
List
<
EntityObj
>
search
(
String
dataSet
,
EntityModel
entityModel
,
QueryFilter
filter
);
List
<
EntityObj
>
search
(
String
dataSet
,
EntityModel
entityModel
,
QueryFilter
filter
);
...
...
ibzdst-core/src/main/java/cn/ibizlab/core/lite/extensions/service/DbEntityService.java
浏览文件 @
c5692772
...
@@ -51,6 +51,35 @@ public class DbEntityService extends ServiceImpl<DbEntityMapper, EntityObj> impl
...
@@ -51,6 +51,35 @@ public class DbEntityService extends ServiceImpl<DbEntityMapper, EntityObj> impl
return
search
(
"CORE"
,
entityModel
,
filter
);
return
search
(
"CORE"
,
entityModel
,
filter
);
}
}
@Override
public
Integer
selectCount
(
EntityModel
entityModel
,
QueryFilter
filter
)
{
String
sql
=
entityModel
.
getSqlSegment
(
"COUNT"
);
String
dsName
=
entityModel
.
getDsName
();
try
{
dstDataSourceService
.
initDataSource
(
dsName
);
DynamicDataSourceContextHolder
.
push
(
dsName
);
DbEntitySearchContext
context
=
new
DbEntitySearchContext
();
context
.
setFilter
(
filter
);
QueryWrapper
qw
=
context
.
getSelectCond
();
if
(!
StringUtils
.
isEmpty
(
filter
.
getCustSqlSegment
()))
qw
.
apply
(
filter
.
getCustSqlSegment
());
Integer
count
=
baseMapper
.
searchCount
(
sql
,
qw
);
return
count
;
}
catch
(
Exception
ex
)
{
log
.
error
(
"详细错误信息:"
+
ex
.
getMessage
()
+
", 执行sql:"
+
sql
);
return
null
;
}
finally
{
DynamicDataSourceContextHolder
.
poll
();
}
}
@Override
@Override
public
List
<
EntityObj
>
search
(
String
dataSet
,
EntityModel
entityModel
,
QueryFilter
filter
)
{
public
List
<
EntityObj
>
search
(
String
dataSet
,
EntityModel
entityModel
,
QueryFilter
filter
)
{
...
...
ibzdst-core/src/main/java/cn/ibizlab/core/lite/extensions/service/MongoEntityService.java
浏览文件 @
c5692772
...
@@ -24,6 +24,12 @@ public class MongoEntityService implements CommonEntityService{
...
@@ -24,6 +24,12 @@ public class MongoEntityService implements CommonEntityService{
return
null
;
return
null
;
}
}
@Override
public
Integer
selectCount
(
EntityModel
entityModel
,
QueryFilter
filter
)
{
return
null
;
}
@Override
@Override
public
List
<
EntityObj
>
search
(
String
dataSet
,
EntityModel
entityModel
,
QueryFilter
filter
)
{
public
List
<
EntityObj
>
search
(
String
dataSet
,
EntityModel
entityModel
,
QueryFilter
filter
)
{
return
null
;
return
null
;
...
...
ibzdst-core/src/main/java/cn/ibizlab/core/util/config/MQConsumerConfigure.java
浏览文件 @
c5692772
...
@@ -55,7 +55,7 @@ public class MQConsumerConfigure {
...
@@ -55,7 +55,7 @@ public class MQConsumerConfigure {
* 设置consumer第一次启动是从队列头部开始还是队列尾部开始
* 设置consumer第一次启动是从队列头部开始还是队列尾部开始
* 如果不是第一次启动,那么按照上次消费的位置继续消费
* 如果不是第一次启动,那么按照上次消费的位置继续消费
*/
*/
consumer
.
setConsumeFromWhere
(
ConsumeFromWhere
.
CONSUME_FROM_
LA
ST_OFFSET
);
consumer
.
setConsumeFromWhere
(
ConsumeFromWhere
.
CONSUME_FROM_
FIR
ST_OFFSET
);
/**
/**
* 设置消费模型,集群还是广播,默认为集群
* 设置消费模型,集群还是广播,默认为集群
*/
*/
...
...
ibzdst-core/src/main/resources/mapper/lite/dbentity/DbEntityMapper.xml
浏览文件 @
c5692772
...
@@ -9,6 +9,11 @@
...
@@ -9,6 +9,11 @@
<if
test=
"ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere"
>
${ew.sqlSegment}
</if>
<if
test=
"ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere"
>
${ew.sqlSegment}
</if>
</select>
</select>
<select
id=
"searchCount"
parameterType=
"cn.ibizlab.core.lite.extensions.filter.DbEntitySearchContext"
resultType=
"Integer"
>
${sql}
<where><if
test=
"ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere"
>
${ew.sqlSegment}
</if></where>
<if
test=
"ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere"
>
${ew.sqlSegment}
</if>
</select>
<insert
id=
"replaceBatch"
parameterType=
"java.util.List"
databaseId=
"mysql"
>
<insert
id=
"replaceBatch"
parameterType=
"java.util.List"
databaseId=
"mysql"
>
<foreach
collection=
"list"
item=
"item"
index=
"index"
separator=
";"
>
<foreach
collection=
"list"
item=
"item"
index=
"index"
separator=
";"
>
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录