From 48c57b372759c86c5d9443e24594e26d5d7ef8a6 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期三, 25 九月 2024 10:24:27 +0800
Subject: [PATCH] 预测模型接口修改
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java | 17 ++++++++---------
1 files changed, 8 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 44402c3..18a80c1 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
@@ -19,7 +19,7 @@
import com.iailab.module.data.point.service.DaPointService;
import com.iailab.module.data.point.service.DaSequenceNumService;
import com.iailab.module.data.point.vo.DaPointPageReqVO;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -72,19 +72,18 @@
@Override
public List<DaPointDTO> list(Map<String, Object> params) {
- String page = (String) params.get("page");
- String limit = (String) params.get("limit");
- String pointType = (String)params.get("pointType");
+ 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) {
pointNos = JSONArray.parseArray(JSONArray.toJSONString(params.get("pointNos")), String.class);
}
- String pointNoLike = (String)params.get("pointNoLike");
+ Object pointNoLike = params.get("pointNoLike");
QueryWrapper<DaPointEntity> queryWrapper = new QueryWrapper();
- queryWrapper.eq(StringUtils.isNotBlank(pointType), "point_type", pointType)
- .in(!CollectionUtils.isEmpty(pointNos),"point_no", pointNos)
- .like(StringUtils.isNotBlank(pointNoLike), "point_no", pointNoLike)
- .last("limit 1, 10");
+ queryWrapper.eq(!ObjectUtils.isEmpty(pointType), "point_type", pointType);
+ queryWrapper.in(pointNos.size() != 0,"point_no", pointNos);
+ queryWrapper.like(!ObjectUtils.isEmpty(pointNoLike), "point_no", pointNoLike);
List<DaPointEntity> list = daPointDao.selectList(queryWrapper);
return ConvertUtils.sourceToTarget(list, DaPointDTO.class);
}
--
Gitblit v1.9.3