Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzdst
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzdst
提交
954f5c18
提交
954f5c18
编写于
9月 10, 2021
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码 [ibz-dst,应用]
上级
6fad42c2
变更
15
隐藏空白字符变更
内嵌
并排
正在显示
15 个修改的文件
包含
102 行增加
和
88 行删除
+102
-88
dict-catalog_BO_CN_base.ts
...e/lanres/entities/dict-catalog/dict-catalog_BO_CN_base.ts
+1
-0
dict-catalog_en_US_base.ts
...e/lanres/entities/dict-catalog/dict-catalog_en_US_base.ts
+1
-0
dict-catalog_zh_CN_base.ts
...e/lanres/entities/dict-catalog/dict-catalog_zh_CN_base.ts
+1
-0
pickup-viewpickupviewpanel-pickupviewpanel-model.ts
...panel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
+3
-0
config.xml
config.xml
+0
-6
Dockerfile
ibzdst-app/ibzdst-app-web/src/main/docker/Dockerfile
+1
-1
ibzdst-app-web-k8s.yaml
...pp/ibzdst-app-web/src/main/docker/ibzdst-app-web-k8s.yaml
+4
-31
ibzdst-app-web.yaml
...st-app/ibzdst-app-web/src/main/docker/ibzdst-app-web.yaml
+1
-15
DictCatalog.java
...rc/main/java/cn/ibizlab/core/dict/domain/DictCatalog.java
+16
-0
h2_table.xml
ibzdst-core/src/main/resources/liquibase/h2_table.xml
+23
-21
DictCatalogMapper.xml
...n/resources/mapper/dict/dictcatalog/DictCatalogMapper.xml
+2
-2
ibzdst.json
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
+14
-0
DictCatalogDTO.java
...-api/src/main/java/cn/ibizlab/api/dto/DictCatalogDTO.java
+18
-0
DELogicAspect.java
...l/src/main/java/cn/ibizlab/util/aspect/DELogicAspect.java
+2
-0
AuthPermissionEvaluator.java
...ava/cn/ibizlab/util/security/AuthPermissionEvaluator.java
+15
-12
未找到文件。
app_web/src/locale/lanres/entities/dict-catalog/dict-catalog_BO_CN_base.ts
浏览文件 @
954f5c18
...
...
@@ -11,6 +11,7 @@ function getLocaleResourceBase(){
enable
:
commonLogic
.
appcommonhandle
(
"是否有效"
,
null
),
updatedate
:
commonLogic
.
appcommonhandle
(
"最后修改时间"
,
null
),
createdate
:
commonLogic
.
appcommonhandle
(
"创建时间"
,
null
),
ext_params
:
commonLogic
.
appcommonhandle
(
"扩展参数"
,
null
),
},
views
:
{
gridview
:
{
...
...
app_web/src/locale/lanres/entities/dict-catalog/dict-catalog_en_US_base.ts
浏览文件 @
954f5c18
...
...
@@ -11,6 +11,7 @@ function getLocaleResourceBase(){
enable
:
commonLogic
.
appcommonhandle
(
"是否有效"
,
null
),
updatedate
:
commonLogic
.
appcommonhandle
(
"最后修改时间"
,
null
),
createdate
:
commonLogic
.
appcommonhandle
(
"创建时间"
,
null
),
ext_params
:
commonLogic
.
appcommonhandle
(
"扩展参数"
,
null
),
},
views
:
{
gridview
:
{
...
...
app_web/src/locale/lanres/entities/dict-catalog/dict-catalog_zh_CN_base.ts
浏览文件 @
954f5c18
...
...
@@ -11,6 +11,7 @@ function getLocaleResourceBase(){
enable
:
commonLogic
.
appcommonhandle
(
"是否有效"
,
null
),
updatedate
:
commonLogic
.
appcommonhandle
(
"最后修改时间"
,
null
),
createdate
:
commonLogic
.
appcommonhandle
(
"创建时间"
,
null
),
ext_params
:
commonLogic
.
appcommonhandle
(
"扩展参数"
,
null
),
},
views
:
{
gridview
:
{
...
...
app_web/src/widgets/dict-catalog/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @
954f5c18
...
...
@@ -39,6 +39,9 @@ export default class PickupViewpickupviewpanelModel {
{
name
:
'createdate'
,
},
{
name
:
'ext_params'
,
},
]
}
...
...
config.xml
浏览文件 @
954f5c18
...
...
@@ -37,12 +37,6 @@
git clone -b master $para2 ibzdst/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzdst/
mvn clean package -Pweb
mvn install -Pweb
cd ibzdst-app/ibzdst-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzdst-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
...
...
ibzdst-app/ibzdst-app-web/src/main/docker/Dockerfile
浏览文件 @
954f5c18
...
...
@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /ibzdst-app-web.jar
EXPOSE
30011
EXPOSE
8080
ADD
ibzdst-app-web.jar /ibzdst-app-web.jar
ibzdst-app/ibzdst-app-web/src/main/docker/ibzdst-app-web-k8s.yaml
浏览文件 @
954f5c18
...
...
@@ -22,34 +22,7 @@ spec:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-app-web:latest
imagePullPolicy
:
Always
ports
:
-
containerPort
:
30011
env
:
-
name
:
SPRING_CLOUD_NACOS_DISCOVERY_IP
value
:
"
172.16.180.237"
-
name
:
SERVER_PORT
value
:
"
30011"
-
name
:
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
value
:
"
172.16.100.243:8848"
-
name
:
SPRING_REDIS_HOST
value
:
"
172.16.100.243"
-
name
:
SPRING_REDIS_PORT
value
:
"
6379"
-
name
:
SPRING_REDIS_DATABASE
value
:
"
0"
-
name
:
SPRING_DATASOURCE_USERNAME
value
:
"
a_A_5d9d78509"
-
name
:
SPRING_DATASOURCE_PASSWORD
value
:
"
@6dEfb3@"
-
name
:
SPRING_DATASOURCE_URL
value
:
"
jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true"
-
name
:
SPRING_DATASOURCE_DRIVER-CLASS-NAME
value
:
"
com.mysql.jdbc.Driver"
-
name
:
SPRING_DATASOURCE_DEFAULTSCHEMA
value
:
"
a_A_5d9d78509"
-
name
:
NACOS
value
:
"
172.16.100.243:8848"
-
name
:
SPRING_CLOUD_NACOS_DISCOVERY_GROUP
value
:
"
ibizdev"
-
containerPort
:
8080
volumeMounts
:
-
name
:
data
mountPath
:
/app/file
...
...
@@ -69,9 +42,9 @@ spec:
type
:
NodePort
ports
:
-
name
:
http
port
:
30011
targetPort
:
30011
nodePort
:
30011
port
:
8080
targetPort
:
8080
nodePort
:
8080
protocol
:
TCP
selector
:
app
:
ibzdst-app-web
...
...
ibzdst-app/ibzdst-app-web/src/main/docker/ibzdst-app-web.yaml
浏览文件 @
954f5c18
...
...
@@ -3,23 +3,9 @@ services:
ibzdst-app-web
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-app-web:latest
ports
:
-
"
30011:30011
"
-
"
8080:8080
"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-
SERVER_PORT=30011
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
-
SPRING_REDIS_HOST=172.16.100.243
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-
SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-
SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-
NACOS=172.16.100.243:8848
-
SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
deploy
:
resources
:
limits
:
...
...
ibzdst-core/src/main/java/cn/ibizlab/core/dict/domain/DictCatalog.java
浏览文件 @
954f5c18
...
...
@@ -120,6 +120,14 @@ public class DictCatalog extends EntityMP implements Serializable {
@JsonProperty
(
"createdate"
)
@ApiModelProperty
(
"创建时间"
)
private
Timestamp
createdate
;
/**
* 扩展参数
*/
@TableField
(
value
=
"extparams"
)
@JSONField
(
name
=
"ext_params"
)
@JsonProperty
(
"ext_params"
)
@ApiModelProperty
(
"扩展参数"
)
private
String
extParams
;
...
...
@@ -155,6 +163,14 @@ public class DictCatalog extends EntityMP implements Serializable {
this
.
modify
(
"memo"
,
memo
);
}
/**
* 设置 [扩展参数]
*/
public
void
setExtParams
(
String
extParams
)
{
this
.
extParams
=
extParams
;
this
.
modify
(
"extparams"
,
extParams
);
}
/**
* 复制当前对象数据到目标对象(粘贴重置)
...
...
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
954f5c18
...
...
@@ -4,7 +4,7 @@
<!--输出实体[DA_BUILD]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_build-2-1"
>
<changeSet
author=
"
root
"
id=
"tab-da_build-2-1"
>
<createTable
tableName=
"IBZDABUILD"
>
<column
name=
"BUILDID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_BUILD_BUILDID"
/>
...
...
@@ -32,7 +32,7 @@
<!--输出实体[DA_CHART]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_chart-1-2"
>
<changeSet
author=
"
root
"
id=
"tab-da_chart-1-2"
>
<createTable
tableName=
"IBZDACHART"
>
<column
name=
"CHARTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_CHART_CHARTID"
/>
...
...
@@ -54,7 +54,7 @@
<!--输出实体[DA_METRIC]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_metric-1-3"
>
<changeSet
author=
"
root
"
id=
"tab-da_metric-1-3"
>
<createTable
tableName=
"IBZDAMETRIC"
>
<column
name=
"DA_METRICID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_METRIC_DA_METRICID"
/>
...
...
@@ -82,7 +82,7 @@
<!--输出实体[DA_REPORT]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_report-15-4"
>
<changeSet
author=
"
root
"
id=
"tab-da_report-15-4"
>
<createTable
tableName=
"IBZDAREPORT"
>
<column
name=
"REPORTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_REPORT_REPORTID"
/>
...
...
@@ -102,7 +102,7 @@
<!--输出实体[DICT_CATALOG]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509"
id=
"tab-dict_catalog-6
-5"
>
<changeSet
author=
"
root"
id=
"tab-dict_catalog-7
-5"
>
<createTable
tableName=
"IBZDICTCATALOG"
>
<column
name=
"CID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DICT_CATALOG_CID"
/>
...
...
@@ -121,12 +121,14 @@
</column>
<column
name=
"CREATEDATE"
remarks=
""
type=
"DATETIME"
>
</column>
<column
name=
"EXTPARAMS"
remarks=
""
type=
"TEXT(1048576)"
>
</column>
</createTable>
</changeSet>
<!--输出实体[DICT_OPTION]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-dict_option-8-6"
>
<changeSet
author=
"
root
"
id=
"tab-dict_option-8-6"
>
<createTable
tableName=
"IBZDICTOPTION"
>
<column
name=
"VKEY"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DICT_OPTION_VKEY"
/>
...
...
@@ -166,7 +168,7 @@
<!--输出实体[DST_DATASOURCE]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-dst_datasource-7-7"
>
<changeSet
author=
"
root
"
id=
"tab-dst_datasource-7-7"
>
<createTable
tableName=
"IBZDATASOURCE"
>
<column
name=
"DSID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DST_DATASOURCE_DSID"
/>
...
...
@@ -182,7 +184,7 @@
<!--输出实体[DST_SYSTEM]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-dst_system-1-8"
>
<changeSet
author=
"
root
"
id=
"tab-dst_system-1-8"
>
<createTable
tableName=
"IBZPSSYSTEM"
>
<column
name=
"PSSYSTEMID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DST_SYSTEM_PSSYSTEMID"
/>
...
...
@@ -202,7 +204,7 @@
<!--输出实体[RU_EXECLOG]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_execlog-1-9"
>
<changeSet
author=
"
root
"
id=
"tab-ru_execlog-1-9"
>
<createTable
tableName=
"IBZRULELOG"
>
<column
name=
"RU_EXECLOGID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_EXECLOG_RU_EXECLOGID"
/>
...
...
@@ -232,7 +234,7 @@
<!--输出实体[RU_EXECRESULT]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_execresult-1-10"
>
<changeSet
author=
"
root
"
id=
"tab-ru_execresult-1-10"
>
<createTable
tableName=
"IBZRULERESULT"
>
<column
name=
"RU_EXECRESULTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_EXECRESULT_RU_EXECRESULT"
/>
...
...
@@ -272,7 +274,7 @@
<!--输出实体[META_DATASET]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_dataset-1-11"
>
<changeSet
author=
"
root
"
id=
"tab-meta_dataset-1-11"
>
<createTable
tableName=
"IBZDATASET"
>
<column
name=
"DATASETID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_DATASET_DATASETID"
/>
...
...
@@ -294,7 +296,7 @@
<!--输出实体[META_ENTITY]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_entity-5-12"
>
<changeSet
author=
"
root
"
id=
"tab-meta_entity-5-12"
>
<createTable
tableName=
"IBZENTITY"
>
<column
name=
"ENTITYID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_ENTITY_ENTITYID"
/>
...
...
@@ -326,7 +328,7 @@
<!--输出实体[META_FIELD]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_field-11-13"
>
<changeSet
author=
"
root
"
id=
"tab-meta_field-11-13"
>
<createTable
tableName=
"IBZFIELD"
>
<column
name=
"FIELDID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_FIELD_FIELDID"
/>
...
...
@@ -390,7 +392,7 @@
<!--输出实体[META_MODEL]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_model-1-14"
>
<changeSet
author=
"
root
"
id=
"tab-meta_model-1-14"
>
<createTable
tableName=
"IBZMODEL"
>
<column
name=
"MODELID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_MODEL_MODELID"
/>
...
...
@@ -416,7 +418,7 @@
<!--输出实体[META_MODULE]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_module-1-15"
>
<changeSet
author=
"
root
"
id=
"tab-meta_module-1-15"
>
<createTable
tableName=
"IBZMODULE"
>
<column
name=
"MODULEID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_MODULE_MODULEID"
/>
...
...
@@ -434,7 +436,7 @@
<!--输出实体[META_RELATION]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_relation-10-16"
>
<changeSet
author=
"
root
"
id=
"tab-meta_relation-10-16"
>
<createTable
tableName=
"IBZRELATION"
>
<column
name=
"RELATIONID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_RELATION_RELATIONID"
/>
...
...
@@ -466,7 +468,7 @@
<!--输出实体[RU_ENGINE]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_engine-1-17"
>
<changeSet
author=
"
root
"
id=
"tab-ru_engine-1-17"
>
<createTable
tableName=
"IBZRULEENGINE"
>
<column
name=
"ENGINEID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_ENGINE_ENGINEID"
/>
...
...
@@ -494,7 +496,7 @@
<!--输出实体[RU_ITEM]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_item-1-18"
>
<changeSet
author=
"
root
"
id=
"tab-ru_item-1-18"
>
<createTable
tableName=
"IBZRULE"
>
<column
name=
"RULEID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_ITEM_RULEID"
/>
...
...
@@ -530,7 +532,7 @@
<!--输出实体[ETL_TABLE_SYNC]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-etl_table_sync-81-19"
>
<changeSet
author=
"
root
"
id=
"tab-etl_table_sync-81-19"
>
<createTable
tableName=
"IBZTABLESYNC"
>
<column
name=
"SYNCID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_ETL_TABLE_SYNC_SYNCID"
/>
...
...
@@ -585,13 +587,13 @@
<!--输出实体[DA_BUILD]外键关系 -->
<!--输出实体[DA_CHART]外键关系 -->
<!--输出实体[DA_METRIC]外键关系 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"fk-da_metric-1-20"
>
<changeSet
author=
"
root
"
id=
"fk-da_metric-1-20"
>
<addForeignKeyConstraint
baseColumnNames=
"BUILDID"
baseTableName=
"IBZDAMETRIC"
constraintName=
"DER1N_DA_METRIC_DA_BUILD_BUILD"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"BUILDID"
referencedTableName=
"IBZDABUILD"
validate=
"true"
/>
</changeSet>
<!--输出实体[DA_REPORT]外键关系 -->
<!--输出实体[DICT_CATALOG]外键关系 -->
<!--输出实体[DICT_OPTION]外键关系 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"fk-dict_option-8-21"
>
<changeSet
author=
"
root
"
id=
"fk-dict_option-8-21"
>
<addForeignKeyConstraint
baseColumnNames=
"CID"
baseTableName=
"IBZDICTOPTION"
constraintName=
"DER1N_DICT_OPTION_DICT_CATALOG"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"CID"
referencedTableName=
"IBZDICTCATALOG"
validate=
"true"
/>
</changeSet>
<!--输出实体[DST_DATASOURCE]外键关系 -->
...
...
ibzdst-core/src/main/resources/mapper/dict/dictcatalog/DictCatalogMapper.xml
浏览文件 @
954f5c18
...
...
@@ -7,7 +7,7 @@
<![CDATA[select t1.* from (SELECT t1.`CCODE`, t1.`CGROUP`, t1.`CID`, t1.`CNAME`, t1.`CREATEDATE`, t1.`ENABLE`, t1.`MEMO`, t1.`UPDATEDATE` FROM `IBZDICTCATALOG` t1 ) t1 where cid=#{id}]]>
</select>
<select
id=
"selectById"
resultMap=
"DictCatalogResultMap"
databaseId=
"oracle"
>
<![CDATA[select t1.* from (SELECT t1.CCODE, t1.CGROUP, t1.CID, t1.CNAME, t1.CREATEDATE, t1.ENABLE, t1.MEMO, t1.UPDATEDATE FROM IBZDICTCATALOG t1 ) t1 where cid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.CCODE, t1.CGROUP, t1.CID, t1.CNAME, t1.CREATEDATE, t1.ENABLE, t1.
EXTPARAMS, t1.
MEMO, t1.UPDATEDATE FROM IBZDICTCATALOG t1 ) t1 where cid=#{id}]]>
</select>
<select
id=
"selectById"
resultMap=
"DictCatalogResultMap"
databaseId=
"postgresql"
>
<![CDATA[select t1.* from (SELECT t1.CCODE, t1.CGROUP, t1.CID, t1.CNAME, t1.CREATEDATE, t1.ENABLE, t1.MEMO, t1.UPDATEDATE FROM IBZDICTCATALOG t1 ) t1 where cid=#{id}]]>
...
...
@@ -59,7 +59,7 @@
</sql>
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"oracle"
>
<![CDATA[ SELECT t1.CCODE, t1.CGROUP, t1.CID, t1.CNAME, t1.CREATEDATE, t1.ENABLE, t1.MEMO, t1.UPDATEDATE FROM IBZDICTCATALOG t1
<![CDATA[ SELECT t1.CCODE, t1.CGROUP, t1.CID, t1.CNAME, t1.CREATEDATE, t1.ENABLE, t1.
EXTPARAMS, t1.
MEMO, t1.UPDATEDATE FROM IBZDICTCATALOG t1
WHERE t1.ENABLE = 1
]]>
</sql>
...
...
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
浏览文件 @
954f5c18
...
...
@@ -881,6 +881,20 @@
"key_field"
:
0
,
"show_order"
:
9
,
"major_field"
:
0
},
{
"fieldname"
:
"EXTPARAMS"
,
"codename"
:
"Ext_params"
,
"field_logic_name"
:
"扩展参数"
,
"entity_name"
:
"DICT_CATALOG"
,
"field_type"
:
"LONGTEXT"
,
"nullable"
:
1
,
"physical_field"
:
1
,
"data_type"
:
"TEXT"
,
"data_length"
:
1048576
,
"key_field"
:
0
,
"show_order"
:
20
,
"major_field"
:
0
}
],
"subEntitys"
:[
...
...
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/DictCatalogDTO.java
浏览文件 @
954f5c18
...
...
@@ -113,6 +113,16 @@ public class DictCatalogDTO extends DTOBase implements Serializable {
@ApiModelProperty
(
"创建时间"
)
private
Timestamp
createdate
;
/**
* 属性 [EXTPARAMS]
*
*/
@JSONField
(
name
=
"ext_params"
)
@JsonProperty
(
"ext_params"
)
@Size
(
min
=
0
,
max
=
1048576
,
message
=
"内容长度必须小于等于[1048576]"
)
@ApiModelProperty
(
"扩展参数"
)
private
String
extParams
;
/**
* 设置 [CCODE]
...
...
@@ -146,6 +156,14 @@ public class DictCatalogDTO extends DTOBase implements Serializable {
this
.
modify
(
"memo"
,
memo
);
}
/**
* 设置 [EXTPARAMS]
*/
public
void
setExtParams
(
String
extParams
){
this
.
extParams
=
extParams
;
this
.
modify
(
"extparams"
,
extParams
);
}
}
...
...
ibzdst-util/src/main/java/cn/ibizlab/util/aspect/DELogicAspect.java
浏览文件 @
954f5c18
...
...
@@ -32,6 +32,7 @@ import org.springframework.util.ClassUtils;
import
org.springframework.util.DigestUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.StringUtils
;
import
org.springframework.core.annotation.Order
;
import
javax.xml.stream.XMLInputFactory
;
import
javax.xml.stream.XMLStreamReader
;
...
...
@@ -52,6 +53,7 @@ import java.util.concurrent.ConcurrentMap;
@Aspect
@Component
@Slf4j
@Order
(
100
)
public
class
DELogicAspect
{
private
static
BpmnXMLConverter
bpmnXMLConverter
=
new
BpmnXMLConverter
();
...
...
ibzdst-util/src/main/java/cn/ibizlab/util/security/AuthPermissionEvaluator.java
浏览文件 @
954f5c18
...
...
@@ -13,6 +13,7 @@ import org.springframework.security.core.Authentication;
import
org.springframework.security.core.GrantedAuthority
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.StringUtils
;
import
java.io.Serializable
;
import
java.lang.reflect.ParameterizedType
;
import
java.lang.reflect.Type
;
...
...
@@ -300,20 +301,22 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
Map
<
String
,
DEField
>
preFields
=
DEFieldCacheMap
.
getDEFields
(
entityBase
.
getClass
());
//从缓存中获取当前类预置属性
for
(
Map
.
Entry
<
String
,
DEField
>
entry
:
preFields
.
entrySet
()){
String
fieldName
=
entry
.
getKey
();
//获取注解字段
DEField
fieldAnnotation
=
entry
.
getValue
();
//获取注解值
String
fieldName
=
fieldAnnotation
.
name
();
//获取注解字段
DEPredefinedFieldType
prefieldType
=
fieldAnnotation
.
preType
();
//用户配置系统预置属性-组织机构标识
if
(
prefieldType
==
prefieldType
.
ORGID
){
orgField
=
fieldName
;
}
//用户配置系统预置属性-部门标识
if
(
prefieldType
==
prefieldType
.
ORGSECTORID
){
orgDeptField
=
fieldName
;
}
//用户配置系统预置属性-部门标识
if
(
prefieldType
==
prefieldType
.
CREATEMAN
){
createManField
=
fieldName
;
if
(!
StringUtils
.
isEmpty
(
fieldName
)){
//用户配置系统预置属性-组织机构标识
if
(
prefieldType
==
prefieldType
.
ORGID
){
orgField
=
fieldName
;
}
//用户配置系统预置属性-部门标识
if
(
prefieldType
==
prefieldType
.
ORGSECTORID
){
orgDeptField
=
fieldName
;
}
//用户配置系统预置属性-部门标识
if
(
prefieldType
==
prefieldType
.
CREATEMAN
){
createManField
=
fieldName
;
}
}
}
permissionFiled
.
put
(
"orgfield"
,
orgField
);
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录