From a17f731ee4bcad459c184be5a7c3de6c3619443b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 07 六月 2023 19:47:03 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java | 97 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 9 deletions(-)
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 22951d0..4a06c65 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
@@ -3,15 +3,15 @@
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.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;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -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;
@@ -34,12 +34,13 @@
@RequestMapping("/DockingPreApplyCode")
@Api(value = "闆嗗洟灞炴�ф槧灏勯厤缃�", tags = "闆嗗洟灞炴�ф槧灏勯厤缃帴鍙�")
public class DockingPreApplyCodeController {
+
/**
* 闆嗗洟灞炴�ф槧灏勯厤缃睘鎬�
*/
private final IDockingPreAttrMappingService dockingPreAttrMappingService;
-/**
+ /**
* 闆嗗洟灞炴�ф槧灏勯厤缃睘鎬�
*/
private final IGroupMdmInterService groupMdmInterService;
@@ -62,7 +63,18 @@
private final IDockingPreApplyFormService dockingPreApplyFormService;
+ /***
+ * 灞炴�ф灇涓捐寖鍥存湇鍔�
+ */
+ private final IDockingPreViewModelService dockingPreViewModelService;
+
+
+ /***
+ * 灞炴�ф灇涓捐寖鍥存湇鍔�
+ */
+
+ private final ICodeClassifyClient codeClassifyClient;
/**
* 鏍规嵁涓绘暟鎹紪鐮乷id鑾峰彇闆嗗洟灞炴�ф槧灏勪俊鎭�
@@ -100,6 +112,7 @@
IPage<DockingPreApplyForm> pages = dockingPreApplyFormService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingPreApplyForm));
return R.data(DockingPreApplyFormWrapper.build().pageVO(pages));
}
+
/**
* 淇濆瓨灞炴�ф槧灏勯厤缃粍浠�
* @param dockingPreAttrMappingVOList 灞炴�ф槧灏勯厤缃暟鎹紶杈撳璞�
@@ -108,10 +121,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());
}
@@ -122,12 +136,44 @@
/**
* 鍙傜収鏍� 闆嗗洟鍒嗙被锛堟槸鍚﹀寘鍚睘鎬э級
* @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄 conditionMap 瀛樹笂 codeclsfid=涓绘暟鎹殑鍒嗙被oid
- * @return 涓婚搴撳垎绫绘樉绀烘爲
+ * @return 闆嗗洟鍒嗙被鏄剧ず鏍�
*/
@GetMapping("/referTree")
public List<Tree> referTree(TreeQueryObject treeQueryObject) {
return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject);
}
+
+
+ /**
+ * 鍙傜収鏍� 涓绘暟鎹ā鏉垮睘鎬т俊鎭�
+ * @param classifyId 涓绘暟鎹垎绫讳富閿�
+ * @return 涓婚搴撳垎绫绘ā鏉垮睘鎬�
+ */
+ @GetMapping("/listViewModelAttributeByClassId")
+ public R listViewModelAttributeByClassId(String classifyId) {
+ return R.data(dockingPreViewModelService.selectDockingPreViewModelByClassId(classifyId,true));
+ }
+
+ /**
+ * 鍙傜収鏍� 涓绘暟鎹垎绫�
+ * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄 conditionMap 瀛樹笂 codeclsfid=涓绘暟鎹殑鍒嗙被oid
+ * @return 涓婚搴撳垎绫绘樉绀烘爲
+ */
+ @GetMapping("/referCodeClassifyTree")
+ public List<Tree> referCodeClassifyTree(TreeQueryObject treeQueryObject) {
+ return codeClassifyClient.referCodeClassifyTree(treeQueryObject);
+ }
+
+ /**
+ * 鍙傜収鏍� 涓绘暟鎹ā鏉垮睘鎬т俊鎭�
+ * @param codeClassifyId 涓绘暟鎹垎绫讳富閿�
+ * @return 涓婚搴撳垎绫绘ā鏉垮睘鎬�
+ */
+ @GetMapping("/listCodeAttributeByClassId")
+ public R listCodeAttributeByClassId(String codeClassifyId) {
+ return R.data(codeClassifyClient.listCodeAttributeByClassId(codeClassifyId));
+ }
+
/***
* 鐢宠闆嗗洟缂栫爜
@@ -144,4 +190,37 @@
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());
+ }
+
+ }
+
+/***
+ * 鏌ヨ鐢宠鍗曠姸鎬�
+ * oids:涓氬姟鏁版嵁oid
+ * @return 杩斿洖鎵ц缁撴灉淇℃伅
+ */
+ @GetMapping( "/queryApplyState")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "鏌ョ湅鐢宠鍗曠姸鎬�", notes = "鏌ョ湅鐢宠鍗曠姸鎬�")
+ public R queryApplyState(String oids){
+ try {
+ return groupMdmInterService.queryApplyState(oids);
+ }catch (VciBaseException e){
+ return R.fail("鏌ョ湅鐢宠鍗曠姸鎬佸け璐ワ細"+e.getMessage());
+ }
+ }
}
--
Gitblit v1.9.3