From e9a590e862148092027510b15d33cdd32691a6f5 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 06 十二月 2023 09:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateButtonController.java |  194 +++++++++++++++++++++++++----------------------
 1 files changed, 103 insertions(+), 91 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateButtonController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateButtonController.java
index dc761b5..f095b7c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateButtonController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateButtonController.java
@@ -1,114 +1,126 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 搴勯獮 (smallchill@163.com)
+ */
 package com.vci.ubcs.code.controller;
 
-import com.vci.ubcs.code.service.CodeClassifyTemplateButtonServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.vci.ubcs.code.dto.CodeClassifyTemplateButtonDTO;
+import com.vci.ubcs.code.service.ICodeClassifyTemplateButtonService;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateButtonVO;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.Collection;
 
 /**
- * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽帶鍒跺櫒
+ * 缂栫爜搴撳畾涔�-妯℃澘鎸夐挳鎵╁睍 鎺у埗鍣�
  *
- * @author weidy
- * @date 2022-01-24
+ * @author ludc
+ * @since 2023-04-20
  */
 @RestController
+@AllArgsConstructor
 @RequestMapping("/codeClsTempButtonController")
-public class CodeClassifyTemplateButtonController {
-    /**
-    * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽� 鏈嶅姟
-    */
-    @Autowired
-    private CodeClassifyTemplateButtonServiceI codeClassifyTemplateButtonService;
+@Api(value = "缂栫爜搴撳畾涔�-妯℃澘鎸夐挳鎵╁睍", tags = "缂栫爜搴撳畾涔�-妯℃澘鎸夐挳鎵╁睍鎺ュ彛")
+public class CodeClassifyTemplateButtonController extends BladeController {
 
-    /**
-     * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽垪琛�
-     * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
-     * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞″垪琛�
-     */
-    @GetMapping("/gridCodeClassifyTemplateButton")
-    public DataGrid<CodeClassifyTemplateButtonVO> gridCodeClassifyTemplateButton(BaseQueryObject baseQueryObject){
-        if(baseQueryObject == null){
-            baseQueryObject = new BaseQueryObject();
-        }
-        return codeClassifyTemplateButtonService.gridCodeClassifyTemplateButton(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
-    }
-    /**
-     * 澧炲姞 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
-     * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞�
-     * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
-     */
-    @PostMapping( "/addSave")
-    public BaseResult<CodeClassifyTemplateButtonVO> addSave(@RequestBody CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO){
-         CodeClassifyTemplateButtonVO codeClassifyTemplateButtonVO = codeClassifyTemplateButtonService.addSave(codeClassifyTemplateButtonDTO);
-         return BaseResult.success(codeClassifyTemplateButtonVO);
-    }
+	/**
+	 * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽� 鏈嶅姟
+	 */
+	private final ICodeClassifyTemplateButtonService codeClassifyTemplateButtonService;
 
-    /**
-     * 淇敼 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
-     * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞�
-     * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
-     */
-    @PutMapping("/editSave")
-    public BaseResult<CodeClassifyTemplateButtonVO> editSave(@RequestBody CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO){
-        CodeClassifyTemplateButtonVO codeClassifyTemplateButtonVO = codeClassifyTemplateButtonService.editSave(codeClassifyTemplateButtonDTO);
-        return BaseResult.success(codeClassifyTemplateButtonVO);
-    }
+	/**
+	 * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽垪琛�
+	 * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞″垪琛�
+	 */
+	@GetMapping("/gridCodeClassifyTemplateButton")
+	public R<IPage<CodeClassifyTemplateButtonVO>> gridCodeClassifyTemplateButton(BaseQueryObject baseQueryObject){
+		return R.data(codeClassifyTemplateButtonService.gridCodeClassifyTemplateButton(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()));
+	}
 
+	/**
+	 * 澧炲姞 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
+	 * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞�
+	 * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+	 */
+	@PostMapping( "/addSave")
+	public R<CodeClassifyTemplateButtonVO> addSave(@RequestBody CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO){
+		return R.data(codeClassifyTemplateButtonService.addSave(codeClassifyTemplateButtonDTO));
+	}
 
-    /**
-     * 鍒犻櫎涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
-     * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
-     * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
-     */
-    @DeleteMapping( "/deleteData")
-    public BaseResult delCodeClassifyTemplateButton( CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO) {
-        return codeClassifyTemplateButtonService.deleteCodeClassifyTemplateButton(codeClassifyTemplateButtonDTO);
-    }
+	/**
+	 * 淇敼 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
+	 * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞�
+	 * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+	 */
+	@PutMapping("/editSave")
+	public R<CodeClassifyTemplateButtonVO> editSave(@Valid @RequestBody CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO){
+		return R.data(codeClassifyTemplateButtonService.editSave(codeClassifyTemplateButtonDTO));
+	}
 
-    /**
-    * 涓婚敭鑾峰彇涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
-    * @param oid 涓婚敭
-    * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞�
-    */
-    @GetMapping("/getObjectByOid")
-    public BaseResult<CodeClassifyTemplateButtonVO> getObjectByOid(String oid){
-        CodeClassifyTemplateButtonVO codeClassifyTemplateButtonVO = codeClassifyTemplateButtonService.getObjectByOid(oid);
-        return BaseResult.success(codeClassifyTemplateButtonVO);
-    }
+	/**
+	 * 鍒犻櫎涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
+	 * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
+	 * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
+	 */
+	@DeleteMapping( "/deleteData")
+	public R delCodeClassifyTemplateButton(@Valid @RequestBody CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO) {
+		return codeClassifyTemplateButtonService.deleteCodeClassifyTemplateButton(codeClassifyTemplateButtonDTO);
+	}
 
-    /**
-     * 涓婚敭鎵归噺鑾峰彇涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
-     * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
-     * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞�
-     */
-    @GetMapping("/listDataByOids")
-    public BaseResult<CodeClassifyTemplateButtonVO> listCodeClassifyTemplateButtonByOids(String oids){
-        Collection<CodeClassifyTemplateButtonVO> voCollection =  codeClassifyTemplateButtonService.listCodeClassifyTemplateButtonByOids(VciBaseUtil.str2List(oids));
-        BaseResult baseResult = BaseResult.success();
-        baseResult.setData(voCollection);
-        return  baseResult;
-    }
+	/**
+	 * 涓婚敭鑾峰彇涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
+	 * @param oid 涓婚敭
+	 * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞�
+	 */
+	@GetMapping("/getObjectByOid")
+	public R<CodeClassifyTemplateButtonVO> getObjectByOid(String oid){
+		CodeClassifyTemplateButtonVO codeClassifyTemplateButtonVO = codeClassifyTemplateButtonService.getObjectByOid(oid);
+		return R.data(codeClassifyTemplateButtonVO);
+	}
 
+	/**
+	 * 涓婚敭鎵归噺鑾峰彇涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
+	 * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
+	 * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞�
+	 */
+	@GetMapping("/listDataByOids")
+	public R<Collection<CodeClassifyTemplateButtonVO>> listCodeClassifyTemplateButtonByOids(String oids){
+		Collection<CodeClassifyTemplateButtonVO> voCollection =  codeClassifyTemplateButtonService.listCodeClassifyTemplateButtonByOids(VciBaseUtil.str2List(oids));
+		return R.data(voCollection);
+	}
 
-
-    /**
-     * 鍙傜収涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽垪琛�
-     * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
-     * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
-     */
-    @GetMapping("/refDataGrid")
-    public DataGrid<CodeClassifyTemplateButtonVO> refDataGridCodeClassifyTemplateButton(BaseQueryObject baseQueryObject){
-        if(baseQueryObject == null){
-            baseQueryObject = new BaseQueryObject();
-        }
-        return codeClassifyTemplateButtonService.refDataGridCodeClassifyTemplateButton(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
-    }
+	/**
+	 * 鍙傜収涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽垪琛�
+	 * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
+	 */
+	@GetMapping("/refDataGrid")
+	public R<IPage<CodeClassifyTemplateButtonVO>> refDataGridCodeClassifyTemplateButton(BaseQueryObject baseQueryObject){
+		if(baseQueryObject == null){
+			baseQueryObject = new BaseQueryObject();
+		}
+		return R.data(codeClassifyTemplateButtonService.refDataGridCodeClassifyTemplateButton(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()));
+	}
 
 }

--
Gitblit v1.9.3