From ce567eb11cd0cdbd826214c355d1a8caff175dca Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 15 十一月 2023 14:25:22 +0800
Subject: [PATCH] bug列表：181（修复新增，修改，删除接口，新增时没设置默认值，导致在建分类时无法查询到，关键属性查重规则）183（历史数据导入模板下载，过滤掉模板中配置的默认属性）
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 77 ++++++++++++++++++++++++++++----------
1 files changed, 57 insertions(+), 20 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 c78da18..4e0bb26 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
@@ -6,12 +6,14 @@
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;
@@ -34,27 +36,35 @@
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());
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);
- baseModel.setOwner("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();
}
@@ -73,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,33 +106,58 @@
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","");
- String createTime= createTimeObj.toString();
- baseModel.setCreateTime(chageStringToDate(createTime));
+ if(createTimeObj!=null) {
+ 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));
+ if(lastModifyTimeObj!=null) {
+ String lastModifyTime = lastModifyTimeObj.toString();
+ baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
+ }
Object tsObj=dataMap.getOrDefault("TS","");
- String ts= tsObj.toString();
- baseModel.setTs(chageStringToDate(ts));
+ if(tsObj!=null) {
+ String ts = tsObj.toString();
+ baseModel.setTs(chageStringToDate(ts));
+ }
baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
- //鐢ㄦ埛id
- String userId = AuthUtil.getUserId().toString();
+ //鐢ㄦ埛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","")));
+ Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
+ if(revisionseq!=null){
+
+ baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
+ }
+
baseModel.setOwner(dataMap.getOrDefault("OWNER",""));
- baseModel.setVersionSeq(chageStringToInt(dataMap.getOrDefault("VERSIONSEQ","")));
+ 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);
+ baseModel.setLastModifier(AuthUtil.getUser().getAccount());
+
}catch (VciBaseException e){
e.printStackTrace();
}
--
Gitblit v1.9.3