From e120b9ee7c7586985867e20e154f18e9f61dce32 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 28 八月 2023 17:52:45 +0800
Subject: [PATCH] 统一接口配置保存bug修复
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 5 ++++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 13 ++++++++-----
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/edit.xml | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/edit.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/edit.xml
new file mode 100644
index 0000000..1db1a26
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/edit.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data systemId="MPM">
+ <user userName="weidy" trueName="榄忓ぇ鍕�" ip="127.0.0.1"/>
+ <classifys>
+ <classify classCode="020101" library="wupin" fullclsfNamePath="鐗╁搧##VCI##鏍囧噯浠�##VCI##铻烘爴">
+ <objects>
+ <object code="02010100039" id="0023401" status="Editing" operate="create" editor="weidy" >
+ <prop key="partname" text="鍚嶇О" value="娓╁害璋冭妭鍣�1"/>
+ <prop key="use" text="涓昏鍔熻兘" value="瀵肩數杩炴帴1"/>
+ <prop key="xinghaoguige" text="涓昏鍔熻兘" value="TH-003274"/>
+ </object>
+ <object code="02010100040" id="0023402" status="Editing" operate="create" editor="weidy">
+ <prop key="partname" text="鎵�灞炵粨鏋�" value="娓╁害璋冭妭鍣�2"/>
+ <prop key="use" text="涓昏鍔熻兘" value="瀵肩數杩炴帴2"/>
+ <prop key="xinghaoguige" text="涓昏鍔熻兘" value="GGXH-003274"/>
+ </object>
+ </objects>
+ </classify>
+ <classify classCode="020102" library="wupin" fullclsfNamePath="鐗╁搧##VCI##鏍囧噯浠�##VCI##铻烘瘝">
+ <objects>
+ <object code="02010200033" id="0023401" status="Editing" operate="create" editor="weidy">
+ <prop key="partname" text="鍚嶇О" value="娓╁害璋冭妭鍣�1"/>
+ <prop key="use" text="涓昏鍔熻兘" value="瀵肩數杩炴帴1"/>
+ <prop key="xinghaoguige" text="涓昏鍔熻兘" value="GGXH-003274"/>
+ </object>
+ <object code="02010200034" id="0023402" status="Editing" operate="create" editor="weidy">
+ <prop key="partname" text="鎵�灞炵粨鏋�" value="娓╁害璋冭妭鍣�2"/>
+ <prop key="use" text="涓昏鍔熻兘" value="瀵肩數杩炴帴2"/>
+ <prop key="xinghaoguige" text="涓昏鍔熻兘" value="GGXH-003274"/>
+ </object>
+ </objects>
+ </classify>
+ </classifys>
+</data>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
index a256faf..21c60ed 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
@@ -367,7 +367,10 @@
@Override
public boolean deleteDataById(String oids) {
- return false;
+ VciBaseUtil.alertNotNull(oids, "鏁版嵁涓婚敭涓虹┖");
+ List<String> oidList=VciBaseUtil.str2List(oids);
+ int i=dockingSystemConfigMapper.deleteBatchIds(oidList);
+ return i>0?true:false;
}
/**
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 6ac3b6e..d05539a 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
@@ -2090,6 +2090,7 @@
XMLResultDataObjectDetailDO resultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
if(isCodeOrGroupCode) {
if(StringUtils.isBlank(groupCode)){
+ errorid="1";
mes+="锛涚敵璇风殑缂栫爜绫诲瀷涓洪泦鍥㈢爜锛岀瓑寰呴泦鍥㈢紪鐮佽祴鍊�";
}
resultDataObjectDetailDO.setCode(groupCode);
@@ -2157,14 +2158,16 @@
}
if(isCodeOrGroupCode) {
if(StringUtils.isBlank(groupCode)){
+ resultDataObjectDetailDO.setErrorid("1");
msg="鐢宠鐨勭紪鐮佺被鍨嬩负闆嗗洟鐮侊紝绛夊緟闆嗗洟缂栫爜璧嬪��";
}
resultDataObjectDetailDO.setCode(groupCode);
}else{
resultDataObjectDetailDO.setCode(code);
+ resultDataObjectDetailDO.setErrorid("0");
}
resultDataObjectDetailDO.setId(sourceOid);
- resultDataObjectDetailDO.setErrorid("0");
+
resultDataObjectDetailDO.setMsg(msg);
resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
//澶勭悊浼犻�佺殑鏁版嵁涓叧閿睘鎬ч噸澶嶇殑锛岀洿鎺ユ嬁鍒板凡缁忕敵璇峰埌缂栫爜鐨勬暟鎹紪鐮佺洿鎺ュ皢璧嬬粰鍏抽敭灞炴�ч噸澶嶇殑鏁版嵁
@@ -2325,9 +2328,9 @@
sb.append(tableName);
sb.append(" where 1=1 ");
if(isCodeOrGroupCode) {
- sb.append(" groupcode in (");
+ sb.append(" and groupcode in (");
}else{
- sb.append(" id in (");
+ sb.append(" and id in (");
}
sb.append(VciBaseUtil.toInSql(codeDataMap.keySet().toArray(new String[0])));
sb.append(")");
@@ -2359,7 +2362,7 @@
RowDatas rowData=codeDataMap.get(code);
String status=rowData.getStatus();
String operation=rowData.getOperation();
- if (cbo.getTs().compareTo(orderDTO.getTs())==0?true:false) {
+ if (cbo.getTs().compareTo(orderDTO.getTs())==0?false:true) {
// throw new VciBaseException("鏁版嵁涓嶆槸鏈�鏂扮殑锛屽彲鑳戒粬浜哄凡缁忎慨鏀癸紝璇峰埛鏂板悗鍐嶈瘯");
errorMap.put(orderDTO.getId(),errorMap.getOrDefault(orderDTO.getId(),"")+";鏁版嵁涓嶆槸鏈�鏂扮殑锛屽彲鑳戒粬浜哄凡缁忎慨鏀癸紝璇峰埛鏂板悗鍐嶈瘯");
}
@@ -4013,7 +4016,7 @@
DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject);
for (String key:dataMap.keySet()){
Object value= dataMap.getOrDefault(key,"");
- clientBusinessObject.setAttributeValue(key,value.toString());
+ clientBusinessObject.setAttributeValue(key,value==null?"":value.toString());
}
clientBusinessObjectList.add(clientBusinessObject);
});
--
Gitblit v1.9.3