From 6af81ea2461ff8fe48320f4d33fe7b22c605254d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 14 十二月 2023 18:56:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/标准..JSON | 9 +++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 32 +++++++++++-----
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/xxx.json | 16 ++++----
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 8 ++--
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StatisticConfigServiceImpl.java | 1
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/TT.json | 17 ++++++++
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 3 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 2
8 files changed, 61 insertions(+), 27 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/TT.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/TT.json
new file mode 100644
index 0000000..967a1a2
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/TT.json
@@ -0,0 +1,17 @@
+{
+ "data": {
+ "systemId": "MPM",
+ "user": {
+ "userName": "weidy",
+ "trueName": "榄忓ぇ鍕�",
+ "ip": "127.0.0.1"
+ },
+ "library": {
+ "id": "wupin",
+ "classifyid":[
+ "020201",
+ "020202"
+ ]
+ }
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/xxx.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/xxx.json
index a83e07e..9cc4b97 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/xxx.json
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/xxx.json
@@ -3,18 +3,14 @@
"classifys": {
"classify": [
{
- "classCode": "050101",
+ "classCode": "1025",
"fullclsfNamePath": "",
- "library": "wupin",
+ "library": "10",
"sections": {
"section": [
{
- "name": "鍥哄畾鐮佹",
- "value": "A"
- },
- {
- "name": "寮曠敤鐮佹",
- "value": "001"
+ "name": "鍒嗙被",
+ "value": "1025"
}
]
},
@@ -30,6 +26,10 @@
"key": "name",
"text": "鍚嶇О",
"value": "鍗婂渾澶磋灪閽�"
+ },{
+ "key": "drawingno",
+ "text": "鍥惧彿",
+ "value": "test2023-11-20-24"
}]
}
]
diff --git "a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\346\240\207\345\207\206..JSON" "b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\346\240\207\345\207\206..JSON"
index 1e34e0c..43fc541 100644
--- "a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\346\240\207\345\207\206..JSON"
+++ "b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\346\240\207\345\207\206..JSON"
@@ -16,7 +16,10 @@
"value": "Q/3B",
"name": "鍥哄畾鐮佹"
},
- { "name": "绯诲垪鍙�" },
+ {
+ "name": "绯诲垪鍙�",
+ "value":""
+ },
{
"value": "-",
"name": "鍒嗗壊绗�"
@@ -33,9 +36,9 @@
"editSeriesFlag": "false",
"releaseTime": "2023-11-14",
"seriesFlag": "false",
- "oldCode": "",
+ "oldCode": "Q/3B12-2023",
"seriesFlow": "",
- "operationType": "1",
+ "operationType": "2",
"creator": "weidy",
"operate": "create",
"status": "Released",
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
index 42e4177..852fe8e 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
@@ -14,6 +14,7 @@
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
@@ -289,7 +290,7 @@
* @param jclassObject
* @throws Throwable
*/
- private void getVilewMode(DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list)
+ private void getVilewMode(@NotNull DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list)
throws Throwable {
String nodeLinkName = jclassObject.getNodeLinkName();
try {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index bd645df..891948a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -670,7 +670,7 @@
* @return
*/
public List<CodeClassifyVO> selectAllClassifyByOid(String oid, String fieldInPath){
- List<CodeClassify> codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,AuthUtil.getTenantId(),fieldInPath);
+ List<CodeClassify> codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,fieldInPath,AuthUtil.getTenantId());
List<CodeClassifyVO> voList = codeClassifyDO2VOs(codeClassifyList);
return voList;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 82d9c86..8e54c6b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -1168,10 +1168,7 @@
"order by to_char(CREATETIME, 'mm')";
//鏌ヨ鍑洪渶瑕佸鐞嗙殑鏁版嵁
List<Map> maps = commonsMapper.selectBySql(sql);
- if(maps.size() == 0){
- throw new ServiceException("浼犲叆绫诲瀷["+ datum.getName() + ":" +
- datum.getId() +"]鏈煡鍒扮浉鍏崇粺璁℃暟鎹紝璇风‘璁�!!!!");
- }
+
//褰撳勾姣忔湀鏈堜唤涔嬪墠涔嬪拰
List<Integer> monthCount = new ArrayList<>(12);
//褰撳勾姣忔湀鐨勬湀浠芥暟鎹�
@@ -1179,6 +1176,9 @@
//鑾峰彇褰撳墠鏈堢殑鏁板瓧
Calendar instance = Calendar.getInstance();
int nowmonth = instance.get(Calendar.MONTH) + 1;
+ if(maps.size() == 0){
+ nowmonth = 0;
+ }
//浠�1鍒�12鏈堣繘琛屽鐞�
for (Integer i = 1; i <= 12; i++) {
//褰撳墠鏈堝悗鎵�鏈夋暟鎹缃负0
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 755fdba..40aa35b 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
@@ -315,7 +315,7 @@
//鏍￠獙鏄惁閰嶇疆
DockingSystemConfig dockingSystemConfig=null;
dockingSystemConfig=checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
- if(dockingSystemConfig==null){
+ if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
errorid[0] ="101";
throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
}
@@ -1064,7 +1064,7 @@
if(CODE_CHECKCONFIG) {
//鏍￠獙鏄惁閰嶇疆
DockingSystemConfig dockingSystemConfig= checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getValue(),codeClassifyVO.getOid());
- if(dockingSystemConfig==null){
+ if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
objerrorCode ="101";
throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
}
@@ -1421,7 +1421,7 @@
if(CODE_CHECKCONFIG) {
//鏍￠獙鏄惁閰嶇疆
DockingSystemConfig dockingSystemConfig= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getValue(),currentCodeClassify[0].getOid());
- if(dockingSystemConfig==null){
+ if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
errorid ="101";
throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ systemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+currentCodeClassify[0].getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
}
@@ -2072,7 +2072,7 @@
//鏍￠獙鏄惁閰嶇疆
DockingSystemConfig dockingSystemConfig=null;
dockingSystemConfig=checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
- if(dockingSystemConfig==null){
+ if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
errorid[0] ="101";
throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
}
@@ -2426,7 +2426,7 @@
}catch (Throwable e){
objerrorCode="1";
e.printStackTrace();
- throw new Throwable("MDM闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
+ throw new Throwable("闆嗘垚绯荤粺鏍囪瘑涓猴細銆�"+systemId+"銆戯紝鍒嗙被搴撲负:銆�"+libray+"銆戠殑闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
}
LinkedList<String> rowNameList=new LinkedList<>();
LinkedHashMap<String,Integer> filedIndexMap=new LinkedHashMap<>();
@@ -2537,7 +2537,7 @@
}catch (Throwable e){
objerrorCode="1";
e.printStackTrace();
- throw new Throwable("MDM闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
+ throw new Throwable("闆嗘垚绯荤粺鏍囪瘑涓猴細銆�"+systemId+"銆戯紝鍒嗙被搴撲负:銆�"+libray+"銆戠殑闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
}
LinkedList<String> rowNameList=new LinkedList<>();
LinkedHashMap<String,Integer> filedIndexMap=new LinkedHashMap<>();
@@ -2729,8 +2729,15 @@
*/
private DockingSystemConfig checkIspass(String systemId,String type,String operationType,String classOid){
log.info("systemId锛�"+systemId+",type:"+SysIntegrationDataFlowTypeEnum.getTextByValue(type)+",operationType:"+sysIntegrationPushTypeEnum.getTextByValue(operationType)+",classOid:"+classOid);
- CodeClassifyVO codeClassifyVO= classifyService.getObjectByOid(classOid);
- classOid=codeClassifyVO.getOid();
+ //CodeClassifyVO codeClassifyVO= classifyService.getObjectByOid(classOid);
+ List<CodeClassify> codeClassifyList= classifyService.selectAllLevelParentByOid(classOid);
+ List<String> classifyOids=new ArrayList<>();
+ if(!CollectionUtils.isEmpty(codeClassifyList)) {
+ classifyOids = codeClassifyList.stream().map(CodeClassify::getOid).collect(Collectors.toList());
+ }else{
+ return null;
+ }
+ //classOid=codeClassifyVO.getOid();
//鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
LambdaQueryWrapper<DockingSystemConfig> queryWrapper = Wrappers.<DockingSystemConfig>lambdaQuery();
queryWrapper.eq(DockingSystemConfig::getUsedFlag, MdmDuckingConstant.SEND_FLAG_TRUE);
@@ -2738,11 +2745,16 @@
queryWrapper.eq(DockingSystemConfig::getDataFlowType,type);
queryWrapper.eq(DockingSystemConfig::getPushType,operationType);
if(StringUtils.isNotBlank(classOid)){
- queryWrapper.in(DockingSystemConfig::getClassifyOid,classOid);
+ queryWrapper.in(DockingSystemConfig::getClassifyOid,classifyOids);
}
List<DockingSystemConfig> dockingSystemConfigList=new ArrayList<>();
dockingSystemConfigList= dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper);
if(!CollectionUtils.isEmpty(dockingSystemConfigList)){
+ return dockingSystemConfigList.get(0);
+ }else{
+ return null;
+ }
+ /*if(!CollectionUtils.isEmpty(dockingSystemConfigList)){
return dockingSystemConfigList.get(0);
}else{
if(StringUtils.isNotBlank(codeClassifyVO.getParentCodeClassifyOid())) {
@@ -2753,6 +2765,6 @@
return dockingSystemConfigList.get(0);
}else{
return new DockingSystemConfig();
- }
+ }*/
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StatisticConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StatisticConfigServiceImpl.java
index 1168900..0c5c98c 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StatisticConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StatisticConfigServiceImpl.java
@@ -96,6 +96,7 @@
public R getBtmAndChartIds() {
QueryWrapper<StatisticConfig> wrapper = new QueryWrapper<>();
wrapper.eq("user_id", AuthUtil.getUser().getUserId());
+ wrapper.isNotNull("chart_ids");
List<StatisticConfig> list = this.list(wrapper);
Map<String, String> collect = list.stream().collect(Collectors.toMap(StatisticConfig::getBtmname, StatisticConfig::getChartIds));
return R.data(collect);
--
Gitblit v1.9.3