From b40cd8c94978d43f9d13ba9ee93a4164b68a8165 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 05 十二月 2023 16:11:51 +0800
Subject: [PATCH] 赋默认值工具类修改，根据多线程流情况修改
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 383a2aa..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,10 +46,9 @@
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(AuthUtil.getUser().getAccount());
+ baseModel.setCreator(account);
baseModel.setFirstR("1");
baseModel.setFirstV("1");
baseModel.setLastR("1");
@@ -54,17 +57,17 @@
// 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(AuthUtil.getUser().getAccount());
+ baseModel.setLastModifier(account);
baseModel.setRevisionValue("1");
baseModel.setRevisionRule("1");
- baseModel.setTenantId(AuthUtil.getTenantId());
+ baseModel.setTenantId(Func.isEmpty(request) ? AuthUtil.getTenantId():AuthUtil.getTenantId(request));
}catch (VciBaseException e){
e.printStackTrace();
}
@@ -78,7 +81,7 @@
* @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());
@@ -86,7 +89,7 @@
// 鐢ㄦ埛id
// String userId = AuthUtil.getUserId().toString();
// 瑕佹眰鏀规垚璐﹀彿
- String account = AuthUtil.getUserAccount();
+ String account = Func.isEmpty(request) ? AuthUtil.getUser().getAccount() : AuthUtil.getUser(request).getAccount();
baseModel.setLastModifier(account);
}catch (VciBaseException e){
e.printStackTrace();
@@ -101,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");
@@ -112,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);
@@ -155,7 +158,7 @@
baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
- baseModel.setLastModifier(AuthUtil.getUser().getAccount());
+ 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",""));
--
Gitblit v1.9.3