From 5ef4f8c1cd47108f19fd64d5cf4dabfdbf9bec34 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 02 六月 2023 12:52:48 +0800
Subject: [PATCH] 集团集成接口联调测试bug修复
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java | 1
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java | 9 ++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 29 ++++++++++++++
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/collection/DockingPreAttrMappingVOList.java | 29 ++++++++++++++
4 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
index 528d94f..a4b5f02 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
@@ -285,6 +285,7 @@
@TableField(value = "targname")
private String targetName;
+
/***
* 鎺ㄩ�佺被鍨� 1:鏁版嵁鎺ㄩ��/2鍒嗙被鎺ㄩ�侊紝榛樿鏁版嵁鎺ㄩ��
*/
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/collection/DockingPreAttrMappingVOList.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/collection/DockingPreAttrMappingVOList.java
new file mode 100644
index 0000000..ecd85b1
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/collection/DockingPreAttrMappingVOList.java
@@ -0,0 +1,29 @@
+package com.vci.ubcs.code.webservice.vo.collection;
+
+import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
+
+import java.io.Serializable;
+import java.util.List;
+
+/***
+ * 灞炴�ф槧灏勪繚瀛樻椂鍊欓泦鍚堝璞℃槧灏�
+ */
+public class DockingPreAttrMappingVOList implements Serializable {
+
+ private List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList;
+
+ public List<DockingPreAttrMappingVO> getDockingPreAttrMappingVOList() {
+ return dockingPreAttrMappingVOList;
+ }
+
+ public void setDockingPreAttrMappingVOList(List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList) {
+ this.dockingPreAttrMappingVOList = dockingPreAttrMappingVOList;
+ }
+
+ @Override
+ public String toString() {
+ return "DockingPreAttrMappingVOList{" +
+ "dockingPreAttrMappingVOList=" + dockingPreAttrMappingVOList +
+ '}';
+ }
+}
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
index 014e1b4..07131a6 100644
--- 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
@@ -5,11 +5,16 @@
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.entity.DockingSystemConfig;
+import com.vci.ubcs.code.service.IDockingSystemConfigService;
import com.vci.ubcs.code.service.IDockingSystemService;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import com.vci.ubcs.code.vo.pagemodel.DockingSystemConfigVO;
import com.vci.ubcs.code.vo.pagemodel.DockingSystemVO;
import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
+import com.vci.ubcs.code.wrapper.DockingSystemConfigWrapper;
import com.vci.ubcs.code.wrapper.DockingSystemWrapper;
+import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -29,7 +34,17 @@
@RequestMapping("/dockingManagement")
@Api(value = "鎺ュ彛绠＄悊", tags = "缂栫爜鐩稿叧鎺ュ彛绠＄悊淇℃伅")
public class DockingManagementController {
+ /***
+ * 闆嗘垚绯荤粺绠＄悊鏈嶅姟
+ */
private final IDockingSystemService dockingSystemService;
+ /***
+ * 闆嗘垚鎺ュ彛閰嶇疆鏈嶅姟
+ */
+ private final IDockingSystemConfigService dockingSystemConfigService;
+
+
+
/**绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛�
* @param dockingSystem 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
@@ -69,12 +84,24 @@
/**
* 鍒犻櫎绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- * @param sysIntBaseDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
+ * @param dockingSystemDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
* @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
*/
@DeleteMapping( "/deleteData")
public R delSystemData( DockingSystemDTO dockingSystemDTO) {
return R.status(dockingSystemService.delSystemData(dockingSystemDTO));
}
+ /**
+ * 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃
+ * @param DockingSystemConfig 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
+ */
+ @GetMapping("/gridSysIntInfo")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "DockingSystemConfig")
+ public R<IPage<DockingSystemConfigVO>> gridSysIntInfo(DockingSystemConfig DockingSystemConfig, Query query){
+ IPage<DockingSystemConfig> pages = dockingSystemConfigService.page(Condition.getPage(query), Condition.getQueryWrapper(DockingSystemConfig));
+ return R.data(DockingSystemConfigWrapper.build().pageVO(pages));
+ }
}
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 08eebfe..d530041 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,9 +4,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.feign.ICodeClassifyClient;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.webservice.service.*;
import com.vci.ubcs.code.webservice.vo.*;
+import com.vci.ubcs.code.webservice.vo.collection.DockingPreAttrMappingVOList;
import com.vci.ubcs.code.webservice.wrapper.DockingPreApplyFormWrapper;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
@@ -19,7 +19,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
-import javax.validation.Valid;
+
import java.util.ArrayList;
import java.util.List;
@@ -119,10 +119,11 @@
@PostMapping( "/batchAddSave")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "淇濆瓨灞炴�ф槧灏勯厤缃�", notes = "dockingPreAttrMappingVOList")
- public R batchSave(@Valid @RequestBody List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList){
+ public R batchSave(@RequestBody DockingPreAttrMappingVOList dockingPreAttrMappingVOList){
+ List<DockingPreAttrMappingVO> dockingPreAttrMappingVOs = dockingPreAttrMappingVOList.getDockingPreAttrMappingVOList();
List<DockingPreAttrMappingVO> dockingPreAttrRangeVOS=new ArrayList<>();
try {
- dockingPreAttrRangeVOS = dockingPreAttrMappingService.batchAddSave(dockingPreAttrMappingVOList);
+ dockingPreAttrRangeVOS = dockingPreAttrMappingService.batchAddSave(dockingPreAttrMappingVOs);
}catch (Exception e){
return R.fail("闆嗗洟闆嗘垚灞炴�ф槧灏勯厤缃繚瀛樺け璐ワ細"+e.getMessage());
}
--
Gitblit v1.9.3