From e1feed4fb9f3a7722eb0cd646e73e6573bdfb6e1 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 16 四月 2024 20:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/GroupAttrPoolMappingController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/GroupAttrPoolMappingController.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/GroupAttrPoolMappingController.java
index 6203583..63b4f77 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/GroupAttrPoolMappingController.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/GroupAttrPoolMappingController.java
@@ -1,19 +1,20 @@
package com.vci.ubcs.code.applyjtcodeservice.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vci.ubcs.code.applyjtcodeservice.entity.DockingPreMetaAttr;
+import com.vci.ubcs.code.applyjtcodeservice.entity.GroupAttrPoolMapping;
import com.vci.ubcs.code.applyjtcodeservice.service.IGroupAttrPoolMappingService;
import com.vci.ubcs.code.applyjtcodeservice.vo.GroupAttrPoolMappingVO;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.sql.rowset.serial.SerialException;
import java.util.List;
-import java.util.Map;
/**
* 闆嗗洟灞炴�ф睜鏄犲皠Controller
@@ -30,12 +31,12 @@
/**
* 鏌ヨ闆嗗洟灞炴�ф睜鏄犲皠鐨勫睘鎬�
- * @param groupAttrPoolMappingVO
+ * @param bladeQueryObject
* @return
*/
- @PostMapping("/getGroupAttrPoolALlList")
- public R<List<GroupAttrPoolMappingVO>> getGroupAttrPoolALlList(@RequestBody GroupAttrPoolMappingVO groupAttrPoolMappingVO) throws SerialException {
- return R.data(groupAttrPoolMappingService.getGroupAttrPoolALlList(groupAttrPoolMappingVO));
+ @GetMapping("/getGroupAttrPoolALlList")
+ public R<IPage<GroupAttrPoolMappingVO>> getGroupAttrPoolALlList(BladeQueryObject bladeQueryObject) throws ServiceException {
+ return R.data(groupAttrPoolMappingService.getGroupAttrPoolALlList(bladeQueryObject));
}
/**
@@ -44,7 +45,7 @@
* @return
*/
@PostMapping("/getByGroupAttrKeyList")
- public R<List<GroupAttrPoolMappingVO>> getByGroupAttrKeyList(@RequestBody GroupAttrPoolMappingVO groupAttrPoolMappingVO) throws SerialException {
+ public R<List<GroupAttrPoolMappingVO>> getByGroupAttrKeyList(@RequestBody GroupAttrPoolMappingVO groupAttrPoolMappingVO) throws ServiceException {
return R.data(groupAttrPoolMappingService.getByGroupAttrKeyList(groupAttrPoolMappingVO));
}
@@ -54,18 +55,18 @@
* @return
*/
@PostMapping("/editGroupAttr")
- public R editGroupAttr(@RequestBody List<GroupAttrPoolMappingVO>groupAttrPoolMappingVO) throws SerialException {
+ public R editGroupAttr(@RequestBody List<GroupAttrPoolMappingVO> groupAttrPoolMappingVO) throws ServiceException {
return R.status(groupAttrPoolMappingService.editGroupAttr(groupAttrPoolMappingVO));
}
/**
- * 鏍规嵁闆嗗洟灞炴�х紪鍙锋煡璇㈤泦鍥㈠睘鎬ф睜鏄犲皠锛屾厧鐢ㄥ洜涓轰細鏇存柊鎵�鏈夌敤鍒拌繖涓泦鍥㈠睘鎬х殑璁板綍
+ * 鏍规嵁闆嗗洟灞炴�х紪鍙锋煡璇㈤泦鍥㈠睘鎬ф睜鏄犲皠骞跺悓姝ワ紝鎱庣敤鍥犱负浼氭洿鏂版墍鏈夌敤鍒拌繖涓泦鍥㈠睘鎬х殑璁板綍
* @param groupAttrPoolMappingVOS
* @return
*/
@PostMapping("/syncGroupAttrMapping")
- public R syncGroupAttrMapping(@RequestBody List<GroupAttrPoolMappingVO> groupAttrPoolMappingVOS) throws SerialException {
- return R.status(groupAttrPoolMappingService.syncGroupAttrMapping(groupAttrPoolMappingVOS));
+ public R syncGroupAttrMapping(@RequestBody List<GroupAttrPoolMappingVO> groupAttrPoolMappingVOS) throws ServiceException {
+ return groupAttrPoolMappingService.syncGroupAttrMapping(groupAttrPoolMappingVOS);
}
/**
@@ -75,7 +76,7 @@
* @throws SerialException
*/
@PostMapping("/saveDistinctGroupAttr")
- public R saveDistinctGroupAttr(@RequestBody List<DockingPreMetaAttr> dockingPreMetaAttrList) throws SerialException {
+ public R saveDistinctGroupAttr(@RequestBody List<DockingPreMetaAttr> dockingPreMetaAttrList) throws ServiceException {
return R.status(groupAttrPoolMappingService.saveDistinctGroupAttr(dockingPreMetaAttrList));
}
--
Gitblit v1.9.3