From 14cb329f0fec66711e3ddeba7e80db289c7fe8fc Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 31 十月 2024 08:51:04 +0800
Subject: [PATCH] 测点列表.xlsx
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 f4d16b2..532099c 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
@@ -55,7 +55,7 @@
@PreAuthorize("@ss.hasPermission('data:point:query')")
@GetMapping("page")
- public CommonResult<PageResult<DaPointDTO>> page(@Valid DaPointPageReqVO reqVO){
+ public CommonResult<PageResult<DaPointDTO>> page(@Valid DaPointPageReqVO reqVO) {
PageResult<DaPointDTO> page = daPointService.queryPage(reqVO);
return success(page);
}
@@ -70,14 +70,14 @@
@PreAuthorize("@ss.hasPermission('data:point:query')")
@GetMapping("/info/{id}")
- public CommonResult<DaPointDTO> info(@PathVariable("id") String id){
- DaPointDTO info= daPointService.info(id);
+ public CommonResult<DaPointDTO> info(@PathVariable("id") String id) {
+ DaPointDTO info = daPointService.info(id);
return success(info);
}
@PreAuthorize("@ss.hasPermission('data:point:create')")
@PostMapping("create")
- public CommonResult<Boolean> create(@RequestBody DaPointDTO daPointDTO){
+ public CommonResult<Boolean> create(@RequestBody DaPointDTO daPointDTO) {
String id = UUID.randomUUID().toString();
daPointDTO.setId(id);
daPointService.add(daPointDTO);
@@ -100,7 +100,7 @@
@PreAuthorize("@ss.hasPermission('data:point:query')")
@GetMapping("pointNo")
- public CommonResult<List<DaPointDTO>> getpoint(@RequestParam Map<String, Object> params){
+ public CommonResult<List<DaPointDTO>> getPoint(@RequestParam Map<String, Object> params) {
List<DaPointDTO> list = daPointService.list(params);
return new CommonResult<List<DaPointDTO>>().setData(list);
@@ -129,11 +129,16 @@
@PreAuthorize("@ss.hasPermission('data:point:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportPointList(@Validated DaPointPageReqVO exportReqVO,
- HttpServletResponse response) throws IOException {
+ HttpServletResponse response) throws IOException {
exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
- List<DaPointEntity> list = daPointService.queryExcelList(exportReqVO).getList();
- List<DaPointExcelVO> daPointExcelVOlist = ConvertUtils.sourceToTarget(list,DaPointExcelVO.class);
- ExcelUtils.write(response, "测点列表.xls", "数据", DaPointExcelVO.class, daPointExcelVOlist);
+ List<DaPointExcelVO> dataList = new ArrayList<>();
+ 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));
+ ExcelUtils.write(response, "测点列表.xls", "测点列表", DaPointExcelVO.class, dataList);
}
@GetMapping("/exportValue")
@@ -149,16 +154,16 @@
List<String> pointNos = new ArrayList<>();
pointNos.add(pointNo);
queryDto.setPointNos(pointNos);
- try{
+ try {
if (start == null) {
queryDto.setStart(new Date());
- }else{
+ } else {
queryDto.setStart(formatter.parse(start));
}
if (end == null) {
queryDto.setEnd(new Date());
- }else{
+ } else {
queryDto.setStart(formatter.parse(end));
}
} catch (ParseException e) {
--
Gitblit v1.9.3