From 4187374bbae66190e7eca6f42cc5e61cfae1637f Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期六, 12 八月 2023 13:33:18 +0800
Subject: [PATCH] PDM集成swing界面相关功能开发
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
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 db243fa..a363fc1 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
@@ -95,11 +95,11 @@
*/
@Autowired(required = false)
private DockingSystemMapper dockingSystemMapper;
- /***
- * 浠诲姟鐢熸垚鏈嶅姟
- */
- @Autowired(required = false)
- private IDockingTaskService dockingTaskService;
+// /***
+// * 浠诲姟鐢熸垚鏈嶅姟
+// */
+// @Resource
+// private IDockingTaskService dockingTaskService;
/**
@@ -164,9 +164,14 @@
log.info(" 澧炲姞绯荤粺闆嗘垚鐨勬帴鍙ｇ鐞嗕俊鎭�:"+dockingSystemConfigDTO.toString());
VciBaseUtil.alertNotNull(dockingSystemConfigDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
checkColumnNotNull(dockingSystemConfigDTO);
- String sourcesystemoid = dockingSystemConfigDTO.getSourceSystemOid();
- DockingSystem dockingSystem = dockingSystemMapper.selectById(sourcesystemoid);
- dockingSystemConfigDTO.setSysBaseOid(sourcesystemoid);
+ String systemOid ="";
+ if(dockingSystemConfigDTO.getDataFlowType().equals(SysIntegrationDataFlowTypeEnum.ACCEPT.getValue())) {
+ systemOid = dockingSystemConfigDTO.getTargetSystemOid();
+ }else{
+ systemOid = dockingSystemConfigDTO.getSourceSystemOid();
+ }
+ DockingSystem dockingSystem = dockingSystemMapper.selectById(systemOid);
+ dockingSystemConfigDTO.setSysBaseOid(systemOid);
dockingSystemConfigDTO.setSysBaseId(dockingSystem.getId());
dockingSystemConfigDTO.setSysBaseName(dockingSystem.getName());
dockingSystemConfigDTO.setUsedFlag("true");//璁剧疆榛樿鍚敤鐘舵��
@@ -386,7 +391,7 @@
String codeClassifyOid = dockingSystemConfig.getClassifyOid();
CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyOid);
CodeClassifyVO topClassifyVO = classifyService.getTopClassifyVO(codeClassifyOid);
- String btmTypeId = topClassifyVO.getBtmtypeid();
+ String btmTypeId = topClassifyVO.getBtmTypeId();
if (StringUtils.isBlank(btmTypeId)) {
return R.fail("杩欎釜鍒嗙被鎵�灞為《灞傚垎绫绘病鏈夋坊鍔犱笟鍔＄被鍨�");
}
@@ -420,7 +425,7 @@
String btmoid = map.get("oid".toUpperCase(Locale.ROOT)) == null ? "" : map.get("oid".toUpperCase(Locale.ROOT)).toString();//鏁版嵁oid
String sendtype = map.get("lcstatus".toUpperCase(Locale.ROOT)) == null ? "" : map.get("lcstatus".toUpperCase(Locale.ROOT)).toString();//鏁版嵁鎺ㄩ�佺被鍨�
String id = map.get("id".toUpperCase(Locale.ROOT)) == null ? "" : map.get("id".toUpperCase(Locale.ROOT)).toString();//缂栫爜
- String btmid = topClassifyVO.getBtmtypeid();//鏁版嵁涓氬姟绫诲瀷
+ String btmid = topClassifyVO.getBtmTypeId();//鏁版嵁涓氬姟绫诲瀷
String classifyoid = map.get("codeclsfid".toUpperCase(Locale.ROOT)) == null ? "" : map.get("codeclsfid".toUpperCase(Locale.ROOT)).toString();//鏁版嵁鎵�鍦ㄧ殑鍒嗙被id
String date2Str = VciDateUtil.date2Str(new Date(), VciDateUtil.DateTimeFormatStr);
DockingTask dockingTaskDO = new DockingTask();
@@ -450,7 +455,7 @@
dockingTaskDO_insert.add(dockingTaskDO);
});
}
- dockingTaskService.saveBatch(dockingTaskDO_insert);
+// dockingTaskService.saveBatch(dockingTaskDO_insert);
}catch (Throwable e){
msg="鏁版嵁鎺ㄩ�佸埌瀹氭椂浠诲姟澶辫触!";
log.error("鏁版嵁鎺ㄩ�佸埌瀹氭椂浠诲姟澶辫触!"+e);
--
Gitblit v1.9.3