From 980a7eab362b5a8c00f13427c73053382ca4ba44 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 06 十二月 2023 09:31:31 +0800
Subject: [PATCH] 集团码导入功能开发
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 81 +++++++++++++++++++++++++---------------
1 files changed, 50 insertions(+), 31 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 a004b76..b479d79 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
@@ -42,24 +42,29 @@
baseModel.setLastModifyTime(new Date());
baseModel.setTs(new Date());
baseModel.setRevisionOid(VciBaseUtil.getPk());
- //鐢ㄦ埛id
- String userId = AuthUtil.getUserId().toString();
+ // 鐢ㄦ埛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");
baseModel.setLastV("1");
baseModel.setRevisionSeq(1);
+ // TODO:鐩墠鍙湁缂栫爜瑙勫垯涓湁鐢ㄥ埌锛屽悗鏈熼渶瑕佸幓鎺夎繖娈典唬鐮佺殑璇濓紝灏辨妸浠栧姞鍦ㄧ紪鐮佽鍒欐柊澧炰腑鍘�
if(Func.isBlank(baseModel.getOwner())){
// 璁剧疆鎵�鏈夎��
baseModel.setOwner(AuthUtil.getUserId().toString());
}
+
baseModel.setVersionSeq(1);
baseModel.setVersionRule("0");
baseModel.setVersionValue("1");
baseModel.setRevisionOid(VciBaseUtil.getPk());
- baseModel.setLastModifier(userId);
+ baseModel.setLastModifier(AuthUtil.getUser().getAccount());
+ baseModel.setRevisionValue("1");
+ baseModel.setRevisionRule("1");
+ baseModel.setTenantId(AuthUtil.getTenantId());
}catch (VciBaseException e){
e.printStackTrace();
}
@@ -78,9 +83,11 @@
try {
baseModel.setLastModifyTime(new Date());
baseModel.setTs(new Date());
- //鐢ㄦ埛id
- String userId = AuthUtil.getUserId().toString();
- baseModel.setLastModifier(userId);
+ // 鐢ㄦ埛id
+ // String userId = AuthUtil.getUserId().toString();
+ // 瑕佹眰鏀规垚璐﹀彿
+ String account = AuthUtil.getUserAccount();
+ baseModel.setLastModifier(account);
}catch (VciBaseException e){
e.printStackTrace();
}
@@ -94,12 +101,13 @@
* @return
* @throws VciBaseException
*/
- public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object) throws VciBaseException {
+ public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object,boolean isCase) 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);
@@ -109,48 +117,59 @@
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",""));
- //鐢ㄦ埛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.setRevisionOid(dataMap.getOrDefault(isCase?"REVISIONOID":"revisionoid",""));
+ //鐢ㄦ埛id ; 瑕佹眰鏀规垚浜嗚处鍙�
+ // String userId = AuthUtil.getUserId().toString();
+ 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(userId);
+ 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()));
+ }
}catch (VciBaseException e){
e.printStackTrace();
}
--
Gitblit v1.9.3