水质设备

zhanzhiqin

2021-12-27 623dd23d3f06ec0382cca8e013d998d63ba7d1d0

水质设备

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

@@ -12,8 +12,8 @@
    @TableId(type = IdType.AUTO)
    private Long id;

    //所属灯杆
    private String belongTo;
//    //所属灯杆
//    private String belongTo;
    //水质设备编码
    private String waterQualityEquipmentCode;
    //设备状态:在线:1/离线:0

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

@@ -4,6 +4,9 @@
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

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

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

@@ -6,10 +6,26 @@

    <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"
            parameterType="java.lang.String">
        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
        WHERE
            t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
        ORDER BY
            t1.id DESC
    </select>

</mapper>

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

@@ -18,7 +18,7 @@
@Service
@AllArgsConstructor
public class WaterQualityEquipmentService extends BaseServiceImpl<WaterQualityEquipmentMapper, WaterQualityEquipment> {

    private WaterQualityEquipmentMapper waterQualityEquipmentMapper;
    /**
     * 查询全部水质设备
     */
@@ -33,13 +33,19 @@
     * 模糊查询
     */
    public List<WaterQualityEquipment> listWaterQualityEquipmentByKeyword(String keyword) {
        if(keyword == null || keyword.trim().length() == 0){
            return listWaterQualityEquipment();

        LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
        if (keyword != null) {
            wrapper.like(WaterQualityEquipment::getBelongTo, keyword);
        }else{
            return waterQualityEquipmentMapper.listWaterQualityEquipmentByKeyword(keyword);
        }
        List<WaterQualityEquipment> airDataList = list(wrapper);
        return airDataList;

//        LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
////        if (keyword != null) {
////            wrapper.like(WaterQualityEquipment::getBelongTo, keyword);
////        }
//        List<WaterQualityEquipment> airDataList = list(wrapper);
//        waterQualityEquipmentMapper.listWaterQualityEquipmentByKeyword(keyword);
    }

    /**