From becbe54034f5803eee6540f533be9eb35ef8b86e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 13 四月 2024 20:46:52 +0800
Subject: [PATCH] 内网开发环境代码合并
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java | 61 +++++++++++++++++-------------
1 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
index 1cf91b0..102c534 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
@@ -141,10 +141,11 @@
log.info("鐢宠闆嗗洟鐮佹暟鎹牸寮�:->"+resultStr);
DockingResultVO resultDataObject = new DockingResultVO();
resultDataObject = mdmApplyGroupCodeProvider.receiveAddApply(dockingGroupDataVO);
+ log.info("鐢宠闆嗗洟鐮佽繑鍥炵粨鏋�:->"+JSONObject.toJSONString(resultDataObject));
code = resultDataObject.getCode();
msg = resultDataObject.getMsg();
boolean res=false;
- if ("1".equals(code)) {
+ if("1".equals(code)) {
//缁撴灉姝ｇ‘鐨勬儏鍐�
List<DockingDataVO> dataObjectVOList = resultDataObject.getData();
res=true;
@@ -154,7 +155,7 @@
DockingMainDataVO data2 = dataObject.getData();
String applyId = data2.getApplyId();//鐢宠鍗昳d
BaseModel baseModel = baseModelMap.get(applyId);
- String customCoding = StringUtils.isBlank(data2.getCustomCoding()) ? "" : data2.getCustomCoding();//闆嗗洟鐮佹
+ String customCoding = StringUtils.isBlank(data2.getCustomCoding()) ? "" : data2.getCustomCoding();
msg = dataObject.getMsg();
if (code2.equals("1")) {//缁撴灉姝ｇ‘鐨勬儏鍐�
if (!"".equals(customCoding)) {
@@ -183,9 +184,9 @@
} catch (JsonProcessingException e) {
}
Date date = new Date();
- baseModel.setLastModifyTime(date);
- baseModel.setTs(date);
- baseModel.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ dockingPreApplyForm.setLastModifyTime(date);
+ dockingPreApplyForm.setTs(date);
+ dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
//DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
}
//鏂板鐨勭敵璇峰崟鏁版嵁
@@ -205,17 +206,17 @@
Date date = new Date();
dockingPreApplyForm.setCreateTime(date);
dockingPreApplyForm.setLastModifyTime(date);
- dockingPreApplyForm.setTs(date);
- dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
dockingPreApplyForm.setCreator(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ dockingPreApplyForm.setTs(date);
// DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
}
//濡傛灉鏈夐泦鍥㈢爜鍒欐洿鏂版暟鎹�
if (isEditDatas) {
if (baseModelMap.containsKey(applyId)) {
baseModel = baseModelMap.get(applyId);
- Map<String,String> dataValueMap=new CaseInsensitiveMap<>(baseModel.getData());
+ //Map<String,String> dataValueMap=new CaseInsensitiveMap<>(baseModel.getData());
/*String classOid=baseModel.getId();
if(partCode.equals(classOid)){
baseModel.setId(10+customCoding);
@@ -234,15 +235,18 @@
});
} else {
res=false;
+ Date date = new Date();
editDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- Date date = new Date();
+ dockingPreApplyForm.setCreateTime(date);
dockingPreApplyForm.setLastModifyTime(date);
- dockingPreApplyForm.setTs(date);
+ dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ dockingPreApplyForm.setCreator(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ dockingPreApplyForm.setTs(date);
//DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
});
addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
@@ -250,13 +254,12 @@
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- Date date = new Date();
dockingPreApplyForm.setCreateTime(date);
dockingPreApplyForm.setLastModifyTime(date);
- dockingPreApplyForm.setTs(date);
+ dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
dockingPreApplyForm.setCreator(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
- dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ dockingPreApplyForm.setTs(date);
//DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
});
}
@@ -275,7 +278,7 @@
}
return R.success("鐢宠鎺ュ彛璋冪敤鎴愬姛");
} catch (VciBaseException e) {
- return R.fail("鐢宠鎺ュ彛璋冪敤澶辫触" + e);
+ return R.fail("鐢宠鎺ュ彛璋冪敤澶辫触" + e.getMessage());
}
}else{
return R.fail("鐢宠鎺ュ彛寮�鍏冲凡鍏抽棴锛屼笉鐢宠闆嗗洟鐮�");
@@ -372,8 +375,8 @@
Date date = new Date();
dockingPreApplyForm.setCreateTime(date);
dockingPreApplyForm.setLastModifyTime(date);
- dockingPreApplyForm.setTs(date);
dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ dockingPreApplyForm.setTs(date);
dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
dockingPreApplyForm.setCreator(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
//DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
@@ -391,8 +394,8 @@
baseModel.setLastModifyTime(date);
baseModel.setTs(date);
baseModel.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
- // baseModel.setId(customCoding);
+ //DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+ //baseModel.setId(customCoding);
baseModel.getData().put("GROUPCODE", customCoding);
updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
}
@@ -555,7 +558,7 @@
dockingPreClassify.setVersionValue(version);
dockingPreClassifyList.add(dockingPreClassify);
});
- boolean res= dockingPreClassifyService.saveOrUpdateBatch(dockingPreClassifyList);
+ boolean res = dockingPreClassifyService.saveOrUpdateBatch(dockingPreClassifyList);
if(res){
R.success(message);
}else{
@@ -670,7 +673,7 @@
VciBaseUtil.alertNotNull(operationType,"闆嗘垚鎿嶄綔绫诲瀷");
try {
if(operationType.equals("all")){
- return queryMdmModel();
+ return queryMdmModel();
}else{
VciBaseUtil.alertNotNull(classifyId,"闆嗗洟鍒嗙被涓婚敭");
return queryClassModel(classifyId);
@@ -926,7 +929,7 @@
* @return
* @throws VciBaseException
*/
- private DockingGroupDataVO queryApplycodeDataObjects(int optationtype,List<BaseModel> codeWupins,Map<String,DockingPreApplyForm> addDockingPreApplyFormMap,Map<String,DockingPreApplyForm> editDockingPreApplyFormMap,Map<String,BaseModel> codeWupinMap) throws VciBaseException{
+ private DockingGroupDataVO queryApplycodeDataObjects(int optationtype,List<BaseModel> codeWupins,Map<String,DockingPreApplyForm> addDockingPreApplyFormMap,Map<String,DockingPreApplyForm> editDockingPreApplyFormMap,Map<String,BaseModel> codeWupinMap) throws VciBaseException{
try {
// TODO锛氫富鏁版嵁鎺ㄩ�佽繃鏉ョ殑鏁版嵁鏄嬁涓嶅埌鍙互鐢宠闆嗗洟鐮佺殑鐢ㄦ埛淇℃伅鐨勶紝骞朵笖杩欎竴鍧楀効鐨勯�昏緫涔熻繕娌℃暡瀹氾紝鎵�浠ヨ繖鍎块噰鐢ㄩ厤缃殑鐢ㄦ埛鏉ョ敵璇烽泦鍥㈢爜
String curUserName = Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount();
@@ -961,7 +964,8 @@
addDockingPreApplyFormMap.put(applyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
// }
- codeWupinMap.put(applyCode, dataBusinessObject);//鐢宠鍗曞拰瀵瑰簲鏁版嵁鍏崇郴
+ //鐢宠鍗曞拰瀵瑰簲鏁版嵁鍏崇郴
+ codeWupinMap.put(applyCode, dataBusinessObject);
// conditionsMap = new HashMap<String, String>();
// conditionsMap.put("jtargetclsfid", codeclsfid);//瑙嗗浘oid
@@ -982,13 +986,16 @@
dockingPreApplyForm.setGroupCode(groucode);
mainData.setCustomCoding(groucode);
}
- mainData.setSecretLevel("鍐呴儴");//瀵嗙骇锛岄粯璁や负鍐呴儴
- mainData.setViewInfos(getviewInfos(optationtype,dockingPreClassify, dataBusinessObject));//鑾峰彇瑙嗗浘妯″瀷
+ //瀵嗙骇锛岄粯璁や负鍐呴儴
+ mainData.setSecretLevel("鍐呴儴");
+ //鑾峰彇瑙嗗浘妯″瀷
+ mainData.setViewInfos(getviewInfos(optationtype,dockingPreClassify, dataBusinessObject));
mainDataList.add(mainData);
}
//鏍规嵁鏁版嵁妯″瀷锛岀粍缁囨墍闇�瑕佹暟鎹�
- DockingGroupDataVO postParameters=new DockingGroupDataVO();
- postParameters.setSysName(dockingApplySysName);//绯荤粺鏍囪瘑
+ DockingGroupDataVO postParameters = new DockingGroupDataVO();
+ //绯荤粺鏍囪瘑
+ postParameters.setSysName(dockingApplySysName);
postParameters.setMainData(mainDataList);//
return postParameters;
} catch (Throwable e) {
@@ -1058,7 +1065,7 @@
String jenglishname=dockingPreMetaAttr.getEnglishName();////闆嗗洟閰嶇疆灞炴��
if(jintegmappconfigMap.containsKey(jenglishname)){
DockingPreAttrMapping dockingPreAttrMapping=jintegmappconfigMap.get(jenglishname);
- String attrId = dockingPreAttrMapping.getTargetAttrId();//缂栫爜灞炴�d
+ // String attrId = dockingPreAttrMapping.getTargetAttrId();//缂栫爜灞炴�d
String jtargetattrkey = dockingPreAttrMapping.getTargetAttrKey();//缂栫爜灞炴�d
Object newVaue=null;
if(StringUtils.isNotBlank(jtargetattrkey)){
@@ -1077,7 +1084,7 @@
}else{
newVaue = getVaue(dockingPreMetaAttr, "");
}
- if(newVaue==null||"".equals(newVaue)){
+ if(newVaue==null || "".equals(newVaue)){
newVaue= dockingPreMetaAttr.getDefaultValue();
}
//newVaue= Func.isNotEmpty(newVaue)?newVaue:"";
--
Gitblit v1.9.3