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