From 9f9772acd06826682635ce17ae3fed4963bbf110 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 02 十二月 2021 16:16:34 +0800
Subject: [PATCH] 大气设备，水质设备
---
dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataMapper.java | 5
dao/src/main/resources/mapper/WaterQualityDataMapper.xml | 20 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java | 46 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 13 -
dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityData.java | 32 ++++
dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml | 16 ++
dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityDataMapper.java | 9 +
dao/src/main/resources/mapper/AirEquipmentMapper.xml | 15 +
/dev/null | 18 --
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 15 -
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java | 57 +++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 56 +++++++
dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java | 12 +
dao/src/main/resources/mapper/AirDataMapper.xml | 2
dao/src/main/java/com/sandu/ximon/dao/domain/AirData.java | 4
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java | 44 +++++
dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityEquipment.java | 25 +++
dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityEquipmentMapper.java | 9 +
dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java | 23 ++
19 files changed, 367 insertions(+), 54 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/AirData.java b/dao/src/main/java/com/sandu/ximon/dao/domain/AirData.java
index 7ba608c..7601251 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/AirData.java
+++ b/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;
}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java b/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
new file mode 100644
index 0000000..70d6e38
--- /dev/null
+++ b/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;
+}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityData.java b/dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityData.java
new file mode 100644
index 0000000..87660ae
--- /dev/null
+++ b/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;
+ //姘磋川閰哥⒈搴H
+ private Double waterQualityPh;
+ //姘磋川婧惰В搴O锛坢g/L锛�
+ private Double waterQualityDo;
+ //姘磋川鐢靛鐜嘐C(10^(-6)S)
+ private Double waterQualityEc;
+ //姘磋川娴婂害锛圢TU锛�
+ private Double waterQualityNtu;
+ //涓婃姤鏃堕棿
+ private LocalDateTime updateTime;
+ //鍒涘缓鏃堕棿
+ private LocalDateTime createTime;
+}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityEquipment.java b/dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityEquipment.java
new file mode 100644
index 0000000..edc808b
--- /dev/null
+++ b/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;
+}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataMapper.java
index e728d5c..0710bf7 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataMapper.java
+++ b/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();
}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java
new file mode 100644
index 0000000..c1bc7f2
--- /dev/null
+++ b/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> {
+}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityDataMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityDataMapper.java
new file mode 100644
index 0000000..430ca9f
--- /dev/null
+++ b/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> {
+}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityEquipmentMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityEquipmentMapper.java
new file mode 100644
index 0000000..bf8755e
--- /dev/null
+++ b/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> {
+}
diff --git a/dao/src/main/resources/mapper/AirDataMapper.xml b/dao/src/main/resources/mapper/AirDataMapper.xml
index 5285a41..bb68757 100644
--- a/dao/src/main/resources/mapper/AirDataMapper.xml
+++ b/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>
\ No newline at end of file
diff --git a/dao/src/main/resources/mapper/AirEquipmentMapper.xml b/dao/src/main/resources/mapper/AirEquipmentMapper.xml
new file mode 100644
index 0000000..3d5c182
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/dao/src/main/resources/mapper/GroupMapper.xml b/dao/src/main/resources/mapper/GroupMapper.xml
deleted file mode 100644
index 4b1b215..0000000
--- a/dao/src/main/resources/mapper/GroupMapper.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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.GroupMapper">
-
- <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.Groups">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <id property="userId" column="user_id" jdbcType="BIGINT"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="count" column="count" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- </resultMap>
- <select id="groupList" resultType="com.sandu.ximon.dao.domain.Groups">
- select * from lamp_group where user_id=#{userId}
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/dao/src/main/resources/mapper/WaterQualityDataMapper.xml b/dao/src/main/resources/mapper/WaterQualityDataMapper.xml
new file mode 100644
index 0000000..02d38f6
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml b/dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml
new file mode 100644
index 0000000..990e2b9
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
index 33f69b2..f33dd11 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
+++ b/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("鎿嶄綔澶辫触");
- }
- }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
new file mode 100644
index 0000000..93ecfa3
--- /dev/null
+++ b/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("鎿嶄綔澶辫触");
+ }
+ }
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
index 04c478e..2738004 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
+++ b/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);
- }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
new file mode 100644
index 0000000..2343341
--- /dev/null
+++ b/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);
+ }
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java
new file mode 100644
index 0000000..bc89092
--- /dev/null
+++ b/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;
+ }
+
+
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
new file mode 100644
index 0000000..78baffa
--- /dev/null
+++ b/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);
+ }
+}
--
Gitblit v1.9.3