From 3729193aff63c48527cfde4467a9fc020100ae37 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 05 十二月 2023 19:08:03 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 135 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 121 insertions(+), 14 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 d070f14..998390e 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
@@ -1,14 +1,16 @@
package com.vci.ubcs.starter.util;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import org.apache.poi.ss.formula.functions.T;
import org.springblade.core.secure.utils.AuthUtil;
-
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
+import org.springblade.core.tool.utils.Func;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* 鏂板鏃堕粯璁ゅ�煎睘鎬ц祴鍊�
@@ -26,7 +28,7 @@
* @return
* @throws VciBaseException
*/
- public static <T extends BaseModel> T addDefaultAttrAssimt(T object,String btmName) throws VciBaseException {
+ public static <T extends BaseModel> T addDefaultAttrAssimt(T object, String btmName) throws VciBaseException {
BaseModel baseModel = object;
try {
baseModel.setOid(VciBaseUtil.getPk());
@@ -34,21 +36,28 @@
baseModel.setNameOid(VciBaseUtil.getPk());
baseModel.setLastModifyTime(new Date());
baseModel.setTs(new Date());
- //鐢ㄦ埛id
- String userId = AuthUtil.getUserId().toString();
+ baseModel.setRevisionOid(VciBaseUtil.getPk());
baseModel.setBtmname(btmName);
- baseModel.setCreator(userId);
+ baseModel.setCreator(AuthUtil.getUserAccount());
baseModel.setFirstR("1");
baseModel.setFirstV("1");
baseModel.setLastR("1");
baseModel.setLastV("1");
baseModel.setRevisionSeq(1);
- baseModel.setOwner("1");
+ // TODO:鐩墠鍙湁缂栫爜瑙勫垯涓湁鐢ㄥ埌锛屽悗鏈熼渶瑕佸幓鎺夎繖娈典唬鐮佺殑璇濓紝灏辨妸浠栧姞鍦ㄧ紪鐮佽鍒欐柊澧炰腑鍘�
+ if(Func.isBlank(baseModel.getOwner())){
+ // 璁剧疆鎵�鏈夎��
+ baseModel.setOwner(AuthUtil.getUserId().toString());
+ }
+
baseModel.setVersionSeq(1);
baseModel.setVersionRule("0");
baseModel.setVersionValue("1");
- baseModel.setNameOid(VciBaseUtil.getPk());
- baseModel.setLastModifier(userId);
+ baseModel.setRevisionOid(VciBaseUtil.getPk());
+ baseModel.setLastModifier(AuthUtil.getUserAccount());
+ baseModel.setRevisionValue("1");
+ baseModel.setRevisionRule("1");
+ baseModel.setTenantId(AuthUtil.getTenantId());
}catch (VciBaseException e){
e.printStackTrace();
}
@@ -67,13 +76,111 @@
try {
baseModel.setLastModifyTime(new Date());
baseModel.setTs(new Date());
- //鐢ㄦ埛id
- String userId = AuthUtil.getUserId().toString();
- baseModel.setLastModifier(userId);
+ // 鐢ㄦ埛id
+ // String userId = AuthUtil.getUserId().toString();
+ // 瑕佹眰鏀规垚璐﹀彿
+ baseModel.setLastModifier(AuthUtil.getUserAccount());
}catch (VciBaseException e){
e.printStackTrace();
}
return (T)baseModel;
}
+ /**
+ * 鏂板鏃跺～鍏呴粯璁ゅ��
+ * @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();
+ }
+ return (T)baseModel;
+ }
+
+ private static int chageStringToInt(String value){
+ int newValue=0;
+ if(StringUtils.isNotBlank(value)){
+ newValue = Integer.parseInt(value);
+ }
+ return newValue;
+ }
+
+ private static Date chageStringToDate(String value){
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date=new Date();
+ if(StringUtils.isNotBlank(value)){
+ try {
+ date = format.parse(value);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ return date;
+ }
}
--
Gitblit v1.9.3