Skip to content

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

ibizdev提交

上级 75be5779
隐藏空白字符变更
内嵌 并排
正在显示 包含 263 行增加 和 45 行删除
app_web/src/service/ibzdict-item/ibzdict-item-service-base.ts
浏览文件 @ a95b013b
......@@ -151,12 +151,22 @@ export default class IBZDictItemServiceBase extends EntityService {
*/
public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzdict && true){
data[this.APPDEKEY] = null;
if(!data.srffrontuf || data.srffrontuf !== "1"){
data[this.APPDEKEY] = null;
}
if(data.srffrontuf){
delete data.srffrontuf;
}
return Http.getInstance().post(`/ibzdicts/${context.ibzdict}/ibzdictitems`,data,isloading);
}
let masterData:any = {};
Object.assign(data,masterData);
data[this.APPDEKEY] = null;
if(!data.srffrontuf || data.srffrontuf !== "1"){
data[this.APPDEKEY] = null;
}
if(data.srffrontuf){
delete data.srffrontuf;
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/ibzdictitems`,data,isloading);
return res;
......
app_web/src/service/ibzdict/ibzdict-service-base.ts
浏览文件 @ a95b013b
......@@ -81,15 +81,23 @@ export default class IBZDictServiceBase extends EntityService {
ibzdictitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdictitems') as any);
if(ibzdictitemsData && ibzdictitemsData.length && ibzdictitemsData.length > 0){
ibzdictitemsData.forEach((item:any) => {
if(Object.is(item.srffrontuf,"0")){
item.itemid = null;
}
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.itemid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdictitems = ibzdictitemsData;
Object.assign(data,masterData);
data[this.APPDEKEY] = null;
if(!data.srffrontuf || data.srffrontuf !== "1"){
data[this.APPDEKEY] = null;
}
if(data.srffrontuf){
delete data.srffrontuf;
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/ibzdicts`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdictitems',JSON.stringify(res.data.ibzdictitems));
......@@ -141,9 +149,12 @@ export default class IBZDictServiceBase extends EntityService {
ibzdictitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdictitems') as any);
if(ibzdictitemsData && ibzdictitemsData.length && ibzdictitemsData.length > 0){
ibzdictitemsData.forEach((item:any) => {
if(Object.is(item.srffrontuf,"0")){
item.itemid = null;
}
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.itemid = null;
}
delete item.srffrontuf;
}
});
}
}
......@@ -184,9 +195,12 @@ export default class IBZDictServiceBase extends EntityService {
ibzdictitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdictitems') as any);
if(ibzdictitemsData && ibzdictitemsData.length && ibzdictitemsData.length > 0){
ibzdictitemsData.forEach((item:any) => {
if(Object.is(item.srffrontuf,"0")){
item.itemid = null;
}
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.itemid = null;
}
delete item.srffrontuf;
}
});
}
}
......
app_web/src/widgets/ibzdict-item/default-searchform/default-searchform-service.ts
浏览文件 @ a95b013b
......@@ -146,6 +146,7 @@ export default class DefaultService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzdict-item/main-form/main-form-service.ts
浏览文件 @ a95b013b
......@@ -146,6 +146,7 @@ export default class MainService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzdict/default-searchform/default-searchform-service.ts
浏览文件 @ a95b013b
......@@ -146,6 +146,7 @@ export default class DefaultService extends ControlService {
});
}
/**
* 添加数据
*
......@@ -159,6 +160,7 @@ export default class DefaultService extends ControlService {
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{dictid: data.dictid, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
......
app_web/src/widgets/ibzdict/main-form/main-form-service.ts
浏览文件 @ a95b013b
......@@ -146,6 +146,7 @@ export default class MainService extends ControlService {
});
}
/**
* 添加数据
*
......@@ -159,6 +160,7 @@ export default class MainService extends ControlService {
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{dictid: data.dictid, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
......
ibzdict-app/ibzdict-app-web/src/main/resources/application-web-dev.yml
浏览文件 @ a95b013b
server:
port: 8080
spring:
application:
name: ibzdict-web
port: 8080
\ No newline at end of file
ibzdict-app/ibzdict-app-web/src/main/resources/application-web-prod.yml
浏览文件 @ a95b013b
server:
port: 8080
spring:
application:
name: ibzdict-web
#zuul网关路由设置
zuul:
routes:
......
ibzdict-app/ibzdict-app-web/src/main/resources/application.yml
浏览文件 @ a95b013b
spring:
profiles:
include: sys , web-prod
application:
name: ibzdict-web
ibzdict-boot/src/main/resources/application-dev.yml
浏览文件 @ a95b013b
server:
port: 8080
spring:
application:
name: ibzdict
main:
allow-bean-definition-overriding: true
port: 8080
\ No newline at end of file
ibzdict-boot/src/main/resources/application.yml
浏览文件 @ a95b013b
spring:
profiles:
include: sys , web-dev, dictapi-dev, dev
application:
name: ibzdict
main:
allow-bean-definition-overriding: true
\ No newline at end of file
ibzdict-core/src/main/resources/liquibase/changelog/20190625112530_init_ibizsys.xml 0 → 100644
浏览文件 @ a95b013b
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="Think (generated)" id="1561433044682-1">
<createTable remarks="文件" tableName="IBZFILE">
<column name="FILEID" type="VARCHAR2(100 BYTE)">
<constraints primaryKey="true" primaryKeyName="SYS_C00168533"/>
</column>
<column name="FILENAME" type="VARCHAR2(200 BYTE)"/>
<column name="FILEPATH" type="VARCHAR2(500 BYTE)"/>
<column name="FOLDER" type="VARCHAR2(20 BYTE)"/>
<column name="CREATEMAN" type="VARCHAR2(60 BYTE)"/>
<column name="CREATEDATE" type="date"/>
<column name="UPDATEMAN" type="VARCHAR2(60 BYTE)"/>
<column name="UPDATEDATE" type="date"/>
<column name="FILEEXT" type="VARCHAR2(10 BYTE)"/>
<column name="FILESIZE" type="INTEGER"/>
<column name="DIGESTCODE" type="VARCHAR2(64 BYTE)"/>
<column name="OWNERTYPE" type="VARCHAR2(100 BYTE)"/>
<column name="OWNERID" type="VARCHAR2(100 BYTE)"/>
<column name="MEMO" type="VARCHAR2(500 BYTE)"/>
<column name="RESERVER" type="VARCHAR2(100 BYTE)"/>
</createTable>
</changeSet>
<changeSet author="Think (generated)" id="1561433044682-2">
<createTable remarks="用户" tableName="IBZUSER">
<column name="USERID" type="VARCHAR2(100 BYTE)">
<constraints primaryKey="true" primaryKeyName="SYS_C00168531"/>
</column>
<column name="PERSONNAME" type="VARCHAR2(200 BYTE)"/>
<column name="USERNAME" type="VARCHAR2(200 BYTE)"/>
<column name="USERCODE" type="VARCHAR2(100 BYTE)"/>
<column name="LOGINNAME" type="VARCHAR2(100 BYTE)"/>
<column name="PASSWORD" type="VARCHAR2(100 BYTE)"/>
<column name="DOMAINS" type="VARCHAR2(100 BYTE)"/>
<column name="MDEPTID" type="VARCHAR2(100 BYTE)"/>
<column name="MDEPTCODE" type="VARCHAR2(100 BYTE)"/>
<column name="MDEPTNAME" type="VARCHAR2(200 BYTE)"/>
<column name="BCODE" type="VARCHAR2(100 BYTE)"/>
<column name="POSTID" type="VARCHAR2(100 BYTE)"/>
<column name="POSTCODE" type="VARCHAR2(100 BYTE)"/>
<column name="POSTNAME" type="VARCHAR2(200 BYTE)"/>
<column name="ORGID" type="VARCHAR2(100 BYTE)"/>
<column name="ORGCODE" type="VARCHAR2(100 BYTE)"/>
<column name="ORGNAME" type="VARCHAR2(200 BYTE)"/>
<column name="NICKNAME" type="VARCHAR2(36 BYTE)"/>
<column name="EMAIL" type="VARCHAR2(100 BYTE)"/>
<column name="AVATAR" type="VARCHAR2(100 BYTE)"/>
<column name="PHONE" type="VARCHAR2(100 BYTE)"/>
<column name="RESERVER" type="VARCHAR2(100 BYTE)"/>
<column name="USERICON" type="VARCHAR2(100 BYTE)"/>
<column name="SEX" type="VARCHAR2(10 BYTE)"/>
<column name="BIRTHDAY" type="date"/>
<column name="CERTCODE" type="VARCHAR2(36 BYTE)"/>
<column name="ADDR" type="VARCHAR2(200 BYTE)"/>
<column name="THEME" type="VARCHAR2(100 BYTE)"/>
<column name="FONTSIZE" type="VARCHAR2(10 BYTE)"/>
<column name="LANG" type="VARCHAR2(100 BYTE)"/>
<column name="MEMO" type="VARCHAR2(500 BYTE)"/>
</createTable>
</changeSet>
<changeSet author="Think (generated)" id="1561433044682-3">
<insert tableName="IBZUSER">
<column name="USERID" value="0100"/>
<column name="PERSONNAME" value="管理员"/>
<column name="USERNAME" value="系统管理员"/>
<column name="USERCODE" value="0100"/>
<column name="LOGINNAME" value="ibzadmin"/>
<column name="PASSWORD" value="123456"/>
<column name="DOMAINS" value="100000"/>
<column name="MDEPTID"/>
<column name="MDEPTCODE"/>
<column name="MDEPTNAME"/>
<column name="BCODE"/>
<column name="POSTID"/>
<column name="POSTCODE"/>
<column name="POSTNAME"/>
<column name="ORGID"/>
<column name="ORGCODE"/>
<column name="ORGNAME"/>
<column name="NICKNAME"/>
<column name="EMAIL"/>
<column name="AVATAR"/>
<column name="PHONE"/>
<column name="RESERVER"/>
<column name="USERICON"/>
<column name="SEX"/>
<column name="BIRTHDAY"/>
<column name="CERTCODE"/>
<column name="ADDR"/>
<column name="THEME"/>
<column name="FONTSIZE"/>
<column name="LANG"/>
<column name="MEMO"/>
</insert>
</changeSet>
</databaseChangeLog>
ibzdict-core/src/main/resources/liquibase/config/init_h2.sql 0 → 100644
浏览文件 @ a95b013b
create schema if not exists a_A_5ae9eb39a;
set schema a_A_5ae9eb39a;
ibzdict-core/src/main/resources/liquibase/empty.xml 0 → 100644
浏览文件 @ a95b013b
<?xml version="1.0" encoding="UTF-8"?>
<databaseChangeLog
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
<!--liquibase启动时需要指定chanlogxml，若无changelog，则使用此xml来初始化liquibase，使liquibase能正常启动 -->
</databaseChangeLog>
\ No newline at end of file
ibzdict-core/src/main/resources/liquibase/h2.xml 0 → 100644
浏览文件 @ a95b013b
<?xml version="1.0" encoding="UTF-8"?>
<databaseChangeLog
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
<include file="changelog/20190625112530_init_ibizsys.xml" relativeToChangelogFile="true"/>
<include file="changelog/20190817112530_init_ibizsys_audit.xml" relativeToChangelogFile="true"/>
<include file="h2_table.xml" relativeToChangelogFile="true"/>
<include file="view.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>
\ No newline at end of file
ibzdict-core/src/main/resources/liquibase/h2_table.xml 0 → 100644
浏览文件 @ a95b013b
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<!--输出实体[IBZDICT]数据结构 -->
<changeSet author="a_A_5ae9eb39a" id="tab-ibzdict-39-1">
<createTable tableName="IBZDICT">
<column name="IBZDICTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZDICT_IBZDICTID"/>
</column>
<column name="IBZDICTNAME" remarks="" type="VARCHAR(200)">
</column>
<column name="ENABLE" remarks="" type="INT">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
<column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column>
<column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
</column>
</createTable>
</changeSet>
<!--输出实体[IBZDICTITEM]数据结构 -->
<changeSet author="a_A_5ae9eb39a" id="tab-ibzdictitem-68-2">
<createTable tableName="IBZDICTITEM">
<column name="IBZDICTITEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZDICTITEM_IBZDICTITEMID"/>
</column>
<column name="IBZDICTITEMNAME" remarks="" type="VARCHAR(200)">
</column>
<column name="DICTITEMVAL" remarks="" type="VARCHAR(30)">
</column>
<column name="DICTID" remarks="" type="VARCHAR(100)">
</column>
<column name="PITEMVAL" remarks="" type="VARCHAR(100)">
</column>
<column name="ITEMFILTER" remarks="" type="VARCHAR(500)">
</column>
<column name="ITEMCLS" remarks="" type="VARCHAR(100)">
</column>
<column name="ITEMICON" remarks="" type="VARCHAR(100)">
</column>
<column name="SHOWORDER" remarks="" type="INT">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
<column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column>
<column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
</column>
</createTable>
</changeSet>
<!--输出实体[IBZDICT]外键关系 -->
<!--输出实体[IBZDICTITEM]外键关系 -->
<changeSet author="a_A_5ae9eb39a" id="fk-ibzdictitem-68-3">
<addForeignKeyConstraint baseColumnNames="DICTID" baseTableName="IBZDICTITEM" constraintName="DER1N_IBZDICTITEM_IBZDICT_DICT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBZDICTID" referencedTableName="IBZDICT" validate="true"/>
</changeSet>
</databaseChangeLog>
ibzdict-core/src/main/resources/liquibase/master.xml 0 → 100644
浏览文件 @ a95b013b
<?xml version="1.0" encoding="UTF-8"?>
<databaseChangeLog
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
<includeAll path="liquibase/changelog/"/>
<include file="view.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>
\ No newline at end of file
ibzdict-core/src/main/resources/liquibase/master_table.xml 0 → 100644
浏览文件 @ a95b013b
<?xml version="1.0" encoding="UTF-8"?>
<databaseChangeLog
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
<includeAll path="liquibase/changelog/"/>
</databaseChangeLog>
\ No newline at end of file
ibzdict-core/src/main/resources/liquibase/rollback/README.md 0 → 100644
浏览文件 @ a95b013b
此文件只用于让模板能发出[rollback]文件夹，无实际用途
\ No newline at end of file
ibzdict-core/src/main/resources/liquibase/view.xml 0 → 100644
浏览文件 @ a95b013b
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
</databaseChangeLog>
ibzdict-provider/ibzdict-provider-dictapi/src/main/resources/application-dictapi-dev.yml
浏览文件 @ a95b013b
server:
port: 8081
spring:
application:
name: ibzdict-dictapi
\ No newline at end of file
port: 8081
\ No newline at end of file
ibzdict-provider/ibzdict-provider-dictapi/src/main/resources/application-dictapi-prod.yml
浏览文件 @ a95b013b
server:
port: 8081
spring:
application:
name: ibzdict-dictapi
\ No newline at end of file
ibzdict-provider/ibzdict-provider-dictapi/src/main/resources/application.yml
浏览文件 @ a95b013b
spring:
profiles:
include: sys , dictapi-prod
application:
name: ibzdict-dictapi
\ No newline at end of file
ibzdict-util/src/main/resources/application-sys.yml
浏览文件 @ a95b013b
#nacos配置中心、数据源
spring:
cloud:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或