大气设备，水质设备

zhanzhiqin

2021-12-02 9f9772acd06826682635ce17ae3fed4963bbf110

大气设备，水质设备

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

@@ -14,8 +14,6 @@

    //所属灯杆
    private String belongTo;
    //大气设备状态:在线:1/离线:0
    private int equipmentState;
    //接入时间
    private LocalDateTime createTime;
    //温度
@@ -38,6 +36,4 @@
    private String windSpeed;
    //上报时间
    private LocalDateTime updateTime;
    //所属人
    private Long userId;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.sandu.ximon.dao.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

@Data
public class AirEquipment implements Serializable {
    @TableId(type = IdType.AUTO)
    private Long id;

    //所属灯杆
    private String belongTo;
    //大气设备状态:在线:1/离线:0
    private int equipmentState;
    //接入时间
    private LocalDateTime createTime;
    //所属人
    private Long userId;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.sandu.ximon.dao.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

@Data
public class WaterQualityData implements Serializable {
    @TableId(type = IdType.AUTO)
    private Long id;
    //设备ID
    private Long equipmentId;
    //水质设备编码
    private String waterQualityEquipmentCode;
    //所属灯杆
    private String belongTo;
    //水质酸碱度pH
    private Double waterQualityPh;
    //水质溶解度DO（mg/L）
    private Double waterQualityDo;
    //水质电导率EC(10^(-6)S)
    private Double waterQualityEc;
    //水质浊度（NTU）
    private Double waterQualityNtu;
    //上报时间
    private LocalDateTime updateTime;
    //创建时间
    private LocalDateTime createTime;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package com.sandu.ximon.dao.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

@Data
public class WaterQualityEquipment implements Serializable {
    @TableId(type = IdType.AUTO)
    private Long id;

    //所属灯杆
    private String belongTo;
    //水质设备编码
    private String waterQualityEquipmentCode;
    //设备状态:在线:1/离线:0
    private int equipmentState;
    //接入时间
    private LocalDateTime createTime;
    //所属人
    private Long userId;
}

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

@@ -4,12 +4,7 @@
import com.sandu.ximon.dao.domain.AirData;
import org.apache.ibatis.annotations.Mapper;

import java.io.Serializable;
import java.util.Collection;
import java.util.List;

@Mapper
public interface AirDataMapper extends BaseMapper<AirData> {
   //Long userId
    List<AirData> laitAirData();
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.common.domain.BaseMapper;
import com.sandu.ximon.dao.domain.AirData;
import com.sandu.ximon.dao.domain.AirEquipment;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

@Mapper
public interface AirEquipmentMapper extends BaseMapper<AirEquipment> {
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package com.sandu.ximon.dao.mapper;

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

@Mapper
public interface WaterQualityDataMapper extends BaseMapper<WaterQualityData> {
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package com.sandu.ximon.dao.mapper;

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

@Mapper
public interface WaterQualityEquipmentMapper extends BaseMapper<WaterQualityEquipment> {
}

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

@@ -7,7 +7,6 @@
    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirData">
        <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="temperature" column="temperature" jdbcType="VARCHAR"/>
        <result property="humidity" column="humidity" jdbcType="VARCHAR"/>
@@ -19,7 +18,6 @@
        <result property="tVoc" column="t_voc" jdbcType="INTEGER"/>
        <result property="windSpeed" column="wind_speed" jdbcType="VARCHAR"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <result property="userId" column="user_id" jdbcType="BIGINT"/>
    </resultMap>

</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sandu.ximon.dao.mapper.AirEquipmentMapper">

    <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"/>
    </resultMap>

</mapper>

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

ÎļþÒÑɾ³ý

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sandu.ximon.dao.mapper.WaterQualityDataMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.WaterQualityData">
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="equipmentId" column="equipment_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="DOUBLE"/>
        <result property="waterQualityDo" column="water_quality_do" jdbcType="DOUBLE"/>
        <result property="waterQualityEc" column="water_quality_ec" jdbcType="DOUBLE"/>
        <result property="waterQualityNtu" column="water_quality_ntu" jdbcType="DOUBLE"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>

</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sandu.ximon.dao.mapper.WaterQualityEquipmentMapper">

    <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="waterQualityEquipmentCode" column="water_quality_equipment_code" 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"/>
    </resultMap>

</mapper>

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

@@ -19,7 +19,7 @@
    private final AirDataService airDataService;

    @GetMapping
    public ResponseVO<Object> listMonitor() {
    public ResponseVO<Object> listAirData() {
        List<AirData> list = airDataService.listAirData();
        return ResponseUtil.successPage(list);
    }
@@ -30,18 +30,9 @@
     * @return
     */
    @GetMapping("/listAirDataByKeyword/{keyword}")
    public ResponseVO<Object> listMonitorByKeyword(@PathVariable String keyword) {
    public ResponseVO<Object> listAirDataByKeyword(@PathVariable String keyword) {
        List<AirData> list = airDataService.listAirDataByKeyword(keyword);
        return ResponseUtil.successPage(list);
    }

    @PostMapping("/delete/{id}")
    public ResponseVO<Object> deleteMonitor(@PathVariable Long id) {
        boolean result = airDataService.deleteAirData(id);
        if (result) {
            return ResponseUtil.success(null);
        } else {
            return ResponseUtil.fail("操作失败");
        }
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
package com.sandu.ximon.admin.controller;

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

import java.util.List;

@RestController
@AllArgsConstructor
@RequestMapping("/v1/admin/airequipment")
public class AirEquipmentController {
    private final AirEquipmentService airEquipmentService;

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

    /**
     * æ¨¡ç³ŠæŸ¥è¯¢
     *
     * @return
     */
    @GetMapping("/listAirEquipmentByKeyword/{keyword}")
    public ResponseVO<Object> listAirEquipmentByKeyword(@PathVariable String keyword) {
        List<AirEquipment> list = airEquipmentService.listAirEquipmentByKeyword(keyword);
        return ResponseUtil.successPage(list);
    }

    @PostMapping("/delete/{id}")
    public ResponseVO<Object> deleteAirEquipment(@PathVariable Long id) {
        boolean result = airEquipmentService.deleteAirEquipment(id);
        if (result) {
            return ResponseUtil.success(null);
        } else {
            return ResponseUtil.fail("操作失败");
        }
    }
}

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

@@ -17,7 +17,7 @@
public class AirDataService extends BaseServiceImpl<AirDataMapper, AirData> {

    /**
     * æŸ¥è¯¢å…¨éƒ¨å¤§æ°”设备数据
     * æŸ¥è¯¢å…¨éƒ¨å¤§æ°”设备
     */
    public List<AirData> listAirData() {
        LambdaQueryWrapper<AirData> wrapper = Wrappers.lambdaQuery(AirData.class);
@@ -39,17 +39,4 @@
        return airDataList;
    }

    /**
     * åˆ é™¤å¤§æ°”设备
     *
     * @param Id
     * @return
     */
    public boolean deleteAirData(Long Id) {
        AirData airData = getById(Id);
        if (airData == null) {
            throw new BusinessException("找不到大气设备");
        }
        return removeById(Id);
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
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.domain.AirData;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.mapper.AirDataMapper;
import com.sandu.ximon.dao.mapper.AirEquipmentMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;

@Service
@AllArgsConstructor
public class AirEquipmentService extends BaseServiceImpl<AirEquipmentMapper, AirEquipment> {

    /**
     * æŸ¥è¯¢å…¨éƒ¨å¤§æ°”设备数据
     */
    public List<AirEquipment> listAirEquipment() {
        LambdaQueryWrapper<AirEquipment> wrapper = Wrappers.lambdaQuery(AirEquipment.class);
        List<AirEquipment> list = list(wrapper);

        return list;
    }

    /**
     * æ¨¡ç³ŠæŸ¥è¯¢
     */
    public List<AirEquipment> listAirEquipmentByKeyword(String keyword) {

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

    /**
     * åˆ é™¤å¤§æ°”设备数据
     *
     * @param Id
     * @return
     */
    public boolean deleteAirEquipment(Long Id) {
        AirEquipment airEquipment = getById(Id);
        if (airEquipment == null) {
            throw new BusinessException("找不到大气设备数据");
        }
        return removeById(Id);
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
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.domain.WaterQualityData;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
import com.sandu.ximon.dao.mapper.WaterQualityDataMapper;
import com.sandu.ximon.dao.mapper.WaterQualityEquipmentMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;

@Service
@AllArgsConstructor
public class WaterQualityDataService extends BaseServiceImpl<WaterQualityDataMapper, WaterQualityData> {

    /**
     * æŸ¥è¯¢å…¨éƒ¨æ°´è´¨è®¾å¤‡æ•°æ®
     */
    public List<WaterQualityData> listWaterQualityData() {
        LambdaQueryWrapper<WaterQualityData> wrapper = Wrappers.lambdaQuery(WaterQualityData.class);
        List<WaterQualityData> list = list(wrapper);

        return list;
    }

    /**
     * æ¨¡ç³ŠæŸ¥è¯¢
     */
    public List<WaterQualityData> listWaterQualityDataByKeyword(String 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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,56 @@
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.domain.AirEquipment;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
import com.sandu.ximon.dao.mapper.AirEquipmentMapper;
import com.sandu.ximon.dao.mapper.WaterQualityEquipmentMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;

@Service
@AllArgsConstructor
public class WaterQualityEquipmentService extends BaseServiceImpl<WaterQualityEquipmentMapper, WaterQualityEquipment> {

    /**
     * æŸ¥è¯¢å…¨éƒ¨æ°´è´¨è®¾å¤‡
     */
    public List<WaterQualityEquipment> listWaterQualityEquipment() {
        LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
        List<WaterQualityEquipment> list = list(wrapper);

        return list;
    }

    /**
     * æ¨¡ç³ŠæŸ¥è¯¢
     */
    public List<WaterQualityEquipment> listWaterQualityEquipmentByKeyword(String keyword) {

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

    /**
     * åˆ é™¤æ°´è´¨è®¾å¤‡
     *
     * @param Id
     * @return
     */
    public boolean deleteWaterQualityEquipment(Long Id) {
        WaterQualityEquipment waterQualityEquipment = getById(Id);
        if (waterQualityEquipment == null) {
            throw new BusinessException("找不到水质设备");
        }
        return removeById(Id);
    }
}