From 850dedca3754c8d29ce74bb4a850f9fc0e58d410 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 26 五月 2023 19:09:43 +0800 Subject: [PATCH] 后端代码整合 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java | 37 +++++++++++++++++++++++++------------ 1 files changed, 25 insertions(+), 12 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 fc02263..2be97e5 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,6 +1,7 @@ package com.vci.ubcs.code.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.vci.ubcs.code.dto.CodeReferConfigDTO; import com.vci.ubcs.code.entity.CodeReferConfig; import com.vci.ubcs.code.service.CodeReferConfigService; import com.vci.ubcs.code.vo.CodeReferConfigVO; @@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; +import java.util.Map; /** * 鍙傜収閰嶇疆琛�(CodeReferConfig)琛ㄦ帶鍒跺眰 @@ -39,8 +42,18 @@ */ @GetMapping("getReferConfigPage") public R<IPage<CodeReferConfigVO>> queryByPage(BladeQueryObject bladeQueryObject) { - return R.data(this.codeReferconfigService.queryByPage(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)); + } /** * 閫氳繃涓婚敭鏌ヨ鍗曟潯鏁版嵁 @@ -49,41 +62,41 @@ * @return 鍗曟潯鏁版嵁 */ @GetMapping("getByOid") - public R<CodeReferConfig> queryById(@RequestParam("oid") String oid) { + public R<CodeReferConfigVO> queryById(@RequestParam("oid") String oid) { return R.data(this.codeReferconfigService.queryById(oid)); } /** * 鏂板鏁版嵁 * - * @param codeReferConfig 瀹炰綋 + * @param codeReferConfigVO 瀹炰綋 * @return 鏂板缁撴灉 */ - @PostMapping("/save") - public R<CodeReferConfig> add(CodeReferConfig codeReferConfig) { - return R.data(this.codeReferconfigService.insert(codeReferConfig)); + @PostMapping("/addSave") + public R<CodeReferConfigVO> add(CodeReferConfigVO codeReferConfigVO) { + return this.codeReferconfigService.insert(codeReferConfigVO); } /** * 缂栬緫鏁版嵁 * - * @param codeReferConfig 瀹炰綋 + * @param codeReferConfigVO 瀹炰綋 * @return 缂栬緫缁撴灉 */ @PutMapping("/edit") - public R<CodeReferConfig> edit(CodeReferConfig codeReferConfig) { - return R.data(this.codeReferconfigService.update(codeReferConfig)); + public R<CodeReferConfigVO> edit(CodeReferConfigVO codeReferConfigVO) { + return this.codeReferconfigService.update(codeReferConfigVO); } /** * 鍒犻櫎鏁版嵁 * - * @param id 涓婚敭 + * @param codeReferConfigDTO 涓婚敭 * @return 鍒犻櫎鏄惁鎴愬姛 */ @DeleteMapping("/del") - public R<Boolean> deleteById(String id) { - return R.data(this.codeReferconfigService.deleteById(id)); + public R<Boolean> deleteById(CodeReferConfigDTO codeReferConfigDTO) { + return this.codeReferconfigService.deleteById(codeReferConfigDTO); } } -- Gitblit v1.9.3