From f02c15e434ffbc248b55d9d14e104c7d8556062b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 28 四月 2023 11:42:42 +0800
Subject: [PATCH] 1、主要完成主题库定义的模板分类的接口移植。 2、主要对界面字数多了换行问题进行了修改。

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstempattrController.java |  151 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 142 insertions(+), 9 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstempattrController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstempattrController.java
index 2ac1921..533194c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstempattrController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstempattrController.java
@@ -18,10 +18,15 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.vci.ubcs.code.dto.CodeClstempattrDTO;
 import com.vci.ubcs.code.entity.CodeClstempattrEntity;
 import com.vci.ubcs.code.service.ICodeClstempattrService;
 import com.vci.ubcs.code.vo.CodeClstempattrVO;
+import com.vci.ubcs.code.vo.CodeOsbtmtypeattributeVO;
 import com.vci.ubcs.code.wrapper.CodeClstempattrWrapper;
+import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.DataGrid;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -31,9 +36,12 @@
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 缂栫爜搴撳畾涔�-妯℃澘灞炴�� 鎺у埗鍣�
@@ -43,11 +51,11 @@
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/CodeClstempattr")
+@RequestMapping("/codeClassifyTempAttrController")
 @Api(value = "缂栫爜搴撳畾涔�-妯℃澘灞炴��", tags = "缂栫爜搴撳畾涔�-妯℃澘灞炴�ф帴鍙�")
 public class CodeClstempattrController extends BladeController {
 
-	private final ICodeClstempattrService CodeClstempattrService;
+	private final ICodeClstempattrService codeClstempattrService;
 
 	/**
 	 * 缂栫爜搴撳畾涔�-妯℃澘灞炴�� 璇︽儏
@@ -56,7 +64,7 @@
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "璇︽儏", notes = "浼犲叆CodeClstempattr")
 	public R<CodeClstempattrVO> detail(CodeClstempattrEntity CodeClstempattr) {
-		CodeClstempattrEntity detail = CodeClstempattrService.getOne(Condition.getQueryWrapper(CodeClstempattr));
+		CodeClstempattrEntity detail = codeClstempattrService.getOne(Condition.getQueryWrapper(CodeClstempattr));
 		return R.data(CodeClstempattrWrapper.build().entityVO(detail));
 	}
 	/**
@@ -66,7 +74,7 @@
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodeClstempattr")
 	public R<IPage<CodeClstempattrVO>> list(CodeClstempattrEntity CodeClstempattr, Query query) {
-		IPage<CodeClstempattrEntity> pages = CodeClstempattrService.page(Condition.getPage(query), Condition.getQueryWrapper(CodeClstempattr));
+		IPage<CodeClstempattrEntity> pages = codeClstempattrService.page(Condition.getPage(query), Condition.getQueryWrapper(CodeClstempattr));
 		return R.data(CodeClstempattrWrapper.build().pageVO(pages));
 	}
 
@@ -77,7 +85,7 @@
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodeClstempattr")
 	public R<IPage<CodeClstempattrVO>> page(CodeClstempattrVO CodeClstempattr, Query query) {
-		IPage<CodeClstempattrVO> pages = CodeClstempattrService.selectCodeClstempattrPage(Condition.getPage(query), CodeClstempattr);
+		IPage<CodeClstempattrVO> pages = codeClstempattrService.selectCodeClstempattrPage(Condition.getPage(query), CodeClstempattr);
 		return R.data(pages);
 	}
 
@@ -88,7 +96,7 @@
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "鏂板", notes = "浼犲叆CodeClstempattr")
 	public R save(@Valid @RequestBody CodeClstempattrEntity CodeClstempattr) {
-		return R.status(CodeClstempattrService.save(CodeClstempattr));
+		return R.status(codeClstempattrService.save(CodeClstempattr));
 	}
 
 	/**
@@ -98,7 +106,7 @@
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "淇敼", notes = "浼犲叆CodeClstempattr")
 	public R update(@Valid @RequestBody CodeClstempattrEntity CodeClstempattr) {
-		return R.status(CodeClstempattrService.updateById(CodeClstempattr));
+		return R.status(codeClstempattrService.updateById(CodeClstempattr));
 	}
 
 	/**
@@ -108,7 +116,7 @@
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆CodeClstempattr")
 	public R submit(@Valid @RequestBody CodeClstempattrEntity CodeClstempattr) {
-		return R.status(CodeClstempattrService.saveOrUpdate(CodeClstempattr));
+		return R.status(codeClstempattrService.saveOrUpdate(CodeClstempattr));
 	}
 
 	/**
@@ -118,8 +126,133 @@
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "閫昏緫鍒犻櫎", notes = "浼犲叆ids")
 	public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String ids) {
-		return R.status(CodeClstempattrService.removeBatchByIds(Func.toLongList(ids)));
+		return R.status(codeClstempattrService.removeBatchByIds(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 涓婚搴撳垎绫荤殑妯℃澘灞炴�у垪琛�
+	 * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞″垪琛�
+	 */
+	@GetMapping("/gridCodeClassifyTemplateAttr")
+	public DataGrid<CodeClstempattrVO> gridCodeClassifyTemplateAttr(BaseQueryObject baseQueryObject){
+		if(baseQueryObject == null){
+			baseQueryObject = new BaseQueryObject();
+		}
+		return codeClstempattrService.gridCodeClassifyTemplateAttr(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
+	}
+
+	/**
+	 * 澧炲姞 涓婚搴撳垎绫荤殑妯℃澘灞炴��
+	 * @param codeClassifyTemplateAttrDTO 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹紶杈撳璞�
+	 * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+	 */
+	@PostMapping( "/addSave")
+	public R<CodeClstempattrVO> addSave(@RequestBody CodeClstempattrDTO codeClassifyTemplateAttrDTO){
+		CodeClstempattrVO codeClassifyTemplateAttrVO = codeClstempattrService.addSave(codeClassifyTemplateAttrDTO);
+		return R.data(codeClassifyTemplateAttrVO);
+	}
+
+	/**
+	 * 鎵归噺淇濆瓨鍒楄〃鏁版嵁
+	 * @param list
+	 * @return
+	 */
+	@PostMapping( "/batchAddSave")
+	public R<List<CodeClstempattrVO>> batchAddSaves(@RequestBody List<CodeClstempattrDTO> list){
+		if(CollectionUtils.isEmpty(list)){
+			return R.fail("鍒楄〃涓嶈兘涓虹┖!");
+		}
+		List<CodeClstempattrVO> codeClassifyTemplateAttrVOs = codeClstempattrService.batchAddSave(list);
+		return R.data(codeClassifyTemplateAttrVOs);
+	}
+
+	/**
+	 * 淇敼 涓婚搴撳垎绫荤殑妯℃澘灞炴��
+	 * @param codeClassifyTemplateAttrDTO 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹紶杈撳璞�
+	 * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+	 */
+	@PutMapping("/editSave")
+	public R<CodeClstempattrVO> editSave(@RequestBody CodeClstempattrDTO codeClassifyTemplateAttrDTO){
+		return codeClstempattrService.editSave(codeClassifyTemplateAttrDTO);
+	}
+
+	/**
+	 * 鍒犻櫎涓婚搴撳垎绫荤殑妯℃澘灞炴��
+	 * @param codeClassifyTemplateAttrDTO 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
+	 * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
+	 */
+	@DeleteMapping( "/deleteData")
+	public R delCodeClassifyTemplateAttr(@RequestBody CodeClstempattrDTO codeClassifyTemplateAttrDTO) {
+		return codeClstempattrService.deleteCodeClassifyTemplateAttr(codeClassifyTemplateAttrDTO);
+	}
+
+	/**
+	 * 涓婚敭鑾峰彇涓婚搴撳垎绫荤殑妯℃澘灞炴��
+	 * @param oid 涓婚敭
+	 * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞�
+	 */
+	@GetMapping("/getObjectByOid")
+	public R<CodeClstempattrVO> getObjectByOid(String oid){
+		CodeClstempattrVO codeClassifyTemplateAttrVO = codeClstempattrService.getObjectByOid(oid);
+		return R.data(codeClassifyTemplateAttrVO);
+	}
+
+
+	/**
+	 * 涓婚敭鎵归噺鑾峰彇涓婚搴撳垎绫荤殑妯℃澘灞炴��
+	 * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
+	 * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞�
+	 */
+	@GetMapping("/listDataByOids")
+	public R listCodeClassifyTemplateAttrByOids(String oids){
+		Collection<CodeClstempattrVO> voCollection =  codeClstempattrService.listCodeClassifyTemplateAttrByOids(VciBaseUtil.str2List(oids));
+//		BaseResult baseResult = BaseResult.success();
+//		baseResult.setData(voCollection);
+		return  R.data(voCollection);
+	}
+
+	/**
+	 * 鍙傜収涓婚搴撳垎绫荤殑妯℃澘灞炴�у垪琛�
+	 * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
+	 */
+	@GetMapping("/refDataGrid")
+	public DataGrid<CodeClstempattrVO> refDataGridCodeClassifyTemplateAttr(BaseQueryObject baseQueryObject){
+		if(baseQueryObject == null){
+			baseQueryObject = new BaseQueryObject();
+		}
+		return codeClstempattrService.refDataGridCodeClassifyTemplateAttr(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
+	}
+
+	/**
+	 * 鏌ヨ杩欎釜涓氬姟绫诲瀷涓嬬殑鎵�鏈夊睘鎬�,鎺掗櫎鎺夎繖涓ā鏉垮凡缁忓瓨鍦ㄧ殑灞炴��
+	 * @param baseQueryObject
+	 * @return
+	 */
+	@GetMapping("/codeClassifyTemplateAttrByBtm")
+	public DataGrid<CodeOsbtmtypeattributeVO> codeClassifyTemplateAttrByBtm(BaseQueryObject baseQueryObject){
+		return codeClstempattrService.codeClassifyTemplateAttrByBtm(baseQueryObject);
+	}
+
+	/**
+	 * 鏌ヨ杩欎釜涓氬姟绫诲瀷涓嬨�佽繖涓ā鏉垮凡缁忓瓨鍦ㄧ殑灞炴��
+	 * @param baseQueryObject
+	 * @return
+	 */
+	@GetMapping("/codeClassifyTemplateAttrByBtmHave")
+	public DataGrid<CodeOsbtmtypeattributeVO> codeClassifyTemplateAttrByBtmHave(BaseQueryObject baseQueryObject){
+		return codeClstempattrService.codeClassifyTemplateAttrByBtmHave(baseQueryObject);
+	}
+
+	/**
+	 * 鍚屾鍒板叾浠栨ā鏉�
+	 * @param codeClassifyAttrDTO   id 鑻辨枃鍚嶇О
+	 * @return 鎵ц缁撴灉
+	 */
+	@PostMapping( "/copyto")
+	public R copyto(@RequestBody CodeClstempattrDTO codeClassifyAttrDTO) {
+		return codeClstempattrService.copyto(codeClassifyAttrDTO);
+	}
 
 }

--
Gitblit v1.9.3