水质 大气

zhanzhiqin

2021-12-31 78cfab6f94517b93fa6218987f1a1e87fac0034c

水质   大气

 dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java

@@ -22,29 +22,9 @@
    private Long id;

    /**
     * 所属灯杆
     */
    private String belongTo;

    /**
     * 大气设备状态:在线:1/离线:0
     */
    private Integer equipmentState;

    /**
     * 接入时间
     */
    private LocalDateTime createTime;

    /**
     * 所属人
     */
    private Long userId;

    /**
     * 灯杆ID
     */
    private String lightPoleId;

    /**
     * MAC地址

 dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityData.java

@@ -13,8 +13,6 @@
    private Long id;
    //水质设备编码
    private String waterQualityEquipmentCode;
    //所属灯杆
    private String belongTo;
    //水质酸碱度pH
    private String waterQualityPh;
    //水质溶解度DO（mg/L）

 dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataMapper.java

@@ -1,5 +1,6 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.dao.domain.AirData;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sandu.ximon.dao.domain.Monitor;
@@ -14,6 +15,10 @@
public interface AirDataMapper extends BaseMapper<AirData> {
    List<String> listAirEquipmentMAC();

    List<AirDataBo> listAirData();

    List<AirDataBo> listAirDataByKeyword(String keyword);

}



 dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java

@@ -1,15 +1,20 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * @Entity com.sandu.ximon.dao.domain.AirEquipment
 */
@Mapper
public interface AirEquipmentMapper extends BaseMapper<AirEquipment> {
    List<AirEquipmentBo> listAirEquipment();

    List<AirEquipmentBo> listAirEquipmentByKeyword(String keyword);
}



 dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityDataMapper.java

@@ -1,6 +1,7 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.common.domain.BaseMapper;
import com.sandu.ximon.dao.bo.WaterQualityDataBo;
import com.sandu.ximon.dao.domain.WaterQualityData;
import org.apache.ibatis.annotations.Mapper;

@@ -8,7 +9,8 @@

@Mapper
public interface WaterQualityDataMapper extends BaseMapper<WaterQualityData> {
    List<WaterQualityData> listWaterQualityDataByKeyword(String keyword);
    List<WaterQualityData> listWaterQualityData();
    List<WaterQualityDataBo> listWaterQualityDataByKeyword(String keyword);

    List<WaterQualityDataBo> listWaterQualityData();

}

 dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityEquipmentMapper.java

@@ -1,6 +1,7 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.common.domain.BaseMapper;
import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
import org.apache.ibatis.annotations.Mapper;

@@ -8,5 +9,6 @@

@Mapper
public interface WaterQualityEquipmentMapper extends BaseMapper<WaterQualityEquipment> {
    List<WaterQualityEquipment> listWaterQualityEquipmentByKeyword(String keyword);
    List<WaterQualityEquipmentBo> listWaterQualityEquipment();
    List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(String keyword);
}

 dao/src/main/resources/mapper/AirDataMapper.xml

@@ -38,4 +38,54 @@
             air_data
    </select>

    <select id="listAirData" resultType="com.sandu.ximon.dao.bo.AirDataBo">
        SELECT
            t1.*, t2.pole_id,
            t3.pole_name
        FROM
            air_data t1
        JOIN (
        SELECT
            MAX(t1.id) a1
        FROM
            air_data t1
        LEFT JOIN pole_binding t2 ON t1.device_mac = t2.device_code
        AND t2.device_type = 3
        LEFT JOIN pole t3 ON t3.id = t2.pole_id
        GROUP BY
            t1.device_mac
            LIMIT 0,
            10
        ) t ON t.a1 = t1.id
        LEFT JOIN pole_binding t2 ON t1.device_mac = t2.device_code
        AND t2.device_type = 3
        LEFT JOIN pole t3 ON t3.id = t2.pole_id
    </select>

    <select id="listAirDataByKeyword" resultType="com.sandu.ximon.dao.bo.AirDataBo">
                SELECT
            t1.*, t2.pole_id,
            t3.pole_name
        FROM
            air_data t1
        JOIN (
        SELECT
            MAX(t1.id) a1
        FROM
            air_data t1
        LEFT JOIN pole_binding t2 ON t1.device_mac = t2.device_code
        AND t2.device_type = 3
        LEFT JOIN pole t3 ON t3.id = t2.pole_id
        WHERE
        t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
        GROUP BY
            t1.device_mac
            LIMIT 0,
            10
        ) t ON t.a1 = t1.id
        LEFT JOIN pole_binding t2 ON t1.device_mac = t2.device_code
        AND t2.device_type = 3
        LEFT JOIN pole t3 ON t3.id = t2.pole_id
    </select>

</mapper>

 dao/src/main/resources/mapper/AirEquipmentMapper.xml

@@ -6,11 +6,7 @@

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirEquipment">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="belongTo" column="belong_to" jdbcType="VARCHAR"/>
            <result property="equipmentState" column="equipment_state" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="userId" column="user_id" jdbcType="BIGINT"/>
            <result property="lightPoleId" column="light_pole_id" jdbcType="VARCHAR"/>
            <result property="mac" column="mac" jdbcType="VARCHAR"/>
    </resultMap>

@@ -19,4 +15,32 @@
        create_time,user_id,light_pole_id,
        mac
    </sql>

    <select id="listAirEquipment" resultType="com.sandu.ximon.dao.bo.AirEquipmentBo">
        SELECT
            t1.*, t2.pole_id,
            t3.pole_name
        FROM
            air_equipment t1
        LEFT JOIN pole_binding t2 ON t1.mac = t2.device_code
        AND t2.device_type = 4
        LEFT JOIN pole t3 ON t3.id = t2.pole_id
        ORDER BY
            t1.id DESC
    </select>
    <select id="listAirEquipmentByKeyword" resultType="com.sandu.ximon.dao.bo.AirEquipmentBo">
        SELECT
            t1.*, t2.pole_id,
            t3.pole_name
        FROM
            air_equipment t1
        LEFT JOIN pole_binding t2 ON t1.mac = t2.device_code
        AND t2.device_type = 4
        LEFT JOIN pole t3 ON t3.id = t2.pole_id
        WHERE
            t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
        ORDER BY
            t1.id DESC

    </select>
</mapper>

 dao/src/main/resources/mapper/WaterQualityDataMapper.xml

@@ -7,7 +7,6 @@
    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.WaterQualityData">
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="waterQualityEquipmentCode" column="water_quality_equipment_code" jdbcType="VARCHAR"/>
        <result property="belongTo" column="belong_to" jdbcType="VARCHAR"/>
        <result property="waterQualityPh" column="water_quality_ph" jdbcType="VARCHAR"/>
        <result property="waterQualityDo" column="water_quality_do" jdbcType="VARCHAR"/>
        <result property="waterQualityEc" column="water_quality_ec" jdbcType="VARCHAR"/>
@@ -15,7 +14,7 @@
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>
    <select id="listWaterQualityDataByKeyword" resultType="com.sandu.ximon.dao.domain.WaterQualityData"
    <select id="listWaterQualityDataByKeyword" resultType="com.sandu.ximon.dao.bo.WaterQualityDataBo"
            parameterType="java.lang.String">
            SELECT
                t1.*, t2.pole_id,
@@ -44,7 +43,7 @@
                LEFT JOIN pole t3 ON t3.id = t2.pole_id
    </select>

    <select id="listWaterQualityData" resultType="com.sandu.ximon.dao.domain.WaterQualityData"
    <select id="listWaterQualityData" resultType="com.sandu.ximon.dao.bo.WaterQualityDataBo"
            parameterType="java.lang.String">
            SELECT
                t1.*, t2.pole_id,
@@ -53,10 +52,7 @@
                water_quality_data t1
            JOIN (
                SELECT
                    MAX(t1.id) a1,
                    t1.water_quality_ph,
                    t2.pole_id,
                    t3.pole_name
                    MAX(t1.id) a1
                FROM
                    water_quality_data t1
                LEFT JOIN pole_binding t2 ON t1.water_quality_equipment_code = t2.device_code

 dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml

@@ -6,13 +6,13 @@

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.WaterQualityEquipment">
        <id property="id" column="id" jdbcType="BIGINT"/>
<!--        <result property="belongTo" column="belong_to" jdbcType="VARCHAR"/>-->
        <!--        <result property="belongTo" column="belong_to" jdbcType="VARCHAR"/>-->
        <result property="waterQualityEquipmentCode" column="water_quality_equipment_code" jdbcType="VARCHAR"/>
        <result property="equipmentState" column="equipment_state" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <select id="listWaterQualityEquipmentByKeyword" resultType="com.sandu.ximon.dao.domain.WaterQualityEquipment"
    <select id="listWaterQualityEquipmentByKeyword" resultType="com.sandu.ximon.dao.bo.WaterQualityEquipmentBo"
            parameterType="java.lang.String">
        SELECT
            t1.*, t2.pole_id,
@@ -27,5 +27,17 @@
        ORDER BY
            t1.id DESC
    </select>
    <select id="listWaterQualityEquipment" resultType="com.sandu.ximon.dao.bo.WaterQualityEquipmentBo">
        SELECT
            t1.*, t2.pole_id,
            t3.pole_name
        FROM
            water_quality_equipment t1
        LEFT JOIN pole_binding t2 ON t1.water_quality_equipment_code = t2.device_code
        AND t2.device_type = 4
        LEFT JOIN pole t3 ON t3.id = t2.pole_id
        ORDER BY
            t1.id DESC
    </select>

</mapper>

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java

@@ -2,8 +2,8 @@

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.admin.service.AirDataService;
import com.sandu.ximon.dao.domain.AirData;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -20,12 +20,25 @@

    @GetMapping
    public ResponseVO<Object> listAirData() {
        List<AirData> list = airDataService.listAirData();
        List<AirDataBo> list = airDataService.listAirData();
        return ResponseUtil.successPage(list);
    }

    /**
     * 查询大气数据模糊查询
     *
     * @param keyword 关键字
     * @return
     */
    @GetMapping("/listAirDataByKeyword/{keyword}")
    public ResponseVO<Object> listAirDataByKeyword(@PathVariable String keyword) {
        List<AirDataBo> list = airDataService.listAirDataByKeyword(keyword);
        return ResponseUtil.successPage(list);
    }

    /**
     * 查询大气设备MAC地址
     *
     * @return
     */
    @GetMapping("/listAirEquipmentMAC")

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java

@@ -3,6 +3,7 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.service.AirEquipmentService;
import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.domain.AirEquipment;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +21,7 @@

    @GetMapping
    public ResponseVO<Object> listAirEquipment() {
        List<AirEquipment> list = airEquipmentService.listAirEquipment();
        List<AirEquipmentBo> list = airEquipmentService.listAirEquipment();
        return ResponseUtil.successPage(list);
    }

@@ -31,7 +32,7 @@
     */
    @GetMapping("/listAirEquipmentByKeyword/{keyword}")
    public ResponseVO<Object> listAirEquipmentByKeyword(@PathVariable String keyword) {
        List<AirEquipment> list = airEquipmentService.listAirEquipmentByKeyword(keyword);
        List<AirEquipmentBo> list = airEquipmentService.listAirEquipmentByKeyword(keyword);
        return ResponseUtil.successPage(list);
    }


 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java

@@ -4,6 +4,7 @@
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.WaterQualityDataDto;
import com.sandu.ximon.admin.service.WaterQualityDataService;
import com.sandu.ximon.dao.bo.WaterQualityDataBo;
import com.sandu.ximon.dao.domain.WaterQualityData;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -21,7 +22,7 @@

    @GetMapping
    public ResponseVO<Object> listWaterQualityData() {
        List<WaterQualityData> list = waterQualityDataService.listWaterQualityData();
        List<WaterQualityDataBo> list = waterQualityDataService.listWaterQualityData();
        return ResponseUtil.success(list);
    }

@@ -32,7 +33,7 @@
     */
    @GetMapping("/listWaterQualityDataByKeyword/{keyword}")
    public ResponseVO<Object> listWaterQualityDataByKeyword(@PathVariable String keyword) {
        List<WaterQualityData> list = waterQualityDataService.listWaterQualityDataByKeyword(keyword);
        List<WaterQualityDataBo> list = waterQualityDataService.listWaterQualityDataByKeyword(keyword);
        return ResponseUtil.success(list);
    }


 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java

@@ -4,6 +4,7 @@
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.WaterQualityEquipmentParam;
import com.sandu.ximon.admin.service.WaterQualityEquipmentService;
import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -21,7 +22,7 @@

    @GetMapping
    public ResponseVO<Object> listWaterQualityEquipment() {
        List<WaterQualityEquipment> list = waterQualityEquipmentService.listWaterQualityEquipment();
        List<WaterQualityEquipmentBo> list = waterQualityEquipmentService.listWaterQualityEquipment();
        return ResponseUtil.success(list);
    }

@@ -32,7 +33,7 @@
     */
    @GetMapping("/listWaterQualityEquipmentByKeyword/{keyword}")
    public ResponseVO<Object> listWaterQualityEquipmentByKeyword(@PathVariable String keyword) {
        List<WaterQualityEquipment> list = waterQualityEquipmentService.listWaterQualityEquipmentByKeyword(keyword);
        List<WaterQualityEquipmentBo> list = waterQualityEquipmentService.listWaterQualityEquipmentByKeyword(keyword);
        return ResponseUtil.success(list);
    }


 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/AirDataProcessor.java

@@ -31,7 +31,7 @@
    public void process(String productKey, String deviceName, CommonFrame frame) {
        String functionCode = frame.getPayload().substring(2, 4);
        if (A5AtmosphereReportEnum.HeartBeat_Data.getCode().equals(functionCode)) {
            log.info("心跳相应");
            log.info("心跳相应——大气数据");
            A5AtmosphereHeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5AtmosphereHeartbeatReportInnerFrame().transformFrame(frame.getPayload());
            log.info(heartbeatReportInnerFrame.toString());


 ximon-admin/src/main/java/com/sandu/ximon/admin/schedule/WaterQualityDataSchedule.java

@@ -2,6 +2,7 @@

import com.sandu.ximon.admin.service.WaterQualityDataService;
import com.sandu.ximon.admin.service.WaterQualityEquipmentService;
import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -25,7 +26,7 @@

    @Scheduled(cron = "0 0 0/1 * * ?")
    public void UserSubjectRefund() {
        List<WaterQualityEquipment> waterQualityEquipmentList = waterQualityEquipmentService.listWaterQualityEquipment();
        List<WaterQualityEquipmentBo> waterQualityEquipmentList = waterQualityEquipmentService.listWaterQualityEquipment();
        for (WaterQualityEquipment waterQualityEquipment : waterQualityEquipmentList) {
            waterQualityDataService.getWaterQualityDataInfo(waterQualityEquipment.getWaterQualityEquipmentCode());
        }

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

@@ -1,11 +1,11 @@
package com.sandu.ximon.admin.service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;

import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
import com.sandu.ximon.dao.domain.AirData;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.mapper.AirDataMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -17,6 +17,7 @@
@AllArgsConstructor
public class AirDataService extends BaseServiceImpl<AirDataMapper, AirData> {
    private final AirDataMapper airDataMapper;
    private final AirEquipmentService airEquipmentService;

    /**
     * 保存上报大气心跳数据
@@ -29,17 +30,32 @@
        BeanUtils.copyProperties(heartBeatDataPackage, airData);
        airData.setDeviceMac(deviceName);

        //将设备信息添加到大气设备表
        AirEquipment airEquipment = new AirEquipment();
        airEquipment.setId(airData.getId());
        airEquipment.setMac(airData.getDeviceMac());
        airEquipment.setCreateTime(airData.getCreateTime());
        airEquipmentService.addAirEquipment(airEquipment);

        return save(airData);
    }

    /**
     * 查询全部大气设备
     * 查询全部大气数据
     */
    public List<AirData> listAirData() {
        LambdaQueryWrapper<AirData> wrapper = Wrappers.lambdaQuery(AirData.class);
        List<AirData> list = list(wrapper);
    public List<AirDataBo> listAirData() {
        return airDataMapper.listAirData();
    }

        return list;
    /**
     * 查询大气数据(模糊查询)
     */
    public List<AirDataBo> listAirDataByKeyword(String keyword) {
        if (keyword == null || keyword.trim().length() == 0) {
            return listAirData();
        } else {
            return airDataMapper.listAirDataByKeyword(keyword);
        }
    }

    /**

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.domain.AirData;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.Monitor;
@@ -18,27 +19,37 @@
@AllArgsConstructor
public class AirEquipmentService extends BaseServiceImpl<AirEquipmentMapper, AirEquipment> {

    private final AirEquipmentMapper airEquipmentMapper;

    /**
     * 查询全部大气设备数据
     */
    public List<AirEquipment> listAirEquipment() {
        LambdaQueryWrapper<AirEquipment> wrapper = Wrappers.lambdaQuery(AirEquipment.class);
        List<AirEquipment> list = list(wrapper);

        return list;
    public List<AirEquipmentBo> listAirEquipment() {
        return airEquipmentMapper.listAirEquipment();
    }

    /**
     * 模糊查询
     */
    public List<AirEquipment> listAirEquipmentByKeyword(String keyword) {

        LambdaQueryWrapper<AirEquipment> wrapper = Wrappers.lambdaQuery(AirEquipment.class);
        if(keyword != null){
            wrapper.like(AirEquipment::getBelongTo,keyword);
    public List<AirEquipmentBo> listAirEquipmentByKeyword(String keyword) {
        if (keyword == null || keyword.trim().length() == 0) {
            return listAirEquipment();
        } else {
            return airEquipmentMapper.listAirEquipmentByKeyword(keyword);
        }
        List<AirEquipment> airDataList = list(wrapper);
        return airDataList;

    }

    /**
     * 添加大气设备数据
     *
     * @return
     */
    public void addAirEquipment(AirEquipment airEquipment) {
        AirEquipment one = getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, airEquipment.getMac()));
        if (one == null) {
            save(airEquipment);
        }
    }

    /**

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

@@ -7,6 +7,7 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.dto.WaterQualityDataDto;
import com.sandu.ximon.dao.bo.WaterQualityDataBo;
import com.sandu.ximon.dao.domain.WaterQualityData;
import com.sandu.ximon.dao.mapper.WaterQualityDataMapper;
import com.sandu.ximon.dao.mapper.WaterQualityEquipmentMapper;
@@ -26,26 +27,19 @@
    /**
     * 查询全部水质设备数据
     */
    public List<WaterQualityData> listWaterQualityData() {
    public List<WaterQualityDataBo> listWaterQualityData() {
        return waterQualityDataMapper.listWaterQualityData();
    }

    /**
     * 模糊查询
     */
    public List<WaterQualityData> listWaterQualityDataByKeyword(String keyword) {
    public List<WaterQualityDataBo> listWaterQualityDataByKeyword(String keyword) {
        if (keyword == null || keyword.trim().length() == 0) {
            return listWaterQualityData();
        } else {
            return waterQualityDataMapper.listWaterQualityDataByKeyword(keyword);
        }

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

    /**

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

@@ -5,6 +5,7 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.WaterQualityEquipmentParam;
import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
@@ -20,24 +21,22 @@
public class WaterQualityEquipmentService extends BaseServiceImpl<WaterQualityEquipmentMapper, WaterQualityEquipment> {
    private WaterQualityEquipmentMapper waterQualityEquipmentMapper;
    private final PoleBindingService poleBindingService;

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

        return list;
    public List<WaterQualityEquipmentBo> listWaterQualityEquipment() {
        return waterQualityEquipmentMapper.listWaterQualityEquipment();
    }

    /**
     * 模糊查询
     */
    public List<WaterQualityEquipment> listWaterQualityEquipmentByKeyword(String keyword) {
        if(keyword == null || keyword.trim().length() == 0){
    public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(String keyword) {
        if (keyword == null || keyword.trim().length() == 0) {
            return listWaterQualityEquipment();

        }else{
        } else {
            return waterQualityEquipmentMapper.listWaterQualityEquipmentByKeyword(keyword);
        }