提交 abd61bb0 编写于 作者: ibizdev's avatar ibizdev

zoo457790531 发布系统代码 [ibz-lite,应用]

上级 52b7c7de
...@@ -8,6 +8,7 @@ function getLocaleResourceBase(){ ...@@ -8,6 +8,7 @@ function getLocaleResourceBase(){
modelfile: commonLogic.appcommonhandle("文件",null), modelfile: commonLogic.appcommonhandle("文件",null),
status: commonLogic.appcommonhandle("状态",null), status: commonLogic.appcommonhandle("状态",null),
system_id: commonLogic.appcommonhandle("系统标识",null), system_id: commonLogic.appcommonhandle("系统标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
}, },
views: { views: {
gridview: { gridview: {
...@@ -31,6 +32,7 @@ function getLocaleResourceBase(){ ...@@ -31,6 +32,7 @@ function getLocaleResourceBase(){
srfdeid: commonLogic.appcommonhandle("",null), srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null), srfsourcekey: commonLogic.appcommonhandle("",null),
configname: commonLogic.appcommonhandle("名称",null), configname: commonLogic.appcommonhandle("名称",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
modelfile: commonLogic.appcommonhandle("文件",null), modelfile: commonLogic.appcommonhandle("文件",null),
configid: commonLogic.appcommonhandle("ID",null), configid: commonLogic.appcommonhandle("ID",null),
}, },
......
...@@ -8,6 +8,7 @@ function getLocaleResourceBase(){ ...@@ -8,6 +8,7 @@ function getLocaleResourceBase(){
modelfile: commonLogic.appcommonhandle("文件",null), modelfile: commonLogic.appcommonhandle("文件",null),
status: commonLogic.appcommonhandle("状态",null), status: commonLogic.appcommonhandle("状态",null),
system_id: commonLogic.appcommonhandle("系统标识",null), system_id: commonLogic.appcommonhandle("系统标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
}, },
views: { views: {
gridview: { gridview: {
...@@ -31,6 +32,7 @@ function getLocaleResourceBase(){ ...@@ -31,6 +32,7 @@ function getLocaleResourceBase(){
srfdeid: commonLogic.appcommonhandle("",null), srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null), srfsourcekey: commonLogic.appcommonhandle("",null),
configname: commonLogic.appcommonhandle("名称",null), configname: commonLogic.appcommonhandle("名称",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
modelfile: commonLogic.appcommonhandle("文件",null), modelfile: commonLogic.appcommonhandle("文件",null),
configid: commonLogic.appcommonhandle("ID",null), configid: commonLogic.appcommonhandle("ID",null),
}, },
......
...@@ -8,6 +8,7 @@ function getLocaleResourceBase(){ ...@@ -8,6 +8,7 @@ function getLocaleResourceBase(){
modelfile: commonLogic.appcommonhandle("文件",null), modelfile: commonLogic.appcommonhandle("文件",null),
status: commonLogic.appcommonhandle("状态",null), status: commonLogic.appcommonhandle("状态",null),
system_id: commonLogic.appcommonhandle("系统标识",null), system_id: commonLogic.appcommonhandle("系统标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
}, },
views: { views: {
gridview: { gridview: {
...@@ -31,6 +32,7 @@ function getLocaleResourceBase(){ ...@@ -31,6 +32,7 @@ function getLocaleResourceBase(){
srfdeid: commonLogic.appcommonhandle("",null), srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null), srfsourcekey: commonLogic.appcommonhandle("",null),
configname: commonLogic.appcommonhandle("名称",null), configname: commonLogic.appcommonhandle("名称",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
modelfile: commonLogic.appcommonhandle("文件",null), modelfile: commonLogic.appcommonhandle("文件",null),
configid: commonLogic.appcommonhandle("ID",null), configid: commonLogic.appcommonhandle("ID",null),
}, },
......
...@@ -23,6 +23,20 @@ ...@@ -23,6 +23,20 @@
</app-form-item> </app-form-item>
</i-col>
<i-col v-show="detailsModel.dynainstid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='dynainstid' :itemRules="this.rules().dynainstid" class='' :caption="$t('entities.dynamicmodelconfig.main_form.details.dynainstid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.dynainstid.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.dynainstid"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.dynainstid.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col> </i-col>
<i-col v-show="detailsModel.modelfile.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.modelfile.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='modelfile' :itemRules="this.rules().modelfile" class='' :caption="$t('entities.dynamicmodelconfig.main_form.details.modelfile')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.modelfile.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='modelfile' :itemRules="this.rules().modelfile" class='' :caption="$t('entities.dynamicmodelconfig.main_form.details.modelfile')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.modelfile.error" :isEmptyCaption="false" labelPos="LEFT">
...@@ -435,6 +449,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -435,6 +449,7 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid: null, srfdeid: null,
srfsourcekey: null, srfsourcekey: null,
configname: null, configname: null,
dynainstid: null,
modelfile: null, modelfile: null,
configid: null, configid: null,
dynamicmodelconfig:null, dynamicmodelconfig:null,
...@@ -492,6 +507,10 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -492,6 +507,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: this.detailsModel.configname.required, type: 'string', message: '名称 值不能为空', trigger: 'change' }, { required: this.detailsModel.configname.required, type: 'string', message: '名称 值不能为空', trigger: 'change' },
{ required: this.detailsModel.configname.required, type: 'string', message: '名称 值不能为空', trigger: 'blur' }, { required: this.detailsModel.configname.required, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
], ],
dynainstid: [
{ required: this.detailsModel.dynainstid.required, type: 'string', message: '动态实例标识 值不能为空', trigger: 'change' },
{ required: this.detailsModel.dynainstid.required, type: 'string', message: '动态实例标识 值不能为空', trigger: 'blur' },
],
modelfile: [ modelfile: [
{ required: this.detailsModel.modelfile.required, type: 'string', message: '文件 值不能为空', trigger: 'change' }, { required: this.detailsModel.modelfile.required, type: 'string', message: '文件 值不能为空', trigger: 'change' },
{ required: this.detailsModel.modelfile.required, type: 'string', message: '文件 值不能为空', trigger: 'blur' }, { required: this.detailsModel.modelfile.required, type: 'string', message: '文件 值不能为空', trigger: 'blur' },
...@@ -622,6 +641,8 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -622,6 +641,8 @@ export default class MainBase extends Vue implements ControlInterface {
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 }) srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
, ,
configname: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'configname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 }) configname: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'configname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
,
dynainstid: new FormItemModel({ caption: '动态实例标识', detailType: 'FORMITEM', name: 'dynainstid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
, ,
modelfile: new FormItemModel({ caption: '文件', detailType: 'FORMITEM', name: 'modelfile', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 }) modelfile: new FormItemModel({ caption: '文件', detailType: 'FORMITEM', name: 'modelfile', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
, ,
...@@ -725,6 +746,18 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -725,6 +746,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'configname', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'configname', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 dynainstid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.dynainstid')
onDynainstidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'dynainstid', newVal: newVal, oldVal: oldVal });
}
/** /**
* 监控表单属性 modelfile 值 * 监控表单属性 modelfile 值
* *
...@@ -815,6 +848,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -815,6 +848,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
/** /**
......
...@@ -55,6 +55,11 @@ export default class MainModel { ...@@ -55,6 +55,11 @@ export default class MainModel {
prop: 'configname', prop: 'configname',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'dynainstid',
prop: 'dynainstid',
dataType: 'TEXT',
},
{ {
name: 'modelfile', name: 'modelfile',
prop: 'modelfile', prop: 'modelfile',
......
...@@ -221,9 +221,6 @@ public class BladeVisualCategoryServiceImpl extends ServiceImpl<BladeVisualCateg ...@@ -221,9 +221,6 @@ public class BladeVisualCategoryServiceImpl extends ServiceImpl<BladeVisualCateg
public IBladeVisualCategoryService getProxyService() { public IBladeVisualCategoryService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass()); return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
} }
......
...@@ -221,9 +221,6 @@ public class BladeVisualConfigServiceImpl extends ServiceImpl<BladeVisualConfigM ...@@ -221,9 +221,6 @@ public class BladeVisualConfigServiceImpl extends ServiceImpl<BladeVisualConfigM
public IBladeVisualConfigService getProxyService() { public IBladeVisualConfigService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass()); return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
} }
......
...@@ -221,9 +221,6 @@ public class BladeVisualMapServiceImpl extends ServiceImpl<BladeVisualMapMapper, ...@@ -221,9 +221,6 @@ public class BladeVisualMapServiceImpl extends ServiceImpl<BladeVisualMapMapper,
public IBladeVisualMapService getProxyService() { public IBladeVisualMapService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass()); return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
} }
......
...@@ -221,9 +221,6 @@ public class BladeVisualServiceImpl extends ServiceImpl<BladeVisualMapper, Blade ...@@ -221,9 +221,6 @@ public class BladeVisualServiceImpl extends ServiceImpl<BladeVisualMapper, Blade
public IBladeVisualService getProxyService() { public IBladeVisualService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass()); return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
} }
......
...@@ -80,6 +80,13 @@ public class DynamicModelConfig extends EntityMP implements Serializable { ...@@ -80,6 +80,13 @@ public class DynamicModelConfig extends EntityMP implements Serializable {
@JSONField(name = "system_id") @JSONField(name = "system_id")
@JsonProperty("system_id") @JsonProperty("system_id")
private String systemId; private String systemId;
/**
* 动态实例标识
*/
@TableField(value = "dynainstid")
@JSONField(name = "dynainstid")
@JsonProperty("dynainstid")
private String dynainstid;
/** /**
* *
...@@ -123,6 +130,14 @@ public class DynamicModelConfig extends EntityMP implements Serializable { ...@@ -123,6 +130,14 @@ public class DynamicModelConfig extends EntityMP implements Serializable {
this.modify("systemid", systemId); this.modify("systemid", systemId);
} }
/**
* 设置 [动态实例标识]
*/
public void setDynainstid(String dynainstid) {
this.dynainstid = dynainstid;
this.modify("dynainstid", dynainstid);
}
/** /**
* 复制当前对象数据到目标对象(粘贴重置) * 复制当前对象数据到目标对象(粘贴重置)
......
...@@ -136,7 +136,6 @@ public class DstAPIServiceImpl implements IDstAPIService { ...@@ -136,7 +136,6 @@ public class DstAPIServiceImpl implements IDstAPIService {
return new PageImpl<DstAPI>(new ArrayList(),context.getPageable(),0); return new PageImpl<DstAPI>(new ArrayList(),context.getPageable(),0);
} }
} }
...@@ -130,7 +130,6 @@ public class DstAppServiceImpl implements IDstAppService { ...@@ -130,7 +130,6 @@ public class DstAppServiceImpl implements IDstAppService {
return new PageImpl<DstApp>(new ArrayList(),context.getPageable(),0); return new PageImpl<DstApp>(new ArrayList(),context.getPageable(),0);
} }
} }
...@@ -293,9 +293,6 @@ public class DstComponentServiceImpl extends ServiceImpl<DstComponentMapper, Dst ...@@ -293,9 +293,6 @@ public class DstComponentServiceImpl extends ServiceImpl<DstComponentMapper, Dst
public IDstComponentService getProxyService() { public IDstComponentService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass()); return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
} }
......
...@@ -249,9 +249,6 @@ public class DstConfigServiceImpl extends ServiceImpl<DstConfigMapper, DstConfig ...@@ -249,9 +249,6 @@ public class DstConfigServiceImpl extends ServiceImpl<DstConfigMapper, DstConfig
public IDstConfigService getProxyService() { public IDstConfigService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass()); return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
} }
......
...@@ -256,9 +256,6 @@ public class DstDataSourceServiceImpl extends ServiceImpl<DstDataSourceMapper, D ...@@ -256,9 +256,6 @@ public class DstDataSourceServiceImpl extends ServiceImpl<DstDataSourceMapper, D
public IDstDataSourceService getProxyService() { public IDstDataSourceService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass()); return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
} }
......
...@@ -124,7 +124,6 @@ public class DstMicroserviceServiceImpl implements IDstMicroserviceService { ...@@ -124,7 +124,6 @@ public class DstMicroserviceServiceImpl implements IDstMicroserviceService {
return new PageImpl<DstMicroservice>(new ArrayList(),context.getPageable(),0); return new PageImpl<DstMicroservice>(new ArrayList(),context.getPageable(),0);
} }
} }
...@@ -253,9 +253,6 @@ public class DstRouterServiceImpl extends ServiceImpl<DstRouterMapper, DstRouter ...@@ -253,9 +253,6 @@ public class DstRouterServiceImpl extends ServiceImpl<DstRouterMapper, DstRouter
public IDstRouterService getProxyService() { public IDstRouterService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass()); return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
} }
......
...@@ -277,9 +277,6 @@ public class DstSystemServiceImpl extends ServiceImpl<DstSystemMapper, DstSystem ...@@ -277,9 +277,6 @@ public class DstSystemServiceImpl extends ServiceImpl<DstSystemMapper, DstSystem
public IDstSystemService getProxyService() { public IDstSystemService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass()); return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
} }
......
...@@ -277,9 +277,6 @@ public class DstViewServiceImpl extends ServiceImpl<DstViewMapper, DstView> impl ...@@ -277,9 +277,6 @@ public class DstViewServiceImpl extends ServiceImpl<DstViewMapper, DstView> impl
public IDstViewService getProxyService() { public IDstViewService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass()); return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
} }
......
...@@ -249,9 +249,6 @@ public class DynamicModelConfigServiceImpl extends ServiceImpl<DynamicModelConfi ...@@ -249,9 +249,6 @@ public class DynamicModelConfigServiceImpl extends ServiceImpl<DynamicModelConfi
public IDynamicModelConfigService getProxyService() { public IDynamicModelConfigService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass()); return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
} }
......
...@@ -288,9 +288,6 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD ...@@ -288,9 +288,6 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
} }
......
...@@ -363,9 +363,6 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt ...@@ -363,9 +363,6 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
public IMetaEntityService getProxyService() { public IMetaEntityService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass()); return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
} }
......
...@@ -335,9 +335,6 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField ...@@ -335,9 +335,6 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
} }
......
...@@ -153,7 +153,6 @@ public class MetaLookupServiceImpl implements IMetaLookupService { ...@@ -153,7 +153,6 @@ public class MetaLookupServiceImpl implements IMetaLookupService {
return new PageImpl<MetaLookup>(new ArrayList(),context.getPageable(),0); return new PageImpl<MetaLookup>(new ArrayList(),context.getPageable(),0);
} }
} }
...@@ -249,9 +249,6 @@ public class MetaModelServiceImpl extends ServiceImpl<MetaModelMapper, MetaModel ...@@ -249,9 +249,6 @@ public class MetaModelServiceImpl extends ServiceImpl<MetaModelMapper, MetaModel
public IMetaModelService getProxyService() { public IMetaModelService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass()); return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
} }
......
...@@ -236,9 +236,6 @@ public class MetaModuleServiceImpl extends ServiceImpl<MetaModuleMapper, MetaMod ...@@ -236,9 +236,6 @@ public class MetaModuleServiceImpl extends ServiceImpl<MetaModuleMapper, MetaMod
public IMetaModuleService getProxyService() { public IMetaModuleService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass()); return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
} }
......
...@@ -356,9 +356,6 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap ...@@ -356,9 +356,6 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
} }
......
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
<!--输出实体[DYNAMIC_MODEL_CONFIG]数据结构 --> <!--输出实体[DYNAMIC_MODEL_CONFIG]数据结构 -->
<changeSet author="root" id="tab-dynamic_model_config-51-11"> <changeSet author="root" id="tab-dynamic_model_config-55-11">
<createTable tableName="IBZDYNAMICMODELCONFIG"> <createTable tableName="IBZDYNAMICMODELCONFIG">
<column name="CONFIGID" remarks="" type="VARCHAR(100)"> <column name="CONFIGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DYNAMIC_MODEL_CONFIG_CONFIG"/> <constraints primaryKey="true" primaryKeyName="PK_DYNAMIC_MODEL_CONFIG_CONFIG"/>
...@@ -235,6 +235,8 @@ ...@@ -235,6 +235,8 @@
</column> </column>
<column name="SYSTEMID" remarks="" type="VARCHAR(100)"> <column name="SYSTEMID" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="DYNAINSTID" remarks="" type="VARCHAR(100)">
</column>
</createTable> </createTable>
</changeSet> </changeSet>
...@@ -443,7 +445,7 @@ ...@@ -443,7 +445,7 @@
<!--输出实体[DST_SYSTEM]外键关系 --> <!--输出实体[DST_SYSTEM]外键关系 -->
<!--输出实体[DST_VIEW]外键关系 --> <!--输出实体[DST_VIEW]外键关系 -->
<!--输出实体[DYNAMIC_MODEL_CONFIG]外键关系 --> <!--输出实体[DYNAMIC_MODEL_CONFIG]外键关系 -->
<changeSet author="root" id="fk-dynamic_model_config-51-18"> <changeSet author="root" id="fk-dynamic_model_config-55-18">
<addForeignKeyConstraint baseColumnNames="SYSTEMID" baseTableName="IBZDYNAMICMODELCONFIG" constraintName="DER1N_DYNAMIC_MODEL_CONFIG_DST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PSSYSTEMID" referencedTableName="IBZPSSYSTEM" validate="true"/> <addForeignKeyConstraint baseColumnNames="SYSTEMID" baseTableName="IBZDYNAMICMODELCONFIG" constraintName="DER1N_DYNAMIC_MODEL_CONFIG_DST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PSSYSTEMID" referencedTableName="IBZPSSYSTEM" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[META_DATASET]外键关系 --> <!--输出实体[META_DATASET]外键关系 -->
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`CONFIGID`, t1.`CONFIGNAME`, t1.`MODELFILE`, t1.`STATUS`, t1.`SYSTEMID` FROM `IBZDYNAMICMODELCONFIG` t1 ) t1 where configid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`CONFIGID`, t1.`CONFIGNAME`, t1.`MODELFILE`, t1.`STATUS`, t1.`SYSTEMID` FROM `IBZDYNAMICMODELCONFIG` t1 ) t1 where configid=#{id}]]>
</select> </select>
<select id="selectById" resultMap="DynamicModelConfigResultMap" databaseId="oracle"> <select id="selectById" resultMap="DynamicModelConfigResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.CONFIGID, t1.CONFIGNAME, t1.MODELFILE, t1.STATUS, t1.SYSTEMID FROM IBZDYNAMICMODELCONFIG t1 ) t1 where configid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.CONFIGID, t1.CONFIGNAME, t1.DYNAINSTID, t1.MODELFILE, t1.STATUS, t1.SYSTEMID FROM IBZDYNAMICMODELCONFIG t1 ) t1 where configid=#{id}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</sql> </sql>
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="oracle"> <sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.CONFIGID, t1.CONFIGNAME, t1.MODELFILE, t1.STATUS, t1.SYSTEMID FROM IBZDYNAMICMODELCONFIG t1 <![CDATA[ SELECT t1.CONFIGID, t1.CONFIGNAME, t1.DYNAINSTID, t1.MODELFILE, t1.STATUS, t1.SYSTEMID FROM IBZDYNAMICMODELCONFIG t1
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="oracle"> <sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.CONFIGID, t1.CONFIGNAME, t1.MODELFILE, t1.STATUS, t1.SYSTEMID FROM IBZDYNAMICMODELCONFIG t1 <![CDATA[ SELECT t1.CONFIGID, t1.CONFIGNAME, t1.DYNAINSTID, t1.MODELFILE, t1.STATUS, t1.SYSTEMID FROM IBZDYNAMICMODELCONFIG t1
]]> ]]>
</sql> </sql>
</mapper> </mapper>
......
...@@ -1852,6 +1852,20 @@ ...@@ -1852,6 +1852,20 @@
"key_field":0, "key_field":0,
"show_order":1000, "show_order":1000,
"major_field":0 "major_field":0
},
{
"fieldname":"DYNAINSTID" ,
"codename":"Dynainstid",
"field_logic_name":"动态实例标识",
"entity_name":"DYNAMIC_MODEL_CONFIG",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":1000,
"major_field":0
} }
], ],
"subEntitys":[ "subEntitys":[
......
...@@ -74,6 +74,15 @@ public class DynamicModelConfigDTO extends DTOBase implements Serializable { ...@@ -74,6 +74,15 @@ public class DynamicModelConfigDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String systemId; private String systemId;
/**
* 属性 [DYNAINSTID]
*
*/
@JSONField(name = "dynainstid")
@JsonProperty("dynainstid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String dynainstid;
/** /**
* 设置 [CONFIGNAME] * 设置 [CONFIGNAME]
...@@ -107,6 +116,14 @@ public class DynamicModelConfigDTO extends DTOBase implements Serializable { ...@@ -107,6 +116,14 @@ public class DynamicModelConfigDTO extends DTOBase implements Serializable {
this.modify("systemid",systemId); this.modify("systemid",systemId);
} }
/**
* 设置 [DYNAINSTID]
*/
public void setDynainstid(String dynainstid){
this.dynainstid = dynainstid ;
this.modify("dynainstid",dynainstid);
}
} }
......
...@@ -159,5 +159,6 @@ public class BladeVisualCategoryResource { ...@@ -159,5 +159,6 @@ public class BladeVisualCategoryResource {
} }
} }
...@@ -159,5 +159,6 @@ public class BladeVisualConfigResource { ...@@ -159,5 +159,6 @@ public class BladeVisualConfigResource {
} }
} }
...@@ -159,5 +159,6 @@ public class BladeVisualMapResource { ...@@ -159,5 +159,6 @@ public class BladeVisualMapResource {
} }
} }
...@@ -160,5 +160,6 @@ public class BladeVisualResource { ...@@ -160,5 +160,6 @@ public class BladeVisualResource {
} }
} }
...@@ -148,6 +148,7 @@ public class DstAPIResource { ...@@ -148,6 +148,7 @@ public class DstAPIResource {
} }
@ApiOperation(value = "根据微服务建立接口", tags = {"接口" }, notes = "根据微服务建立接口") @ApiOperation(value = "根据微服务建立接口", tags = {"接口" }, notes = "根据微服务建立接口")
@RequestMapping(method = RequestMethod.POST, value = "/dstmicroservices/{dstmicroservice_id}/dstapis") @RequestMapping(method = RequestMethod.POST, value = "/dstmicroservices/{dstmicroservice_id}/dstapis")
public ResponseEntity<DstAPIDTO> createByDstMicroservice(@PathVariable("dstmicroservice_id") String dstmicroservice_id, @RequestBody DstAPIDTO dstapidto) { public ResponseEntity<DstAPIDTO> createByDstMicroservice(@PathVariable("dstmicroservice_id") String dstmicroservice_id, @RequestBody DstAPIDTO dstapidto) {
......
...@@ -148,6 +148,7 @@ public class DstAppResource { ...@@ -148,6 +148,7 @@ public class DstAppResource {
} }
@ApiOperation(value = "根据系统建立应用", tags = {"应用" }, notes = "根据系统建立应用") @ApiOperation(value = "根据系统建立应用", tags = {"应用" }, notes = "根据系统建立应用")
@RequestMapping(method = RequestMethod.POST, value = "/dstsystems/{dstsystem_id}/dstapps") @RequestMapping(method = RequestMethod.POST, value = "/dstsystems/{dstsystem_id}/dstapps")
public ResponseEntity<DstAppDTO> createByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, @RequestBody DstAppDTO dstappdto) { public ResponseEntity<DstAppDTO> createByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, @RequestBody DstAppDTO dstappdto) {
......
...@@ -179,6 +179,7 @@ public class DstComponentResource { ...@@ -179,6 +179,7 @@ public class DstComponentResource {
} }
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-DstComponent-Create-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-DstComponent-Create-all')")
@ApiOperation(value = "根据应用建立组件", tags = {"组件" }, notes = "根据应用建立组件") @ApiOperation(value = "根据应用建立组件", tags = {"组件" }, notes = "根据应用建立组件")
@RequestMapping(method = RequestMethod.POST, value = "/dstapps/{dstapp_id}/dstcomponents") @RequestMapping(method = RequestMethod.POST, value = "/dstapps/{dstapp_id}/dstcomponents")
......
...@@ -179,5 +179,6 @@ public class DstConfigResource { ...@@ -179,5 +179,6 @@ public class DstConfigResource {
} }
} }
...@@ -197,5 +197,6 @@ public class DstDataSourceResource { ...@@ -197,5 +197,6 @@ public class DstDataSourceResource {
} }
} }
...@@ -148,6 +148,7 @@ public class DstMicroserviceResource { ...@@ -148,6 +148,7 @@ public class DstMicroserviceResource {
} }
@ApiOperation(value = "根据系统建立微服务", tags = {"微服务" }, notes = "根据系统建立微服务") @ApiOperation(value = "根据系统建立微服务", tags = {"微服务" }, notes = "根据系统建立微服务")
@RequestMapping(method = RequestMethod.POST, value = "/dstsystems/{dstsystem_id}/dstmicroservices") @RequestMapping(method = RequestMethod.POST, value = "/dstsystems/{dstsystem_id}/dstmicroservices")
public ResponseEntity<DstMicroserviceDTO> createByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, @RequestBody DstMicroserviceDTO dstmicroservicedto) { public ResponseEntity<DstMicroserviceDTO> createByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, @RequestBody DstMicroserviceDTO dstmicroservicedto) {
......
...@@ -160,6 +160,7 @@ public class DstRouterResource { ...@@ -160,6 +160,7 @@ public class DstRouterResource {
} }
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-DstRouter-Create-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-DstRouter-Create-all')")
@ApiOperation(value = "根据应用建立路由", tags = {"路由" }, notes = "根据应用建立路由") @ApiOperation(value = "根据应用建立路由", tags = {"路由" }, notes = "根据应用建立路由")
@RequestMapping(method = RequestMethod.POST, value = "/dstapps/{dstapp_id}/dstrouters") @RequestMapping(method = RequestMethod.POST, value = "/dstapps/{dstapp_id}/dstrouters")
......
...@@ -160,6 +160,7 @@ public class DstViewResource { ...@@ -160,6 +160,7 @@ public class DstViewResource {
} }
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-DstView-Create-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-DstView-Create-all')")
@ApiOperation(value = "根据应用建立页面", tags = {"页面" }, notes = "根据应用建立页面") @ApiOperation(value = "根据应用建立页面", tags = {"页面" }, notes = "根据应用建立页面")
@RequestMapping(method = RequestMethod.POST, value = "/dstapps/{dstapp_id}/dstviews") @RequestMapping(method = RequestMethod.POST, value = "/dstapps/{dstapp_id}/dstviews")
......
...@@ -178,5 +178,6 @@ public class DynamicModelConfigResource { ...@@ -178,5 +178,6 @@ public class DynamicModelConfigResource {
} }
} }
...@@ -159,6 +159,7 @@ public class MetaDataSetResource { ...@@ -159,6 +159,7 @@ public class MetaDataSetResource {
} }
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaDataSet-Create-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaDataSet-Create-all')")
@ApiOperation(value = "根据实体建立数据集", tags = {"数据集" }, notes = "根据实体建立数据集") @ApiOperation(value = "根据实体建立数据集", tags = {"数据集" }, notes = "根据实体建立数据集")
@RequestMapping(method = RequestMethod.POST, value = "/metaentities/{metaentity_id}/metadatasets") @RequestMapping(method = RequestMethod.POST, value = "/metaentities/{metaentity_id}/metadatasets")
......
...@@ -198,6 +198,7 @@ public class MetaEntityResource { ...@@ -198,6 +198,7 @@ public class MetaEntityResource {
} }
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaEntity-Create-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaEntity-Create-all')")
@ApiOperation(value = "根据系统建立实体", tags = {"实体" }, notes = "根据系统建立实体") @ApiOperation(value = "根据系统建立实体", tags = {"实体" }, notes = "根据系统建立实体")
@RequestMapping(method = RequestMethod.POST, value = "/dstsystems/{dstsystem_id}/metaentities") @RequestMapping(method = RequestMethod.POST, value = "/dstsystems/{dstsystem_id}/metaentities")
......
...@@ -160,6 +160,7 @@ public class MetaFieldResource { ...@@ -160,6 +160,7 @@ public class MetaFieldResource {
} }
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaField-Create-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaField-Create-all')")
@ApiOperation(value = "根据实体建立属性", tags = {"属性" }, notes = "根据实体建立属性") @ApiOperation(value = "根据实体建立属性", tags = {"属性" }, notes = "根据实体建立属性")
@RequestMapping(method = RequestMethod.POST, value = "/metaentities/{metaentity_id}/metafields") @RequestMapping(method = RequestMethod.POST, value = "/metaentities/{metaentity_id}/metafields")
......
...@@ -179,5 +179,6 @@ public class MetaModelResource { ...@@ -179,5 +179,6 @@ public class MetaModelResource {
} }
} }
...@@ -159,5 +159,6 @@ public class MetaModuleResource { ...@@ -159,5 +159,6 @@ public class MetaModuleResource {
} }
} }
...@@ -179,6 +179,7 @@ public class MetaRelationshipResource { ...@@ -179,6 +179,7 @@ public class MetaRelationshipResource {
} }
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaRelationship-Create-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaRelationship-Create-all')")
@ApiOperation(value = "根据实体建立实体关系", tags = {"实体关系" }, notes = "根据实体建立实体关系") @ApiOperation(value = "根据实体建立实体关系", tags = {"实体关系" }, notes = "根据实体建立实体关系")
@RequestMapping(method = RequestMethod.POST, value = "/metaentities/{metaentity_id}/metarelationships") @RequestMapping(method = RequestMethod.POST, value = "/metaentities/{metaentity_id}/metarelationships")
......
...@@ -293,7 +293,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator { ...@@ -293,7 +293,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
Map<String,String> permissionFiled=new HashMap<>(); Map<String,String> permissionFiled=new HashMap<>();
String orgField="orgid"; //组织属性 String orgField="orgid"; //组织属性
String orgDeptField="orgsecid"; //部门属性 String orgDeptField="orgsectorid"; //部门属性
String createManField="createman"; //创建人属性 String createManField="createman"; //创建人属性
DEFieldCacheMap.getFieldMap(entityBase.getClass().getName()); DEFieldCacheMap.getFieldMap(entityBase.getClass().getName());
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册