From 3729193aff63c48527cfde4467a9fc020100ae37 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 05 十二月 2023 19:08:03 +0800 Subject: [PATCH] 代码提交 --- Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 29 +++++++++-------------------- 1 files changed, 9 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 7c77831..998390e 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,24 +1,15 @@ 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; 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 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; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; -import java.util.Locale; import java.util.Map; /** @@ -37,7 +28,7 @@ * @return * @throws VciBaseException */ - public static <T extends BaseModel> T addDefaultAttrAssimt(T object, String btmName, HttpServletRequest request/*涓嶅湪澶氱嚎绋嬫祦涓娇鐢ㄥ氨涓嶉渶瑕佷紶request*/) throws VciBaseException { + public static <T extends BaseModel> T addDefaultAttrAssimt(T object, String btmName) throws VciBaseException { BaseModel baseModel = object; try { baseModel.setOid(VciBaseUtil.getPk()); @@ -46,9 +37,8 @@ baseModel.setLastModifyTime(new Date()); baseModel.setTs(new Date()); baseModel.setRevisionOid(VciBaseUtil.getPk()); - String account = Func.isEmpty(request) ? AuthUtil.getUser().getAccount() : AuthUtil.getUser(request).getAccount(); baseModel.setBtmname(btmName); - baseModel.setCreator(account); + baseModel.setCreator(AuthUtil.getUserAccount()); baseModel.setFirstR("1"); baseModel.setFirstV("1"); baseModel.setLastR("1"); @@ -57,17 +47,17 @@ // TODO:鐩墠鍙湁缂栫爜瑙勫垯涓湁鐢ㄥ埌锛屽悗鏈熼渶瑕佸幓鎺夎繖娈典唬鐮佺殑璇濓紝灏辨妸浠栧姞鍦ㄧ紪鐮佽鍒欐柊澧炰腑鍘� if(Func.isBlank(baseModel.getOwner())){ // 璁剧疆鎵�鏈夎�� - baseModel.setOwner(Func.isEmpty(request) ? AuthUtil.getUserId().toString():AuthUtil.getUserId(request).toString()); + baseModel.setOwner(AuthUtil.getUserId().toString()); } baseModel.setVersionSeq(1); baseModel.setVersionRule("0"); baseModel.setVersionValue("1"); baseModel.setRevisionOid(VciBaseUtil.getPk()); - baseModel.setLastModifier(account); + baseModel.setLastModifier(AuthUtil.getUserAccount()); baseModel.setRevisionValue("1"); baseModel.setRevisionRule("1"); - baseModel.setTenantId(Func.isEmpty(request) ? AuthUtil.getTenantId():AuthUtil.getTenantId(request)); + baseModel.setTenantId(AuthUtil.getTenantId()); }catch (VciBaseException e){ e.printStackTrace(); } @@ -81,7 +71,7 @@ * @return * @throws VciBaseException */ - public static <T extends BaseModel> T updateDefaultAttrAssimt(T object,HttpServletRequest request) throws VciBaseException { + public static <T extends BaseModel> T updateDefaultAttrAssimt(T object) throws VciBaseException { BaseModel baseModel = object; try { baseModel.setLastModifyTime(new Date()); @@ -89,8 +79,7 @@ // 鐢ㄦ埛id // String userId = AuthUtil.getUserId().toString(); // 瑕佹眰鏀规垚璐﹀彿 - String account = Func.isEmpty(request) ? AuthUtil.getUser().getAccount() : AuthUtil.getUser(request).getAccount(); - baseModel.setLastModifier(account); + baseModel.setLastModifier(AuthUtil.getUserAccount()); }catch (VciBaseException e){ e.printStackTrace(); } @@ -104,7 +93,7 @@ * @return * @throws VciBaseException */ - public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object,HttpServletRequest request) 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"); @@ -158,7 +147,7 @@ baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE","")); baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE","")); baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID","")); - baseModel.setLastModifier(Func.isEmpty(request) ? AuthUtil.getUser().getAccount() : AuthUtil.getUser(request).getAccount()); + baseModel.setLastModifier(AuthUtil.getUser().getAccount()); baseModel.setLcStatus(dataMap.getOrDefault("LCSTATUS","")); baseModel.setName(dataMap.getOrDefault("NAME","")); baseModel.setTenantId(dataMap.getOrDefault("TENADTID","")); -- Gitblit v1.9.3