From bffb1bc89d01f3a04cc8235024065f25c47be9f8 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 30 五月 2023 18:16:47 +0800
Subject: [PATCH] 集团集成接口完善
---
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DokingAttributeSerchVO.java | 26 +++++++++++++
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java | 8 +++-
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java | 5 ++
Source/UBCS/ubcs-service-api/ubcs-webservice-api/pom.xml | 5 ++
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java | 9 +---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java | 60 ++++++++++++++++++++++++++++++
6 files changed, 105 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java
index 050798b..8898595 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java
@@ -291,4 +291,64 @@
*/
private String parentQueryAttr;
+ @Override
+ public String toString() {
+ return "CodeClassifyTemplateAttrVO{" +
+ "classifyTemplateOid='" + classifyTemplateOid + '\'' +
+ ", classifyTemplateOidName='" + classifyTemplateOidName + '\'' +
+ ", classifyAttributeOid='" + classifyAttributeOid + '\'' +
+ ", classifyAttributeOidName='" + classifyAttributeOidName + '\'' +
+ ", attributeDataType='" + attributeDataType + '\'' +
+ ", attributeDataTypeText='" + attributeDataTypeText + '\'' +
+ ", keyAttrFlag='" + keyAttrFlag + '\'' +
+ ", queryAttrFlag='" + queryAttrFlag + '\'' +
+ ", seniorQueryAttrFlag='" + seniorQueryAttrFlag + '\'' +
+ ", sameRepeatAttrFlag='" + sameRepeatAttrFlag + '\'' +
+ ", sortAttrFlag='" + sortAttrFlag + '\'' +
+ ", qrcodeFlag='" + qrcodeFlag + '\'' +
+ ", barcodeFlag='" + barcodeFlag + '\'' +
+ ", componentRule='" + componentRule + '\'' +
+ ", verifyRule='" + verifyRule + '\'' +
+ ", classifyInvokeLevel='" + classifyInvokeLevel + '\'' +
+ ", classifyInvokeAttr='" + classifyInvokeAttr + '\'' +
+ ", classifyInvokeAttrName='" + classifyInvokeAttrName + '\'' +
+ ", classifyInvokeEditFlag='" + classifyInvokeEditFlag + '\'' +
+ ", orderNum=" + orderNum +
+ ", formDisplayFlag='" + formDisplayFlag + '\'' +
+ ", tableDisplayFlag='" + tableDisplayFlag + '\'' +
+ ", attributeGroup='" + attributeGroup + '\'' +
+ ", enumId='" + enumId + '\'' +
+ ", enumName='" + enumName + '\'' +
+ ", enumEditFlag='" + enumEditFlag + '\'' +
+ ", referBtmId='" + referBtmId + '\'' +
+ ", referBtmName='" + referBtmName + '\'' +
+ ", referConfig='" + referConfig + '\'' +
+ ", requireFlag='" + requireFlag + '\'' +
+ ", readOnlyFlag='" + readOnlyFlag + '\'' +
+ ", controlLength=" + controlLength +
+ ", formDisplayStyle='" + formDisplayStyle + '\'' +
+ ", tableDisplayStyle='" + tableDisplayStyle + '\'' +
+ ", formHref='" + formHref + '\'' +
+ ", tableHref='" + tableHref + '\'' +
+ ", precisionLength=" + precisionLength +
+ ", scaleLength=" + scaleLength +
+ ", valueArea='" + valueArea + '\'' +
+ ", codeDateFormat='" + codeDateFormat + '\'' +
+ ", tableDisplayJs='" + tableDisplayJs + '\'' +
+ ", textAreaFlag='" + textAreaFlag + '\'' +
+ ", imageFlag='" + imageFlag + '\'' +
+ ", defaultValue='" + defaultValue + '\'' +
+ ", prefixValue='" + prefixValue + '\'' +
+ ", suffixValue='" + suffixValue + '\'' +
+ ", filterSourceAttr='" + filterSourceAttr + '\'' +
+ ", filterSourceAttrName='" + filterSourceAttrName + '\'' +
+ ", enumString='" + enumString + '\'' +
+ ", attrTableWidth=" + attrTableWidth +
+ ", explain='" + explain + '\'' +
+ ", libraryIdentification='" + libraryIdentification + '\'' +
+ ", parentCode='" + parentCode + '\'' +
+ ", parentName='" + parentName + '\'' +
+ ", parentQueryAttr='" + parentQueryAttr + '\'' +
+ '}';
+ }
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/pom.xml b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/pom.xml
index a6c7ec2..3331c2c 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/pom.xml
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/pom.xml
@@ -22,6 +22,11 @@
</dependency>
<dependency>
<groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-code-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-util-api</artifactId>
<version>3.0.1.RELEASE</version>
<scope>compile</scope>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DokingAttributeSerchVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DokingAttributeSerchVO.java
new file mode 100644
index 0000000..b9cb2a4
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DokingAttributeSerchVO.java
@@ -0,0 +1,26 @@
+package com.vci.ubcs.code.webservice.vo;
+
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class DokingAttributeSerchVO {
+
+ private String classifyId;
+ private String searchValue;
+ private boolean flag;
+ private List<CodeClassifyTemplateAttrVO> rightAttributes;
+ private List<CodeClassifyTemplateAttrVO> leftAttributes;
+
+ @Override
+ public String toString() {
+ return "DokingAttributeSerchVO{" +
+ "classifyId='" + classifyId + '\'' +
+ ", searchValue='" + searchValue + '\'' +
+ ", flag=" + flag +
+ ", rightAttributes=" + rightAttributes +
+ ", leftAttributes=" + leftAttributes +
+ '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
index 2195b67..7e52aaa 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
@@ -4,16 +4,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.webservice.service.*;
+import com.vci.ubcs.code.webservice.vo.*;
import com.vci.ubcs.code.webservice.wrapper.DockingPreApplyFormWrapper;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.Tree;
import com.vci.ubcs.code.webservice.entity.DockingPreApplyForm;
-import com.vci.ubcs.code.webservice.vo.BaseModelVO;
-import com.vci.ubcs.code.webservice.vo.DockingPreApplyFormVO;
-import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
-import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
-import com.vci.ubcs.starter.web.util.VciBaseUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -151,7 +147,7 @@
* 鍚屾闆嗗洟妯″瀷瑙嗗浘
* @return 杩斿洖鎵ц缁撴灉淇℃伅
*/
- @PostMapping( "/applyGroupCode")
+ @PostMapping( "/syncClassifyModel")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍚屾闆嗗洟妯″瀷瑙嗗浘", notes = "鍚屾闆嗗洟妯″瀷瑙嗗浘->all:鍚屾闆嗗洟涓绘ā鍨�,one:鍚屾闆嗗洟妯″瀷璇︾粏淇℃伅")
public R syncClassifyModel(String classifyId,String operationType){
@@ -162,4 +158,5 @@
}
}
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java
index 00fa4b3..b25838d 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.webservice.entity.DockingPreAttrMapping;
import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
+import com.vci.ubcs.code.webservice.vo.DokingAttributeSerchVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import org.springblade.core.tool.api.R;
@@ -44,6 +45,9 @@
*/
boolean checkHasConfigByTragetCodeclassifyId(String targetClassifyId);
-
-
+ /***
+ * 灞炴�ф煡璇�
+ * @return
+ */
+ public R search(DokingAttributeSerchVO dokingAttributeSerchVO);
}
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 cfaa96a..15fbcdc 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
@@ -8,6 +8,7 @@
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.vo.DokingAttributeSerchVO;
import com.vci.ubcs.code.webservice.wrapper.DockingPreAttrMappingWrapper;
import com.vci.ubcs.code.webservice.wrapper.DockingPreAttrRangeWrapper;
import com.vci.ubcs.starter.exception.VciBaseException;
@@ -206,6 +207,10 @@
}
}
+ @Override
+ public R search(DokingAttributeSerchVO dokingAttributeSerchVO) {
+ return null;
+ }
/***
--
Gitblit v1.9.3