From dc3ae0abbe8c508249397d5c9744387a6ace23c3 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 11 十二月 2023 18:38:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 137 ++++++++++-----------------------------------
1 files changed, 32 insertions(+), 105 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 74939d7..83d0d13 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
@@ -156,96 +156,19 @@
}
/**
- * 鏂板鏃跺～鍏呴粯璁ゅ��
- * @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
- * @param <T> 杩斿洖鍊肩殑绫诲瀷
- * @return
- * @throws VciBaseException
- */
- public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object) throws VciBaseException {
- BaseModel baseModel = object;
- 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","");
- if(createTimeObj!=null) {
- String createTime = createTimeObj.toString();
- baseModel.setCreateTime(chageStringToDate(createTime));
- }
- baseModel.setNameOid(dataMap.getOrDefault("NAMEOID",""));
-
- Object lastModifyTimeObj=dataMap.getOrDefault("LASTMODIFYTIME","");
- if(lastModifyTimeObj!=null) {
- String lastModifyTime = lastModifyTimeObj.toString();
- baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
- }
- Object tsObj=dataMap.getOrDefault("TS","");
- if(tsObj!=null) {
- String ts = tsObj.toString();
- baseModel.setTs(chageStringToDate(ts));
- }
- baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
- //鐢ㄦ埛id ; 瑕佹眰鏀规垚浜嗚处鍙�
- // String userId = AuthUtil.getUserId().toString();
- baseModel.setBtmname(dataMap.getOrDefault("BTMNAME",""));
- baseModel.setCreator(dataMap.getOrDefault("CREATOR",""));
- baseModel.setFirstR(dataMap.getOrDefault("FIRSTR",""));
- baseModel.setFirstV(dataMap.getOrDefault("FIRSTV",""));
- baseModel.setLastR(dataMap.getOrDefault("LASTR",""));
- baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
- Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
- if(revisionseq!=null){
- baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
- }
-
- baseModel.setOwner(dataMap.getOrDefault("OWNER",""));
- 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(AuthUtil.getUser().getAccount());
- baseModel.setLcStatus(dataMap.getOrDefault("LCSTATUS",""));
- baseModel.setName(dataMap.getOrDefault("NAME",""));
- baseModel.setTenantId(dataMap.getOrDefault("TENADTID",""));
- baseModel.setDescription(dataMap.getOrDefault("DESCRIOTION",""));
- baseModel.setCopyFromVersion(dataMap.getOrDefault("COPYFROMVERSION",""));
- Object secretgrade=dataMap.get("SECRETGRADE");
- if(secretgrade!=null){
- baseModel.setSecretGrade(chageStringToInt(secretgrade.toString()));
- }
- }catch (VciBaseException e){
- e.printStackTrace();
- throw e;
- }
- return (T)baseModel;
- }
-
- /**
* 鏂板鏃跺～鍏呴粯璁ゅ�硷細澶氱嚎绋嬫祦涓皟鐢�
* @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
* @param <T> 杩斿洖鍊肩殑绫诲瀷
* @return
* @throws VciBaseException
*/
- public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object, BladeUser user) throws VciBaseException {
+ public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object,boolean isCase, BladeUser user) throws VciBaseException {
BaseModel baseModel = object;
+ baseModel.getData().putAll(dataMap);
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- baseModel.setOid(dataMap.getOrDefault("OID",""));
- baseModel.setId(dataMap.getOrDefault("ID",""));
+ baseModel.setOid(dataMap.getOrDefault(isCase?"OID":"oid",""));
+ baseModel.setId(dataMap.getOrDefault(isCase?"ID":"id",""));
Map<String,Object> newDataMap=new HashMap<>();
/*for (String key:dataMap.keySet()){
Object value=dataMap.get(key);
@@ -255,52 +178,56 @@
newDataMap.put(key.toLowerCase(Locale.ROOT),value);
});*/
//baseModel.setData((Map)newDataMap);
- Object createTimeObj=dataMap.getOrDefault("CREATETIME","");
+ Object createTimeObj=dataMap.getOrDefault(isCase?"CREATETIME":"createtime","");
if(createTimeObj!=null) {
String createTime = createTimeObj.toString();
baseModel.setCreateTime(chageStringToDate(createTime));
}
- baseModel.setNameOid(dataMap.getOrDefault("NAMEOID",""));
+ baseModel.setNameOid(dataMap.getOrDefault(isCase?"NAMEOID":"nameoid",""));
- Object lastModifyTimeObj=dataMap.getOrDefault("LASTMODIFYTIME","");
+ Object lastModifyTimeObj=dataMap.getOrDefault(isCase?"LASTMODIFYTIME":"lastmodifytime","");
if(lastModifyTimeObj!=null) {
String lastModifyTime = lastModifyTimeObj.toString();
baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
}
- Object tsObj=dataMap.getOrDefault("TS","");
+ Object tsObj=dataMap.getOrDefault(isCase?"TS":"ts","");
if(tsObj!=null) {
String ts = tsObj.toString();
baseModel.setTs(chageStringToDate(ts));
}
- baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
+ baseModel.setRevisionOid(dataMap.getOrDefault(isCase?"REVISIONOID":"revisionoid",""));
//鐢ㄦ埛id ; 瑕佹眰鏀规垚浜嗚处鍙�
// String userId = AuthUtil.getUserId().toString();
- baseModel.setBtmname(dataMap.getOrDefault("BTMNAME",""));
- baseModel.setCreator(dataMap.getOrDefault("CREATOR",""));
- baseModel.setFirstR(dataMap.getOrDefault("FIRSTR",""));
- baseModel.setFirstV(dataMap.getOrDefault("FIRSTV",""));
- baseModel.setLastR(dataMap.getOrDefault("LASTR",""));
- baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
- Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
+ baseModel.setBtmname(dataMap.getOrDefault(isCase?"BTMNAME":"btmname",""));
+ baseModel.setCreator(dataMap.getOrDefault(isCase?"CREATOR":"creator",""));
+ baseModel.setFirstR(dataMap.getOrDefault(isCase?"FIRSTR":"firstr",""));
+ baseModel.setFirstV(dataMap.getOrDefault(isCase?"FIRSTV":"firstv",""));
+ baseModel.setLastR(dataMap.getOrDefault(isCase?"LASTR":"lastr",""));
+ baseModel.setLastV(dataMap.getOrDefault(isCase?"LASTV":"lastv",""));
+ Object revisionseq =dataMap.getOrDefault(isCase?"REVISIONSEQ":"revisionseq","");
if(revisionseq!=null){
baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
}
- baseModel.setOwner(dataMap.getOrDefault("OWNER",""));
- Object versionseq =dataMap.getOrDefault("VERSIONSEQ","");
+ baseModel.setOwner(dataMap.getOrDefault(isCase?"OWNER":"owner",""));
+ Object versionseq =dataMap.getOrDefault(isCase?"VERSIONSEQ":"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(Func.isNotEmpty(user) ? user.getAccount():AuthUtil.getUser().getAccount());
- baseModel.setLcStatus(dataMap.getOrDefault("LCSTATUS",""));
- baseModel.setName(dataMap.getOrDefault("NAME",""));
- baseModel.setTenantId(dataMap.getOrDefault("TENADTID",""));
- baseModel.setDescription(dataMap.getOrDefault("DESCRIOTION",""));
- baseModel.setCopyFromVersion(dataMap.getOrDefault("COPYFROMVERSION",""));
- Object secretgrade=dataMap.get("SECRETGRADE");
+ baseModel.setVersionRule(dataMap.getOrDefault(isCase?"VERSIONRULE":"versionrule",""));
+ baseModel.setVersionValue(dataMap.getOrDefault(isCase?"VERSIONVALUE":"versionvalue",""));
+
+ baseModel.setRevisionRule(dataMap.getOrDefault(isCase?"REVISIONRULE":"revisionrule",""));
+
+ baseModel.setRevisionOid(dataMap.getOrDefault(isCase?"REVISIONOID":"revisionoid",""));
+ baseModel.setRevisionValue(dataMap.getOrDefault(isCase?"REVISIONVALUE":"revisionvalue",""));
+ baseModel.setLastModifier(AuthUtil.getUser().getAccount());
+ baseModel.setLcStatus(dataMap.getOrDefault(isCase?"LCSTATUS":"lcstatus",""));
+ baseModel.setName(dataMap.getOrDefault(isCase?"NAME":"name",""));
+ baseModel.setTenantId(dataMap.getOrDefault(isCase?"TENANT_ID":"tenant_id",""));
+ baseModel.setDescription(dataMap.getOrDefault(isCase?"DESCRIPTION":"description",""));
+ baseModel.setCopyFromVersion(dataMap.getOrDefault(isCase?"COPYFROMVERSION":"copyfromversion",""));
+ Object secretgrade=dataMap.get(isCase?"SECRETGRADE":"secretgrade");
if(secretgrade!=null){
baseModel.setSecretGrade(chageStringToInt(secretgrade.toString()));
}
--
Gitblit v1.9.3