From 695e4a085727ef5017597dd1ab72a47d0e9883e6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 30 五月 2023 19:19:55 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
similarity index 80%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
index fbc0489..7e52aaa 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
@@ -1,22 +1,15 @@
-package com.vci.ubcs.code.controller;
+package com.vci.ubcs.code.webservice.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.vci.ubcs.code.entity.DockingPreApplyForm;
-import com.vci.ubcs.code.feign.IMdmInterJtClient;
-import com.vci.ubcs.code.service.IDockingPreApplyFormService;
-import com.vci.ubcs.code.service.IDockingPreAttrMappingService;
-import com.vci.ubcs.code.service.IDockingPreAttrRangeService;
-import com.vci.ubcs.code.service.IDockingPreClassifyService;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreApplyFormVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
-import com.vci.ubcs.code.wrapper.DockingPreApplyFormWrapper;
-import com.vci.ubcs.starter.revision.model.BaseModel;
+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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -24,7 +17,6 @@
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;
@@ -44,6 +36,12 @@
* 闆嗗洟灞炴�ф槧灏勯厤缃睘鎬�
*/
private final IDockingPreAttrMappingService dockingPreAttrMappingService;
+
+/**
+ * 闆嗗洟灞炴�ф槧灏勯厤缃睘鎬�
+ */
+ private final IGroupMdmInterService groupMdmInterService;
+
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
*/
@@ -125,7 +123,7 @@
* @return 涓婚搴撳垎绫绘樉绀烘爲
*/
@GetMapping("/referTree")
- public List<Tree> referTree(@RequestBody TreeQueryObject treeQueryObject) {
+ public List<Tree> referTree(TreeQueryObject treeQueryObject) {
return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject);
}
@@ -139,9 +137,26 @@
public R applyGroupCode(String oids,String btmName){
List<BaseModelVO> BaseModelVOs=new ArrayList<>();
try {
- return dockingPreAttrMappingService.applyGroupCode(oids,btmName);
+ return groupMdmInterService.applyGroupCode(oids,btmName);
}catch (Throwable e){
return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage());
}
}
+
+ /***
+ * 鍚屾闆嗗洟妯″瀷瑙嗗浘
+ * @return 杩斿洖鎵ц缁撴灉淇℃伅
+ */
+ @PostMapping( "/syncClassifyModel")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "鍚屾闆嗗洟妯″瀷瑙嗗浘", notes = "鍚屾闆嗗洟妯″瀷瑙嗗浘->all:鍚屾闆嗗洟涓绘ā鍨�,one:鍚屾闆嗗洟妯″瀷璇︾粏淇℃伅")
+ public R syncClassifyModel(String classifyId,String operationType){
+ try {
+ return groupMdmInterService.syncClassifyModel(classifyId,operationType);
+ }catch (VciBaseException e){
+ return R.fail("鍚屾闆嗗洟妯″瀷瑙嗗浘澶辫触锛�"+e.getMessage());
+ }
+
+ }
+
}
--
Gitblit v1.9.3