From e60e0df52a2429755fec485b164db1475dabaf9a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 26 九月 2023 17:23:30 +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 | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 102 insertions(+), 4 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..a004b76 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,21 @@
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.HashMap;
import java.util.Locale;
+import java.util.Map;
/**
* 鏂板鏃堕粯璁ゅ�煎睘鎬ц祴鍊�
@@ -31,7 +36,7 @@
public static <T extends BaseModel> T addDefaultAttrAssimt(T object,String btmName) throws VciBaseException {
BaseModel baseModel = object;
try {
- baseModel.setOid(VciBaseUtil.getPk().toUpperCase());
+ baseModel.setOid(VciBaseUtil.getPk());
baseModel.setCreateTime(new Date());
baseModel.setNameOid(VciBaseUtil.getPk());
baseModel.setLastModifyTime(new Date());
@@ -46,11 +51,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 +87,94 @@
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(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