From 84ee37e1f485a1d3136535f9ef1c43058d9308ab Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 29 十一月 2023 11:39:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java |   67 +++++++++++++++++++--------------
 1 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
index d0d1fa1..0af732b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
@@ -1,13 +1,15 @@
 package com.vci.ubcs.code.controller;
 
-import com.vci.ubcs.code.entity.CodeReferConfig;
-import com.vci.ubcs.code.service.CodeReferConfigService;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.http.ResponseEntity;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.vci.ubcs.code.dto.CodeReferConfigDTO;
+import com.vci.ubcs.code.service.ICodeReferConfigService;
+import com.vci.ubcs.code.vo.CodeReferConfigVO;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
+import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 鍙傜収閰嶇疆琛�(CodeReferConfig)琛ㄦ帶鍒跺眰
@@ -18,66 +20,75 @@
 @RestController
 @RequestMapping("codeReferConfig")
 public class CodeReferConfigController {
+
     /**
      * 鏈嶅姟瀵硅薄
      */
     @Resource
-    private CodeReferConfigService plCodeReferconfigService;
+    private ICodeReferConfigService codeReferconfigService;
 
     /**
      * 鍒嗛〉鏌ヨ
-     *
-     * @param codeReferConfig 绛涢�夋潯浠�
-     * @param pageRequest      鍒嗛〉瀵硅薄
+     * @param bladeQueryObject 绛涢�夋潯浠�
      * @return 鏌ヨ缁撴灉
      */
-    @GetMapping
-    public ResponseEntity<Page<CodeReferConfig>> queryByPage(CodeReferConfig codeReferConfig, PageRequest pageRequest) {
-        return ResponseEntity.ok(this.plCodeReferconfigService.queryByPage(codeReferConfig, pageRequest));
+    @GetMapping("getReferConfigPage")
+    public R<IPage<CodeReferConfigVO>> queryByPage(BladeQueryObject bladeQueryObject) {
+        return R.data(this.codeReferconfigService.queryByJoinPage(bladeQueryObject));
     }
+
+	/**
+	 * 鏌ヨ鍒楄〃
+	 * @param codeReferConfigVO 绛涢�夋潯浠�
+	 * @return 鏌ヨ缁撴灉
+	 */
+	@GetMapping("getReferConfigList")
+	public R<List<CodeReferConfigVO>> queryByList(CodeReferConfigVO codeReferConfigVO) {
+		return R.data(this.codeReferconfigService.queryByList(codeReferConfigVO));
+	}
 
     /**
      * 閫氳繃涓婚敭鏌ヨ鍗曟潯鏁版嵁
      *
-     * @param id 涓婚敭
+     * @param oid 涓婚敭
      * @return 鍗曟潯鏁版嵁
      */
-    @GetMapping("{id}")
-    public ResponseEntity<CodeReferConfig> queryById(@PathVariable("id") String id) {
-        return ResponseEntity.ok(this.plCodeReferconfigService.queryById(id));
+    @GetMapping("getByOid")
+    public R<CodeReferConfigVO> queryById(@RequestParam("oid") String oid) {
+        return R.data(this.codeReferconfigService.queryById(oid));
     }
 
     /**
      * 鏂板鏁版嵁
      *
-     * @param codeReferConfig 瀹炰綋
+     * @param codeReferConfigVO 瀹炰綋
      * @return 鏂板缁撴灉
      */
-    @PostMapping
-    public ResponseEntity<CodeReferConfig> add(CodeReferConfig codeReferConfig) {
-        return ResponseEntity.ok(this.plCodeReferconfigService.insert(codeReferConfig));
+    @PostMapping("/addSave")
+    public R<CodeReferConfigVO> add(CodeReferConfigVO codeReferConfigVO) {
+        return this.codeReferconfigService.insert(codeReferConfigVO);
     }
 
     /**
      * 缂栬緫鏁版嵁
      *
-     * @param codeReferConfig 瀹炰綋
+     * @param codeReferConfigVO 瀹炰綋
      * @return 缂栬緫缁撴灉
      */
-    @PutMapping
-    public ResponseEntity<CodeReferConfig> edit(CodeReferConfig codeReferConfig) {
-        return ResponseEntity.ok(this.plCodeReferconfigService.update(codeReferConfig));
+    @PutMapping("/edit")
+    public R<CodeReferConfigVO> edit(CodeReferConfigVO codeReferConfigVO) {
+        return this.codeReferconfigService.update(codeReferConfigVO);
     }
 
     /**
      * 鍒犻櫎鏁版嵁
      *
-     * @param id 涓婚敭
+     * @param codeReferConfigDTO 涓婚敭
      * @return 鍒犻櫎鏄惁鎴愬姛
      */
-    @DeleteMapping
-    public ResponseEntity<Boolean> deleteById(String id) {
-        return ResponseEntity.ok(this.plCodeReferconfigService.deleteById(id));
+    @DeleteMapping("/del")
+    public R<Boolean> deleteById(CodeReferConfigDTO codeReferConfigDTO) {
+        return this.codeReferconfigService.deleteById(codeReferConfigDTO);
     }
 
 }

--
Gitblit v1.9.3