From 0636b9f9cbf8be1089d880a31293efeb6e983dc3 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 26 二月 2025 18:11:52 +0800
Subject: [PATCH] 数据归档
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/package-info.java | 1
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/admin/ArcSettingController.java | 33 ++++------------
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/admin/ArcDataController.java | 42 +++++++++++++++++++++
3 files changed, 52 insertions(+), 24 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/admin/ArcDataController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/admin/ArcDataController.java
new file mode 100644
index 0000000..6697823
--- /dev/null
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/admin/ArcDataController.java
@@ -0,0 +1,42 @@
+package com.iailab.module.data.arc.controller.admin;
+
+import com.iailab.framework.common.pojo.CommonResult;
+import com.iailab.framework.common.pojo.PageResult;
+import com.iailab.module.data.arc.entity.ArcDataEntity;
+import com.iailab.module.data.arc.service.ArcDataService;
+import com.iailab.module.data.arc.vo.ArcDataPageReqVO;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import static com.iailab.framework.common.pojo.CommonResult.success;
+
+/**
+ * @author PanZhibao
+ * @Description
+ * @createTime 2025年02月26日
+ */
+@Tag(name = "数据归档数据")
+@RestController
+@RequestMapping("/data/arc/data")
+@Validated
+public class ArcDataController {
+
+ @Autowired
+ private ArcDataService arcDataService;
+
+ @PostMapping("archiving")
+ public CommonResult<Boolean> archiving(@RequestBody String type) {
+ arcDataService.archiving(type);
+ return success(true);
+ }
+
+ @GetMapping("page")
+ public CommonResult<PageResult<ArcDataEntity>> dataPage(@Valid ArcDataPageReqVO reqVO) {
+ PageResult<ArcDataEntity> page = arcDataService.queryPage(reqVO);
+ return success(page);
+ }
+}
\ No newline at end of file
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/ArcController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/admin/ArcSettingController.java
similarity index 75%
rename from iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/ArcController.java
rename to iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/admin/ArcSettingController.java
index 3689048..d077580 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/ArcController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/admin/ArcSettingController.java
@@ -1,16 +1,14 @@
-package com.iailab.module.data.arc.controller;
+package com.iailab.module.data.arc.controller.admin;
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.pojo.PageResult;
-import com.iailab.module.data.arc.entity.ArcDataEntity;
import com.iailab.module.data.arc.entity.ArcSettingEntity;
-import com.iailab.module.data.arc.service.ArcDataService;
import com.iailab.module.data.arc.service.ArcSettingService;
-import com.iailab.module.data.arc.vo.ArcDataPageReqVO;
import com.iailab.module.data.arc.vo.ArcSettingPageReqVO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -21,34 +19,18 @@
import static com.iailab.framework.common.pojo.CommonResult.success;
-@Tag(name = "数据归档，测点")
+@Tag(name = "数据归档设置")
@RestController
-@RequestMapping("/data/arc")
+@RequestMapping("/data/arc/setting")
@Validated
-public class ArcController {
+public class ArcSettingController {
@Autowired
private ArcSettingService arcSettingService;
- @Autowired
- private ArcDataService arcDataService;
-
-
- @PostMapping("archiving")
- public CommonResult<Boolean> archiving(@RequestBody String type) {
- arcDataService.archiving(type);
- return success(true);
- }
-
@GetMapping("page")
public CommonResult<PageResult<ArcSettingEntity>> page(@Valid ArcSettingPageReqVO reqVO) {
PageResult<ArcSettingEntity> page = arcSettingService.queryPage(reqVO);
- return success(page);
- }
-
- @GetMapping("dataPage")
- public CommonResult<PageResult<ArcDataEntity>> dataPage(@Valid ArcDataPageReqVO reqVO) {
- PageResult<ArcDataEntity> page = arcDataService.queryPage(reqVO);
return success(page);
}
@@ -65,6 +47,7 @@
return success(info);
}
+ @PreAuthorize("@ss.hasPermission('data:arc:create')")
@PostMapping("create")
public CommonResult<Boolean> create(@RequestBody ArcSettingEntity arcSettingEntity) {
String id = UUID.randomUUID().toString();
@@ -73,12 +56,14 @@
return success(true);
}
+ @PreAuthorize("@ss.hasPermission('data:arc:update')")
@PutMapping("/update")
public CommonResult<Boolean> update(@RequestBody ArcSettingEntity arcSettingEntity) {
arcSettingService.update(arcSettingEntity);
return success(true);
}
-
+
+ @PreAuthorize("@ss.hasPermission('data:arc:delete')")
@DeleteMapping("/delete")
public CommonResult<Boolean> delete(String id) {
arcSettingService.delete(id);
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/package-info.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/package-info.java
new file mode 100644
index 0000000..8a8da93
--- /dev/null
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/package-info.java
@@ -0,0 +1 @@
+package com.iailab.module.data.arc.controller;
\ No newline at end of file
--
Gitblit v1.9.3