From 49fef33cebe18fc10430147dbbb867c67d97750b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 05 十二月 2023 16:19:36 +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 | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 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 a004b76..7c77831 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,5 +1,6 @@
package com.vci.ubcs.starter.util;
+import com.alibaba.nacos.api.naming.pojo.healthcheck.impl.Http;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.BaseModel;
@@ -7,7 +8,10 @@
import org.apache.poi.ss.formula.functions.T;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.WebUtil;
+import org.springframework.web.util.WebUtils;
+import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.text.ParseException;
@@ -33,7 +37,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, HttpServletRequest request/*涓嶅湪澶氱嚎绋嬫祦涓娇鐢ㄥ氨涓嶉渶瑕佷紶request*/) throws VciBaseException {
BaseModel baseModel = object;
try {
baseModel.setOid(VciBaseUtil.getPk());
@@ -42,24 +46,28 @@
baseModel.setLastModifyTime(new Date());
baseModel.setTs(new Date());
baseModel.setRevisionOid(VciBaseUtil.getPk());
- //鐢ㄦ埛id
- String userId = AuthUtil.getUserId().toString();
+ String account = Func.isEmpty(request) ? AuthUtil.getUser().getAccount() : AuthUtil.getUser(request).getAccount();
baseModel.setBtmname(btmName);
- baseModel.setCreator(userId);
+ 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(AuthUtil.getUserId().toString());
+ baseModel.setOwner(Func.isEmpty(request) ? AuthUtil.getUserId().toString():AuthUtil.getUserId(request).toString());
}
+
baseModel.setVersionSeq(1);
baseModel.setVersionRule("0");
baseModel.setVersionValue("1");
baseModel.setRevisionOid(VciBaseUtil.getPk());
- baseModel.setLastModifier(userId);
+ baseModel.setLastModifier(account);
+ baseModel.setRevisionValue("1");
+ baseModel.setRevisionRule("1");
+ baseModel.setTenantId(Func.isEmpty(request) ? AuthUtil.getTenantId():AuthUtil.getTenantId(request));
}catch (VciBaseException e){
e.printStackTrace();
}
@@ -73,14 +81,16 @@
* @return
* @throws VciBaseException
*/
- public static <T extends BaseModel> T updateDefaultAttrAssimt(T object) throws VciBaseException {
+ public static <T extends BaseModel> T updateDefaultAttrAssimt(T object,HttpServletRequest request) throws VciBaseException {
BaseModel baseModel = object;
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 = Func.isEmpty(request) ? AuthUtil.getUser().getAccount() : AuthUtil.getUser(request).getAccount();
+ baseModel.setLastModifier(account);
}catch (VciBaseException e){
e.printStackTrace();
}
@@ -94,7 +104,7 @@
* @return
* @throws VciBaseException
*/
- public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object) throws VciBaseException {
+ public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object,HttpServletRequest request) throws VciBaseException {
BaseModel baseModel = object;
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -105,7 +115,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);
@@ -127,8 +137,8 @@
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",""));
@@ -137,7 +147,6 @@
baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
if(revisionseq!=null){
-
baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
}
@@ -149,8 +158,16 @@
baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
- baseModel.setLastModifier(userId);
-
+ baseModel.setLastModifier(Func.isEmpty(request) ? AuthUtil.getUser().getAccount() : AuthUtil.getUser(request).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();
}
--
Gitblit v1.9.3