From 85d10ebf08cb41fa3ec06272e6e991cdd0a534f9 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 01 六月 2023 17:54:58 +0800
Subject: [PATCH] 集团集属性映射界面加载接口bug修复
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java | 6
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreClassifyDTO.java | 12
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java | 12
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/ICodeClassifyClient.java | 10
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java | 6
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 2
/dev/null | 746 ----------------------------------------------
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java | 48 ++
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 80 +++++
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreClassifyMapper.xml | 13
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreClassifyVO.java | 12
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingLogeServiceImpl.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreClassify.java | 2
16 files changed, 167 insertions(+), 790 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntBaseDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemDTO.java
similarity index 88%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntBaseDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemDTO.java
index 38cc7e3..df1e944 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntBaseDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemDTO.java
@@ -9,7 +9,7 @@
* @author lihang
* @date 2022-03-07
*/
-public class SysIntBaseDTO extends BaseModelVO {
+public class DockingSystemDTO extends BaseModelVO {
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java
index 47f0387..e833756 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java
@@ -5,17 +5,17 @@
import java.util.List;
public class SysIntInfoBseDTO extends BaseModelVO {
- private SysIntInfoDTO sysIntInfoDTO;
+ private DockingSystemConfigDTO sysIntInfoDTO;
private List<SysIntParamDTO> sysIntParamDTO;
private List<SysIntHeaderDTO> sysIntHeaderDTOS;
- public SysIntInfoDTO getSysIntInfoDTO() {
+ public DockingSystemConfigDTO getSysIntInfoDTO() {
return sysIntInfoDTO;
}
- public void setSysIntInfoDTO(SysIntInfoDTO sysIntInfoDTO) {
+ public void setSysIntInfoDTO(DockingSystemConfigDTO sysIntInfoDTO) {
this.sysIntInfoDTO = sysIntInfoDTO;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoDTO.java
deleted file mode 100644
index a238354..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoDTO.java
+++ /dev/null
@@ -1,664 +0,0 @@
-package com.vci.ubcs.code.dto;
-
-
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
-
-import java.util.List;
-
-/**
- * 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- *
- * @author lihang
- * @date 2022-03-07
- */
-public class SysIntInfoDTO extends BaseModelVO {
-
- /**
- * 绂佹淇敼杩欎釜鍊�
- */
- private static final long serialVersionUID = 4615707120053955466L;
-
- /**
- * 璁よ瘉鏂瑰紡
- */
- private String authorityoid;
-
- /**
- * 璁よ瘉鏂瑰紡鏄剧ず鏂囨湰
- */
- private String authorityoidName;
- /**
- * 鎺ュ彛鍑芥暟
- */
- private String interfaceFunction;
-
- /**
- * 鎺ュ彛绫诲瀷
- */
- private String interfacetype;
-
- /**
- * 鎺ュ彛绫诲瀷鏄剧ず鏂囨湰
- */
- private String interfacetypeText;
- /**
- * 鍙傛暟绫诲瀷
- */
- private String paramtype;
-
- /**
- * 鍙傛暟绫诲瀷鏄剧ず鏂囨湰
- */
- private String paramtypeText;
- /**
- * 璇锋眰鏂瑰紡
- */
- private String requestmethod;
-
- /**
- * 璇锋眰鏂瑰紡鏄剧ず鏂囨湰
- */
- private String requestmethodText;
- /**
- * 鍒嗙被oid
- */
- private String classifyoid;
- /**
- * 鍚敤銆佸仠鐢╰rue/false锛屼笉鐢ㄥ钩鍙扮殑鏋氫妇锛屽噺灏戝骞冲彴鐨勮�﹀悎
- */
- private String usedflag;
- /**
- * 鎺ㄩ�佺郴缁無id
- */
- private String sysbaseoid;
- /**
- * 鎺ㄩ�佺郴缁熺紪鍙�
- */
- private String sysbaseid;
- /**
- * 鎺ㄩ�佺郴缁熷悕绉�
- */
- private String sysbasename;
- /**
- * 璇锋眰鍦板潃
- */
- private String requesturl;
-
- /**
- * 杩斿洖鍊肩被鍨�
- */
- private String returntype;
-
- /**
- * 杩斿洖鍊肩被鍨嬫樉绀烘枃鏈�
- */
- private String returntypeText;
- /**
- * 鏉ユ簮绯荤粺涓婚敭
- */
- private String sourcesystemoid;
-
- /**
- * 鏉ユ簮绯荤粺涓婚敭鏄剧ず鏂囨湰
- */
- private String sourcesystemoidName;
-
- /**
- * 鏉ユ簮绯荤粺鍚嶇О
- */
- private String sourceSysName;
-
- /**
- * 鏉ユ簮绯荤粺鏍囪瘑
- */
- private String sourceSysId;
-
- /**
- * 鐩爣绯荤粺涓婚敭
- */
- private String targetsystemoid;
-
- /**
- * 鐩爣绯荤粺涓婚敭鏄剧ず鏂囨湰
- */
- private String targetsystemoidName;
-
- /**
- * 鐩爣绯荤粺鍚嶇О
- */
- private String targetSysName;
-
- /**
- * 鐩爣绯荤粺鏍囪瘑
- */
- private String targetSysId;
-
-
-
- /**
- * 鎺ュ彛鎻忚堪
- */
- private String description;
-
- /**
- * 绫昏矾寰�
- */
- private String classPath;
-
- /**
- * 鏁版嵁娴佸悜鏂瑰紡
- */
- private String dataFlowType;
-
- /**
- * 鏁版嵁娴佸悜鏂瑰紡鐨勬樉绀哄瓧娈�
- */
- private String dataFlowTypeText;
-
- /**
- * 瀛樺偍鐨勪笟鍔＄被鍨�
- */
- private String btmTypeId;
-
- /**
- * 瀛樺偍鐨勪笟鍔＄被鍨嬬殑涓枃鍚嶇О
- */
- private String btmTypeName;
-
- /**
- * 鍛藉悕绌洪棿
- */
- private String namespace;
-
- /**
- * soapAction
- */
- private String soapaction;
-
- /**
- * 鍙傛暟鍚嶇О
- */
- private String targName;
-
- /**
- * cxfaxis
- */
- private String cxfaxis;
-
- /**
- * 鍒嗙被id
- */
- private String classifyid;
-
- /**
- * 鍒嗙被鍚嶇О
- */
- private String classifyname;
- /***
- * 鍙傛暟淇℃伅瀵硅薄
- */
- private List<SysIntParamDTO> sysIntParamDTOs;
- /***
- * header淇℃伅瀵硅薄
- */
- private List<SysIntHeaderDTO> sysIntHeaderDTOS;
-
- public String pushType;
-
- public String getClassifyid() {
- return classifyid;
- }
-
- public void setClassifyid(String classifyid) {
- this.classifyid = classifyid;
- }
-
- public String getClassifyname() {
- return classifyname;
- }
-
- public void setClassifyname(String classifyname) {
- this.classifyname = classifyname;
- }
-
- public String getTargName() {
- return targName;
- }
-
- public void setTargName(String targName) {
- this.targName = targName;
- }
-
- public String getSoapaction() {
- return soapaction;
- }
-
- public void setSoapaction(String soapaction) {
- this.soapaction = soapaction;
- }
-
- public String getCxfaxis() {
- return cxfaxis;
- }
-
- public void setCxfaxis(String cxfaxis) {
- this.cxfaxis = cxfaxis;
- }
-
- public String getNamespace() {
- return namespace;
- }
-
- public void setNamespace(String namespace) {
- this.namespace = namespace;
- }
-
- public String getBtmTypeId() {
- return btmTypeId;
- }
-
- public void setBtmTypeId(String btmTypeId) {
- this.btmTypeId = btmTypeId;
- }
-
- public String getBtmTypeName() {
- return btmTypeName;
- }
-
- public void setBtmTypeName(String btmTypeName) {
- this.btmTypeName = btmTypeName;
- }
- /**
- * 鑾峰彇 璁よ瘉鏂瑰紡
- */
- public String getAuthorityoid (){
- return authorityoid;
- }
-
- /**
- * 璁剧疆 璁よ瘉鏂瑰紡
- */
- public void setAuthorityoid (String authorityoid){
- this.authorityoid = authorityoid;
- }
-
- /**
- * 鑾峰彇璁よ瘉鏂瑰紡鏄剧ず鏂囨湰
- */
- public String getAuthorityoidName (){
- return authorityoidName;
- }
-
- /**
- * 璁剧疆璁よ瘉鏂瑰紡鏄剧ず鏂囨湰
- */
- public void setAuthorityoidName (String authorityoidName){
- this.authorityoidName = authorityoidName;
- }
- /**
- * 鑾峰彇 鎺ュ彛鍑芥暟
- */
- public String getInterfaceFunction (){
- return interfaceFunction;
- }
-
- /**
- * 璁剧疆 鎺ュ彛鍑芥暟
- */
- public void setInterfaceFunction (String interfaceFunction){
- this.interfaceFunction = interfaceFunction;
- }
-
- /**
- * 鑾峰彇 鎺ュ彛绫诲瀷
- */
- public String getInterfacetype (){
- return interfacetype;
- }
-
- /**
- * 璁剧疆 鎺ュ彛绫诲瀷
- */
- public void setInterfacetype (String interfacetype){
- this.interfacetype = interfacetype;
- }
-
- /**
- * 鑾峰彇鎺ュ彛绫诲瀷鏄剧ず鏂囨湰
- */
- public String getInterfacetypeText (){
- return interfacetypeText;
- }
-
- /**
- * 璁剧疆鎺ュ彛绫诲瀷鏄剧ず鏂囨湰
- */
- public void setInterfacetypeText (String interfacetypeText){
- this.interfacetypeText = interfacetypeText;
- }
- /**
- * 鑾峰彇 鍙傛暟绫诲瀷
- */
- public String getParamtype (){
- return paramtype;
- }
-
- /**
- * 璁剧疆 鍙傛暟绫诲瀷
- */
- public void setParamtype (String paramtype){
- this.paramtype = paramtype;
- }
-
- /**
- * 鑾峰彇鍙傛暟绫诲瀷鏄剧ず鏂囨湰
- */
- public String getParamtypeText (){
- return paramtypeText;
- }
-
- /**
- * 璁剧疆鍙傛暟绫诲瀷鏄剧ず鏂囨湰
- */
- public void setParamtypeText (String paramtypeText){
- this.paramtypeText = paramtypeText;
- }
- /**
- * 鑾峰彇 璇锋眰鏂瑰紡
- */
- public String getRequestmethod (){
- return requestmethod;
- }
-
- /**
- * 璁剧疆 璇锋眰鏂瑰紡
- */
- public void setRequestmethod (String requestmethod){
- this.requestmethod = requestmethod;
- }
-
- /**
- * 鑾峰彇璇锋眰鏂瑰紡鏄剧ず鏂囨湰
- */
- public String getRequestmethodText (){
- return requestmethodText;
- }
-
- /**
- * 璁剧疆璇锋眰鏂瑰紡鏄剧ず鏂囨湰
- */
- public void setRequestmethodText (String requestmethodText){
- this.requestmethodText = requestmethodText;
- }
- /**
- * 鑾峰彇 璇锋眰鍦板潃
- */
- public String getRequesturl (){
- return requesturl;
- }
-
- /**
- * 璁剧疆 璇锋眰鍦板潃
- */
- public void setRequesturl (String requesturl){
- this.requesturl = requesturl;
- }
-
- /**
- * 鑾峰彇 杩斿洖鍊肩被鍨�
- */
- public String getReturntype (){
- return returntype;
- }
-
- /**
- * 璁剧疆 杩斿洖鍊肩被鍨�
- */
- public void setReturntype (String returntype){
- this.returntype = returntype;
- }
-
- /**
- * 鑾峰彇杩斿洖鍊肩被鍨嬫樉绀烘枃鏈�
- */
- public String getReturntypeText (){
- return returntypeText;
- }
-
- /**
- * 璁剧疆杩斿洖鍊肩被鍨嬫樉绀烘枃鏈�
- */
- public void setReturntypeText (String returntypeText){
- this.returntypeText = returntypeText;
- }
- /**
- * 鑾峰彇 鏉ユ簮绯荤粺涓婚敭
- */
- public String getSourcesystemoid (){
- return sourcesystemoid;
- }
-
- /**
- * 璁剧疆 鏉ユ簮绯荤粺涓婚敭
- */
- public void setSourcesystemoid (String sourcesystemoid){
- this.sourcesystemoid = sourcesystemoid;
- }
-
- /**
- * 鑾峰彇鏉ユ簮绯荤粺涓婚敭鏄剧ず鏂囨湰
- */
- public String getSourcesystemoidName (){
- return sourcesystemoidName;
- }
-
- /**
- * 璁剧疆鏉ユ簮绯荤粺涓婚敭鏄剧ず鏂囨湰
- */
- public void setSourcesystemoidName (String sourcesystemoidName){
- this.sourcesystemoidName = sourcesystemoidName;
- }
- /**
- * 鑾峰彇 鐩爣绯荤粺涓婚敭
- */
- public String getTargetsystemoid (){
- return targetsystemoid;
- }
-
- /**
- * 璁剧疆 鐩爣绯荤粺涓婚敭
- */
- public void setTargetsystemoid (String targetsystemoid){
- this.targetsystemoid = targetsystemoid;
- }
-
- /**
- * 鑾峰彇鐩爣绯荤粺涓婚敭鏄剧ず鏂囨湰
- */
- public String getTargetsystemoidName (){
- return targetsystemoidName;
- }
-
- /**
- * 璁剧疆鐩爣绯荤粺涓婚敭鏄剧ず鏂囨湰
- */
- public void setTargetsystemoidName (String targetsystemoidName){
- this.targetsystemoidName = targetsystemoidName;
- }
-
- @Override
- public String getDescription() {
- return description;
- }
-
- @Override
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getClassPath() {
- return classPath;
- }
-
- public void setClassPath(String classPath) {
- this.classPath = classPath;
- }
-
- public String getDataFlowType() {
- return dataFlowType;
- }
-
- public void setDataFlowType(String dataFlowType) {
- this.dataFlowType = dataFlowType;
- }
-
- public String getDataFlowTypeText() {
- return dataFlowTypeText;
- }
-
- public void setDataFlowTypeText(String dataFlowTypeText) {
- this.dataFlowTypeText = dataFlowTypeText;
- }
-
- public String getClassifyoid() {
- return classifyoid;
- }
-
- public void setClassifyoid(String classifyoid) {
- this.classifyoid = classifyoid;
- }
-
- public String getUsedflag() {
- return usedflag;
- }
-
- public void setUsedflag(String usedflag) {
- this.usedflag = usedflag;
- }
-
- public String getSysbaseoid() {
- return sysbaseoid;
- }
-
- public void setSysbaseoid(String sysbaseoid) {
- this.sysbaseoid = sysbaseoid;
- }
-
- public String getSysbasename() {
- return sysbasename;
- }
-
- public void setSysbasename(String sysbasename) {
- this.sysbasename = sysbasename;
- }
-
- public String getSysbaseid() {
- return sysbaseid;
- }
-
- public void setSysbaseid(String sysbaseid) {
- this.sysbaseid = sysbaseid;
- }
-
- public List<SysIntParamDTO> getSysIntParamDTOs() {
- return sysIntParamDTOs;
- }
-
- public void setSysIntParamDTOs(List<SysIntParamDTO> sysIntParamDTOs) {
- this.sysIntParamDTOs = sysIntParamDTOs;
- }
-
- public List<SysIntHeaderDTO> getSysIntHeaderDTOS() {
- return sysIntHeaderDTOS;
- }
-
- public void setSysIntHeaderDTOS(List<SysIntHeaderDTO> sysIntHeaderDTOS) {
- this.sysIntHeaderDTOS = sysIntHeaderDTOS;
- }
-
- public String getPushType() {
- return pushType;
- }
-
- public void setPushType(String pushType) {
- this.pushType = pushType;
- }
-
- public String getSourceSysName() {
- return sourceSysName;
- }
-
- public void setSourceSysName(String sourceSysName) {
- this.sourceSysName = sourceSysName;
- }
-
- public String getSourceSysId() {
- return sourceSysId;
- }
-
- public void setSourceSysId(String sourceSysId) {
- this.sourceSysId = sourceSysId;
- }
-
- public String getTargetSysName() {
- return targetSysName;
- }
-
- public void setTargetSysName(String targetSysName) {
- this.targetSysName = targetSysName;
- }
-
- public String getTargetSysId() {
- return targetSysId;
- }
-
- public void setTargetSysId(String targetSysId) {
- this.targetSysId = targetSysId;
- }
-
- @Override
- public String toString() {
- return "SysIntInfoDTO{" +
- "authorityoid='" + authorityoid + '\'' +
- ", authorityoidName='" + authorityoidName + '\'' +
- ", interfaceFunction='" + interfaceFunction + '\'' +
- ", interfacetype='" + interfacetype + '\'' +
- ", interfacetypeText='" + interfacetypeText + '\'' +
- ", paramtype='" + paramtype + '\'' +
- ", paramtypeText='" + paramtypeText + '\'' +
- ", requestmethod='" + requestmethod + '\'' +
- ", requestmethodText='" + requestmethodText + '\'' +
- ", classifyoid='" + classifyoid + '\'' +
- ", usedflag='" + usedflag + '\'' +
- ", sysbaseoid='" + sysbaseoid + '\'' +
- ", sysbaseid='" + sysbaseid + '\'' +
- ", sysbasename='" + sysbasename + '\'' +
- ", requesturl='" + requesturl + '\'' +
- ", returntype='" + returntype + '\'' +
- ", returntypeText='" + returntypeText + '\'' +
- ", sourcesystemoid='" + sourcesystemoid + '\'' +
- ", sourcesystemoidName='" + sourcesystemoidName + '\'' +
- ", sourceSysName='" + sourceSysName + '\'' +
- ", sourceSysId='" + sourceSysId + '\'' +
- ", targetsystemoid='" + targetsystemoid + '\'' +
- ", targetsystemoidName='" + targetsystemoidName + '\'' +
- ", targetSysName='" + targetSysName + '\'' +
- ", targetSysId='" + targetSysId + '\'' +
- ", description='" + description + '\'' +
- ", classPath='" + classPath + '\'' +
- ", dataFlowType='" + dataFlowType + '\'' +
- ", dataFlowTypeText='" + dataFlowTypeText + '\'' +
- ", btmTypeId='" + btmTypeId + '\'' +
- ", btmTypeName='" + btmTypeName + '\'' +
- ", namespace='" + namespace + '\'' +
- ", soapaction='" + soapaction + '\'' +
- ", targName='" + targName + '\'' +
- ", cxfaxis='" + cxfaxis + '\'' +
- ", classifyid='" + classifyid + '\'' +
- ", classifyname='" + classifyname + '\'' +
- ", sysIntParamDTOs=" + sysIntParamDTOs +
- ", sysIntHeaderDTOS=" + sysIntHeaderDTOS +
- ", pushType='" + pushType + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/ICodeClassifyClient.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/ICodeClassifyClient.java
index 0d61f55..210b71f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/ICodeClassifyClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/ICodeClassifyClient.java
@@ -45,7 +45,7 @@
String TOP = API_PREFIX + "/top";
String CODE_CLASSIFY_TREE=API_PREFIX+"/referCodeClassifyTree";
String CODE_ATTRIBUTE_LIST=API_PREFIX+"/listCodeAttributeByClassId";
-
+ String CODE_GETBYID="/getById";
/**
* 鑾峰彇涓婚搴撳畾涔夎〃鍒楄〃
*
@@ -71,4 +71,12 @@
*/
@GetMapping(CODE_ATTRIBUTE_LIST)
public List<CodeClassifyTemplateAttrVO> listCodeAttributeByClassId(@RequestParam("codeClassifyId") String codeClassifyId);
+
+ /***
+ * 鏍规嵁鍒嗙被id宸埍蹇冨垎绫讳俊鎭�
+ * @param classifyId
+ * @return
+ */
+ @GetMapping(CODE_GETBYID)
+ CodeClassify getById(@RequestParam("classifyId")String classifyId);
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntBaseVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemVO.java
similarity index 88%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntBaseVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemVO.java
index 7ac7eb1..f6ff321 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntBaseVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemVO.java
@@ -8,7 +8,7 @@
* @author lihang
* @date 2022-03-07
*/
-public class SysIntBaseVO extends BaseModelVO {
+public class DockingSystemVO extends BaseModelVO {
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntInfoVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntInfoVO.java
deleted file mode 100644
index 49027d5..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntInfoVO.java
+++ /dev/null
@@ -1,746 +0,0 @@
-package com.vci.ubcs.code.vo.pagemodel;
-
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
-
-import java.util.List;
-
-/**
- * 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄
- *
- * @author lihang
- * @date 2022-03-07
- */
-public class SysIntInfoVO extends BaseModelVO {
-
- /**
- * 绂佹淇敼杩欎釜鍊�
- */
- private static final long serialVersionUID = 4615707117716142069L;
-
- /**
- * 璁よ瘉鏂瑰紡
- */
- private String authorityoid;
-
- /**
- * 璁よ瘉鏂瑰紡鏄剧ず鏂囨湰
- */
- private String authorityoidName;
-
- /**
- * 璁よ瘉鏂瑰紡
- */
- private String authorityType;
-
- /**
- * 璁よ瘉鏂瑰紡鏄剧ず鏂囨湰
- */
- private String authorityTypeText;
-
- /**
- * 楠岃瘉鐢ㄦ埛
- */
- private String userAccount;
-
- /**
- * 楠岃瘉瀵嗙爜
- */
- private String userCode;
-
- /**
- * 楠岃瘉浠ょ墝
- */
- private String token;
-
- /**
- * 鎺ュ彛鍑芥暟
- */
- private String interfaceFunction;
-
- /**
- * 鎺ュ彛鎻忚堪
- */
- private String description;
-
-
- /**
- * 鎺ュ彛绫诲瀷
- */
- private String interfacetype;
-
-
- /**
- * 鎺ュ彛绫诲瀷鏄剧ず鏂囨湰
- */
- private String interfacetypeText;
- /**
- * 鍙傛暟绫诲瀷
- */
- private String paramtype;
-
-
- /**
- * 鍙傛暟绫诲瀷鏄剧ず鏂囨湰
- */
- private String paramtypeText;
- /**
- * 璇锋眰鏂瑰紡
- */
- private String requestmethod;
-
-
- /**
- * 璇锋眰鏂瑰紡鏄剧ず鏂囨湰
- */
- private String requestmethodText;
- /**
- * 鍒嗙被oid
- */
- private String classifyoid;
-
- /**
- * 鍚敤銆佸仠鐢╰rue/false锛屼笉鐢ㄥ钩鍙扮殑鏋氫妇锛屽噺灏戝骞冲彴鐨勮�﹀悎
- */
- private String usedflag;
-
- /**
- * 鎺ㄩ�佺郴缁無id
- */
- private String sysbaseoid;
-
- /**
- * 鎺ㄩ�佺郴缁熺紪鍙�
- */
- private String sysbaseid;
-
- /**
- * 鎺ㄩ�佺郴缁熷悕绉�
- */
- private String sysbasename;
-
- /**
- * 璇锋眰鍦板潃
- */
- private String requesturl;
-
-
- /**
- * 杩斿洖鍊肩被鍨�
- */
- private String returntype;
-
-
- /**
- * 杩斿洖鍊肩被鍨嬫樉绀烘枃鏈�
- */
- private String returntypeText;
- /**
- * 鏉ユ簮绯荤粺涓婚敭
- */
- private String sourceSystemOid;
-
- /**
- * 鏉ユ簮绯荤粺鍚嶇О
- */
- private String sourceSysName;
-
- /**
- * 鏉ユ簮绯荤粺鏍囪瘑
- */
- private String sourceSysId;
-
- /**
- * 鏉ユ簮绯荤粺涓婚敭鏄剧ず鏂囨湰
- */
- private String sourcesystemoidName;
-
- /**
- * 鐩爣绯荤粺涓婚敭
- */
- private String targetsystemoid;
-
- /**
- * 鐩爣绯荤粺鍚嶇О
- */
- private String targetSysName;
-
- /**
- * 鐩爣绯荤粺鏍囪瘑
- */
- private String targetSysId;
-
- /**
- * 鐩爣绯荤粺涓婚敭鏄剧ず鏂囨湰
- */
- private String targetsystemoidName;
-
- /**
- * 绫昏矾寰�
- */
- private String classPath;
-
- /**
- * 鏁版嵁娴佸悜鏂瑰紡
- */
- private String dataFlowType;
-
- /**
- * 鏁版嵁娴佸悜鏂瑰紡鐨勬樉绀哄瓧娈�
- */
- private String dataFlowTypeText;
-
- /**
- * 瀛樺偍鐨勪笟鍔＄被鍨�
- */
- private String btmTypeId;
-
- /**
- * 瀛樺偍鐨勪笟鍔＄被鍨嬬殑涓枃鍚嶇О
- */
- private String btmTypeName;
-
- /**
- * 鍛藉悕绌洪棿
- */
- private String namespace;
-
- /**
- * soapAction
- */
- private String soapaction;
-
- /**
- * cxfaxis
- */
- private String cxfaxis;
-
- /**
- * 鍙傛暟鍚嶇О
- */
- private String targName;
-
- /***
- * 鎺ㄩ�佺被鍨� 1:鏁版嵁鎺ㄩ��/2鍒嗙被鎺ㄩ�侊紝榛樿鏁版嵁鎺ㄩ��
- */
- private String pushType;
- /***
- * 鎺ㄩ�佺被鍨嬫樉绀哄��
- */
- private String pushTypeText;
-
- /**
- * 鍒嗙被id
- */
- private String classifyid;
-
- /**
- * 鍒嗙被鍚嶇О
- */
- private String classifyname;
-
- /***
- * 鍙傛暟淇℃伅瀵硅薄
- */
- private List<SysIntParamVO> sysIntParamVOs;
- /***
- * header淇℃伅瀵硅薄
- */
- private List<SysIntHeaderVO> sysIntHeaderVOs;
-
- public String getClassifyid() {
- return classifyid;
- }
-
- public void setClassifyid(String classifyid) {
- this.classifyid = classifyid;
- }
-
- public String getClassifyname() {
- return classifyname;
- }
-
- public void setClassifyname(String classifyname) {
- this.classifyname = classifyname;
- }
- public String getTargName() {
- return targName;
- }
-
- public void setTargName(String targName) {
- this.targName = targName;
- }
-
- public String getSoapaction() {
- return soapaction;
- }
-
- public void setSoapaction(String soapaction) {
- this.soapaction = soapaction;
- }
-
- public String getCxfaxis() {
- return cxfaxis;
- }
-
- public void setCxfaxis(String cxfaxis) {
- this.cxfaxis = cxfaxis;
- }
-
- public String getNamespace() {
- return namespace;
- }
-
- public void setNamespace(String namespace) {
- this.namespace = namespace;
- }
-
- public String getBtmTypeId() {
- return btmTypeId;
- }
-
- public void setBtmTypeId(String btmTypeId) {
- this.btmTypeId = btmTypeId;
- }
-
- public String getBtmTypeName() {
- return btmTypeName;
- }
-
- public void setBtmTypeName(String btmTypeName) {
- this.btmTypeName = btmTypeName;
- }
-
- public String getUsedflag() {
- return usedflag;
- }
-
- public void setUsedflag(String usedflag) {
- this.usedflag = usedflag;
- }
-
- public String getSysbaseoid() {
- return sysbaseoid;
- }
-
- public void setSysbaseoid(String sysbaseoid) {
- this.sysbaseoid = sysbaseoid;
- }
-
- public String getSysbasename() {
- return sysbasename;
- }
-
- public void setSysbasename(String sysbasename) {
- this.sysbasename = sysbasename;
- }
-
- public String getClassPath() {
- return classPath;
- }
-
- public void setClassPath(String classPath) {
- this.classPath = classPath;
- }
-
- /**
- * 鑾峰彇 璁よ瘉鏂瑰紡
- */
- public String getAuthorityoid (){
- return authorityoid;
- }
-
- /**
- * 璁剧疆 璁よ瘉鏂瑰紡
- */
- public void setAuthorityoid (String authorityoid){
- this.authorityoid = authorityoid;
- }
- /**
- * 鑾峰彇璁よ瘉鏂瑰紡鏄剧ず鏂囨湰
- */
- public String getAuthorityoidName (){
- return authorityoidName;
- }
-
- /**
- * 璁剧疆璁よ瘉鏂瑰紡鏄剧ず鏂囨湰
- */
- public void setAuthorityoidName (String authorityoidName){
- this.authorityoidName = authorityoidName;
- }
- /**
- * 鑾峰彇 鎺ュ彛绫诲瀷
- */
- public String getInterfacetype (){
- return interfacetype;
- }
-
- /**
- * 璁剧疆 鎺ュ彛绫诲瀷
- */
- public void setInterfacetype (String interfacetype){
- this.interfacetype = interfacetype;
- }
- /**
- * 鑾峰彇鎺ュ彛绫诲瀷鏄剧ず鏂囨湰
- */
- public String getInterfacetypeText (){
- return interfacetypeText;
- }
-
- /**
- * 璁剧疆 鎺ュ彛绫诲瀷鏄剧ず鏂囨湰
- */
- public void setInterfacetypeText (String interfacetypeText){
- this.interfacetypeText = interfacetypeText;
- }
- /**
- * 鑾峰彇 鍙傛暟绫诲瀷
- */
- public String getParamtype (){
- return paramtype;
- }
-
- /**
- * 璁剧疆 鍙傛暟绫诲瀷
- */
- public void setParamtype (String paramtype){
- this.paramtype = paramtype;
- }
- /**
- * 鑾峰彇鍙傛暟绫诲瀷鏄剧ず鏂囨湰
- */
- public String getParamtypeText (){
- return paramtypeText;
- }
-
- /**
- * 璁剧疆 鍙傛暟绫诲瀷鏄剧ず鏂囨湰
- */
- public void setParamtypeText (String paramtypeText){
- this.paramtypeText = paramtypeText;
- }
- /**
- * 鑾峰彇 璇锋眰鏂瑰紡
- */
- public String getRequestmethod (){
- return requestmethod;
- }
-
- /**
- * 璁剧疆 璇锋眰鏂瑰紡
- */
- public void setRequestmethod (String requestmethod){
- this.requestmethod = requestmethod;
- }
- /**
- * 鑾峰彇璇锋眰鏂瑰紡鏄剧ず鏂囨湰
- */
- public String getRequestmethodText (){
- return requestmethodText;
- }
-
- /**
- * 璁剧疆 璇锋眰鏂瑰紡鏄剧ず鏂囨湰
- */
- public void setRequestmethodText (String requestmethodText){
- this.requestmethodText = requestmethodText;
- }
- /**
- * 鑾峰彇 璇锋眰鍦板潃
- */
- public String getRequesturl (){
- return requesturl;
- }
-
- /**
- * 璁剧疆 璇锋眰鍦板潃
- */
- public void setRequesturl (String requesturl){
- this.requesturl = requesturl;
- }
- /**
- * 鑾峰彇 杩斿洖鍊肩被鍨�
- */
- public String getReturntype (){
- return returntype;
- }
-
- /**
- * 璁剧疆 杩斿洖鍊肩被鍨�
- */
- public void setReturntype (String returntype){
- this.returntype = returntype;
- }
- /**
- * 鑾峰彇杩斿洖鍊肩被鍨嬫樉绀烘枃鏈�
- */
- public String getReturntypeText (){
- return returntypeText;
- }
-
- /**
- * 璁剧疆 杩斿洖鍊肩被鍨嬫樉绀烘枃鏈�
- */
- public void setReturntypeText (String returntypeText){
- this.returntypeText = returntypeText;
- }
- /**
- * 鑾峰彇 鏉ユ簮绯荤粺涓婚敭
- */
- public String getSourceSystemoid (){
- return sourceSystemOid;
- }
-
- /**
- * 璁剧疆 鏉ユ簮绯荤粺涓婚敭
- */
- public void setSourceSystemoid (String sourceSystemOid){
- this.sourceSystemOid = sourceSystemOid;
- }
- /**
- * 鑾峰彇鏉ユ簮绯荤粺涓婚敭鏄剧ず鏂囨湰
- */
- public String getSourcesystemoidName (){
- return sourcesystemoidName;
- }
-
- /**
- * 璁剧疆鏉ユ簮绯荤粺涓婚敭鏄剧ず鏂囨湰
- */
- public void setSourcesystemoidName (String sourcesystemoidName){
- this.sourcesystemoidName = sourcesystemoidName;
- }
- /**
- * 鑾峰彇 鐩爣绯荤粺涓婚敭
- */
- public String getTargetsystemoid (){
- return targetsystemoid;
- }
-
- /**
- * 璁剧疆 鐩爣绯荤粺涓婚敭
- */
- public void setTargetsystemoid (String targetsystemoid){
- this.targetsystemoid = targetsystemoid;
- }
- /**
- * 鑾峰彇鐩爣绯荤粺涓婚敭鏄剧ず鏂囨湰
- */
- public String getTargetsystemoidName (){
- return targetsystemoidName;
- }
-
- /**
- * 璁剧疆鐩爣绯荤粺涓婚敭鏄剧ず鏂囨湰
- */
- public void setTargetsystemoidName (String targetsystemoidName){
- this.targetsystemoidName = targetsystemoidName;
- }
-
- public String getSourceSysName() {
- return sourceSysName;
- }
-
- public void setSourceSysName(String sourceSysName) {
- this.sourceSysName = sourceSysName;
- }
-
- public String getSourceSysId() {
- return sourceSysId;
- }
-
- public void setSourceSysId(String sourceSysId) {
- this.sourceSysId = sourceSysId;
- }
-
- public String getTargetSysName() {
- return targetSysName;
- }
-
- public void setTargetSysName(String targetSysName) {
- this.targetSysName = targetSysName;
- }
-
- public String getTargetSysId() {
- return targetSysId;
- }
-
- public void setTargetSysId(String targetSysId) {
- this.targetSysId = targetSysId;
- }
-
- public String getAuthorityType() {
- return authorityType;
- }
-
- public void setAuthorityType(String authorityType) {
- this.authorityType = authorityType;
- }
-
- public String getUserAccount() {
- return userAccount;
- }
-
- public void setUserAccount(String userAccount) {
- this.userAccount = userAccount;
- }
-
- public String getUserCode() {
- return userCode;
- }
-
- public void setUserCode(String userCode) {
- this.userCode = userCode;
- }
-
- public String getToken() {
- return token;
- }
-
- public void setToken(String token) {
- this.token = token;
- }
-
- public String getInterfaceFunction() {
- return interfaceFunction;
- }
-
- public void setInterfaceFunction(String interfaceFunction) {
- this.interfaceFunction = interfaceFunction;
- }
-
- @Override
- public String getDescription() {
- return description;
- }
-
- @Override
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getAuthorityTypeText() {
- return authorityTypeText;
- }
-
- public void setAuthorityTypeText(String authorityTypeText) {
- this.authorityTypeText = authorityTypeText;
- }
-
- public String getDataFlowType() {
- return dataFlowType;
- }
-
- public void setDataFlowType(String dataFlowType) {
- this.dataFlowType = dataFlowType;
- }
-
- public String getDataFlowTypeText() {
- return dataFlowTypeText;
- }
-
- public void setDataFlowTypeText(String dataFlowTypeText) {
- this.dataFlowTypeText = dataFlowTypeText;
- }
-
- public String getClassifyoid() {
- return classifyoid;
- }
-
- public void setClassifyoid(String classifyoid) {
- this.classifyoid = classifyoid;
- }
-
- public String getSysbaseid() {
- return sysbaseid;
- }
-
- public void setSysbaseid(String sysbaseid) {
- this.sysbaseid = sysbaseid;
- }
-
- public String getPushType() {
- return pushType;
- }
-
- public void setPushType(String pushType) {
- this.pushType = pushType;
- }
-
- public String getPushTypeText() {
- return pushTypeText;
- }
-
- public void setPushTypeText(String pushTypeText) {
- this.pushTypeText = pushTypeText;
- }
-
- public List<SysIntParamVO> getSysIntParamVOs() {
- return sysIntParamVOs;
- }
-
- public void setSysIntParamVOs(List<SysIntParamVO> sysIntParamVOs) {
- this.sysIntParamVOs = sysIntParamVOs;
- }
-
- public List<SysIntHeaderVO> getSysIntHeaderVOs() {
- return sysIntHeaderVOs;
- }
-
- public void setSysIntHeaderVOs(List<SysIntHeaderVO> sysIntHeaderVOs) {
- this.sysIntHeaderVOs = sysIntHeaderVOs;
- }
-
- @Override
- public String toString() {
- return "SysIntInfoVO{" +
- "authorityoid='" + authorityoid + '\'' +
- ", authorityoidName='" + authorityoidName + '\'' +
- ", authorityType='" + authorityType + '\'' +
- ", authorityTypeText='" + authorityTypeText + '\'' +
- ", userAccount='" + userAccount + '\'' +
- ", userCode='" + userCode + '\'' +
- ", token='" + token + '\'' +
- ", interfaceFunction='" + interfaceFunction + '\'' +
- ", description='" + description + '\'' +
- ", interfacetype='" + interfacetype + '\'' +
- ", interfacetypeText='" + interfacetypeText + '\'' +
- ", paramtype='" + paramtype + '\'' +
- ", paramtypeText='" + paramtypeText + '\'' +
- ", requestmethod='" + requestmethod + '\'' +
- ", requestmethodText='" + requestmethodText + '\'' +
- ", classifyoid='" + classifyoid + '\'' +
- ", usedflag='" + usedflag + '\'' +
- ", sysbaseoid='" + sysbaseoid + '\'' +
- ", sysbaseid='" + sysbaseid + '\'' +
- ", sysbasename='" + sysbasename + '\'' +
- ", requesturl='" + requesturl + '\'' +
- ", returntype='" + returntype + '\'' +
- ", returntypeText='" + returntypeText + '\'' +
- ", sourceSystemOid='" + sourceSystemOid + '\'' +
- ", sourceSysName='" + sourceSysName + '\'' +
- ", sourceSysId='" + sourceSysId + '\'' +
- ", sourcesystemoidName='" + sourcesystemoidName + '\'' +
- ", targetsystemoid='" + targetsystemoid + '\'' +
- ", targetSysName='" + targetSysName + '\'' +
- ", targetSysId='" + targetSysId + '\'' +
- ", targetsystemoidName='" + targetsystemoidName + '\'' +
- ", classPath='" + classPath + '\'' +
- ", dataFlowType='" + dataFlowType + '\'' +
- ", dataFlowTypeText='" + dataFlowTypeText + '\'' +
- ", btmTypeId='" + btmTypeId + '\'' +
- ", btmTypeName='" + btmTypeName + '\'' +
- ", namespace='" + namespace + '\'' +
- ", soapaction='" + soapaction + '\'' +
- ", cxfaxis='" + cxfaxis + '\'' +
- ", targName='" + targName + '\'' +
- ", pushType='" + pushType + '\'' +
- ", pushTypeText='" + pushTypeText + '\'' +
- ", classifyid='" + classifyid + '\'' +
- ", classifyname='" + classifyname + '\'' +
- ", sysIntParamVOs=" + sysIntParamVOs +
- ", sysIntHeaderVOs=" + sysIntHeaderVOs +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreClassifyDTO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreClassifyDTO.java
index 1021e7e..dffa444 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreClassifyDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreClassifyDTO.java
@@ -26,7 +26,7 @@
/****
* 鍒嗙被閾炬帴鍚嶇О
*/
- private String getNodeLinkName;
+ private String nodeLinkName;
/***
* 鐖剁骇鑺傜偣
*/
@@ -52,12 +52,12 @@
this.nodeLink = nodeLink;
}
- public String getGetNodeLinkName() {
- return getNodeLinkName;
+ public String getNodeLinkName() {
+ return nodeLinkName;
}
- public void setGetNodeLinkName(String getNodeLinkName) {
- this.getNodeLinkName = getNodeLinkName;
+ public void setNodeLinkName(String nodeLinkName) {
+ this.nodeLinkName = nodeLinkName;
}
public String getPid() {
@@ -81,7 +81,7 @@
return "DockingPreClassifyDTO{" +
"className='" + className + '\'' +
", nodeLink='" + nodeLink + '\'' +
- ", getNodeLinkName='" + getNodeLinkName + '\'' +
+ ", nodeLinkName='" + nodeLinkName + '\'' +
", pid='" + pid + '\'' +
", dockingPreViewModelDTOList=" + dockingPreViewModelDTOList +
'}';
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreClassify.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreClassify.java
index eac2632..9e4cb15 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreClassify.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreClassify.java
@@ -37,7 +37,7 @@
* 鍒嗙被閾炬帴鍚嶇О
*/
@ApiModelProperty(value = "閾炬帴鍚嶇О")
- private String getNodeLinkName;
+ private String nodeLinkName;
/***
* 鐖剁骇鑺傜偣
*/
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreClassifyVO.java
index 4fbd1a3..55460d4 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreClassifyVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreClassifyVO.java
@@ -24,7 +24,7 @@
/****
* 鍒嗙被閾炬帴鍚嶇О
*/
- private String getNodeLinkName;
+ private String nodeLinkName;
/***
* 鐖剁骇鑺傜偣
*/
@@ -50,12 +50,12 @@
this.nodeLink = nodeLink;
}
- public String getGetNodeLinkName() {
- return getNodeLinkName;
+ public String getNodeLinkName() {
+ return nodeLinkName;
}
- public void setGetNodeLinkName(String getNodeLinkName) {
- this.getNodeLinkName = getNodeLinkName;
+ public void setNodeLinkName(String nodeLinkName) {
+ this.nodeLinkName = nodeLinkName;
}
public String getPid() {
@@ -79,7 +79,7 @@
return "DockingPreClassifyVO{" +
"className='" + className + '\'' +
", nodeLink='" + nodeLink + '\'' +
- ", getNodeLinkName='" + getNodeLinkName + '\'' +
+ ", nodeLinkName='" + nodeLinkName + '\'' +
", pid='" + pid + '\'' +
", dockingPreViewModelVOList=" + dockingPreViewModelVOList +
'}';
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
new file mode 100644
index 0000000..014e1b4
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -0,0 +1,80 @@
+package com.vci.ubcs.code.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.vci.ubcs.code.dto.DockingSystemDTO;
+import com.vci.ubcs.code.entity.CodeRule;
+import com.vci.ubcs.code.entity.DockingSystem;
+import com.vci.ubcs.code.service.IDockingSystemService;
+import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import com.vci.ubcs.code.vo.pagemodel.DockingSystemVO;
+import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
+import com.vci.ubcs.code.wrapper.DockingSystemWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 鐮佹鍩虹淇℃伅鎺у埗鍣�
+ *
+ * @author xiejun
+ * @date 2023-05-31
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/dockingManagement")
+@Api(value = "鎺ュ彛绠＄悊", tags = "缂栫爜鐩稿叧鎺ュ彛绠＄悊淇℃伅")
+public class DockingManagementController {
+ private final IDockingSystemService dockingSystemService;
+
+ /**绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛�
+ * @param dockingSystem 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ *@return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
+ */
+ @GetMapping("/gridSysIntBase")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "dockingSystem")
+ public R<IPage<DockingSystemVO>> page(DockingSystem dockingSystem, Query query) {
+ IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSystem));
+ return R.data(DockingSystemWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 澧炲姞 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
+ * @param dockingSystemDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
+ * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+ */
+ @PostMapping( "/addSave")
+ public R<DockingSystemVO> addSave(@RequestBody DockingSystemDTO dockingSystemDTO){
+ boolean res= dockingSystemService.addSave(dockingSystemDTO);
+ return R.status(res);
+ }
+
+
+ /**
+ * 淇敼 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
+ * @param dockingSystemDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
+ * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+ */
+ @PutMapping("/editSave")
+ public R<DockingSystemVO> editSave(@RequestBody DockingSystemDTO dockingSystemDTO){
+ DockingSystemVO dockingSystemVO = dockingSystemService.editSave(dockingSystemDTO);
+ return R.data(dockingSystemVO);
+ }
+
+
+ /**
+ * 鍒犻櫎绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
+ * @param sysIntBaseDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
+ * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
+ */
+ @DeleteMapping( "/deleteData")
+ public R delSystemData( DockingSystemDTO dockingSystemDTO) {
+ return R.status(dockingSystemService.delSystemData(dockingSystemDTO));
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java
index 02d1596..f8172ec 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java
@@ -85,5 +85,17 @@
return codeClassifyTemplateVO.getAttributes();
}
+ /**
+ * 鏍规嵁鍒嗙被id锛岃幏鍙栧垎绫�
+ * @param classifyId
+ * @return
+ */
+
+ @Override
+ @GetMapping(CODE_GETBYID)
+ public CodeClassify getById(String classifyId) {
+ return plCodeClassifyService.getById(classifyId);
+ }
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingLogeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingLogeServiceImpl.java
index fdfd4ea..a1e0a6b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingLogeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingLogeServiceImpl.java
@@ -9,7 +9,7 @@
/**
* 缂栫爜淇℃伅 鏈嶅姟瀹炵幇绫�
*
- * @author xiej
+ * @author xiejun
* @since 2023-05-17
*/
@Service
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index b054ef5..d1bd445 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -134,7 +134,7 @@
<if test="oid != null ">
codeclassify0.parentCodeClassifyOid = '${oid}'
</if>
- <if test="oid = null ">
+ <if test="oid == null ">
codeclassify0.parentCodeClassifyOid is null
</if>
CONNECT BY PRIOR codeclassify0.OID = codeclassify0.parentCodeClassifyOid
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java
index 099beaf..5217beb 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java
@@ -205,7 +205,7 @@
dockingPreClassify.setPid(pid);
dockingPreClassify.setId(classNumber);
dockingPreClassify.setNodeLink(nodeLink);
- dockingPreClassify.setGetNodeLinkName(nodeLinkName);
+ dockingPreClassify.setNodeLinkName(nodeLinkName);
dockingPreClassify.setClassName(className);
dockingPreClassifyArrayList.add(dockingPreClassify);
// 鑾峰彇瀵瑰簲鐨勫垎绫昏鍥炬ā鍨�
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java
index d0cc795..7799f12 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java
@@ -4,10 +4,11 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.entity.CodeClassify;
+import com.vci.ubcs.code.feign.ICodeClassifyClient;
+import com.vci.ubcs.code.webservice.entity.*;
import com.vci.ubcs.code.webservice.mapper.DockingPreAttrMappingMapper;
-import com.vci.ubcs.code.webservice.service.IDockingPreAttrMappingService;
-import com.vci.ubcs.code.webservice.service.IDockingPreAttrRangeService;
-import com.vci.ubcs.code.webservice.service.IDockingPreMetaAttrService;
+import com.vci.ubcs.code.webservice.service.*;
import com.vci.ubcs.code.webservice.vo.DokingAttributeSerchVO;
import com.vci.ubcs.code.webservice.wrapper.DockingPreAttrMappingWrapper;
import com.vci.ubcs.code.webservice.wrapper.DockingPreAttrRangeWrapper;
@@ -15,14 +16,12 @@
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.webservice.entity.DockingPreAttrMapping;
-import com.vci.ubcs.code.webservice.entity.DockingPreAttrRange;
-import com.vci.ubcs.code.webservice.entity.DockingPreMetaAttr;
import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -45,6 +44,11 @@
*/
@Autowired(required = false)
private DockingPreAttrMappingMapper dockingPreAttrMappingMapper;
+ /***
+ * 涓绘暟鎹垎绫绘湇鍔�
+ */
+ @Autowired(required = true)
+ private ICodeClassifyClient codeClassifyClient;
/***
* 涓氬姟鏁版嵁灞炴�ф湇鍔�
@@ -64,8 +68,19 @@
private IDockingPreAttrRangeService dockingPreAttrRangeService;
+ /***
+ * 闆嗗洟鍒嗙被瑙嗗浘妯″瀷鏈嶅姟
+ */
+ @Autowired(required = false)
+ private IDockingPreViewModelService dockingPreViewModelService;
+ /***
+ * 闆嗗洟灞炴�ф湇鍔�
+ */
+ @Autowired(required = false)
+ @Lazy
+ private IDockingPreClassifyService dockingPreClassifyService;
/***
* 鏍规嵁涓绘暟鎹垎绫讳富閿幏鍙栧垎绫讳俊鎭厤缃�
@@ -77,31 +92,40 @@
VciBaseUtil.alertNotNull(codeClassifyId,"涓绘暟鎹垎绫讳富閿�");
VciBaseUtil.alertNotNull(sourceClassifyId,"闆嗗洟鍒嗙被涓婚敭");
//棣栧厛鑾峰彇鍒嗙被妯℃澘灞炴�э紝鐒跺悗涓庡睘鎬ч厤缃潗姣旇緝锛屼互闃茶鏈夊鍒犲睘鎬х殑鍙兘
+ DockingPreClassify dockingPreClassify=dockingPreClassifyService.getById(sourceClassifyId);
List<DockingPreMetaAttr> dockingPreMetaAttrList= dockingPreMetaAttrService.selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getSourceClassifyId,sourceClassifyId));
List<DockingPreAttrMapping> dockingPreAttrMappings=this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getSourceClassifyId, sourceClassifyId).eq(DockingPreAttrMapping::getTargetClassifyId, codeClassifyId));
Map<String/**灞炴�т富閿�**/, DockingPreAttrMapping> dockingPreAttrMappingMap = dockingPreAttrMappings.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getMetaListId(), t -> t));
-
+ List<DockingPreViewModel> dockingPreViewModelList= dockingPreViewModelService.list(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,sourceClassifyId));
+ Map<String,DockingPreViewModel> dockingPreViewModelMap=dockingPreViewModelList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
+ CodeClassify codeClassify= codeClassifyClient.getById(codeClassifyId);
List<DockingPreAttrMapping> newDockingPreAttrMappingList=new ArrayList<>();
dockingPreMetaAttrList.stream().forEach(dockingPreMetaAttr -> {
String attrOid=dockingPreMetaAttr.getOid();
DockingPreAttrMapping dockingPreAttrMapping=new DockingPreAttrMapping();
if(dockingPreAttrMappingMap.containsKey(attrOid)){
dockingPreAttrMapping= dockingPreAttrMappingMap.get(attrOid);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreAttrMapping);
}else{
DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreAttrMapping, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
dockingPreAttrMapping.setMetaListId(dockingPreMetaAttr.getOid());//灞炴�т富閿�
dockingPreAttrMapping.setSourceAttrKey(dockingPreMetaAttr.getEnglishName());//鑻辨枃鍚嶇О
dockingPreAttrMapping.setSourceAttrName(dockingPreMetaAttr.getChineseName());//涓枃鍚嶇О
dockingPreAttrMapping.setSourceClassifyId(dockingPreMetaAttr.getSourceClassifyId());//闆嗗洟鍒嗙被oid
- dockingPreAttrMapping.setSourceClassifyName("");//鍒嗙被鍚嶇О
+ DockingPreViewModel dockingPreViewModel=new DockingPreViewModel();
+ if(dockingPreViewModelMap.containsKey(dockingPreMetaAttr.getViewModelId())){
+ dockingPreViewModel=dockingPreViewModelMap.get(dockingPreMetaAttr.getViewModelId());
+ }
+ dockingPreAttrMapping.setSourceClassifyName(dockingPreClassify.getClassName());//鍒嗙被鍚嶇О
dockingPreAttrMapping.setViewModeId(dockingPreMetaAttr.getViewModelId());//妯″瀷瑙嗗浘id
- dockingPreAttrMapping.setViewModelName("");//鍒嗙被妯″瀷鍚嶇О
- dockingPreAttrMapping.setViewName("");//鍒嗙被妯″瀷鍚嶇О
-
+ dockingPreAttrMapping.setViewModelName(dockingPreViewModel.getName());//鍒嗙被妯″瀷鍚嶇О
+ dockingPreAttrMapping.setViewName(dockingPreViewModel.getViewName());//鍒嗙被妯″瀷鍚嶇О
+ dockingPreAttrMapping.setTargetClassifyId(codeClassifyId);
+ dockingPreAttrMapping.setTargetClassifyName(codeClassify.getName());
}
newDockingPreAttrMappingList.add(dockingPreAttrMapping);
});
- return dockingPreAttrMappingDO2VOS(dockingPreAttrMappings,false);
+ return dockingPreAttrMappingDO2VOS(newDockingPreAttrMappingList,false);
}
/***
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
index b2ff550..fb328fa 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
@@ -421,7 +421,7 @@
dockingPreClassify.setPid(pid);
dockingPreClassify.setId(classNumber);
dockingPreClassify.setNodeLink(nodeLink);
- dockingPreClassify.setGetNodeLinkName(nodeLinkName);
+ dockingPreClassify.setNodeLinkName(nodeLinkName);
dockingPreClassify.setClassName(className);
dockingPreClassify.setVersionValue(version);
dockingPreClassifyList.add(dockingPreClassify);
@@ -545,7 +545,7 @@
dockingPreClassify.setPid(pid);
dockingPreClassify.setId(classNumber);
dockingPreClassify.setNodeLink(nodeLink);
- dockingPreClassify.setGetNodeLinkName(nodeLinkName);
+ dockingPreClassify.setNodeLinkName(nodeLinkName);
dockingPreClassify.setClassName(className);
dockingPreClassifyArrayList.add(dockingPreClassify);
// 鑾峰彇瀵瑰簲鐨勫垎绫昏鍥炬ā鍨�
@@ -787,7 +787,7 @@
DockingMainData mainData = new DockingMainData();
mainData.setApplyEntId(dockingApplyUnitCode);//鐢宠鍗曚綅浠ｇ爜
mainData.setApplyId(apllyCode);//鐢宠鍗曞彿
- mainData.setClassName(dockingPreClassify.getGetNodeLinkName());//鍒嗙被鍚嶇О
+ mainData.setClassName(dockingPreClassify.getNodeLinkName());//鍒嗙被鍚嶇О
mainData.setCreateBy(curUserName);//
mainData.setSecretLevel("鍐呴儴");//瀵嗙骇锛岄粯璁や负鍐呴儴
mainData.setViewInfos(getviewInfos(optationtype,dockingPreClassify, dataBusinessObject));//鑾峰彇瑙嗗浘妯″瀷
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreClassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreClassifyMapper.xml
index 220f181..503dc2f 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreClassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreClassifyMapper.xml
@@ -31,7 +31,7 @@
<result column="COPYFROMVERSION" property="copyFromVersion"/>
<result column="CLASSNAME" property="className"/>
<result column="NODELINK" property="nodeLink"/>
- <result column="NODELINKNAME" property="getNodeLinkName"/>
+ <result column="NODELINKNAME" property="nodeLinkName"/>
<result column="PID" property="pid"/>
</resultMap>
<select id="selectCompanyGroupClassifyVOByTree" resultMap="plDockingClassifyResultMap">
@@ -67,17 +67,16 @@
codeclassify0.NODELINKNAME as nodelinkname,
codeclassify0.PID as pid
from PL_CODE_JCLASSIFY codeclassify0
+ start with
<!--<where>-->
- <if test="oid != null and oid != ''">
- start with
+ <if test="oid != null">
codeclassify0.pid = '${oid}'
- connect by prior codeclassify0.oid =codeclassify0.pid
</if>
- <!-- <if test="oid = null">
+ <if test="oid == null ">
codeclassify0.pid is null
- </if>-->
+ </if>
<!--</where>-->
-
+ connect by prior codeclassify0.oid =codeclassify0.pid
order by id asc
</select>
--
Gitblit v1.9.3