Skip to content

I
ibzou
提交 cd22229b 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

zoo457790531 发布系统代码 [ibz-ou，统一组织单位]

上级 bbb7c528
显示空白字符变更
内嵌 并排
正在显示 包含 58 行增加 和 26 行删除
app_web/src/locale/lanres/entities/sys-employee/sys-employee_BO_CN_base.ts
浏览文件 @ cd22229b
......@@ -120,6 +120,7 @@ function getLocaleResourceBase(){
usercode: commonLogic.appcommonhandle("用户工号",null),
personname: commonLogic.appcommonhandle("姓名",null),
loginname: commonLogic.appcommonhandle("登录名",null),
password: commonLogic.appcommonhandle("密码",null),
orgid: commonLogic.appcommonhandle("单位",null),
orgname: commonLogic.appcommonhandle("单位",null),
mdeptid: commonLogic.appcommonhandle("主部门",null),
......
app_web/src/locale/lanres/entities/sys-employee/sys-employee_en_US_base.ts
浏览文件 @ cd22229b
......@@ -120,6 +120,7 @@ function getLocaleResourceBase(){
usercode: commonLogic.appcommonhandle("用户工号",null),
personname: commonLogic.appcommonhandle("姓名",null),
loginname: commonLogic.appcommonhandle("登录名",null),
password: commonLogic.appcommonhandle("密码",null),
orgid: commonLogic.appcommonhandle("单位",null),
orgname: commonLogic.appcommonhandle("单位",null),
mdeptid: commonLogic.appcommonhandle("主部门",null),
......
app_web/src/locale/lanres/entities/sys-employee/sys-employee_zh_CN_base.ts
浏览文件 @ cd22229b
......@@ -120,6 +120,7 @@ function getLocaleResourceBase(){
usercode: commonLogic.appcommonhandle("用户工号",null),
personname: commonLogic.appcommonhandle("姓名",null),
loginname: commonLogic.appcommonhandle("登录名",null),
password: commonLogic.appcommonhandle("密码",null),
orgid: commonLogic.appcommonhandle("单位",null),
orgname: commonLogic.appcommonhandle("单位",null),
mdeptid: commonLogic.appcommonhandle("主部门",null),
......
app_web/src/widgets/sys-employee/main-form/main-form-base.vue
浏览文件 @ cd22229b
......@@ -745,6 +745,7 @@ export default class MainBase extends Vue implements ControlInterface {
usercode: null,
personname: null,
loginname: null,
password: null,
orgid: null,
orgname: null,
mdeptid: null,
......@@ -1047,6 +1048,8 @@ export default class MainBase extends Vue implements ControlInterface {
personname: new FormItemModel({ caption: '姓名', detailType: 'FORMITEM', name: 'personname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
,
loginname: new FormItemModel({ caption: '登录名', detailType: 'FORMITEM', name: 'loginname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 1 })
,
password: new FormItemModel({ caption: '密码', detailType: 'FORMITEM', name: 'password', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
orgid: new FormItemModel({ caption: '单位', detailType: 'FORMITEM', name: 'orgid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 1 })
,
......@@ -1232,6 +1235,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'loginname', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 password 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.password')
onPasswordChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'password', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 orgid 值
*
......@@ -1608,6 +1623,7 @@ export default class MainBase extends Vue implements ControlInterface {
if (Object.is(name, '') || Object.is(name, 'pdeptcheck')) {
......
app_web/src/widgets/sys-employee/main-form/main-form-model.ts
浏览文件 @ cd22229b
......@@ -70,6 +70,11 @@ export default class MainModel {
prop: 'loginname',
dataType: 'TEXT',
},
{
name: 'password',
prop: 'password',
dataType: 'TEXT',
},
{
name: 'orgid',
prop: 'orgid',
......
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ cd22229b
......@@ -4,7 +4,7 @@
<!--输出实体[SYS_DEPT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_dept-79-1">
<changeSet author="root" id="tab-sys_dept-79-1">
<createTable tableName="IBZDEPT">
<column name="DEPTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_DEPT_DEPTID"/>
......@@ -44,7 +44,7 @@
<!--输出实体[SYS_DEPTMEMBER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_deptmember-35-2">
<changeSet author="root" id="tab-sys_deptmember-35-2">
<createTable tableName="IBZDEPTMEMBER">
<column name="MEMBERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_DEPTMEMBER_MEMBERID"/>
......@@ -62,7 +62,7 @@
<!--输出实体[SYS_EMP]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_emp-85-3">
<changeSet author="root" id="tab-sys_emp-86-3">
<createTable tableName="IBZEMP">
<column name="USERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_EMP_USERID"/>
......@@ -142,7 +142,7 @@
<!--输出实体[SYS_ORG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_org-49-4">
<changeSet author="root" id="tab-sys_org-49-4">
<createTable tableName="IBZORG">
<column name="ORGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ORG_ORGID"/>
......@@ -174,7 +174,7 @@
<!--输出实体[SYS_POST]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_post-25-5">
<changeSet author="root" id="tab-sys_post-25-5">
<createTable tableName="IBZPOST">
<column name="POSTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_POST_POSTID"/>
......@@ -192,7 +192,7 @@
<!--输出实体[SYS_TEAM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_team-25-6">
<changeSet author="root" id="tab-sys_team-25-6">
<createTable tableName="IBZTEAM">
<column name="TEAMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_TEAM_TEAMID"/>
......@@ -208,7 +208,7 @@
<!--输出实体[SYS_TEAMMEMBER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_teammember-30-7">
<changeSet author="root" id="tab-sys_teammember-30-7">
<createTable tableName="IBZTEAMMEMBER">
<column name="TEAMMEMBERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_TEAMMEMBER_TEAMMEMBERID"/>
......@@ -225,46 +225,46 @@
</changeSet>
<!--输出实体[SYS_DEPT]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_dept-79-8">
<changeSet author="root" id="fk-sys_dept-79-8">
<addForeignKeyConstraint baseColumnNames="PDEPTID" baseTableName="IBZDEPT" constraintName="DER1N_SYS_DEPT_SYS_DEPT_PDEPTI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-sys_dept-79-9">
<changeSet author="root" id="fk-sys_dept-79-9">
<addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZDEPT" constraintName="DER1N_SYS_DEPT_SYS_ORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
</changeSet>
<!--输出实体[SYS_DEPTMEMBER]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-35-10">
<changeSet author="root" id="fk-sys_deptmember-35-10">
<addForeignKeyConstraint baseColumnNames="DEPTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_SYS_DEPTMEMBER_SYS_DEPT_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-35-11">
<changeSet author="root" id="fk-sys_deptmember-35-11">
<addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_SYS_DEPTMEMBER_SYS_EMP_U" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-35-12">
<changeSet author="root" id="fk-sys_deptmember-35-12">
<addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_SYS_DEPTMEMBER_SYS_POST_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
</changeSet>
<!--输出实体[SYS_EMP]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_emp-85-13">
<changeSet author="root" id="fk-sys_emp-86-13">
<addForeignKeyConstraint baseColumnNames="MDEPTID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_DEPT_MDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-sys_emp-85-14">
<changeSet author="root" id="fk-sys_emp-86-14">
<addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_ORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-sys_emp-85-15">
<changeSet author="root" id="fk-sys_emp-86-15">
<addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_POST_POSTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
</changeSet>
<!--输出实体[SYS_ORG]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_org-49-16">
<changeSet author="root" id="fk-sys_org-49-16">
<addForeignKeyConstraint baseColumnNames="PORGID" baseTableName="IBZORG" constraintName="DER1N_SYS_ORG_SYS_ORG_PORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
</changeSet>
<!--输出实体[SYS_POST]外键关系 -->
<!--输出实体[SYS_TEAM]外键关系 -->
<!--输出实体[SYS_TEAMMEMBER]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_teammember-30-17">
<changeSet author="root" id="fk-sys_teammember-30-17">
<addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_EMP_U" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-sys_teammember-30-18">
<changeSet author="root" id="fk-sys_teammember-30-18">
<addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_POST_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-sys_teammember-30-19">
<changeSet author="root" id="fk-sys_teammember-30-19">
<addForeignKeyConstraint baseColumnNames="TEAMID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_TEAM_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TEAMID" referencedTableName="IBZTEAM" validate="true"/>
</changeSet>
......
ibzou-util/src/main/java/cn/ibizlab/util/aspect/DELogicAspect.java
浏览文件 @ cd22229b
......@@ -78,12 +78,14 @@ public class DELogicAspect {
EntityBase entity = null;
if ("remove".equalsIgnoreCase(action) || "get".equalsIgnoreCase(action)) {
entity = getEntity(service.getClass());
if(!ObjectUtils.isEmpty(entity)) {
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;
}
......@@ -187,7 +189,7 @@ public class DELogicAspect {
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");
throw new BadRequestAlertException(String.format("编译实体处理逻辑 [%s] 发生异常, %s", logic.getName(), results.getMessages()), "DELogicAspect", "reloadLogic");
}
KieContainer kieContainer = kieServices.newKieContainer(kieServices.getRepository().getDefaultReleaseId());
logic.setContainer(kieContainer);
......@@ -290,6 +292,7 @@ public class DELogicAspect {
logic.setMd5(getMd5(refFiles));
}
} catch (Exception e) {
log.error("执行处理逻辑失败"+e);
} finally {
try {
if (reader != null) {
......@@ -299,6 +302,7 @@ public class DELogicAspect {
bpmn.close();
}
} catch (Exception e) {
log.error("执行处理逻辑失败"+e);
}
}
return logic;
......@@ -326,7 +330,8 @@ public class DELogicAspect {
if(!ObjectUtils.isEmpty(service.getSuperclass()) && !service.getSuperclass().getName().equals(Object.class.getName())) {
return getEntity(service.getSuperclass());
}
throw new BadRequestAlertException("获取实体信息失败", "DELogicAspect", "getEntity");
log.error("获取实体信息失败，未能在[{}]中找到参数为实体类对象的行为，如create.update等",service.getSimpleName());
return null;
}
/**
......@@ -347,6 +352,7 @@ public class DELogicAspect {
buffer.append(strBpmn);
}
} catch (Exception e) {
log.error("处理逻辑版本检查失败"+e);
} finally {
if (bpmnFile != null) {
bpmnFile.close();
......@@ -359,6 +365,7 @@ public class DELogicAspect {
return null;
}
} catch (Exception e) {
log.error("处理逻辑版本检查失败"+e);
return null;
}
}
......@@ -418,6 +425,7 @@ public class DELogicAspect {
FileUtils.copyToFile(in, bpmn);
}
} catch (IOException e) {
log.error("执行处理逻辑失败，无法获取逻辑文件"+e);
} finally {
if (in != null) {
try {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或