From e9a590e862148092027510b15d33cdd32691a6f5 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 06 十二月 2023 09:43:11 +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 |  163 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 152 insertions(+), 11 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 b479d79..5e9e678 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
@@ -4,17 +4,13 @@
 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.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
-
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -33,7 +29,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());
@@ -42,8 +38,6 @@
 			baseModel.setLastModifyTime(new Date());
 			baseModel.setTs(new Date());
 			baseModel.setRevisionOid(VciBaseUtil.getPk());
-			// 鐢ㄦ埛id
-			// String userId = AuthUtil.getUserId().toString();
 			baseModel.setBtmname(btmName);
 			baseModel.setCreator(AuthUtil.getUser().getAccount());
 			baseModel.setFirstR("1");
@@ -72,6 +66,52 @@
 	}
 
 	/**
+	 * 褰撳湪澶氱嚎绋嬫祦涓皟鐢ㄦ椂锛岃幏鍙栦笉鍒拌姹傚ご淇℃伅锛�
+	 * 鎵�浠ュ緱鍦ㄥ绾跨▼娴佸闈㈣幏鍙栧埌request
+	 * @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
+	 * @param <T>   杩斿洖鍊肩殑绫诲瀷
+	 * @param btmName  涓氬姟绫诲瀷
+	 * @return
+	 * @throws VciBaseException
+	 */
+	public static <T extends BaseModel> T addDefaultAttrAssimt(T object, String btmName, BladeUser user) throws VciBaseException {
+		BaseModel baseModel = object;
+		try {
+			baseModel.setOid(VciBaseUtil.getPk());
+			baseModel.setCreateTime(new Date());
+			baseModel.setNameOid(VciBaseUtil.getPk());
+			baseModel.setLastModifyTime(new Date());
+			baseModel.setTs(new Date());
+			baseModel.setRevisionOid(VciBaseUtil.getPk());
+			baseModel.setBtmname(btmName);
+			String account = Func.isNotEmpty(user) ? user.getAccount():AuthUtil.getUser().getAccount();
+			baseModel.setCreator(account);
+			baseModel.setFirstR("1");
+			baseModel.setFirstV("1");
+			baseModel.setLastR("1");
+			baseModel.setLastV("1");
+			baseModel.setRevisionSeq(1);
+			// TODO:鐩墠鍙湁缂栫爜瑙勫垯涓湁鐢ㄥ埌锛屽悗鏈熼渶瑕佸幓鎺夎繖娈典唬鐮佺殑璇濓紝灏辨妸浠栧姞鍦ㄧ紪鐮佽鍒欐柊澧炰腑鍘�
+			if(Func.isBlank(baseModel.getOwner())){
+				// 璁剧疆鎵�鏈夎��
+				baseModel.setOwner(Func.isNotEmpty(user) ? user.getUserId().toString():AuthUtil.getUserId().toString());
+			}
+
+			baseModel.setVersionSeq(1);
+			baseModel.setVersionRule("0");
+			baseModel.setVersionValue("1");
+			baseModel.setRevisionOid(VciBaseUtil.getPk());
+			baseModel.setLastModifier(account);
+			baseModel.setRevisionValue("1");
+			baseModel.setRevisionRule("1");
+			baseModel.setTenantId(Func.isNotEmpty(user) ? user.getTenantId():AuthUtil.getTenantId());
+		}catch (VciBaseException e){
+			e.printStackTrace();
+		}
+		return (T)baseModel;
+	}
+
+	/**
 	 * 淇敼鏃跺~鍏呴粯璁ゅ��
 	 * @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
 	 * @param <T>   杩斿洖鍊肩殑绫诲瀷
@@ -86,8 +126,29 @@
 			// 鐢ㄦ埛id
 			// String userId = AuthUtil.getUserId().toString();
 			// 瑕佹眰鏀规垚璐﹀彿
-			String account = AuthUtil.getUserAccount();
-			baseModel.setLastModifier(account);
+			baseModel.setLastModifier(AuthUtil.getUser().getAccount());
+		}catch (VciBaseException e){
+			e.printStackTrace();
+		}
+		return (T)baseModel;
+	}
+
+	/**
+	 * 淇敼鏃跺~鍏呴粯璁ゅ�硷細澶氱嚎绋嬫祦涓皟鐢�
+	 * @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
+	 * @param <T>   杩斿洖鍊肩殑绫诲瀷
+	 * @return
+	 * @throws VciBaseException
+	 */
+	public static <T extends BaseModel> T updateDefaultAttrAssimt(T object, BladeUser user) throws VciBaseException {
+		BaseModel baseModel = object;
+		try {
+			baseModel.setLastModifyTime(new Date());
+			baseModel.setTs(new Date());
+			// 鐢ㄦ埛id
+			// String userId = AuthUtil.getUserId().toString();
+			// 瑕佹眰鏀规垚璐﹀彿
+			baseModel.setLastModifier(Func.isNotEmpty(user) ? user.getAccount():AuthUtil.getUser().getAccount());
 		}catch (VciBaseException e){
 			e.printStackTrace();
 		}
@@ -113,7 +174,7 @@
 				Object value=dataMap.get(key);
 				newDataMap.put(key.toLowerCase(Locale.ROOT),value);
 			}*/
-		/*	dataMap.forEach((key,value)->{
+			/*	dataMap.forEach((key,value)->{
 				newDataMap.put(key.toLowerCase(Locale.ROOT),value);
 			});*/
 			//baseModel.setData((Map)newDataMap);
@@ -172,6 +233,85 @@
 			}
 		}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 {
+		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(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");
+			if(secretgrade!=null){
+				baseModel.setSecretGrade(chageStringToInt(secretgrade.toString()));
+			}
+		}catch (VciBaseException e){
+			e.printStackTrace();
+			throw e;
 		}
 		return (T)baseModel;
 	}
@@ -196,4 +336,5 @@
 		}
 		return date;
 	}
+
 }

--
Gitblit v1.9.3