From 7db864d691fdc62cda52c11b4c740cdc25dfeaa9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 11 十二月 2023 18:14:09 +0800
Subject: [PATCH] 代码覆盖，合并copy方法
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 13 ++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 12 +++--
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 82 +----------------------------------------
3 files changed, 21 insertions(+), 86 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 5e9e678..83d0d13 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
@@ -156,13 +156,13 @@
}
/**
- * 鏂板鏃跺～鍏呴粯璁ゅ��
+ * 鏂板鏃跺～鍏呴粯璁ゅ�硷細澶氱嚎绋嬫祦涓皟鐢�
* @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
* @param <T> 杩斿洖鍊肩殑绫诲瀷
* @return
* @throws VciBaseException
*/
- public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object,boolean isCase) throws VciBaseException {
+ public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object,boolean isCase, BladeUser user) throws VciBaseException {
BaseModel baseModel = object;
baseModel.getData().putAll(dataMap);
try {
@@ -228,84 +228,6 @@
baseModel.setDescription(dataMap.getOrDefault(isCase?"DESCRIPTION":"description",""));
baseModel.setCopyFromVersion(dataMap.getOrDefault(isCase?"COPYFROMVERSION":"copyfromversion",""));
Object secretgrade=dataMap.get(isCase?"SECRETGRADE":"secretgrade");
- if(secretgrade!=null){
- baseModel.setSecretGrade(chageStringToInt(secretgrade.toString()));
- }
- }catch (VciBaseException e){
- e.printStackTrace();
- throw e;
- }
- return (T)baseModel;
- }
-
- /**
- * 鏂板鏃跺～鍏呴粯璁ゅ�硷細澶氱嚎绋嬫祦涓皟鐢�
- * @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
- * @param <T> 杩斿洖鍊肩殑绫诲瀷
- * @return
- * @throws VciBaseException
- */
- public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object, BladeUser user) 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(Func.isNotEmpty(user) ? user.getAccount():AuthUtil.getUser().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()));
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 6b4bca3..06872ec 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -4407,7 +4407,7 @@
List<BaseModel> newCboList = new ArrayList<>();
newDataList.stream().forEach(stringStringMap -> {
BaseModel baseModel=new BaseModel();
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(stringStringMap,baseModel,false);
+ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(stringStringMap,baseModel,false,user);
baseModel.setData(stringStringMap);
newCboList.add(baseModel);
});
@@ -4631,9 +4631,10 @@
}
private List<ClientBusinessObject> ChangeMapTOClientBusinessObjects(List<Map<String,String>> oldDataMap){
List<ClientBusinessObject> clientBusinessObjectList=new ArrayList<>();
+ final BladeUser user = AuthUtil.getUser();
oldDataMap.stream().forEach(dataMap->{
ClientBusinessObject clientBusinessObject=new ClientBusinessObject();
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject,true);
+ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject,true,user);
for (String key:dataMap.keySet()){
Object value= dataMap.getOrDefault(key,"");
clientBusinessObject.setAttributeValue(key.toLowerCase(Locale.ROOT),value==null?"":value.toString());
@@ -5289,10 +5290,10 @@
// 淇敼鐗堟鍙�
engineService.updateBatchByBaseModel(btmTypeId,oldCbos);
List<CodeAllCode> codeAllCodeList=new ArrayList<>();
-
+ final BladeUser user = AuthUtil.getUser();
cboList.stream().forEach(clientBusinessObject -> {
BaseModel newBaseModel=new BaseModel();
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(clientBusinessObject.getData(),newBaseModel,true);
+ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(clientBusinessObject.getData(),newBaseModel,true,user);
newCbos.add(newBaseModel);
});
// 鎻掑叆鏂扮殑鏁版嵁
@@ -5324,6 +5325,7 @@
public void batchSwitchCheckExist(Map<String,String> errorMap,List<ClientBusinessObject> cboList,CodeClassifyFullInfoBO classifyFullInfo,CodeClassifyTemplateVO templateVO,ExecGroupCodePortDataDTO execGroupCodePortDataDTO,Map<Integer/**鍒楀彿**/,String/**瀛楁鐨勫悕绉�**/> fieldIndexMap){
List<BaseModel> oldBaseModelList=new ArrayList<>();
List<CodeAllCode> codeAllCodeList=new ArrayList<>();
+ final BladeUser user = AuthUtil.getUser();
cboList.stream().forEach(clientBusinessObject -> {
String code=clientBusinessObject.getId();
String rowIndex=clientBusinessObject.getAttributeValue(IMPORT_ROW_INDEX);
@@ -5336,7 +5338,7 @@
Map<String,String> dataMap=dataList.get(0);
BaseModel oldBaseModel=new BaseModel();
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,oldBaseModel,false);
+ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,oldBaseModel,false,user);
String oldOid=oldBaseModel.getOid();
clientBusinessObject.setCopyFromVersion(oldOid);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index 301a208..1f85607 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -55,6 +55,7 @@
import com.vci.ubcs.system.vo.RoleVO;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
@@ -68,6 +69,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -391,6 +394,13 @@
resultStr= transferResultXMl(xmlResultSystemVO,dataType);
}catch (Throwable e){
e.printStackTrace();
+ StringWriter sw = null;
+ PrintWriter pw = null;
+ sw = new StringWriter();
+ pw = new PrintWriter(sw);
+ e.printStackTrace(pw);//灏嗗嚭閿欑殑鏍堜俊鎭緭鍑哄埌printWriter涓�
+ pw.flush();
+ sw.flush();
msg="鐢宠缂栫爜澶辫触:"+e.getMessage();
/* XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
XMLResultSystemVO.setErrorid(errorid);
@@ -2298,9 +2308,10 @@
private List<ClientBusinessObject> ChangeMapTOClientBusinessObjects(List<Map<String,String>> oldDataMap){
List<ClientBusinessObject> clientBusinessObjectList=new ArrayList<>();
+ final BladeUser user = AuthUtil.getUser();
oldDataMap.stream().forEach(dataMap->{
ClientBusinessObject clientBusinessObject=new ClientBusinessObject();
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject,true);
+ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject,true,user);
for (String key:dataMap.keySet()){
Object value= dataMap.getOrDefault(key,"");
clientBusinessObject.setAttributeValue(key.toLowerCase(Locale.ROOT),value==null?"":value.toString());
--
Gitblit v1.9.3