From 3d34f39838f12fa69f088b229e91dfe3febe4185 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 10 十月 2022 11:27:29 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java | 16 +-
dao/src/main/resources/mapper/AirEquipmentNongGengMapper.xml | 10 +
dao/src/main/resources/mapper/AirDataNongGengMapper.xml | 55 +++++----
dao/src/main/java/com/sandu/ximon/dao/enums/AirNongGengEnums.java | 110 ++++++++++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java | 38 +++---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java | 29 ++--
dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipmentNongGeng.java | 13 +
dao/src/main/java/com/sandu/ximon/dao/domain/AirDataNongGeng.java | 67 +++++++---
dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentNongGengMapper.java | 5
dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataNongGengMapper.java | 6
10 files changed, 249 insertions(+), 100 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/AirDataNongGeng.java b/dao/src/main/java/com/sandu/ximon/dao/domain/AirDataNongGeng.java
index 2097496..7436538 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/AirDataNongGeng.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/AirDataNongGeng.java
@@ -4,16 +4,17 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* 鍐滆�曞ぇ姘旂洃娴嬫暟鎹�
+ *
* @TableName air_data_nong_geng
*/
-@TableName(value ="air_data_nong_geng")
+@TableName(value = "air_data_nong_geng")
@Data
public class AirDataNongGeng implements Serializable {
/**
@@ -30,82 +31,102 @@
/**
* 鍣０
*/
- private BigDecimal noise;
+ private String noise;
/**
- * 纭寲姘�
+ * voc鎸ュ彂鎬ф湁鏈虹墿
*/
- private BigDecimal hydrogenSulfide;
+ private String voc;
/**
* SO2 娴撳害
*/
- private BigDecimal so2;
+ private String so2;
/**
* NO2 娴撳害
*/
- private BigDecimal no2;
+ private String no2;
/**
* CO 娴撳害
*/
- private BigDecimal co;
+ private String co;
+
+ /**
+ * 浜屾哀鍖栫⒊
+ */
+ private String co2;
/**
* o3 娴撳害
*/
- private BigDecimal o3;
+ private String o3;
/**
* pm2.5 娴撳害
*/
- private BigDecimal pm2point5;
+ private String pm2point5;
/**
* pm10
*/
- private BigDecimal pm10;
+ private String pm10;
/**
* 绌烘皵娓╁害
*/
- private BigDecimal airTemperature;
+ private String airTemperature;
/**
* 绌烘皵婀垮害
*/
- private BigDecimal airHumidity;
+ private String airHumidity;
/**
* 澶ф皵鍘嬪己
*/
- private BigDecimal airPressure;
+ private String airPressure;
/**
* 椋庡悜
*/
- private BigDecimal windDirection;
+ private String windDirection;
/**
* 椋庨��
*/
- private BigDecimal windSpeed;
+ private String windSpeed;
/**
- * 鍗佸垎閽熼洦閲�
+ * 闄嶉洦閲�
*/
- private BigDecimal tenRainfallMin;
+ private String rainfall;
/**
- * 杈愬皠
+ * 缈绘枟闆ㄩ噺
*/
- private BigDecimal radiation;
+ private String tippingBucketRainfall;
/**
* 鍏夌収
*/
- private BigDecimal illumination;
+ private String illumination;
+
+ /**
+ * 鐑數鎬昏緪灏�
+ */
+ private String thermalRadiation;
+
+ /**
+ * 绱绾�
+ */
+ private String ultravioletRay;
+
+ /**
+ * 璁惧绫诲瀷 AirNongGengEnums
+ */
+ private String type;
/**
* 鍒涘缓鏃堕棿
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipmentNongGeng.java b/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipmentNongGeng.java
index 90f0d1d..aa82dbb 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipmentNongGeng.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipmentNongGeng.java
@@ -4,20 +4,20 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-
import java.io.Serializable;
import java.time.LocalDateTime;
-
+import java.util.Date;
import lombok.Data;
/**
+ *
* @TableName air_equipment_nong_geng
*/
-@TableName(value = "air_equipment_nong_geng")
+@TableName(value ="air_equipment_nong_geng")
@Data
public class AirEquipmentNongGeng implements Serializable {
/**
- *
+ *
*/
@TableId
private Long id;
@@ -28,6 +28,11 @@
private String mac;
/**
+ * 璁惧绫诲瀷 AirNongGengEnums
+ */
+ private String type;
+
+ /**
* 鎺ュ叆鏃堕棿
*/
private LocalDateTime createTime;
diff --git a/dao/src/main/java/com/sandu/ximon/dao/enums/AirNongGengEnums.java b/dao/src/main/java/com/sandu/ximon/dao/enums/AirNongGengEnums.java
new file mode 100644
index 0000000..bdc8a5d
--- /dev/null
+++ b/dao/src/main/java/com/sandu/ximon/dao/enums/AirNongGengEnums.java
@@ -0,0 +1,110 @@
+package com.sandu.ximon.dao.enums;
+
+/**
+ * @author LiuHaoNan
+ * @date 2022/10/9
+ * 澶ф皵璁惧鍒嗙被鏋氫妇
+ */
+public class AirNongGengEnums {
+
+ /**
+ * RY-G/W
+ */
+ public static final String RY_GW = "1";
+
+ /**
+ * RY-CPM2510
+ */
+ public static final String RY_CPM2510 = "2";
+
+ /**
+ * RY-CPM2516
+ */
+ public static final String RY_CPM2516 = "3";
+
+ /**
+ * RY-CPM2512
+ */
+ public static final String RY_CPM2512 = "4";
+
+ /**
+ * HCD6815
+ */
+ public static final String HCD_6815 = "5";
+
+ /**
+ * HCD6816Z
+ */
+ public static final String HCD_6816Z_1 = "6";
+
+ /**
+ * HCD6817Z
+ */
+ public static final String HCD_6817Z = "7";
+
+ /**
+ * HCD6816Z
+ */
+ public static final String HCD_6816Z_2 = "8";
+
+ /**
+ *HCD6817
+ */
+ public static final String HCD_6817 = "9";
+
+ /**
+ * HCD6817B
+ */
+ public static final String HCD_6817B = "10";
+
+ /**
+ * HCD6818A
+ */
+ public static final String HCD_6818A = "16";
+
+ /**
+ * HCD6818N
+ */
+ public static final String HCD_6818N = "18";
+
+ /**
+ * HCD6818D
+ */
+ public static final String HCD_6818D = "19";
+
+ /**
+ * HCD6818B
+ */
+ public static final String HCD_6818B = "11";
+
+ /**
+ * HCD6818E
+ */
+ public static final String HCD_6818E = "12";
+
+ /**
+ * HCD6818C
+ */
+ public static final String HCD_6818C = "13";
+
+ /**
+ * HCD6818
+ */
+ public static final String HCD_6818 = "14";
+
+ /**
+ * HCD6820
+ */
+ public static final String HCD_6820 = "15";
+
+ /**
+ * HCD6820锛堥珮閰嶇増锛�
+ */
+ public static final String HCD_6820_Pro = "17";
+
+ /**
+ * HCD6818V鍨嬬綉鏍煎寲绌烘皵璐ㄩ噺鍙橀�佸櫒锛堟埛澶栧瀷锛�
+ */
+ public static final String HCD_6818V_Out = "20";
+
+}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataNongGengMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataNongGengMapper.java
index 1c53f0c..a318dc8 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataNongGengMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataNongGengMapper.java
@@ -1,14 +1,16 @@
package com.sandu.ximon.dao.mapper;
-import com.sandu.ximon.dao.bo.AirDataBo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sandu.ximon.dao.bo.AirDataNongGengBo;
import com.sandu.ximon.dao.domain.AirDataNongGeng;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
+ * @author Administrator
+ * @description 閽堝琛ㄣ�恆ir_data_nong_geng(鍐滆�曞ぇ姘旂洃娴嬫暟鎹�)銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2022-10-10 10:00:03
* @Entity com.sandu.ximon.dao.domain.AirDataNongGeng
*/
@Mapper
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentNongGengMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentNongGengMapper.java
index f7ff70a..904c7f7 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentNongGengMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentNongGengMapper.java
@@ -1,13 +1,16 @@
package com.sandu.ximon.dao.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sandu.ximon.dao.bo.AirEquipmentNongGengBo;
import com.sandu.ximon.dao.domain.AirEquipmentNongGeng;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
+ * @author Administrator
+ * @description 閽堝琛ㄣ�恆ir_equipment_nong_geng銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2022-10-10 09:58:08
* @Entity com.sandu.ximon.dao.domain.AirEquipmentNongGeng
*/
@Mapper
diff --git a/dao/src/main/resources/mapper/AirDataNongGengMapper.xml b/dao/src/main/resources/mapper/AirDataNongGengMapper.xml
index b6d1dc9..eedd950 100644
--- a/dao/src/main/resources/mapper/AirDataNongGengMapper.xml
+++ b/dao/src/main/resources/mapper/AirDataNongGengMapper.xml
@@ -5,35 +5,40 @@
<mapper namespace="com.sandu.ximon.dao.mapper.AirDataNongGengMapper">
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirDataNongGeng">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="mac" column="mac" jdbcType="VARCHAR"/>
- <result property="noise" column="noise" jdbcType="DECIMAL"/>
- <result property="hydrogenSulfide" column="hydrogen_sulfide" jdbcType="DECIMAL"/>
- <result property="so2" column="so2" jdbcType="DECIMAL"/>
- <result property="no2" column="no2" jdbcType="DECIMAL"/>
- <result property="co" column="co" jdbcType="DECIMAL"/>
- <result property="o3" column="o3" jdbcType="DECIMAL"/>
- <result property="pm2point5" column="pm2point5" jdbcType="DECIMAL"/>
- <result property="pm10" column="pm10" jdbcType="DECIMAL"/>
- <result property="airTemperature" column="air_temperature" jdbcType="DECIMAL"/>
- <result property="airHumidity" column="air_humidity" jdbcType="DECIMAL"/>
- <result property="airPressure" column="air_pressure" jdbcType="DECIMAL"/>
- <result property="windDirection" column="wind_direction" jdbcType="DECIMAL"/>
- <result property="windSpeed" column="wind_speed" jdbcType="DECIMAL"/>
- <result property="tenRainfallMin" column="ten_rainfall_min" jdbcType="DECIMAL"/>
- <result property="radiation" column="radiation" jdbcType="DECIMAL"/>
- <result property="illumination" column="illumination" jdbcType="DECIMAL"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="mac" column="mac" jdbcType="VARCHAR"/>
+ <result property="noise" column="noise" jdbcType="VARCHAR"/>
+ <result property="voc" column="voc" jdbcType="VARCHAR"/>
+ <result property="so2" column="so2" jdbcType="VARCHAR"/>
+ <result property="no2" column="no2" jdbcType="VARCHAR"/>
+ <result property="co" column="co" jdbcType="VARCHAR"/>
+ <result property="co2" column="co2" jdbcType="VARCHAR"/>
+ <result property="o3" column="o3" jdbcType="VARCHAR"/>
+ <result property="pm2point5" column="pm2point5" jdbcType="VARCHAR"/>
+ <result property="pm10" column="pm10" jdbcType="VARCHAR"/>
+ <result property="airTemperature" column="air_temperature" jdbcType="VARCHAR"/>
+ <result property="airHumidity" column="air_humidity" jdbcType="VARCHAR"/>
+ <result property="airPressure" column="air_pressure" jdbcType="VARCHAR"/>
+ <result property="windDirection" column="wind_direction" jdbcType="VARCHAR"/>
+ <result property="windSpeed" column="wind_speed" jdbcType="VARCHAR"/>
+ <result property="rainfall" column="rainfall" jdbcType="VARCHAR"/>
+ <result property="tippingBucketRainfall" column="tipping_bucket_rainfall" jdbcType="VARCHAR"/>
+ <result property="illumination" column="illumination" jdbcType="VARCHAR"/>
+ <result property="thermalRadiation" column="thermal_radiation" jdbcType="VARCHAR"/>
+ <result property="ultravioletRay" column="ultraviolet_ray" jdbcType="VARCHAR"/>
+ <result property="type" column="type" jdbcType="VARCHAR"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
id,mac,noise,
- hydrogen_sulfide,so2,no2,
- co,o3,pm2point5,
- pm10,air_temperature,air_humidity,
- air_pressure,wind_direction,wind_speed,
- ten_rainfall_min,radiation,illumination,
- create_time
+ voc,so2,no2,
+ co,co2,o3,
+ pm2point5,pm10,air_temperature,
+ air_humidity,air_pressure,wind_direction,
+ wind_speed,rainfall,tipping_bucket_rainfall,
+ illumination,thermal_radiation,ultraviolet_ray,
+ type,create_time
</sql>
<select id="listAirId" resultType="java.lang.Long">
SELECT
diff --git a/dao/src/main/resources/mapper/AirEquipmentNongGengMapper.xml b/dao/src/main/resources/mapper/AirEquipmentNongGengMapper.xml
index 6a34be8..cac377c 100644
--- a/dao/src/main/resources/mapper/AirEquipmentNongGengMapper.xml
+++ b/dao/src/main/resources/mapper/AirEquipmentNongGengMapper.xml
@@ -5,13 +5,15 @@
<mapper namespace="com.sandu.ximon.dao.mapper.AirEquipmentNongGengMapper">
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirEquipmentNongGeng">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="mac" column="mac" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="mac" column="mac" jdbcType="VARCHAR"/>
+ <result property="type" column="type" jdbcType="VARCHAR"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
- id,mac,create_time
+ id,mac,type,
+ create_time
</sql>
<select id="listAirEquipmentByIds" resultType="com.sandu.ximon.dao.bo.AirEquipmentNongGengBo">
SELECT
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java
index 2e51904..8e833af 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java
@@ -74,12 +74,12 @@
* @param keyword 鍏抽敭瀛�
* @return
*/
- @GetMapping("/listAirData")
- public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
- if (!permissionConfig.check(MenuEnum.AIR_DATA__NONG_GENG_LIST.getCode())) {
- return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
- }
- List<AirDataNongGengBo> list = airDataNongGengService.listAirDataByKeyword(baseConditionVO, keyword);
- return ResponseUtil.successPage(list);
- }
+// @GetMapping("/listAirData")
+// public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+// if (!permissionConfig.check(MenuEnum.AIR_DATA__NONG_GENG_LIST.getCode())) {
+// return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+// }
+// List<AirDataNongGengBo> list = airDataNongGengService.listAirDataByKeyword(baseConditionVO, keyword);
+// return ResponseUtil.successPage(list);
+// }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java
index 8f07daa..ec8f163 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java
@@ -57,23 +57,23 @@
return save(airDataNongGeng);
}
-
- /**
- * 鏌ヨ澶ф皵鏁版嵁(妯＄硦鏌ヨ)
- */
- public List<AirDataNongGengBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- List<Long> listAirId;
- if (SecurityUtils.getClientId() == null) {
- listAirId = baseMapper.listAirId(keyword, null);
- } else {
- listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
- }
- if (CollUtil.isEmpty(listAirId)) {
- return CollUtil.newArrayList();
- }
- List<AirDataNongGengBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
- return airDataBos;
-
- }
+//
+// /**
+// * 鏌ヨ澶ф皵鏁版嵁(妯＄硦鏌ヨ)
+// */
+// public List<AirDataNongGengBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
+// PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+// List<Long> listAirId;
+// if (SecurityUtils.getClientId() == null) {
+// listAirId = baseMapper.listAirId(keyword, null);
+// } else {
+// listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
+// }
+// if (CollUtil.isEmpty(listAirId)) {
+// return CollUtil.newArrayList();
+// }
+// List<AirDataNongGengBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
+// return airDataBos;
+//
+// }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
index d361a03..6b8f1bc 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
@@ -6,7 +6,6 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
-import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AirEquipmentNongGengBo;
@@ -61,27 +60,29 @@
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
}
List<AirEquipmentNongGengBo> airEquipmentBos;
- if (SecurityUtils.getClientId() == null) {
- airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
- } else {
- airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
- }
+// if (SecurityUtils.getClientId() == null) {
+// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
+// } else {
+// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
+// }
- return airEquipmentBos;
+ return null;
+// return airEquipmentBos;
}
/**
* 澶ф皵璁惧鍒楄〃锛堝啘鑰曪紝鐢ㄤ簬棣栭〉鏁版嵁缁熻锛�
*/
public List<AirEquipmentNongGengBo> listAirEquipmentOnHome() {
- List<AirEquipmentNongGengBo> airEquipmentBos;
- if (SecurityUtils.getClientId() == null) {
- airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
- } else {
- airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
- }
+// List<AirEquipmentNongGengBo> airEquipmentBos;
+// if (SecurityUtils.getClientId() == null) {
+// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
+// } else {
+// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
+// }
- return airEquipmentBos;
+// return airEquipmentBos;
+ return null;
}
/**
--
Gitblit v1.9.3