From e1f235008ea146a9ddd283682c762cec4dca94cb Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 13 九月 2023 15:28:07 +0800
Subject: [PATCH] 接口管理接口搜索支持模糊查询
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 251 +++++++++++++++++++++++++++-----------------------
1 files changed, 136 insertions(+), 115 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 2c282f1..7198dd1 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
@@ -9,7 +9,7 @@
import com.thoughtworks.xstream.io.xml.DomDriver;
import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
+
import com.vci.ubcs.code.dto.DockingSysIntHeaderDTO;
import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
import com.vci.ubcs.code.dto.DockingSysIntParamDTO;
@@ -34,6 +34,8 @@
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
+import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
+import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
@@ -95,11 +97,11 @@
*/
@Autowired(required = false)
private DockingSystemMapper dockingSystemMapper;
- /***
- * 浠诲姟鐢熸垚鏈嶅姟
- */
- @Autowired( required = false)
- private IDockingTaskService dockingTaskService;
+// /***
+// * 浠诲姟鐢熸垚鏈嶅姟
+// */
+// @Resource
+// private IDockingTaskService dockingTaskService;
/**
@@ -134,9 +136,9 @@
private IDockingLogeService dockingLogeService;
@Override
- public IPage<DockingSystemConfigVO> page(DockingSystemConfig DockingSystemConfig, Query query) {
+ public IPage<DockingSystemConfigVO> page(Map<String,String>codtionMap, Query query) {
- IPage<DockingSystemConfig> pages = page(Condition.getPage(query), Condition.getQueryWrapper(DockingSystemConfig));
+ IPage<DockingSystemConfig> pages = page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(codtionMap));
List<DockingSystemConfig> dockingSystemConfigList= pages.getRecords();
dockingSystemConfigList.stream().forEach(dockingSystemConfig -> {
dockingSystemConfig.setDataFlowTypeText(SysIntegrationDataFlowTypeEnum.getTextByValue(dockingSystemConfig.getDataFlowType()));
@@ -160,51 +162,58 @@
*/
@Transactional(rollbackFor = Exception.class)
@Override
- public boolean addSave(DockingSystemConfigDTO dockingSystemConfigDTO) {
+ public boolean addSave(DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable {
log.info(" 澧炲姞绯荤粺闆嗘垚鐨勬帴鍙ｇ鐞嗕俊鎭�:"+dockingSystemConfigDTO.toString());
VciBaseUtil.alertNotNull(dockingSystemConfigDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
checkColumnNotNull(dockingSystemConfigDTO);
- String sourcesystemoid = dockingSystemConfigDTO.getSourceSystemOid();
- DockingSystem dockingSystem = dockingSystemMapper.selectById(sourcesystemoid);
- dockingSystemConfigDTO.setSysBaseOid(sourcesystemoid);
- dockingSystemConfigDTO.setSysBaseId(dockingSystem.getId());
- dockingSystemConfigDTO.setSysBaseName(dockingSystem.getName());
- dockingSystemConfigDTO.setUsedFlag("true");//璁剧疆榛樿鍚敤鐘舵��
-
- //灏咲TO杞崲涓篋O
- DockingSystemConfig dockingSystemConfig = new DockingSystemConfig();
- revisionModelUtil.copyFromDTOIgnore(dockingSystemConfigDTO,dockingSystemConfig);
-
-
- List<DockingSysIntParamDTO> sysIntParamDTOList= dockingSystemConfigDTO.getSysIntParamDTOS();
- List<DockingSysIntParam> sysIntParamList=new ArrayList<>();
- if(!CollectionUtils.isEmpty(sysIntParamDTOList)) {
- sysIntParamDTOList.stream().forEach(sysIntParamDTO -> {
- DockingSysIntParam sysIntParamDO = new DockingSysIntParam();
- sysIntParamDTO.setInfoOid(dockingSystemConfigDTO.getOid());
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntParamDTO, sysIntParamDO);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(sysIntParamDO,MdmBtmTypeConstant.SYS_INT_PARAMTERY);
- sysIntParamList.add(sysIntParamDO);
- });
+ String systemOid ="";
+ if(dockingSystemConfigDTO.getDataFlowType().equals(SysIntegrationDataFlowTypeEnum.PUSH.getValue())) {
+ systemOid = dockingSystemConfigDTO.getTargetSystemOid();
+ }else{
+ systemOid = dockingSystemConfigDTO.getSourceSystemOid();
}
- List<DockingSysIntHeaderDTO> sysIntHeaderDTOs= dockingSystemConfigDTO.getSysIntHeaderDTOS();
- List<DockingSysIntHeader> sysIntHeaderList = new ArrayList<>();
- if(!CollectionUtils.isEmpty(sysIntHeaderDTOs)) {
- sysIntHeaderDTOs.stream().forEach(sysIntHeaderDTO -> {
- DockingSysIntHeader dockingSysIntHeader = new DockingSysIntHeader();
- sysIntHeaderDTO.setInfoOid(dockingSystemConfigDTO.getOid());
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntHeaderDTO, dockingSysIntHeader);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSysIntHeader,MdmBtmTypeConstant.SYS_INT_HEADER);
- sysIntHeaderList.add(dockingSysIntHeader);
- });
- }
- dockingSysIntParamService.saveBatch(sysIntParamList);
- dockingSysIntHeaderService.saveBatch(sysIntHeaderList);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystemConfig,MdmBtmTypeConstant.SYS_INT_INFO);
- dockingSystemConfigMapper.insert(dockingSystemConfig);
+ DockingSystem dockingSystem = dockingSystemMapper.selectById(systemOid);
+ if(dockingSystem!=null) {
+ dockingSystemConfigDTO.setSysBaseOid(systemOid);
+ dockingSystemConfigDTO.setSysBaseId(dockingSystem.getId());
+ dockingSystemConfigDTO.setSysBaseName(dockingSystem.getName());
+ dockingSystemConfigDTO.setUsedFlag("true");//璁剧疆榛樿鍚敤鐘舵��
+ //灏咲TO杞崲涓篋O
+ DockingSystemConfig dockingSystemConfig = new DockingSystemConfig();
+ revisionModelUtil.copyFromDTOIgnore(dockingSystemConfigDTO,dockingSystemConfig);
+
+
+ List<DockingSysIntParamDTO> sysIntParamDTOList= dockingSystemConfigDTO.getSysIntParamDTOS();
+ List<DockingSysIntParam> sysIntParamList=new ArrayList<>();
+ if(!CollectionUtils.isEmpty(sysIntParamDTOList)) {
+ sysIntParamDTOList.stream().forEach(sysIntParamDTO -> {
+ DockingSysIntParam sysIntParamDO = new DockingSysIntParam();
+ sysIntParamDTO.setInfoOid(dockingSystemConfigDTO.getOid());
+ BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntParamDTO, sysIntParamDO);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(sysIntParamDO, MdmBtmTypeConstant.SYS_INT_PARAMTERY);
+ sysIntParamList.add(sysIntParamDO);
+ });
+ }
+ List<DockingSysIntHeaderDTO> sysIntHeaderDTOs= dockingSystemConfigDTO.getSysIntHeaderDTOS();
+ List<DockingSysIntHeader> sysIntHeaderList = new ArrayList<>();
+ if(!CollectionUtils.isEmpty(sysIntHeaderDTOs)) {
+ sysIntHeaderDTOs.stream().forEach(sysIntHeaderDTO -> {
+ DockingSysIntHeader dockingSysIntHeader = new DockingSysIntHeader();
+ sysIntHeaderDTO.setInfoOid(dockingSystemConfigDTO.getOid());
+ BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntHeaderDTO, dockingSysIntHeader);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSysIntHeader,MdmBtmTypeConstant.SYS_INT_HEADER);
+ sysIntHeaderList.add(dockingSysIntHeader);
+ });
+ }
+ dockingSysIntParamService.saveBatch(sysIntParamList);
+ dockingSysIntHeaderService.saveBatch(sysIntHeaderList);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystemConfig,MdmBtmTypeConstant.SYS_INT_INFO);
+ dockingSystemConfigMapper.insert(dockingSystemConfig);
+ }else{
+ throw new Throwable("鏍规嵁閫夋嫨鐨勯泦鎴愮郴缁熸湭鏍￠獙鍒扮郴缁熶腑瀛樺湪姝ら泦鎴愮郴缁燂紝璇锋牳瀵癸紒");
+ }
return true;
-
}
/**
@@ -214,76 +223,85 @@
*/
@Transactional(rollbackFor = Exception.class)
@Override
- public boolean editSave(DockingSystemConfigDTO dockingSystemConfigDTO) {
+ public boolean editSave(DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable {
VciBaseUtil.alertNotNull(dockingSystemConfigDTO,"鏁版嵁瀵硅薄",dockingSystemConfigDTO.getOid(),"绯荤粺闆嗘垚鍩虹淇℃伅涓婚敭");
- String sourcesystemoid = dockingSystemConfigDTO.getSourceSystemOid();//.getSourcesystemoid();
- DockingSystem dockingSystem = dockingSystemMapper.selectById(sourcesystemoid);
- dockingSystemConfigDTO.setSysBaseOid(sourcesystemoid);
- dockingSystemConfigDTO.setSysBaseId(dockingSystem.getId());
- dockingSystemConfigDTO.setBtmname(dockingSystem.getName());
- //灏咲TO杞崲涓篋O
- DockingSystemConfig dockingSystemConfig = dockingSystemConfigMapper.selectById(dockingSystemConfigDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(dockingSystemConfigDTO,dockingSystemConfig);
- String sysInfoOid=dockingSystemConfigDTO.getOid();
- List<DockingSysIntParamDTO> dockingSysIntParamDTOS= dockingSystemConfigDTO.getSysIntParamDTOS();
- List<DockingSysIntParam> dockingSysIntParamList=new ArrayList<>();
- if(!CollectionUtils.isEmpty(dockingSysIntParamDTOS)) {
- dockingSysIntParamDTOS.stream().forEach(dockingSysIntParamDTO -> {
- DockingSysIntParam dockingSysIntParam = new DockingSysIntParam();
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingSysIntParamDTO, dockingSysIntParam);
- dockingSysIntParamList.add(dockingSysIntParam);
- });
+ String systemOid ="";
+ if(dockingSystemConfigDTO.getDataFlowType().equals(SysIntegrationDataFlowTypeEnum.PUSH.getValue())) {
+ systemOid = dockingSystemConfigDTO.getTargetSystemOid();
+ }else{
+ systemOid = dockingSystemConfigDTO.getSourceSystemOid();
}
- List<DockingSysIntHeaderDTO> dockingSysIntHeaderDTOS= dockingSystemConfigDTO.getSysIntHeaderDTOS();
- List<DockingSysIntHeader> dockingSysIntHeaderList = new ArrayList<>();
- if(!CollectionUtils.isEmpty(dockingSysIntHeaderDTOS)) {
- dockingSysIntHeaderDTOS.stream().forEach(dockingSysIntHeaderDTO -> {
- DockingSysIntHeader dockingSysIntHeader = new DockingSysIntHeader();
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingSysIntHeaderDTO, dockingSysIntHeader);
- dockingSysIntHeaderList.add(dockingSysIntHeader);
- });
- }
+ DockingSystem dockingSystem = dockingSystemMapper.selectById(systemOid);
+ if(dockingSystem!=null) {
+ dockingSystemConfigDTO.setSysBaseOid(dockingSystem.getOid());
+ dockingSystemConfigDTO.setSysBaseId(dockingSystem.getId());
+ dockingSystemConfigDTO.setSysBaseName(dockingSystem.getName());
+ //灏咲TO杞崲涓篋O
+ DockingSystemConfig dockingSystemConfig = dockingSystemConfigMapper.selectById(dockingSystemConfigDTO.getOid());
+ revisionModelUtil.copyFromDTOIgnore(dockingSystemConfigDTO, dockingSystemConfig);
+ String sysInfoOid = dockingSystemConfigDTO.getOid();
+ List<DockingSysIntParamDTO> dockingSysIntParamDTOS = dockingSystemConfigDTO.getSysIntParamDTOS();
+ List<DockingSysIntParam> dockingSysIntParamList = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(dockingSysIntParamDTOS)) {
+ dockingSysIntParamDTOS.stream().forEach(dockingSysIntParamDTO -> {
+ DockingSysIntParam dockingSysIntParam = new DockingSysIntParam();
+ BeanUtilForVCI.copyPropertiesIgnoreCase(dockingSysIntParamDTO, dockingSysIntParam);
+ dockingSysIntParamList.add(dockingSysIntParam);
+ });
+ }
+ List<DockingSysIntHeaderDTO> dockingSysIntHeaderDTOS = dockingSystemConfigDTO.getSysIntHeaderDTOS();
+ List<DockingSysIntHeader> dockingSysIntHeaderList = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(dockingSysIntHeaderDTOS)) {
+ dockingSysIntHeaderDTOS.stream().forEach(dockingSysIntHeaderDTO -> {
+ DockingSysIntHeader dockingSysIntHeader = new DockingSysIntHeader();
+ BeanUtilForVCI.copyPropertiesIgnoreCase(dockingSysIntHeaderDTO, dockingSysIntHeader);
+ dockingSysIntHeaderList.add(dockingSysIntHeader);
+ });
+ }
- //鎵归噺澶勭悊淇濆瓨header瀵硅薄
- if(!CollectionUtils.isEmpty(dockingSysIntHeaderList)) {
- List<String> idList=new ArrayList<>();
- List<DockingSysIntHeader> headers_old =this.dockingSysIntHeaderService.list(Wrappers.<DockingSysIntHeader>query().lambda().eq(DockingSysIntHeader::getInfoOid,sysInfoOid));;
- for (DockingSysIntHeader sysIntHeader:headers_old){
- sysIntHeader.setUsedFlag(FLAG_FAIL);
- idList.add(sysIntHeader.getOid());
- }
- if(idList.size()!=0){
- boolean res=dockingSysIntHeaderService.removeBatchByIds(idList);
- }
- //鍐嶆柊澧瀐eaders
- for(DockingSysIntHeader sysIntHeader:dockingSysIntHeaderList){
- sysIntHeader.setUsedFlag(FLAG_TRUE);
- sysIntHeader.setInfoOid(dockingSystemConfig.getOid());
+ //鎵归噺澶勭悊淇濆瓨header瀵硅薄
+ if (!CollectionUtils.isEmpty(dockingSysIntHeaderList)) {
+ List<String> idList = new ArrayList<>();
+ List<DockingSysIntHeader> headers_old = this.dockingSysIntHeaderService.list(Wrappers.<DockingSysIntHeader>query().lambda().eq(DockingSysIntHeader::getInfoOid, sysInfoOid));
+ ;
+ for (DockingSysIntHeader sysIntHeader : headers_old) {
+ sysIntHeader.setUsedFlag(FLAG_FAIL);
+ idList.add(sysIntHeader.getOid());
+ }
+ if (idList.size() != 0) {
+ boolean res = dockingSysIntHeaderService.removeBatchByIds(idList);
+ }
+ //鍐嶆柊澧瀐eaders
+ for (DockingSysIntHeader sysIntHeader : dockingSysIntHeaderList) {
+ sysIntHeader.setUsedFlag(FLAG_TRUE);
+ sysIntHeader.setInfoOid(dockingSystemConfig.getOid());
+ }
+ boolean res = dockingSysIntHeaderService.saveBatch(dockingSysIntHeaderList);
}
- boolean res= dockingSysIntHeaderService.saveBatch(dockingSysIntHeaderList);
+ //鎵归噺澶勭悊淇濆瓨Param瀵硅薄
+ if (!CollectionUtils.isEmpty(dockingSysIntParamList)) {
+ //鍏堝垹闄arams_old
+ List<String> idList = new ArrayList<>();
+ List<DockingSysIntParam> params_old = this.dockingSysIntParamService.list(Wrappers.<DockingSysIntParam>query().lambda().eq(DockingSysIntParam::getInfoOid, sysInfoOid));
+ for (DockingSysIntParam sysIntParamDO : params_old) {
+ sysIntParamDO.setUsedFlag(FLAG_FAIL);
+ idList.add(sysIntParamDO.getOid());
+ }
+ if (idList.size() != 0) {
+ boolean res = dockingSysIntParamService.removeBatchByIds(idList);
+ }
+ //鍐嶆柊澧瀙arams
+ for (DockingSysIntParam sysIntParamDOi : dockingSysIntParamList) {
+ sysIntParamDOi.setUsedFlag(FLAG_TRUE);
+ sysIntParamDOi.setInfoOid(dockingSystemConfig.getOid());
+ }
+ dockingSysIntParamService.saveBatch(dockingSysIntParamList);
+ }
+ this.dockingSystemConfigMapper.updateById(dockingSystemConfig);
+ }else{
+ throw new Throwable("鏍规嵁閫夋嫨鐨勯泦鎴愮郴缁熸湭鏍￠獙鍒扮郴缁熶腑瀛樺湪姝ら泦鎴愮郴缁燂紝璇锋牳瀵癸紒");
}
- //鎵归噺澶勭悊淇濆瓨Param瀵硅薄
- if(!CollectionUtils.isEmpty(dockingSysIntParamList)) {
- //鍏堝垹闄arams_old
- List<String> idList=new ArrayList<>();
- List<DockingSysIntParam> params_old =this.dockingSysIntParamService.list(Wrappers.<DockingSysIntParam>query().lambda().eq(DockingSysIntParam::getInfoOid,sysInfoOid));
- for (DockingSysIntParam sysIntParamDO:params_old){
- sysIntParamDO.setUsedFlag(FLAG_FAIL);
- idList.add(sysIntParamDO.getOid());
- }
- if(idList.size()!=0){
- boolean res= dockingSysIntParamService.removeBatchByIds(idList);
- }
- //鍐嶆柊澧瀙arams
- for(DockingSysIntParam sysIntParamDOi:dockingSysIntParamList){
- sysIntParamDOi.setUsedFlag(FLAG_TRUE);
- sysIntParamDOi.setInfoOid(dockingSystemConfig.getOid());
- }
- dockingSysIntParamService.saveBatch(dockingSysIntParamList);
- }
- this.dockingSystemConfigMapper.updateById(dockingSystemConfig);
- //return changeoDckingSystemEntityVOs(dockingSystemConfig,dockingSysIntHeaderList,dockingSysIntParamList);
return true;
}
/***
@@ -359,7 +377,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;
}
/**
@@ -386,7 +407,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 +441,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 +471,7 @@
dockingTaskDO_insert.add(dockingTaskDO);
});
}
- dockingTaskService.saveBatch(dockingTaskDO_insert);
+// dockingTaskService.saveBatch(dockingTaskDO_insert);
}catch (Throwable e){
msg="鏁版嵁鎺ㄩ�佸埌瀹氭椂浠诲姟澶辫触!";
log.error("鏁版嵁鎺ㄩ�佸埌瀹氭椂浠诲姟澶辫触!"+e);
--
Gitblit v1.9.3