From f31b1b0a442c83432de9bdf6bc4539bc68acaf6c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 10 十月 2023 19:57:51 +0800
Subject: [PATCH] 修改从其他规则中克隆码段反馈信息错误的bug
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 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..e1f4796 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
@@ -13,6 +13,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -35,7 +36,7 @@
public static <T extends BaseModel> T addDefaultAttrAssimt(T object,String btmName) throws VciBaseException {
BaseModel baseModel = object;
try {
- baseModel.setOid(VciBaseUtil.getPk().toUpperCase());
+ baseModel.setOid(VciBaseUtil.getPk());
baseModel.setCreateTime(new Date());
baseModel.setNameOid(VciBaseUtil.getPk());
baseModel.setLastModifyTime(new Date());
@@ -44,7 +45,7 @@
//鐢ㄦ埛id
String userId = AuthUtil.getUserId().toString();
baseModel.setBtmname(btmName);
- baseModel.setCreator(userId);
+ baseModel.setCreator(AuthUtil.getUser().getAccount());
baseModel.setFirstR("1");
baseModel.setFirstV("1");
baseModel.setLastR("1");
@@ -98,17 +99,33 @@
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
baseModel.setOid(dataMap.getOrDefault("OID",""));
+ baseModel.setId(dataMap.getOrDefault("ID",""));
+ Map<String,Object> newDataMap=new HashMap<>();
+ /*for (String key:dataMap.keySet()){
+ Object value=dataMap.get(key);
+ newDataMap.put(key.toLowerCase(Locale.ROOT),value);
+ }*/
+ /* dataMap.forEach((key,value)->{
+ newDataMap.put(key.toLowerCase(Locale.ROOT),value);
+ });*/
+ //baseModel.setData((Map)newDataMap);
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 +135,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