From dc590d026e1130a98c70181fb65f8ed09414e787 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 14 七月 2023 17:48:11 +0800
Subject: [PATCH] 1、主要解决获取当前用户信息等问题，使用AuthUtil来进行获取，对生成token等信息进行了修改增加。

---
 Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 46 insertions(+), 10 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 50c59af..22b2d70 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;
 
@@ -34,12 +34,13 @@
 @RequestMapping("/DockingPreApplyCode")
 @Api(value = "闆嗗洟灞炴�ф槧灏勯厤缃�", tags = "闆嗗洟灞炴�ф槧灏勯厤缃帴鍙�")
 public class DockingPreApplyCodeController {
+
 	/**
 	 * 闆嗗洟灞炴�ф槧灏勯厤缃睘鎬�
 	 */
 	private final IDockingPreAttrMappingService dockingPreAttrMappingService;
 
-/**
+	/**
  * 闆嗗洟灞炴�ф槧灏勯厤缃睘鎬�
  */
 	private final IGroupMdmInterService groupMdmInterService;
@@ -61,6 +62,12 @@
 	 */
 
 	private final IDockingPreApplyFormService dockingPreApplyFormService;
+
+	/***
+	 * 灞炴�ф灇涓捐寖鍥存湇鍔�
+	 */
+
+	private final IDockingPreViewModelService dockingPreViewModelService;
 
 
 	/***
@@ -105,6 +112,7 @@
 		IPage<DockingPreApplyForm> pages = dockingPreApplyFormService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingPreApplyForm));
 		return R.data(DockingPreApplyFormWrapper.build().pageVO(pages));
 	}
+
 	/**
 	 * 淇濆瓨灞炴�ф槧灏勯厤缃粍浠�
 	 * @param dockingPreAttrMappingVOList 灞炴�ф槧灏勯厤缃暟鎹紶杈撳璞�
@@ -113,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());
 		}
@@ -130,8 +139,19 @@
 	 * @return 闆嗗洟鍒嗙被鏄剧ず鏍�
 	 */
 	@GetMapping("/referTree")
-	public List<Tree> referTree(@RequestBody TreeQueryObject treeQueryObject)  {
+	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));
 	}
 
 	/**
@@ -140,7 +160,7 @@
 	 * @return 涓婚搴撳垎绫绘樉绀烘爲
 	 */
 	@GetMapping("/referCodeClassifyTree")
-	public List<Tree> referCodeClassifyTree(@RequestBody TreeQueryObject treeQueryObject)  {
+	public List<Tree> referCodeClassifyTree(TreeQueryObject treeQueryObject)  {
 		return codeClassifyClient.referCodeClassifyTree(treeQueryObject);
 	}
 
@@ -149,9 +169,9 @@
 	 * @param codeClassifyId 涓绘暟鎹垎绫讳富閿�
 	 * @return 涓婚搴撳垎绫绘ā鏉垮睘鎬�
 	 */
-	@GetMapping("/referCodeClassifyTree")
-	public List<CodeClassifyTemplateAttrVO>  listCodeAttributeByClassId(String codeClassifyId)  {
-		return codeClassifyClient.listCodeAttributeByClassId(codeClassifyId);
+	@GetMapping("/listCodeAttributeByClassId")
+	public R listCodeAttributeByClassId(String codeClassifyId)  {
+		return R.data(codeClassifyClient.listCodeAttributeByClassId(codeClassifyId));
 	}
 
 
@@ -171,6 +191,7 @@
 		}
 	}
 
+
 	/***
 	 * 鍚屾闆嗗洟妯″瀷瑙嗗浘
 	 * @return 杩斿洖鎵ц缁撴灉淇℃伅
@@ -187,4 +208,19 @@
 
 	}
 
+/***
+ * 鏌ヨ鐢宠鍗曠姸鎬�
+ * 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