From 234b0ac195934b34c06045b2d2ef0f10e239dd8e Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 23 四月 2025 00:06:54 +0800
Subject: [PATCH] 系统合并
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java | 42 +++++++++++++++++-------------------------
1 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java
index f398a4a..cf5067b 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java
@@ -1,18 +1,18 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.ManageRecordIntervals;
import com.ruoyi.manage.service.ManageRecordIntervalsService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+import com.deepoove.poi.data.style.*;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-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 org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -24,56 +24,48 @@
* 鏂囦欢瀹氭湡瀹℃煡璁板綍 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 10:54:31
*/
+@Api(tags = "璁板綍鐨勬帶鍒�")
@RestController
@RequestMapping("/manageRecordIntervals")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
public class ManageRecordIntervalsController {
@Resource
private ManageRecordIntervalsService manageRecordIntervalsService;
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢瀹氭湡瀹℃煡璁板綍")
- @PostMapping("/pageManageRecordIntervals")
- public Result pageManageRecordIntervals(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageRecordIntervals manageRecordIntervals = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordIntervals.class);
+ @GetMapping("/pageManageRecordIntervals")
+ public Result pageManageRecordIntervals(Page page,ManageRecordIntervals manageRecordIntervals) throws Exception {
return Result.success(manageRecordIntervalsService.pageManageRecordIntervals(page, manageRecordIntervals));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鏂板鏂囦欢瀹氭湡瀹℃煡璁板綍")
@PostMapping("/addManageRecordIntervals")
public Result addManageRecordIntervals(@RequestBody ManageRecordIntervals manageRecordIntervals) {
return Result.success(manageRecordIntervalsService.addManageRecordIntervals(manageRecordIntervals));
}
- @ValueAuth
+
@ApiOperation(value = "缂栬緫鏂囦欢瀹氭湡瀹℃煡璁板綍")
@PostMapping("/doManageRecordIntervals")
public Result doManageRecordIntervals(@RequestBody ManageRecordIntervals manageRecordIntervals) {
return Result.success(manageRecordIntervalsService.updateById(manageRecordIntervals));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒犻櫎鏂囦欢瀹氭湡瀹℃煡璁板綍")
- @PostMapping("/delManageRecordIntervals")
+ @DeleteMapping("/delManageRecordIntervals")
public Result delManageRecordIntervals(Integer id) {
return Result.success(manageRecordIntervalsService.delManageRecordIntervals(id));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎嚭鏂囦欢瀹氭湡瀹℃煡璁板綍")
- @PostMapping("/exportOutManageRecordIntervals")
- public Result exportOutManageRecordIntervals(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
- ManageRecordIntervals manageRecordIntervals = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordIntervals.class);
+ @GetMapping("/exportOutManageRecordIntervals")
+ public Result exportOutManageRecordIntervals(ManageRecordIntervals manageRecordIntervals, HttpServletResponse response) throws Exception {
return Result.success(manageRecordIntervalsService.exportOutManageRecordIntervals(manageRecordIntervals,response));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎叆鏂囦欢瀹氭湡瀹℃煡璁板綍")
@PostMapping("/exportInManageRecordIntervals")
public Result exportInManageRecordIntervals(MultipartFile file){
--
Gitblit v1.9.3