From 18997e6de96f7be5b55a94168c80103e6363cb0e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 12 七月 2023 20:24:53 +0800
Subject: [PATCH] 提交代码

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java |   78 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 75 insertions(+), 3 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 251eb48..3b51169 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,16 +1,20 @@
 package com.vci.ubcs.starter.util;
 
-import com.alibaba.druid.util.StringUtils;
+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 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.Locale;
+import java.util.Map;
 
 /**
  * 鏂板鏃堕粯璁ゅ�煎睘鎬ц祴鍊�
@@ -46,11 +50,14 @@
 			baseModel.setLastR("1");
 			baseModel.setLastV("1");
 			baseModel.setRevisionSeq(1);
-			baseModel.setOwner("1");
+			if(Func.isBlank(baseModel.getOwner())){
+				// 璁剧疆鎵�鏈夎��
+				baseModel.setOwner(AuthUtil.getUserId().toString());
+			}
 			baseModel.setVersionSeq(1);
 			baseModel.setVersionRule("0");
 			baseModel.setVersionValue("1");
-			baseModel.setNameOid(VciBaseUtil.getPk());
+			baseModel.setRevisionOid(VciBaseUtil.getPk());
 			baseModel.setLastModifier(userId);
 		}catch (VciBaseException e){
 			e.printStackTrace();
@@ -79,4 +86,69 @@
 		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",""));
+			Object createTimeObj=dataMap.getOrDefault("CREATETIME","");
+			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));
+			Object tsObj=dataMap.getOrDefault("TS","");
+			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",""));
+			baseModel.setRevisionSeq(chageStringToInt(dataMap.getOrDefault("REVISIONSEQ","")));
+			baseModel.setOwner(dataMap.getOrDefault("OWNER",""));
+			baseModel.setVersionSeq(chageStringToInt(dataMap.getOrDefault("VERSIONSEQ","")));
+			baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
+			baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
+			baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
+			baseModel.setLastModifier(userId);
+		}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