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/service/impl/DaPointServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java
index fee2663..a2b1ce0 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java
@@ -109,11 +109,17 @@
if (params.get("pointNos") != null) {
pointNos = JSONArray.parseArray(JSONArray.toJSONString(params.get("pointNos")), String.class);
}
+ List<String> pointTypes = new ArrayList<>();
+ if (params.get("pointTypes") != null) {
+ pointTypes = Arrays.asList(params.get("pointTypes").toString().split(","));
+ }
+
Object pointNoLike = params.get("pointNoLike");
QueryWrapper<DaPointEntity> queryWrapper = new QueryWrapper();
queryWrapper.eq(!ObjectUtils.isEmpty(pointType), "point_type", pointType);
queryWrapper.in(pointNos.size() != 0,"point_no", pointNos);
queryWrapper.like(!ObjectUtils.isEmpty(pointNoLike), "point_no", pointNoLike);
+ queryWrapper.in(pointTypes.size() != 0,"point_type", pointTypes);
List<DaPointEntity> list = daPointDao.selectList(queryWrapper);
return ConvertUtils.sourceToTarget(list, DaPointDTO.class);
}
@@ -167,6 +173,15 @@
}
@Override
+ public List<DaPointDTO> getConstantPoint(DaPointPageReqVO reqVO) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("pointType", PointTypeEnum.CONSTANT.getCode());
+ params.put("pointNo", reqVO.getPointNo());
+ params.put("pointName", reqVO.getPointName());
+ return daPointDao.getConstantPoint(params);
+ }
+
+ @Override
public List<DaPointDTO> getConstantPoint(String freq) {
Map<String, Object> params = new HashMap<>();
params.put("pointType", PointTypeEnum.CONSTANT.getCode());
@@ -182,6 +197,16 @@
params.put("isEnable", CommonConstant.IS_ENABLE);
params.put("pointNos", pointNos);
return daPointDao.getConstantPoint(params);
+ }
+
+ @Override
+ public List<DaPointDTO> getMeasurePoint(DaPointPageReqVO reqVO) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("pointType", PointTypeEnum.MEASURE_POINT.getCode());
+ params.put("pointNo", reqVO.getPointNo());
+ params.put("pointName", reqVO.getPointName());
+ params.put("sourceName", reqVO.getSourceName());
+ return daPointDao.getMeasurePoint(params);
}
@Override
@@ -212,6 +237,15 @@
return null;
}
return list.get(0);
+ }
+
+ @Override
+ public List<DaPointDTO> getMathPoint(DaPointPageReqVO reqVO) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("pointType", PointTypeEnum.CALCULATE_POINT.getCode());
+ params.put("pointNo", reqVO.getPointNo());
+ params.put("pointName", reqVO.getPointName());
+ return daPointDao.getMathPoint(params);
}
@Override
@@ -311,10 +345,8 @@
}
@Override
- public PageResult<DaPointEntity> queryExcelList(DaPointPageReqVO exportReqVO) {
-
- return daPointDao.selectExcelList(exportReqVO);
-
+ public List<DaPointDTO> getList(DaPointPageReqVO exportReqVO) {
+ return daPointDao.getList(exportReqVO);
}
@Override
--
Gitblit v1.9.3