Skip to content

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

zhouweidong 发布系统代码 [ibiz-rt，ibizlab-runtime]

上级 8adbc1e0
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1252 行增加 和 482 行删除
app_Web/src/components/app-data-upload/app-data-upload.vue
浏览文件 @ eb0193d4
......@@ -52,6 +52,7 @@ import CodeListService from "@/codelist/codelist-service";
import EntityService from '@/service/entity-service';
import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
import { Environment } from '@/environments/environment';
import moment from "moment";
@Component({
})
......@@ -395,11 +396,11 @@ export default class AppDataUploadView extends Vue {
let reader = new FileReader();
reader.onload = (e:any) => {
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 list1 = this.getFirstRow(this.workBookData);
xlsxData = this.AddXlsxData(xlsxData, list1);
this.importDataArray = JSON.parse(JSON.stringify(xlsxData));
this.importDataArray = this.$util.deepCopy(xlsxData);
(this.$refs.inputUpLoad as any).value = '';
};
reader.readAsBinaryString(f);
......@@ -505,6 +506,11 @@ export default class AppDataUploadView extends Vue {
data.forEach((item:any) =>{
let curObject: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){
let codelistTag:string = this.allFieldMap.get(ele).codelist.tag;
let codelistIsNumber:boolean = this.allFieldMap.get(ele).codelist.isnumber;
......
app_Web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue
浏览文件 @ eb0193d4
......@@ -12,8 +12,8 @@
:filterable="filterable"
@on-open-change="onClick"
: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">
<Checkbox :value = "(currentVal.indexOf(item.value.toString()))==-1?false:true">
<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 ? item.value.toString() : '')) == -1 ? false : true">
{{Object.is(codelistType,'STATIC') ? $t('codelist.'+tag+'.'+item.value) : item.text}}
</Checkbox>
</i-option>
......
app_Web/src/pages/ou/sys-department-tree-exp-view/sys-department-tree-exp-view.less
浏览文件 @ eb0193d4
......@@ -6,6 +6,7 @@
}
.sys-department-tree-exp-view{
position: relative;
height: 100%;
}
app_Web/src/pages/ou/sys-organization-tree-exp-view/sys-organization-tree-exp-view.less
浏览文件 @ eb0193d4
......@@ -6,6 +6,7 @@
}
.sys-organization-tree-exp-view{
position: relative;
height: 100%;
}
app_Web/src/widgets/jobs-info/main-form/main-form-base.vue
浏览文件 @ eb0193d4
......@@ -176,7 +176,7 @@
<i-col v-show="detailsModel.create_time.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='create_time' :itemRules="this.rules().create_time" class='' :caption="$t('entities.jobsinfo.main_form.details.create_time')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.create_time.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='create_time' :value="data.create_time" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
<app-span name='create_time' :value="data.create_time" dataType="DATETIME" unitName="" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
......@@ -186,7 +186,7 @@
<i-col v-show="detailsModel.update_time.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='update_time' :itemRules="this.rules().update_time" class='' :caption="$t('entities.jobsinfo.main_form.details.update_time')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.update_time.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='update_time' :value="data.update_time" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
<app-span name='update_time' :value="data.update_time" dataType="DATETIME" unitName="" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
......
app_Web/src/widgets/jobs-log/main-form/main-form-base.vue
浏览文件 @ eb0193d4
......@@ -106,7 +106,7 @@
<i-col v-show="detailsModel.create_time.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='create_time' :itemRules="this.rules().create_time" class='' :caption="$t('entities.jobslog.main_form.details.create_time')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.create_time.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='create_time' :value="data.create_time" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
<app-span name='create_time' :value="data.create_time" dataType="DATETIME" unitName="" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
......
app_Web/src/widgets/msg-template/main-form/main-form-base.vue
浏览文件 @ eb0193d4
......@@ -36,7 +36,7 @@
<i-col v-show="detailsModel.open_type.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='open_type' :itemRules="this.rules().open_type" class='' :caption="$t('entities.msgtemplate.main_form.details.open_type')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.open_type.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='open_type' :value="data.open_type" dataType="PICKUPDATA" :precision="0"
<app-span name='open_type' :value="data.open_type" dataType="PICKUPDATA" unitName="" :precision="0"
tag='NotifyOpenAccessType' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
......
app_Web/src/widgets/sys-department/main-form/main-form-base.vue
浏览文件 @ eb0193d4
......@@ -144,7 +144,7 @@
<i-col v-show="detailsModel.createdate.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='createdate' :itemRules="this.rules().createdate" class='' :caption="$t('entities.sysdepartment.main_form.details.createdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createdate.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='createdate' :value="data.createdate" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
<app-span name='createdate' :value="data.createdate" dataType="DATETIME" unitName="" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
......@@ -154,7 +154,7 @@
<i-col v-show="detailsModel.updatedate.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='updatedate' :itemRules="this.rules().updatedate" class='' :caption="$t('entities.sysdepartment.main_form.details.updatedate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updatedate.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='updatedate' :value="data.updatedate" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
<app-span name='updatedate' :value="data.updatedate" dataType="DATETIME" unitName="" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
......
app_Web/src/widgets/sys-employee/main-form/main-form-base.vue
浏览文件 @ eb0193d4
......@@ -112,7 +112,7 @@
<i-col v-show="detailsModel.postcode.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='postcode' :itemRules="this.rules().postcode" class='' :caption="$t('entities.sysemployee.main_form.details.postcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.postcode.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='postcode' :value="data.postcode" dataType="PICKUPDATA" :precision="0"
<app-span name='postcode' :value="data.postcode" dataType="PICKUPDATA" unitName="" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
......
app_Web/src/widgets/sys-organization/main-form/main-form-base.vue
浏览文件 @ eb0193d4
......@@ -102,7 +102,7 @@
<i-col v-show="detailsModel.createdate.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='createdate' :itemRules="this.rules().createdate" class='' :caption="$t('entities.sysorganization.main_form.details.createdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createdate.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='createdate' :value="data.createdate" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
<app-span name='createdate' :value="data.createdate" dataType="DATETIME" unitName="" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
......@@ -112,7 +112,7 @@
<i-col v-show="detailsModel.updatedate.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='updatedate' :itemRules="this.rules().updatedate" class='' :caption="$t('entities.sysorganization.main_form.details.updatedate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updatedate.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='updatedate' :value="data.updatedate" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
<app-span name='updatedate' :value="data.updatedate" dataType="DATETIME" unitName="" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
......
app_Web/src/widgets/sys-user-role/main-form/main-form-base.vue
浏览文件 @ eb0193d4
......@@ -22,7 +22,7 @@
<i-col v-show="detailsModel.sys_user_roleid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='sys_user_roleid' :itemRules="this.rules().sys_user_roleid" class='' :caption="$t('entities.sysuserrole.main_form.details.sys_user_roleid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_user_roleid.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='sys_user_roleid' :value="data.sys_user_roleid" dataType="GUID" :precision="0"
<app-span name='sys_user_roleid' :value="data.sys_user_roleid" dataType="GUID" unitName="" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
......
app_Web/src/widgets/wfmember/main-form/main-form-base.vue
浏览文件 @ eb0193d4
......@@ -36,7 +36,7 @@
<i-col v-show="detailsModel.orgname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='orgname' :itemRules="this.rules().orgname" class='' :caption="$t('entities.wfmember.main_form.details.orgname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='orgname' :value="data.orgname" dataType="PICKUPDATA" :precision="0"
<app-span name='orgname' :value="data.orgname" dataType="PICKUPDATA" unitName="" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
......@@ -46,7 +46,7 @@
<i-col v-show="detailsModel.mdeptname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='mdeptname' :itemRules="this.rules().mdeptname" class='' :caption="$t('entities.wfmember.main_form.details.mdeptname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.mdeptname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='mdeptname' :value="data.mdeptname" dataType="PICKUPDATA" :precision="0"
<app-span name='mdeptname' :value="data.mdeptname" dataType="PICKUPDATA" unitName="" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
......
ibzrt-core/src/main/java/cn/ibizlab/core/dict/client/DictCatalogFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class DictCatalogFallback implements DictCatalogFeignClient {
}
public DictCatalog saveEntity(DictCatalog dictcatalog) {
return null;
}
public Boolean save(DictCatalog dictcatalog) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/dict/client/DictCatalogFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface DictCatalogFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/dictcatalogs/save")
Boolean save(@RequestBody DictCatalog dictcatalog);
DictCatalog saveEntity(@RequestBody DictCatalog dictcatalog);
default Boolean save(@RequestBody DictCatalog dictcatalog) { return saveEntity(dictcatalog)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/dictcatalogs/savebatch")
Boolean saveBatch(@RequestBody List<DictCatalog> dictcatalogs);
......
ibzrt-core/src/main/java/cn/ibizlab/core/dict/client/DictOptionFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class DictOptionFallback implements DictOptionFeignClient {
}
public DictOption saveEntity(DictOption dictoption) {
return null;
}
public Boolean save(DictOption dictoption) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/dict/client/DictOptionFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface DictOptionFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/dictoptions/save")
Boolean save(@RequestBody DictOption dictoption);
DictOption saveEntity(@RequestBody DictOption dictoption);
default Boolean save(@RequestBody DictOption dictoption) { return saveEntity(dictoption)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/dictoptions/savebatch")
Boolean saveBatch(@RequestBody List<DictOption> dictoptions);
......
ibzrt-core/src/main/java/cn/ibizlab/core/dict/service/impl/DictCatalogServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class DictCatalogServiceImpl implements IDictCatalogService {
@Override
@Transactional
public boolean save(DictCatalog et) {
if(et.getId()==null) et.setId((String)et.getDefaultKey(true));
if(!dictCatalogFeignClient.save(et))
return false;
DictCatalog rt = dictCatalogFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/dict/service/impl/DictOptionServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class DictOptionServiceImpl implements IDictOptionService {
@Override
@Transactional
public boolean save(DictOption et) {
if(et.getValueKey()==null) et.setValueKey((String)et.getDefaultKey(true));
if(!dictOptionFeignClient.save(et))
return false;
DictOption rt = dictOptionFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/disk/client/SDFileFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SDFileFallback implements SDFileFeignClient {
}
public SDFile saveEntity(SDFile sdfile) {
return null;
}
public Boolean save(SDFile sdfile) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/disk/client/SDFileFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SDFileFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/sdfiles/save")
Boolean save(@RequestBody SDFile sdfile);
SDFile saveEntity(@RequestBody SDFile sdfile);
default Boolean save(@RequestBody SDFile sdfile) { return saveEntity(sdfile)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/sdfiles/savebatch")
Boolean saveBatch(@RequestBody List<SDFile> sdfiles);
......
ibzrt-core/src/main/java/cn/ibizlab/core/disk/service/impl/SDFileServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class SDFileServiceImpl implements ISDFileService {
@Override
@Transactional
public boolean save(SDFile et) {
if(et.getId()==null) et.setId((String)et.getDefaultKey(true));
if(!sDFileFeignClient.save(et))
return false;
SDFile rt = sDFileFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/notify/client/MsgBodyFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class MsgBodyFallback implements MsgBodyFeignClient {
}
public MsgBody saveEntity(MsgBody msgbody) {
return null;
}
public Boolean save(MsgBody msgbody) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/notify/client/MsgBodyFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface MsgBodyFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/msgbodies/save")
Boolean save(@RequestBody MsgBody msgbody);
MsgBody saveEntity(@RequestBody MsgBody msgbody);
default Boolean save(@RequestBody MsgBody msgbody) { return saveEntity(msgbody)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/msgbodies/savebatch")
Boolean saveBatch(@RequestBody List<MsgBody> msgbodies);
......
ibzrt-core/src/main/java/cn/ibizlab/core/notify/client/MsgOpenAccessFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class MsgOpenAccessFallback implements MsgOpenAccessFeignClient {
}
public MsgOpenAccess saveEntity(MsgOpenAccess msgopenaccess) {
return null;
}
public Boolean save(MsgOpenAccess msgopenaccess) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/notify/client/MsgOpenAccessFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface MsgOpenAccessFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/msgopenaccesses/save")
Boolean save(@RequestBody MsgOpenAccess msgopenaccess);
MsgOpenAccess saveEntity(@RequestBody MsgOpenAccess msgopenaccess);
default Boolean save(@RequestBody MsgOpenAccess msgopenaccess) { return saveEntity(msgopenaccess)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/msgopenaccesses/savebatch")
Boolean saveBatch(@RequestBody List<MsgOpenAccess> msgopenaccesses);
......
ibzrt-core/src/main/java/cn/ibizlab/core/notify/client/MsgTemplateFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class MsgTemplateFallback implements MsgTemplateFeignClient {
}
public MsgTemplate saveEntity(MsgTemplate msgtemplate) {
return null;
}
public Boolean save(MsgTemplate msgtemplate) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/notify/client/MsgTemplateFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface MsgTemplateFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/msgtemplates/save")
Boolean save(@RequestBody MsgTemplate msgtemplate);
MsgTemplate saveEntity(@RequestBody MsgTemplate msgtemplate);
default Boolean save(@RequestBody MsgTemplate msgtemplate) { return saveEntity(msgtemplate)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/msgtemplates/savebatch")
Boolean saveBatch(@RequestBody List<MsgTemplate> msgtemplates);
......
ibzrt-core/src/main/java/cn/ibizlab/core/notify/client/MsgUserAccountFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class MsgUserAccountFallback implements MsgUserAccountFeignClient {
}
public MsgUserAccount saveEntity(MsgUserAccount msguseraccount) {
return null;
}
public Boolean save(MsgUserAccount msguseraccount) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/notify/client/MsgUserAccountFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface MsgUserAccountFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/msguseraccounts/save")
Boolean save(@RequestBody MsgUserAccount msguseraccount);
MsgUserAccount saveEntity(@RequestBody MsgUserAccount msguseraccount);
default Boolean save(@RequestBody MsgUserAccount msguseraccount) { return saveEntity(msguseraccount)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/msguseraccounts/savebatch")
Boolean saveBatch(@RequestBody List<MsgUserAccount> msguseraccounts);
......
ibzrt-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgBodyServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class MsgBodyServiceImpl implements IMsgBodyService {
@Override
@Transactional
public boolean save(MsgBody et) {
if(et.getMsgId()==null) et.setMsgId((String)et.getDefaultKey(true));
if(!msgBodyFeignClient.save(et))
return false;
MsgBody rt = msgBodyFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgOpenAccessServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class MsgOpenAccessServiceImpl implements IMsgOpenAccessService {
@Override
@Transactional
public boolean save(MsgOpenAccess et) {
if(et.getId()==null) et.setId((String)et.getDefaultKey(true));
if(!msgOpenAccessFeignClient.save(et))
return false;
MsgOpenAccess rt = msgOpenAccessFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgTemplateServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class MsgTemplateServiceImpl implements IMsgTemplateService {
@Override
@Transactional
public boolean save(MsgTemplate et) {
if(et.getTid()==null) et.setTid((String)et.getDefaultKey(true));
if(!msgTemplateFeignClient.save(et))
return false;
MsgTemplate rt = msgTemplateFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgUserAccountServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class MsgUserAccountServiceImpl implements IMsgUserAccountService {
@Override
@Transactional
public boolean save(MsgUserAccount et) {
if(et.getId()==null) et.setId((String)et.getDefaultKey(true));
if(!msgUserAccountFeignClient.save(et))
return false;
MsgUserAccount rt = msgUserAccountFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/SysDepartmentFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysDepartmentFallback implements SysDepartmentFeignClient {
}
public SysDepartment saveEntity(SysDepartment sysdepartment) {
return null;
}
public Boolean save(SysDepartment sysdepartment) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/SysDepartmentFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysDepartmentFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/sysdepartments/save")
Boolean save(@RequestBody SysDepartment sysdepartment);
SysDepartment saveEntity(@RequestBody SysDepartment sysdepartment);
default Boolean save(@RequestBody SysDepartment sysdepartment) { return saveEntity(sysdepartment)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/sysdepartments/savebatch")
Boolean saveBatch(@RequestBody List<SysDepartment> sysdepartments);
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/SysDeptMemberFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysDeptMemberFallback implements SysDeptMemberFeignClient {
}
public SysDeptMember saveEntity(SysDeptMember sysdeptmember) {
return null;
}
public Boolean save(SysDeptMember sysdeptmember) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/SysDeptMemberFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysDeptMemberFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/sysdeptmembers/save")
Boolean save(@RequestBody SysDeptMember sysdeptmember);
SysDeptMember saveEntity(@RequestBody SysDeptMember sysdeptmember);
default Boolean save(@RequestBody SysDeptMember sysdeptmember) { return saveEntity(sysdeptmember)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/sysdeptmembers/savebatch")
Boolean saveBatch(@RequestBody List<SysDeptMember> sysdeptmembers);
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/SysEmployeeFallback.java
浏览文件 @ eb0193d4
......@@ -65,6 +65,10 @@ public class SysEmployeeFallback implements SysEmployeeFeignClient {
return null;
}
public SysEmployee saveEntity(SysEmployee sysemployee) {
return null;
}
public Boolean save(SysEmployee sysemployee) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/SysEmployeeFeignClient.java
浏览文件 @ eb0193d4
......@@ -61,7 +61,9 @@ public interface SysEmployeeFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/sysemployees/save")
Boolean save(@RequestBody SysEmployee sysemployee);
SysEmployee saveEntity(@RequestBody SysEmployee sysemployee);
default Boolean save(@RequestBody SysEmployee sysemployee) { return saveEntity(sysemployee)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/sysemployees/savebatch")
Boolean saveBatch(@RequestBody List<SysEmployee> sysemployees);
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/SysOrganizationFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysOrganizationFallback implements SysOrganizationFeignClient {
}
public SysOrganization saveEntity(SysOrganization sysorganization) {
return null;
}
public Boolean save(SysOrganization sysorganization) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/SysOrganizationFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysOrganizationFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/save")
Boolean save(@RequestBody SysOrganization sysorganization);
SysOrganization saveEntity(@RequestBody SysOrganization sysorganization);
default Boolean save(@RequestBody SysOrganization sysorganization) { return saveEntity(sysorganization)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/savebatch")
Boolean saveBatch(@RequestBody List<SysOrganization> sysorganizations);
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/SysPostFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysPostFallback implements SysPostFeignClient {
}
public SysPost saveEntity(SysPost syspost) {
return null;
}
public Boolean save(SysPost syspost) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/SysPostFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysPostFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/sysposts/save")
Boolean save(@RequestBody SysPost syspost);
SysPost saveEntity(@RequestBody SysPost syspost);
default Boolean save(@RequestBody SysPost syspost) { return saveEntity(syspost)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/sysposts/savebatch")
Boolean saveBatch(@RequestBody List<SysPost> sysposts);
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/SysTeamFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysTeamFallback implements SysTeamFeignClient {
}
public SysTeam saveEntity(SysTeam systeam) {
return null;
}
public Boolean save(SysTeam systeam) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/SysTeamFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysTeamFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/systeams/save")
Boolean save(@RequestBody SysTeam systeam);
SysTeam saveEntity(@RequestBody SysTeam systeam);
default Boolean save(@RequestBody SysTeam systeam) { return saveEntity(systeam)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/systeams/savebatch")
Boolean saveBatch(@RequestBody List<SysTeam> systeams);
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/SysTeamMemberFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysTeamMemberFallback implements SysTeamMemberFeignClient {
}
public SysTeamMember saveEntity(SysTeamMember systeammember) {
return null;
}
public Boolean save(SysTeamMember systeammember) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/SysTeamMemberFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysTeamMemberFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/systeammembers/save")
Boolean save(@RequestBody SysTeamMember systeammember);
SysTeamMember saveEntity(@RequestBody SysTeamMember systeammember);
default Boolean save(@RequestBody SysTeamMember systeammember) { return saveEntity(systeammember)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/systeammembers/savebatch")
Boolean saveBatch(@RequestBody List<SysTeamMember> systeammembers);
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysDepartmentServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class SysDepartmentServiceImpl implements ISysDepartmentService {
@Override
@Transactional
public boolean save(SysDepartment et) {
if(et.getDeptid()==null) et.setDeptid((String)et.getDefaultKey(true));
if(!sysDepartmentFeignClient.save(et))
return false;
SysDepartment rt = sysDepartmentFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysDeptMemberServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class SysDeptMemberServiceImpl implements ISysDeptMemberService {
@Override
@Transactional
public boolean save(SysDeptMember et) {
if(et.getMemberid()==null) et.setMemberid((String)et.getDefaultKey(true));
if(!sysDeptMemberFeignClient.save(et))
return false;
SysDeptMember rt = sysDeptMemberFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysEmployeeServiceImpl.java
浏览文件 @ eb0193d4
......@@ -124,9 +124,10 @@ public class SysEmployeeServiceImpl implements ISysEmployeeService {
@Override
@Transactional
public boolean save(SysEmployee et) {
if(et.getUserid()==null) et.setUserid((String)et.getDefaultKey(true));
if(!sysEmployeeFeignClient.save(et))
return false;
SysEmployee rt = sysEmployeeFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysOrganizationServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class SysOrganizationServiceImpl implements ISysOrganizationService {
@Override
@Transactional
public boolean save(SysOrganization et) {
if(et.getOrgid()==null) et.setOrgid((String)et.getDefaultKey(true));
if(!sysOrganizationFeignClient.save(et))
return false;
SysOrganization rt = sysOrganizationFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysPostServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class SysPostServiceImpl implements ISysPostService {
@Override
@Transactional
public boolean save(SysPost et) {
if(et.getPostid()==null) et.setPostid((String)et.getDefaultKey(true));
if(!sysPostFeignClient.save(et))
return false;
SysPost rt = sysPostFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysTeamMemberServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class SysTeamMemberServiceImpl implements ISysTeamMemberService {
@Override
@Transactional
public boolean save(SysTeamMember et) {
if(et.getTeammemberid()==null) et.setTeammemberid((String)et.getDefaultKey(true));
if(!sysTeamMemberFeignClient.save(et))
return false;
SysTeamMember rt = sysTeamMemberFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysTeamServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class SysTeamServiceImpl implements ISysTeamService {
@Override
@Transactional
public boolean save(SysTeam et) {
if(et.getTeamid()==null) et.setTeamid((String)et.getDefaultKey(true));
if(!sysTeamFeignClient.save(et))
return false;
SysTeam rt = sysTeamFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/logic/ISysEmployeesaveDeptMemberLogic.java
浏览文件 @ eb0193d4
package cn.ibizlab.core.ou.service.logic;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
import cn.ibizlab.core.ou.domain.SysEmployee;
/**
* 关系型数据实体[saveDeptMember] 对象
*/
@Deprecated
public interface ISysEmployeesaveDeptMemberLogic {
void execute(SysEmployee et) ;
}
ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/logic/impl/SysEmployeesaveDeptMemberLogicImpl.java
浏览文件 @ eb0193d4
package cn.ibizlab.core.ou.service.logic.impl;
import java.util.Map;
import java.util.HashMap;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.kie.api.runtime.KieSession;
import org.kie.api.runtime.KieContainer;
import cn.ibizlab.core.ou.service.logic.ISysEmployeesaveDeptMemberLogic;
import cn.ibizlab.core.ou.domain.SysEmployee;
@Deprecated
public class SysEmployeesaveDeptMemberLogicImpl{
/**
* 关系型数据实体[saveDeptMember] 对象
*/
@Slf4j
@Service
public class SysEmployeesaveDeptMemberLogicImpl implements ISysEmployeesaveDeptMemberLogic {
@Autowired
private KieContainer kieContainer;
@Autowired
private cn.ibizlab.core.ou.service.ISysDeptMemberService sysdeptmemberservice;
public cn.ibizlab.core.ou.service.ISysDeptMemberService getSysdeptmemberService() {
return this.sysdeptmemberservice;
}
@Autowired
private cn.ibizlab.core.ou.service.ISysEmployeeService iBzSysDefaultService;
public cn.ibizlab.core.ou.service.ISysEmployeeService getIBzSysDefaultService() {
return this.iBzSysDefaultService;
}
@Override
public void execute(SysEmployee et) {
KieSession kieSession = null;
try {
kieSession = kieContainer.newKieSession();
kieSession.insert(et);
kieSession.setGlobal("sysemployeesavedeptmemberdefault", et);
cn.ibizlab.core.ou.domain.SysDeptMember sysemployeesavedeptmembermember = new cn.ibizlab.core.ou.domain.SysDeptMember();
kieSession.insert(sysemployeesavedeptmembermember);
kieSession.setGlobal("sysemployeesavedeptmembermember", sysemployeesavedeptmembermember);
kieSession.setGlobal("sysdeptmemberservice", sysdeptmemberservice);
kieSession.setGlobal("iBzSysSysemployeeDefaultService", iBzSysDefaultService);
kieSession.setGlobal("curuser", cn.ibizlab.util.security.AuthenticationUser.getAuthenticationUser());
kieSession.startProcess("cn.ibizlab.core.ou.service.logic.sysemployeesavedeptmember");
} catch (Exception e) {
throw new RuntimeException("执行[保存人事关系]处理逻辑发生异常" + e);
} finally {
if(kieSession != null) {
kieSession.destroy();
}
}
}
}
ibzrt-core/src/main/java/cn/ibizlab/core/pay/client/PayOpenAccessFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class PayOpenAccessFallback implements PayOpenAccessFeignClient {
}
public PayOpenAccess saveEntity(PayOpenAccess payopenaccess) {
return null;
}
public Boolean save(PayOpenAccess payopenaccess) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/pay/client/PayOpenAccessFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface PayOpenAccessFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/payopenaccesses/save")
Boolean save(@RequestBody PayOpenAccess payopenaccess);
PayOpenAccess saveEntity(@RequestBody PayOpenAccess payopenaccess);
default Boolean save(@RequestBody PayOpenAccess payopenaccess) { return saveEntity(payopenaccess)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/payopenaccesses/savebatch")
Boolean saveBatch(@RequestBody List<PayOpenAccess> payopenaccesses);
......
ibzrt-core/src/main/java/cn/ibizlab/core/pay/client/PayTradeFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class PayTradeFallback implements PayTradeFeignClient {
}
public PayTrade saveEntity(PayTrade paytrade) {
return null;
}
public Boolean save(PayTrade paytrade) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/pay/client/PayTradeFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface PayTradeFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/paytrades/save")
Boolean save(@RequestBody PayTrade paytrade);
PayTrade saveEntity(@RequestBody PayTrade paytrade);
default Boolean save(@RequestBody PayTrade paytrade) { return saveEntity(paytrade)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/paytrades/savebatch")
Boolean saveBatch(@RequestBody List<PayTrade> paytrades);
......
ibzrt-core/src/main/java/cn/ibizlab/core/pay/service/impl/PayOpenAccessServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class PayOpenAccessServiceImpl implements IPayOpenAccessService {
@Override
@Transactional
public boolean save(PayOpenAccess et) {
if(et.getId()==null) et.setId((String)et.getDefaultKey(true));
if(!payOpenAccessFeignClient.save(et))
return false;
PayOpenAccess rt = payOpenAccessFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/pay/service/impl/PayTradeServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class PayTradeServiceImpl implements IPayTradeService {
@Override
@Transactional
public boolean save(PayTrade et) {
if(et.getTradeId()==null) et.setTradeId((String)et.getDefaultKey(true));
if(!payTradeFeignClient.save(et))
return false;
PayTrade rt = payTradeFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/task/client/JobsInfoFallback.java
浏览文件 @ eb0193d4
......@@ -65,6 +65,10 @@ public class JobsInfoFallback implements JobsInfoFeignClient {
return null;
}
public JobsInfo saveEntity(JobsInfo jobsinfo) {
return null;
}
public Boolean save(JobsInfo jobsinfo) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/task/client/JobsInfoFeignClient.java
浏览文件 @ eb0193d4
......@@ -61,7 +61,9 @@ public interface JobsInfoFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/jobsinfos/save")
Boolean save(@RequestBody JobsInfo jobsinfo);
JobsInfo saveEntity(@RequestBody JobsInfo jobsinfo);
default Boolean save(@RequestBody JobsInfo jobsinfo) { return saveEntity(jobsinfo)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/jobsinfos/savebatch")
Boolean saveBatch(@RequestBody List<JobsInfo> jobsinfos);
......
ibzrt-core/src/main/java/cn/ibizlab/core/task/client/JobsLockFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class JobsLockFallback implements JobsLockFeignClient {
}
public JobsLock saveEntity(JobsLock jobslock) {
return null;
}
public Boolean save(JobsLock jobslock) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/task/client/JobsLockFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface JobsLockFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/jobslocks/save")
Boolean save(@RequestBody JobsLock jobslock);
JobsLock saveEntity(@RequestBody JobsLock jobslock);
default Boolean save(@RequestBody JobsLock jobslock) { return saveEntity(jobslock)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/jobslocks/savebatch")
Boolean saveBatch(@RequestBody List<JobsLock> jobslocks);
......
ibzrt-core/src/main/java/cn/ibizlab/core/task/client/JobsLogFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class JobsLogFallback implements JobsLogFeignClient {
}
public JobsLog saveEntity(JobsLog jobslog) {
return null;
}
public Boolean save(JobsLog jobslog) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/task/client/JobsLogFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface JobsLogFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/jobslogs/save")
Boolean save(@RequestBody JobsLog jobslog);
JobsLog saveEntity(@RequestBody JobsLog jobslog);
default Boolean save(@RequestBody JobsLog jobslog) { return saveEntity(jobslog)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/jobslogs/savebatch")
Boolean saveBatch(@RequestBody List<JobsLog> jobslogs);
......
ibzrt-core/src/main/java/cn/ibizlab/core/task/client/JobsRegistryFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class JobsRegistryFallback implements JobsRegistryFeignClient {
}
public JobsRegistry saveEntity(JobsRegistry jobsregistry) {
return null;
}
public Boolean save(JobsRegistry jobsregistry) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/task/client/JobsRegistryFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface JobsRegistryFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/jobsregistries/save")
Boolean save(@RequestBody JobsRegistry jobsregistry);
JobsRegistry saveEntity(@RequestBody JobsRegistry jobsregistry);
default Boolean save(@RequestBody JobsRegistry jobsregistry) { return saveEntity(jobsregistry)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/jobsregistries/savebatch")
Boolean saveBatch(@RequestBody List<JobsRegistry> jobsregistries);
......
ibzrt-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsInfoServiceImpl.java
浏览文件 @ eb0193d4
......@@ -124,9 +124,10 @@ public class JobsInfoServiceImpl implements IJobsInfoService {
@Override
@Transactional
public boolean save(JobsInfo et) {
if(et.getId()==null) et.setId((String)et.getDefaultKey(true));
if(!jobsInfoFeignClient.save(et))
return false;
JobsInfo rt = jobsInfoFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsLockServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class JobsLockServiceImpl implements IJobsLockService {
@Override
@Transactional
public boolean save(JobsLock et) {
if(et.getId()==null) et.setId((String)et.getDefaultKey(true));
if(!jobsLockFeignClient.save(et))
return false;
JobsLock rt = jobsLockFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsLogServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class JobsLogServiceImpl implements IJobsLogService {
@Override
@Transactional
public boolean save(JobsLog et) {
if(et.getId()==null) et.setId((String)et.getDefaultKey(true));
if(!jobsLogFeignClient.save(et))
return false;
JobsLog rt = jobsLogFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsRegistryServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class JobsRegistryServiceImpl implements IJobsRegistryService {
@Override
@Transactional
public boolean save(JobsRegistry et) {
if(et.getId()==null) et.setId((String)et.getDefaultKey(true));
if(!jobsRegistryFeignClient.save(et))
return false;
JobsRegistry rt = jobsRegistryFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysAppFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysAppFallback implements SysAppFeignClient {
}
public SysApp saveEntity(SysApp sysapp) {
return null;
}
public Boolean save(SysApp sysapp) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysAppFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysAppFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/sysapps/save")
Boolean save(@RequestBody SysApp sysapp);
SysApp saveEntity(@RequestBody SysApp sysapp);
default Boolean save(@RequestBody SysApp sysapp) { return saveEntity(sysapp)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/sysapps/savebatch")
Boolean saveBatch(@RequestBody List<SysApp> sysapps);
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysAuthLogFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysAuthLogFallback implements SysAuthLogFeignClient {
}
public SysAuthLog saveEntity(SysAuthLog sysauthlog) {
return null;
}
public Boolean save(SysAuthLog sysauthlog) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysAuthLogFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysAuthLogFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/save")
Boolean save(@RequestBody SysAuthLog sysauthlog);
SysAuthLog saveEntity(@RequestBody SysAuthLog sysauthlog);
default Boolean save(@RequestBody SysAuthLog sysauthlog) { return saveEntity(sysauthlog)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/savebatch")
Boolean saveBatch(@RequestBody List<SysAuthLog> sysauthlogs);
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysOpenAccessFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysOpenAccessFallback implements SysOpenAccessFeignClient {
}
public SysOpenAccess saveEntity(SysOpenAccess sysopenaccess) {
return null;
}
public Boolean save(SysOpenAccess sysopenaccess) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysOpenAccessFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysOpenAccessFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/sysopenaccesses/save")
Boolean save(@RequestBody SysOpenAccess sysopenaccess);
SysOpenAccess saveEntity(@RequestBody SysOpenAccess sysopenaccess);
default Boolean save(@RequestBody SysOpenAccess sysopenaccess) { return saveEntity(sysopenaccess)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/sysopenaccesses/savebatch")
Boolean saveBatch(@RequestBody List<SysOpenAccess> sysopenaccesses);
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysPSSystemFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysPSSystemFallback implements SysPSSystemFeignClient {
}
public SysPSSystem saveEntity(SysPSSystem syspssystem) {
return null;
}
public Boolean save(SysPSSystem syspssystem) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysPSSystemFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysPSSystemFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/syspssystems/save")
Boolean save(@RequestBody SysPSSystem syspssystem);
SysPSSystem saveEntity(@RequestBody SysPSSystem syspssystem);
default Boolean save(@RequestBody SysPSSystem syspssystem) { return saveEntity(syspssystem)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/syspssystems/savebatch")
Boolean saveBatch(@RequestBody List<SysPSSystem> syspssystems);
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysPermissionFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysPermissionFallback implements SysPermissionFeignClient {
}
public SysPermission saveEntity(SysPermission syspermission) {
return null;
}
public Boolean save(SysPermission syspermission) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysPermissionFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysPermissionFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/save")
Boolean save(@RequestBody SysPermission syspermission);
SysPermission saveEntity(@RequestBody SysPermission syspermission);
default Boolean save(@RequestBody SysPermission syspermission) { return saveEntity(syspermission)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/savebatch")
Boolean saveBatch(@RequestBody List<SysPermission> syspermissions);
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysRoleFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysRoleFallback implements SysRoleFeignClient {
}
public SysRole saveEntity(SysRole sysrole) {
return null;
}
public Boolean save(SysRole sysrole) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysRoleFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysRoleFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/save")
Boolean save(@RequestBody SysRole sysrole);
SysRole saveEntity(@RequestBody SysRole sysrole);
default Boolean save(@RequestBody SysRole sysrole) { return saveEntity(sysrole)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/savebatch")
Boolean saveBatch(@RequestBody List<SysRole> sysroles);
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysRolePermissionFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysRolePermissionFallback implements SysRolePermissionFeignClient {
}
public SysRolePermission saveEntity(SysRolePermission sysrolepermission) {
return null;
}
public Boolean save(SysRolePermission sysrolepermission) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysRolePermissionFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysRolePermissionFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/sysrolepermissions/save")
Boolean save(@RequestBody SysRolePermission sysrolepermission);
SysRolePermission saveEntity(@RequestBody SysRolePermission sysrolepermission);
default Boolean save(@RequestBody SysRolePermission sysrolepermission) { return saveEntity(sysrolepermission)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/sysrolepermissions/savebatch")
Boolean saveBatch(@RequestBody List<SysRolePermission> sysrolepermissions);
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysUserAuthFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysUserAuthFallback implements SysUserAuthFeignClient {
}
public SysUserAuth saveEntity(SysUserAuth sysuserauth) {
return null;
}
public Boolean save(SysUserAuth sysuserauth) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysUserAuthFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysUserAuthFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/sysuserauths/save")
Boolean save(@RequestBody SysUserAuth sysuserauth);
SysUserAuth saveEntity(@RequestBody SysUserAuth sysuserauth);
default Boolean save(@RequestBody SysUserAuth sysuserauth) { return saveEntity(sysuserauth)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/sysuserauths/savebatch")
Boolean saveBatch(@RequestBody List<SysUserAuth> sysuserauths);
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysUserFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysUserFallback implements SysUserFeignClient {
}
public SysUser saveEntity(SysUser sysuser) {
return null;
}
public Boolean save(SysUser sysuser) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysUserFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysUserFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/sysusers/save")
Boolean save(@RequestBody SysUser sysuser);
SysUser saveEntity(@RequestBody SysUser sysuser);
default Boolean save(@RequestBody SysUser sysuser) { return saveEntity(sysuser)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/sysusers/savebatch")
Boolean saveBatch(@RequestBody List<SysUser> sysusers);
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysUserRoleFallback.java
浏览文件 @ eb0193d4
......@@ -61,6 +61,10 @@ public class SysUserRoleFallback implements SysUserRoleFeignClient {
}
public SysUserRole saveEntity(SysUserRole sysuserrole) {
return null;
}
public Boolean save(SysUserRole sysuserrole) {
return false;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SysUserRoleFeignClient.java
浏览文件 @ eb0193d4
......@@ -57,7 +57,9 @@ public interface SysUserRoleFeignClient {
@RequestMapping(method = RequestMethod.POST, value = "/sysuserroles/save")
Boolean save(@RequestBody SysUserRole sysuserrole);
SysUserRole saveEntity(@RequestBody SysUserRole sysuserrole);
default Boolean save(@RequestBody SysUserRole sysuserrole) { return saveEntity(sysuserrole)!=null; }
@RequestMapping(method = RequestMethod.POST, value = "/sysuserroles/savebatch")
Boolean saveBatch(@RequestBody List<SysUserRole> sysuserroles);
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysAppServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class SysAppServiceImpl implements ISysAppService {
@Override
@Transactional
public boolean save(SysApp et) {
if(et.getId()==null) et.setId((String)et.getDefaultKey(true));
if(!sysAppFeignClient.save(et))
return false;
SysApp rt = sysAppFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysAuthLogServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class SysAuthLogServiceImpl implements ISysAuthLogService {
@Override
@Transactional
public boolean save(SysAuthLog et) {
if(et.getLogid()==null) et.setLogid((String)et.getDefaultKey(true));
if(!sysAuthLogFeignClient.save(et))
return false;
SysAuthLog rt = sysAuthLogFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysOpenAccessServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class SysOpenAccessServiceImpl implements ISysOpenAccessService {
@Override
@Transactional
public boolean save(SysOpenAccess et) {
if(et.getId()==null) et.setId((String)et.getDefaultKey(true));
if(!sysOpenAccessFeignClient.save(et))
return false;
SysOpenAccess rt = sysOpenAccessFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysPSSystemServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class SysPSSystemServiceImpl implements ISysPSSystemService {
@Override
@Transactional
public boolean save(SysPSSystem et) {
if(et.getPssystemid()==null) et.setPssystemid((String)et.getDefaultKey(true));
if(!sysPSSystemFeignClient.save(et))
return false;
SysPSSystem rt = sysPSSystemFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysPermissionServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class SysPermissionServiceImpl implements ISysPermissionService {
@Override
@Transactional
public boolean save(SysPermission et) {
if(et.getPermissionid()==null) et.setPermissionid((String)et.getDefaultKey(true));
if(!sysPermissionFeignClient.save(et))
return false;
SysPermission rt = sysPermissionFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRolePermissionServiceImpl.java
浏览文件 @ eb0193d4
......@@ -108,9 +108,10 @@ public class SysRolePermissionServiceImpl implements ISysRolePermissionService {
@Override
@Transactional
public boolean save(SysRolePermission et) {
if(et.getRolepermissionid()==null) et.setRolepermissionid((String)et.getDefaultKey(true));
if(!sysRolePermissionFeignClient.save(et))
return false;
SysRolePermission rt = sysRolePermissionFeignClient.saveEntity(et);
if(rt == null)
return false;
CachedBeanCopier.copy(rt, et);
return true;
}
......
ibzrt-dependencies/pom.xml
浏览文件 @ eb0193d4
此差异已折叠。
ibzrt-util/pom.xml
浏览文件 @ eb0193d4
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或