From 48c2e5ffb3f9ad3509006e50f3142ea4d0e7f619 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期三, 16 十月 2024 09:32:16 +0800
Subject: [PATCH] 修改拼接sql逻辑以及返回逻辑
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 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 18a80c1..4f28365 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.object.ConvertUtils;
@@ -48,8 +49,9 @@
@Override
- public PageResult<DaPointEntity> queryPage(DaPointPageReqVO reqVO) {
- return daPointDao.selectPage(reqVO);
+ public PageResult<DaPointDTO> queryPage(DaPointPageReqVO reqVO) {
+ IPage<DaPointDTO> page = daPointDao.selectPage(reqVO);
+ return new PageResult<DaPointDTO>(page.getRecords(), page.getTotal());
}
@Override
@@ -71,9 +73,19 @@
}
@Override
+ public DaPointDTO getSimpleInfoById(String id) {
+ return ConvertUtils.sourceToTarget(daPointDao.selectById(id), DaPointDTO.class);
+ }
+
+ @Override
+ public DaPointDTO getSimpleInfoByNo(String no) {
+ QueryWrapper<DaPointEntity> queryWrapper = new QueryWrapper();
+ queryWrapper.eq("pointNo", no);
+ return ConvertUtils.sourceToTarget(daPointDao.selectOne(queryWrapper), DaPointDTO.class);
+ }
+
+ @Override
public List<DaPointDTO> list(Map<String, Object> params) {
- Object page = params.get("page");
- Object limit = params.get("limit");
Object pointType = params.get("pointType");
List<String> pointNos = new ArrayList<>();
if (params.get("pointNos") != null) {
@@ -123,17 +135,17 @@
measurePoint.setSourceId(dataPoint.getSourceOption().get(1));
measurePoint.setTagNo(dataPoint.getSourceOption().get(2));
daMeasurePointService.update(measurePoint);
- } else if (PointTypeEnum.CALCULATE_POINT.equals(dataPoint.getPointType())) {
+ } else if (PointTypeEnum.CALCULATE_POINT.getName().equals(dataPoint.getPointType())) {
daMathPointService.update(dataPoint.getMathPoint());
}
}
@Override
@DSTransactional(rollbackFor = Exception.class)
- public void delete(String[] ids) {
- daPointDao.deleteBatchIds(Arrays.asList(ids));
- daMeasurePointService.deleteByPoint(ids);
- daMathPointService.deleteByPoint(ids);
+ public void delete(String[] id) {
+ daPointDao.deleteBatchIds(Arrays.asList(id));
+ daMeasurePointService.deleteByPoint(id);
+ daMathPointService.deleteByPoint(id);
}
@Override
--
Gitblit v1.9.3