Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzdict
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzdict
提交
36f625b1
提交
36f625b1
编写于
2月 07, 2021
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码 [ibz-dict,字典]
上级
09ef6edb
变更
15
展开全部
显示空白字符变更
内嵌
并排
正在显示
15 个修改的文件
包含
706 行增加
和
224 行删除
+706
-224
app-data-upload.vue
app_web/src/components/app-data-upload/app-data-upload.vue
+8
-2
app-message-popover.vue
...rc/components/app-message-popover/app-message-popover.vue
+118
-116
dropdown-list-mpicker.vue
...omponents/dropdown-list-mpicker/dropdown-list-mpicker.vue
+2
-2
dropdown-list.vue
app_web/src/components/dropdown-list/dropdown-list.vue
+3
-1
environment.ts
app_web/src/environments/environment.ts
+2
-0
application-web-prod.yml
...zdict-app-web/src/main/resources/application-web-prod.yml
+4
-0
application-dev.yml
ibzdict-boot/src/main/resources/application-dev.yml
+4
-0
DroolsAutoConfiguration.java
.../cn/ibizlab/core/util/config/DroolsAutoConfiguration.java
+6
-89
pom.xml
ibzdict-dependencies/pom.xml
+11
-0
DictCatalogResource.java
...rc/main/java/cn/ibizlab/api/rest/DictCatalogResource.java
+5
-3
DictOptionResource.java
...src/main/java/cn/ibizlab/api/rest/DictOptionResource.java
+8
-5
pom.xml
ibzdict-util/pom.xml
+34
-0
DELogicAspect.java
...l/src/main/java/cn/ibizlab/util/aspect/DELogicAspect.java
+476
-0
LayeringCache.java
.../main/java/cn/ibizlab/util/cache/cache/LayeringCache.java
+6
-6
DELogic.java
...ct-util/src/main/java/cn/ibizlab/util/domain/DELogic.java
+19
-0
未找到文件。
app_web/src/components/app-data-upload/app-data-upload.vue
浏览文件 @
36f625b1
...
@@ -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
浏览文件 @
36f625b1
...
@@ -84,13 +84,12 @@
...
@@ -84,13 +84,12 @@
</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
;
...
@@ -118,6 +117,9 @@
...
@@ -118,6 +117,9 @@
* vue挂载
* vue挂载
*/
*/
mounted
():
void
{
mounted
():
void
{
if
(
!
Environment
.
workflow
){
return
;
}
// 首次获取待办列表
// 首次获取待办列表
this
.
getMyTasks
();
this
.
getMyTasks
();
// 定时器:每隔1分钟重新获取待办列表
// 定时器:每隔1分钟重新获取待办列表
...
@@ -217,7 +219,7 @@
...
@@ -217,7 +219,7 @@
this
.
msgShowCnt
=
this
.
myMsgs
.
length
>=
10
?
10
:
this
.
myMsgs
.
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
浏览文件 @
36f625b1
...
@@ -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
浏览文件 @
36f625b1
...
@@ -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
浏览文件 @
36f625b1
...
@@ -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
)
{
...
...
ibzdict-app/ibzdict-app-web/src/main/resources/application-web-prod.yml
浏览文件 @
36f625b1
...
@@ -67,5 +67,9 @@ zuul:
...
@@ -67,5 +67,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
ibzdict-boot/src/main/resources/application-dev.yml
浏览文件 @
36f625b1
...
@@ -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
ibzdict-core/src/main/java/cn/ibizlab/core/util/config/DroolsAutoConfiguration.java
浏览文件 @
36f625b1
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
ibzdict-dependencies/pom.xml
浏览文件 @
36f625b1
...
@@ -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>
...
...
ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/rest/DictCatalogResource.java
浏览文件 @
36f625b1
...
@@ -73,7 +73,7 @@ public class DictCatalogResource {
...
@@ -73,7 +73,7 @@ public class DictCatalogResource {
DictCatalog
domain
=
dictcatalogMapping
.
toDomain
(
dictcatalogdto
);
DictCatalog
domain
=
dictcatalogMapping
.
toDomain
(
dictcatalogdto
);
domain
.
setId
(
dictcatalog_id
);
domain
.
setId
(
dictcatalog_id
);
dictcatalogService
.
update
(
domain
);
dictcatalogService
.
update
(
domain
);
DictCatalogDTO
dto
=
dictcatalogMapping
.
toDto
(
domain
);
DictCatalogDTO
dto
=
dictcatalogMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
}
...
@@ -125,8 +125,10 @@ public class DictCatalogResource {
...
@@ -125,8 +125,10 @@ public class DictCatalogResource {
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Save-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Save-all')"
)
@ApiOperation
(
value
=
"保存字典"
,
tags
=
{
"字典"
},
notes
=
"保存字典"
)
@ApiOperation
(
value
=
"保存字典"
,
tags
=
{
"字典"
},
notes
=
"保存字典"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dictcatalogs/save"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dictcatalogs/save"
)
public
ResponseEntity
<
Boolean
>
save
(
@RequestBody
DictCatalogDTO
dictcatalogdto
)
{
public
ResponseEntity
<
DictCatalogDTO
>
save
(
@RequestBody
DictCatalogDTO
dictcatalogdto
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dictcatalogService
.
save
(
dictcatalogMapping
.
toDomain
(
dictcatalogdto
)));
DictCatalog
domain
=
dictcatalogMapping
.
toDomain
(
dictcatalogdto
);
dictcatalogService
.
save
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dictcatalogMapping
.
toDto
(
domain
));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Save-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Save-all')"
)
...
...
ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/rest/DictOptionResource.java
浏览文件 @
36f625b1
...
@@ -73,7 +73,7 @@ public class DictOptionResource {
...
@@ -73,7 +73,7 @@ public class DictOptionResource {
DictOption
domain
=
dictoptionMapping
.
toDomain
(
dictoptiondto
);
DictOption
domain
=
dictoptionMapping
.
toDomain
(
dictoptiondto
);
domain
.
setValueKey
(
dictoption_id
);
domain
.
setValueKey
(
dictoption_id
);
dictoptionService
.
update
(
domain
);
dictoptionService
.
update
(
domain
);
DictOptionDTO
dto
=
dictoptionMapping
.
toDto
(
domain
);
DictOptionDTO
dto
=
dictoptionMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
}
...
@@ -125,8 +125,10 @@ public class DictOptionResource {
...
@@ -125,8 +125,10 @@ public class DictOptionResource {
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Save-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Save-all')"
)
@ApiOperation
(
value
=
"保存字典项"
,
tags
=
{
"字典项"
},
notes
=
"保存字典项"
)
@ApiOperation
(
value
=
"保存字典项"
,
tags
=
{
"字典项"
},
notes
=
"保存字典项"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dictoptions/save"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dictoptions/save"
)
public
ResponseEntity
<
Boolean
>
save
(
@RequestBody
DictOptionDTO
dictoptiondto
)
{
public
ResponseEntity
<
DictOptionDTO
>
save
(
@RequestBody
DictOptionDTO
dictoptiondto
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dictoptionService
.
save
(
dictoptionMapping
.
toDomain
(
dictoptiondto
)));
DictOption
domain
=
dictoptionMapping
.
toDomain
(
dictoptiondto
);
dictoptionService
.
save
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dictoptionMapping
.
toDto
(
domain
));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Save-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Save-all')"
)
...
@@ -248,10 +250,11 @@ public class DictOptionResource {
...
@@ -248,10 +250,11 @@ public class DictOptionResource {
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Save-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Save-all')"
)
@ApiOperation
(
value
=
"根据字典保存字典项"
,
tags
=
{
"字典项"
},
notes
=
"根据字典保存字典项"
)
@ApiOperation
(
value
=
"根据字典保存字典项"
,
tags
=
{
"字典项"
},
notes
=
"根据字典保存字典项"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions/save"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions/save"
)
public
ResponseEntity
<
Boolean
>
saveByDictCatalog
(
@PathVariable
(
"dictcatalog_id"
)
String
dictcatalog_id
,
@RequestBody
DictOptionDTO
dictoptiondto
)
{
public
ResponseEntity
<
DictOptionDTO
>
saveByDictCatalog
(
@PathVariable
(
"dictcatalog_id"
)
String
dictcatalog_id
,
@RequestBody
DictOptionDTO
dictoptiondto
)
{
DictOption
domain
=
dictoptionMapping
.
toDomain
(
dictoptiondto
);
DictOption
domain
=
dictoptionMapping
.
toDomain
(
dictoptiondto
);
domain
.
setCatalogId
(
dictcatalog_id
);
domain
.
setCatalogId
(
dictcatalog_id
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dictoptionService
.
save
(
domain
));
dictoptionService
.
save
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dictoptionMapping
.
toDto
(
domain
));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Save-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Save-all')"
)
...
...
ibzdict-util/pom.xml
浏览文件 @
36f625b1
...
@@ -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>
ibzdict-util/src/main/java/cn/ibizlab/util/aspect/DELogicAspect.java
0 → 100644
浏览文件 @
36f625b1
此差异已折叠。
点击以展开。
ibzdict-util/src/main/java/cn/ibizlab/util/cache/cache/LayeringCache.java
浏览文件 @
36f625b1
...
@@ -59,15 +59,15 @@ public class LayeringCache extends AbstractValueAdaptingCache {
...
@@ -59,15 +59,15 @@ public class LayeringCache extends AbstractValueAdaptingCache {
@Override
@Override
public
ValueWrapper
get
(
Object
key
)
{
public
ValueWrapper
get
(
Object
key
)
{
ValueWrapper
wrapper
=
caffeineCache
.
get
(
key
);
ValueWrapper
wrapper
=
caffeineCache
.
get
(
key
);
Object
value
=
ObjectUtils
.
isEmpty
(
wrapper
)?
null
:
wrapper
.
get
();
Object
value
=
ObjectUtils
.
isEmpty
(
wrapper
)
?
null
:
wrapper
.
get
();
log
.
debug
(
"查询一级缓存 key:{}
,value:{}"
,
key
,
value
);
log
.
debug
(
"查询一级缓存 key:{}
"
,
key
,
value
);
if
(
ObjectUtils
.
isEmpty
(
value
))
{
if
(
ObjectUtils
.
isEmpty
(
value
))
{
wrapper
=
redisCache
.
get
(
key
);
wrapper
=
redisCache
.
get
(
key
);
value
=
ObjectUtils
.
isEmpty
(
wrapper
)?
null
:
wrapper
.
get
();
value
=
ObjectUtils
.
isEmpty
(
wrapper
)
?
null
:
wrapper
.
get
();
log
.
debug
(
"查询二级缓存 key:{}
,value:{}"
,
key
,
value
);
log
.
debug
(
"查询二级缓存 key:{}
"
,
key
);
if
(!
ObjectUtils
.
isEmpty
(
value
))
{
if
(!
ObjectUtils
.
isEmpty
(
value
))
{
caffeineCache
.
put
(
key
,
value
);
caffeineCache
.
put
(
key
,
value
);
log
.
debug
(
"查询二级缓存,并将数据放到一级缓存。 key:{}
,value:{}"
,
key
,
value
);
log
.
debug
(
"查询二级缓存,并将数据放到一级缓存。 key:{}
"
,
key
);
}
}
}
}
return
wrapper
;
return
wrapper
;
...
...
ibzdict-util/src/main/java/cn/ibizlab/util/domain/DELogic.java
0 → 100644
浏览文件 @
36f625b1
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
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录