From 9a4d5981d798bc93042b247837e0e8209ff298b3 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 25 二月 2025 15:05:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/ArcPointController.java | 74 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 6 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/ArcPointController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/ArcPointController.java
index 29ccd1c..c8bd879 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/ArcPointController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/ArcPointController.java
@@ -1,26 +1,36 @@
package com.iailab.module.data.point.controller.admin;
import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.data.point.dto.DaPointDTO;
+import com.iailab.framework.common.pojo.PageResult;
+import com.iailab.module.data.point.entity.ArcPointDataEntity;
+import com.iailab.module.data.point.entity.ArcPointSettingEntity;
import com.iailab.module.data.point.service.ArcPointDataService;
+import com.iailab.module.data.point.service.ArcPointSettingService;
+import com.iailab.module.data.point.vo.ArcPointDataPageReqVO;
+import com.iailab.module.data.point.vo.ArcPointSettingPageReqVO;
+import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.checkerframework.checker.units.qual.A;
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.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.validation.Valid;
+import java.util.List;
+import java.util.Map;
import java.util.UUID;
import static com.iailab.framework.common.pojo.CommonResult.success;
@Tag(name = "数据归档，测点")
@RestController
-@RequestMapping("/data/da/point")
+@RequestMapping("/data/da/arc")
@Validated
public class ArcPointController {
+
+ @Autowired
+ private ArcPointSettingService arcPointSettingService;
@Autowired
private ArcPointDataService arcPointDataService;
@@ -31,4 +41,56 @@
arcPointDataService.archiving(type);
return success(true);
}
+
+ @GetMapping("page")
+ public CommonResult<PageResult<ArcPointSettingEntity>> page(@Valid ArcPointSettingPageReqVO reqVO) {
+ PageResult<ArcPointSettingEntity> page = arcPointSettingService.queryPage(reqVO);
+ return success(page);
+ }
+
+ @GetMapping("dataPage")
+ public CommonResult<PageResult<ArcPointDataEntity>> dataPage(@Valid ArcPointDataPageReqVO reqVO) {
+ PageResult<ArcPointDataEntity> page = arcPointDataService.queryPage(reqVO);
+ return success(page);
+ }
+
+ @GetMapping("/list")
+ @Operation(summary = "列表")
+ public CommonResult<List<ArcPointSettingEntity>> list(@Valid @RequestParam Map<String, Object> params) {
+ List<ArcPointSettingEntity> list = arcPointSettingService.list(params);
+ return success(list);
+ }
+
+ @GetMapping("/info/{id}")
+ public CommonResult<ArcPointSettingEntity> info(@PathVariable("id") String id) {
+ ArcPointSettingEntity info = arcPointSettingService.info(id);
+ return success(info);
+ }
+
+ @PostMapping("create")
+ public CommonResult<Boolean> create(@RequestBody ArcPointSettingEntity arcPointSettingEntity) {
+ String id = UUID.randomUUID().toString();
+ arcPointSettingEntity.setId(id);
+ arcPointSettingService.add(arcPointSettingEntity);
+ return success(true);
+ }
+
+ @PutMapping("/update")
+ public CommonResult<Boolean> update(@RequestBody ArcPointSettingEntity arcPointSettingEntity) {
+ arcPointSettingService.update(arcPointSettingEntity);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ public CommonResult<Boolean> delete(String id) {
+ arcPointSettingService.delete(id);
+ return success(true);
+ }
+
+ @PutMapping("/enable")
+ @Operation(summary = "启用")
+ public CommonResult<Boolean> enable(@RequestBody String[] ids) {
+ arcPointSettingService.enableByIds(ids);
+ return success(true);
+ }
}
--
Gitblit v1.9.3