From 140065f50679c04ea873db3f6c958358b8dd8ddc Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 24 十二月 2024 14:35:43 +0800
Subject: [PATCH] 计算点修复负数计算问题
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java
index a1788ea..928b664 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java
@@ -13,6 +13,7 @@
import com.iailab.module.data.influxdb.service.InfluxDBService;
import com.iailab.module.data.point.common.PointTypeEnum;
import com.iailab.module.data.point.dto.DaPointDTO;
+import com.iailab.module.data.point.dto.DaPointSimpleDTO;
import com.iailab.module.data.point.service.DaPointService;
import com.iailab.module.data.point.vo.*;
import io.swagger.v3.oas.annotations.Operation;
@@ -20,7 +21,6 @@
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -71,6 +71,14 @@
}
@PreAuthorize("@ss.hasPermission('data:point:query')")
+ @GetMapping("/simple-list")
+ @Operation(summary = "列表")
+ public CommonResult<List<DaPointSimpleDTO>> simpleList(@Valid @RequestParam Map<String, Object> params) {
+ List<DaPointDTO> list = daPointService.list(params);
+ return success(ConvertUtils.sourceToTarget(list, DaPointSimpleDTO.class));
+ }
+
+ @PreAuthorize("@ss.hasPermission('data:point:query')")
@GetMapping("/info/{id}")
public CommonResult<DaPointDTO> info(@PathVariable("id") String id) {
DaPointDTO info = daPointService.info(id);
@@ -111,7 +119,6 @@
@PreAuthorize("@ss.hasPermission('data:point:update')")
@PutMapping("/enable")
@Operation(summary = "启用")
- @Transactional
public CommonResult<Boolean> enable(@RequestBody String[] ids) {
daPointService.enableByIds(ids);
return success(true);
@@ -120,7 +127,6 @@
@PreAuthorize("@ss.hasPermission('data:point:update')")
@PutMapping("/disable")
@Operation(summary = "禁用")
- @Transactional
public CommonResult<Boolean> disable(@RequestBody String[] ids) {
daPointService.disableByIds(ids);
return success(true);
@@ -132,14 +138,15 @@
@ApiAccessLog(operateType = EXPORT)
public void exportPointList(@Validated DaPointPageReqVO exportReqVO,
HttpServletResponse response) throws IOException {
- exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
- List<DaPointExcelVO> dataList = new ArrayList<>();
- List<DaPointDTO> measurePointList = daPointService.getMeasurePoint(exportReqVO);
+ List<DaPointExcelVO> dataList = ConvertUtils.sourceToTarget(daPointService.getList(exportReqVO), DaPointExcelVO.class);
+ /*List<DaPointDTO> measurePointList = daPointService.getMeasurePoint(exportReqVO);
dataList.addAll(ConvertUtils.sourceToTarget(measurePointList, DaPointExcelVO.class));
List<DaPointDTO> mathPointList = daPointService.getMathPoint(exportReqVO);
dataList.addAll(ConvertUtils.sourceToTarget(mathPointList, DaPointExcelVO.class));
List<DaPointDTO> constantPointList = daPointService.getConstantPoint(exportReqVO);
dataList.addAll(ConvertUtils.sourceToTarget(constantPointList, DaPointExcelVO.class));
+ List<DaPointDTO> cumulatePointList = daPointService.getCumulatePoint(exportReqVO);
+ dataList.addAll(ConvertUtils.sourceToTarget(cumulatePointList, DaPointExcelVO.class));*/
ExcelUtils.write(response, "测点列表.xls", "测点列表", DaPointExcelVO.class, dataList);
}
@@ -196,7 +203,6 @@
@Parameter(name = "file", description = "Excel 文件", required = true),
@Parameter(name = "updateSupport", description = "是否支持更新，默认为 false", example = "true")
})
-// @PreAuthorize("@ss.hasPermission('data:point:import')")
public CommonResult<PointImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
@RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
List<PointImportExcelVO> list = ExcelUtils.read(file, PointImportExcelVO.class);
--
Gitblit v1.9.3