水质数据查询

zhanzhiqin

2021-12-28 67670fd6629282533584f9b30858cd62bf7e8afa

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java

@@ -9,6 +9,7 @@
import com.sandu.ximon.admin.dto.WaterQualityDataDto;
import com.sandu.ximon.dao.domain.WaterQualityData;
import com.sandu.ximon.dao.mapper.WaterQualityDataMapper;
import com.sandu.ximon.dao.mapper.WaterQualityEquipmentMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

@@ -20,27 +21,31 @@
    //水质参数获取网址，例如："http://iot.ainongye.cn/json/设备编号.json"
    private final String WATER_QUALITY_DATA_URL = "http://iot.ainongye.cn/json/";

    private WaterQualityDataMapper waterQualityDataMapper;

    /**
     * 查询全部水质设备数据
     */
    public List<WaterQualityData> listWaterQualityData() {
        LambdaQueryWrapper<WaterQualityData> wrapper = Wrappers.lambdaQuery(WaterQualityData.class);
        List<WaterQualityData> list = list(wrapper);

        return list;
        return waterQualityDataMapper.listWaterQualityData();
    }

    /**
     * 模糊查询
     */
    public List<WaterQualityData> listWaterQualityDataByKeyword(String keyword) {

        LambdaQueryWrapper<WaterQualityData> wrapper = Wrappers.lambdaQuery(WaterQualityData.class);
        if (keyword != null) {
            wrapper.like(WaterQualityData::getBelongTo, keyword);
        if (keyword == null || keyword.trim().length() == 0) {
            return listWaterQualityData();
        } else {
            return waterQualityDataMapper.listWaterQualityDataByKeyword(keyword);
        }
        List<WaterQualityData> waterQualityDataList = list(wrapper);
        return waterQualityDataList;

//        LambdaQueryWrapper<WaterQualityData> wrapper = Wrappers.lambdaQuery(WaterQualityData.class);
//        if (keyword != null) {
//            wrapper.like(WaterQualityData::getBelongTo, keyword);
//        }
//        List<WaterQualityData> waterQualityDataList = list(wrapper);
//        return waterQualityDataList;
    }

    /**