From 1a7e084b432dbe97bf4d851ea77ac046093f5746 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期六, 26 八月 2023 13:59:34 +0800
Subject: [PATCH] 统一接口配置保存bug修复
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
index 3b51169..2cf2df2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -98,17 +98,25 @@
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
baseModel.setOid(dataMap.getOrDefault("OID",""));
+ baseModel.setId(dataMap.getOrDefault("ID",""));
+ baseModel.setData(dataMap);;
Object createTimeObj=dataMap.getOrDefault("CREATETIME","");
- String createTime= createTimeObj.toString();
- baseModel.setCreateTime(chageStringToDate(createTime));
+ if(createTimeObj!=null) {
+ String createTime = createTimeObj.toString();
+ baseModel.setCreateTime(chageStringToDate(createTime));
+ }
baseModel.setNameOid(dataMap.getOrDefault("NAMEOID",""));
Object lastModifyTimeObj=dataMap.getOrDefault("LASTMODIFYTIME","");
- String lastModifyTime= lastModifyTimeObj.toString();
- baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
+ if(lastModifyTimeObj!=null) {
+ String lastModifyTime = lastModifyTimeObj.toString();
+ baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
+ }
Object tsObj=dataMap.getOrDefault("TS","");
- String ts= tsObj.toString();
- baseModel.setTs(chageStringToDate(ts));
+ if(tsObj!=null) {
+ String ts = tsObj.toString();
+ baseModel.setTs(chageStringToDate(ts));
+ }
baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
//鐢ㄦ埛id
String userId = AuthUtil.getUserId().toString();
@@ -118,13 +126,22 @@
baseModel.setFirstV(dataMap.getOrDefault("FIRSTV",""));
baseModel.setLastR(dataMap.getOrDefault("LASTR",""));
baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
- baseModel.setRevisionSeq(chageStringToInt(dataMap.getOrDefault("REVISIONSEQ","")));
+ Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
+ if(revisionseq!=null){
+
+ baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
+ }
+
baseModel.setOwner(dataMap.getOrDefault("OWNER",""));
- baseModel.setVersionSeq(chageStringToInt(dataMap.getOrDefault("VERSIONSEQ","")));
+ Object versionseq =dataMap.getOrDefault("VERSIONSEQ","");
+ if(versionseq!=null){
+ baseModel.setVersionSeq(chageStringToInt(versionseq.toString()));
+ }
baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
baseModel.setLastModifier(userId);
+
}catch (VciBaseException e){
e.printStackTrace();
}
--
Gitblit v1.9.3