From 63a3920ea3d17f8a677d4edc9ffaab279367cb70 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 六月 2025 09:16:27 +0800
Subject: [PATCH] 水肥、气象、墒情最新、历史数据查询测试并修改bug
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStManureMapper.xml | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStSoilMapper.xml | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherLastMapper.xml | 15 ++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilHistoryMapper.xml | 15 ++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherHistoryMapper.xml | 15 ++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilLastMapper.xml | 17 ++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilDayMapper.xml | 17 ++++-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoManure.java | 10 +++
pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/console/Command.java | 4
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoSoil.java | 8 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoSoilDay.java | 8 ++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureHistoryMapper.xml | 19 +++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureLastMapper.xml | 16 ++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStWeatherMapper.xml | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java | 10 +++
15 files changed, 130 insertions(+), 30 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoManure.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoManure.java
index ceaac69..cf0fcc0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoManure.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoManure.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -14,6 +15,13 @@
* @Description
*/
@Data
+@JsonPropertyOrder({
+ "id", "manureId", "manureName", "dt", "alarm",
+ "stirRunning1", "stirRunning2", "stirRunning3", "stirRunning4",
+ "injectRunning", "irrRunning",
+ "manureFlow", "manureTime", "stirTime",
+ "stirDuration", "injectDuration"
+})
public class VoManure {
public static final long serialVersionUID = 202506251634001L;
@@ -34,7 +42,7 @@
* 姘磋偉鏈哄悕绉�
*/
@Schema(description = "姘磋偉鏈哄悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long manureName;
+ public String manureName;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoSoil.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoSoil.java
index db2a3ff..a2312f4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoSoil.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoSoil.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -14,6 +15,11 @@
* @Description
*/
@Data
+@JsonPropertyOrder({
+ "id", "soilId", "soilName", "dt",
+ "soilHumidity1", "soilHumidity2", "soilHumidity3", "soilHumidity4", "soilHumidity5",
+ "soilTemperature1", "soilTemperature2", "soilTemperature3", "soilTemperature4", "soilTemperature5"
+})
public class VoSoil {
public static final long serialVersionUID = 202506260903001L;
@@ -34,7 +40,7 @@
* 澧掓儏绔欏悕绉�
*/
@Schema(description = "澧掓儏绔欏悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long soilName;
+ public String soilName;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoSoilDay.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoSoilDay.java
index e7bceca..f38ecd6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoSoilDay.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoSoilDay.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -14,6 +15,11 @@
* @Description
*/
@Data
+@JsonPropertyOrder({
+ "id", "soilId", "soilName", "dt",
+ "soilHumidity1", "soilHumidity2", "soilHumidity3", "soilHumidity4", "soilHumidity5",
+ "soilTemperature1", "soilTemperature2", "soilTemperature3", "soilTemperature4", "soilTemperature5"
+})
public class VoSoilDay {
public static final long serialVersionUID = 202506261020001L;
@@ -34,7 +40,7 @@
* 澧掓儏绔欏悕绉�
*/
@Schema(description = "澧掓儏绔欏悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long soilName;
+ public String soilName;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java
index 2b16a61..c6ec18d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -14,6 +15,13 @@
* @Description
*/
@Data
+@JsonPropertyOrder({
+ "id", "weatherId", "weatherName", "dt",
+ "airTemperature", "airHumidity",
+ "ultraviolet", "lightIntensity",
+ "rainfall", "windSpeed",
+ "windDirection", "windDirectionStr"
+})
public class VoWeather {
public static final long serialVersionUID = 202506260903001L;
@@ -34,7 +42,7 @@
* 姘旇薄绔欏悕绉�
*/
@Schema(description = "姘旇薄绔欏悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long weatherName;
+ public String weatherName;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStManureMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStManureMapper.xml
index 210b2c3..2ab36d6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStManureMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStManureMapper.xml
@@ -93,7 +93,7 @@
select
<include refid="part_Column_List" />
FROM pr_st_manure
- WHERE deleted = 0 AND fbox_id=#{fbox_id,jdbcType=VARCHAR} AND no=#{fbox_id,jdbcType=INTEGER}
+ WHERE deleted != 1 AND fbox_id=#{fbox_id,jdbcType=VARCHAR} AND no=#{no,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStSoilMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStSoilMapper.xml
index 6d8fdd8..5bfd5d1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStSoilMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStSoilMapper.xml
@@ -92,7 +92,7 @@
select
<include refid="part_Column_List" />
FROM pr_st_soil
- WHERE deleted = 0 AND fbox_id=#{fbox_id,jdbcType=VARCHAR} AND no=#{fbox_id,jdbcType=INTEGER}
+ WHERE deleted != 1 AND fbox_id=#{fbox_id,jdbcType=VARCHAR} AND no=#{no,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStWeatherMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStWeatherMapper.xml
index cbf0c66..5426cbd 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStWeatherMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStWeatherMapper.xml
@@ -86,7 +86,7 @@
select
<include refid="part_Column_List" />
FROM pr_st_weather
- WHERE deleted = 0 AND fbox_id=#{fbox_id,jdbcType=VARCHAR} AND no=#{fbox_id,jdbcType=INTEGER}
+ WHERE deleted != 1 AND fbox_id=#{fbox_id,jdbcType=VARCHAR} AND no=#{no,jdbcType=INTEGER}
</select>
<select id="selectAllSimple" resultType="com.dy.pipIrrGlobal.voPr.VoMqttSimple">
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureHistoryMapper.xml
index c94dc1e..c65c2ea 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureHistoryMapper.xml
@@ -25,6 +25,17 @@
id, manure_id, dt, stir_running1, stir_running2, stir_running3, stir_running4, inject_running,
irr_running, alarm, manure_flow, manure_time, stir_time, stir_duration, inject_duration
</sql>
+ <sql id="Base_Column_List_with_alias">
+ <!--@mbg.generated-->
+ ${alias}.id, ${alias}.manure_id, ${alias}.dt,
+ ${alias}.stir_running1, ${alias}.stir_running2,
+ ${alias}.stir_running3, ${alias}.stir_running4,
+ ${alias}.inject_running, ${alias}.irr_running,
+ ${alias}.alarm, ${alias}.manure_flow,
+ ${alias}.manure_time, ${alias}.stir_time,
+ ${alias}.stir_duration, ${alias}.inject_duration
+ </sql>
+
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
@@ -48,7 +59,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND htb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
@@ -57,7 +68,9 @@
<!--鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍-->
<select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoManure">
SELECT
- <include refid="Base_Column_List" />,
+ <include refid="Base_Column_List_with_alias" >
+ <property name="alias" value="htb"/>
+ </include>,
mtb.`name` AS manureName
FROM rm_manure_history htb
INNER JOIN pr_st_manure mtb ON mtb.id = htb.manure_id
@@ -71,7 +84,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND htb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureLastMapper.xml
index a620094..9526f67 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureLastMapper.xml
@@ -27,6 +27,14 @@
stir_running4, inject_running, irr_running, alarm, manure_flow, manure_time, stir_time,
stir_duration, inject_duration
</sql>
+
+ <sql id="Base_Column_List_with_alias">
+ <!--@mbg.generated-->
+ ${alias}.id, ${alias}.last_history_id, ${alias}.manure_id, ${alias}.dt, ${alias}.stir_running1, ${alias}.stir_running2, ${alias}.stir_running3,
+ ${alias}.stir_running4, ${alias}.inject_running, ${alias}.irr_running, ${alias}.alarm, ${alias}.manure_flow, ${alias}.manure_time, ${alias}.stir_time,
+ ${alias}.stir_duration, ${alias}.inject_duration
+ </sql>
+
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
@@ -65,7 +73,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND ltb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
@@ -74,7 +82,9 @@
<!--鏍规嵁鎸囧畾鏉′欢鏌ヨ璁板綍-->
<select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoManure">
SELECT
- <include refid="Base_Column_List" />,
+ <include refid="Base_Column_List_with_alias" >
+ <property name="alias" value="ltb"/>
+ </include>,
mtb.`name` AS manureName
FROM rm_manure_last ltb
INNER JOIN pr_st_manure mtb ON mtb.id = ltb.manure_id
@@ -88,7 +98,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND ltb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilDayMapper.xml
index a63c315..15338e4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilDayMapper.xml
@@ -38,6 +38,15 @@
soil_sum_humidity4, soil_sum_humidity5, soil_sum_temperature1, soil_sum_temperature2,
soil_sum_temperature3, soil_sum_temperature4, soil_sum_temperature5
</sql>
+ <sql id="Base_Column_List_with_alias">
+ <!--@mbg.generated-->
+ ${alias}.id, ${alias}.soil_id, ${alias}.dt, ${alias}.ymd,
+ ${alias}.soil_humidity1, ${alias}.soil_humidity2, ${alias}.soil_humidity3, ${alias}.soil_humidity4, ${alias}.soil_humidity5,
+ ${alias}.soil_temperature1, ${alias}.soil_temperature2, ${alias}.soil_temperature3, ${alias}.soil_temperature4, ${alias}.soil_temperature5,
+ ${alias}.times,
+ ${alias}.soil_sum_humidity1, ${alias}.soil_sum_humidity2, ${alias}.soil_sum_humidity3, ${alias}.soil_sum_humidity4, ${alias}.soil_sum_humidity5,
+ ${alias}.soil_sum_temperature1, ${alias}.soil_sum_temperature2, ${alias}.soil_sum_temperature3, ${alias}.soil_sum_temperature4, ${alias}.soil_sum_temperature5
+ </sql>
<sql id="Part_Column_List">
<!--@mbg.generated-->
id, soil_id, dt, ymd, soil_humidity1, soil_humidity2, soil_humidity3, soil_humidity4,
@@ -103,7 +112,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND ltb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
@@ -112,7 +121,9 @@
<!--鏍规嵁鎸囧畾鏉′欢鏌ヨ璁板綍-->
<select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoSoilDay">
SELECT
- <include refid="Base_Column_List" />,
+ <include refid="Base_Column_List_with_alias" >
+ <property name="alias" value="ltb"/>
+ </include>,
mtb.`name` AS soilName
FROM rm_soil_day ltb
INNER JOIN pr_st_soil mtb ON mtb.id = ltb.soil_id
@@ -126,7 +137,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND ltb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilHistoryMapper.xml
index b05d596..3e9eec7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilHistoryMapper.xml
@@ -24,6 +24,13 @@
soil_humidity5, soil_temperature1, soil_temperature2, soil_temperature3, soil_temperature4,
soil_temperature5
</sql>
+ <sql id="Base_Column_List_with_alias">
+ <!--@mbg.generated-->
+ ${alias}.id, ${alias}.soil_id, ${alias}.dt, ${alias}.soil_humidity1,
+ ${alias}.soil_humidity2, ${alias}.soil_humidity3, ${alias}.soil_humidity4,
+ ${alias}.soil_humidity5, ${alias}.soil_temperature1, ${alias}.soil_temperature2,
+ ${alias}.soil_temperature3, ${alias}.soil_temperature4, ${alias}.soil_temperature5
+ </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
@@ -47,7 +54,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND htb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
@@ -56,7 +63,9 @@
<!--鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍-->
<select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoSoil">
SELECT
- <include refid="Base_Column_List" />,
+ <include refid="Base_Column_List_with_alias" >
+ <property name="alias" value="htb"/>
+ </include>,
mtb.`name` AS soilName
FROM rm_soil_history htb
INNER JOIN pr_st_soil mtb ON mtb.id = htb.soil_id
@@ -70,7 +79,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND htb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilLastMapper.xml
index 478e8e1..eb042e1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilLastMapper.xml
@@ -25,6 +25,15 @@
soil_humidity4, soil_humidity5, soil_temperature1, soil_temperature2, soil_temperature3,
soil_temperature4, soil_temperature5
</sql>
+
+ <sql id="Base_Column_List_with_alias">
+ <!--@mbg.generated-->
+ ${alias}.id, ${alias}.last_history_id, ${alias}.soil_id, ${alias}.dt, ${alias}.soil_humidity1,
+ ${alias}.soil_humidity2, ${alias}.soil_humidity3, ${alias}.soil_humidity4,
+ ${alias}.soil_humidity5, ${alias}.soil_temperature1, ${alias}.soil_temperature2,
+ ${alias}.soil_temperature3, ${alias}.soil_temperature4, ${alias}.soil_temperature5
+ </sql>
+
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
@@ -64,7 +73,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND ltb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
@@ -73,7 +82,9 @@
<!--鏍规嵁鎸囧畾鏉′欢鏌ヨ璁板綍-->
<select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoSoil">
SELECT
- <include refid="Base_Column_List" />,
+ <include refid="Base_Column_List_with_alias" >
+ <property name="alias" value="ltb"/>
+ </include>,
mtb.`name` AS soilName
FROM rm_soil_last ltb
INNER JOIN pr_st_soil mtb ON mtb.id = ltb.soil_id
@@ -87,7 +98,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND ltb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherHistoryMapper.xml
index 3019090..77909d1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherHistoryMapper.xml
@@ -20,6 +20,13 @@
id, weather_id, dt, air_temperature, air_humidity, ultraviolet, light_intensity,
rainfall, wind_speed, wind_direction
</sql>
+ <sql id="Base_Column_List_with_alias">
+ <!--@mbg.generated-->
+ ${alias}.id, ${alias}.weather_id, ${alias}.dt, ${alias}.air_temperature,
+ ${alias}.air_humidity, ${alias}.ultraviolet, ${alias}.light_intensity,
+ ${alias}.rainfall, ${alias}.wind_speed, ${alias}.wind_direction
+ </sql>
+
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
@@ -43,7 +50,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND htb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
@@ -52,7 +59,9 @@
<!--鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍-->
<select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoWeather">
SELECT
- <include refid="Base_Column_List" />,
+ <include refid="Base_Column_List_with_alias" >
+ <property name="alias" value="htb"/>
+ </include>,
mtb.`name` AS weatherName
FROM rm_weather_history htb
INNER JOIN pr_st_weather mtb ON mtb.id = htb.weather_id
@@ -66,7 +75,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND htb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherLastMapper.xml
index 9be0f00..157e5a8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherLastMapper.xml
@@ -21,6 +21,13 @@
id, last_history_id, weather_id, dt, air_temperature, air_humidity, ultraviolet,
light_intensity, rainfall, wind_speed, wind_direction
</sql>
+ <sql id="Base_Column_List_with_alias">
+ <!--@mbg.generated-->
+ ${alias}.id, ${alias}.last_history_id, ${alias}.weather_id, ${alias}.dt, ${alias}.air_temperature,
+ ${alias}.air_humidity, ${alias}.ultraviolet, ${alias}.light_intensity,
+ ${alias}.rainfall, ${alias}.wind_speed, ${alias}.wind_direction
+ </sql>
+
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
@@ -60,7 +67,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND ltb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
@@ -69,7 +76,9 @@
<!--鏍规嵁鎸囧畾鏉′欢鏌ヨ璁板綍-->
<select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoWeather">
SELECT
- <include refid="Base_Column_List" />,
+ <include refid="Base_Column_List_with_alias" >
+ <property name="alias" value="ltb"/>
+ </include>,
mtb.`name` AS weatherName
FROM rm_weather_last ltb
INNER JOIN pr_st_weather mtb ON mtb.id = ltb.weather_id
@@ -83,7 +92,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND ltb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/console/Command.java b/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/console/Command.java
index ae2242f..a8799d7 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/console/Command.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/console/Command.java
@@ -21,8 +21,8 @@
static{
commands = new String[]{
"config 鏌ョ湅閰嶇疆淇℃伅",
- "mw 121 [tag] 鍛戒护鍚箟锛氶�氫俊涓棿浠跺湪浜戞湇鍔″櫒锛�121.199.41.121锛変笂鐨刐tag](鍏冭皨ym,娌欑洏sp娴嬭瘯test锛屾姹焟j锛屾皯鍕q锛屽欢搴唝q锛岄粦榫欐睙hlj锛岀敇宸瀏z锛屽噳宸瀕z锛岄噾宸漥c锛屽槈宄叧jyg)绯荤粺閰嶇疆",
- "mw 233 [tag] 鍛戒护鍚箟锛氶�氫俊涓棿浠跺湪浜戞湇鍔″櫒锛�8.130.130.233锛変笂鐨刐tag](鍏冭皨ym,娌欑洏sp娴嬭瘯test锛屾姹焟j锛屾皯鍕q锛屽欢搴唝q锛岄粦榫欐睙hlj锛岀敇宸瀏z锛屽噳宸瀕z锛岄噾宸漥c锛屽槈宄叧jyg)绯荤粺閰嶇疆",
+ "mw 121 [tag] 鍛戒护鍚箟锛氶�氫俊涓棿浠跺湪浜戞湇鍔″櫒锛�121.199.41.121锛変笂鐨刐tag](姘戝嫟mq锛屽欢搴唝q锛岄粦榫欐睙hlj锛岀敇宸瀏z锛屽噳宸瀕z锛岄噾宸漥c锛屽槈宄叧jyg)绯荤粺閰嶇疆",
+ "mw 233 [tag] 鍛戒护鍚箟锛氶�氫俊涓棿浠跺湪浜戞湇鍔″櫒锛�8.130.130.233锛変笂鐨刐tag](鍏冭皨ym锛屾矙鐩榮p锛屾祴璇晅est锛屾姹焟j)绯荤粺閰嶇疆",
"web 121 鍛戒护鍚箟锛歸eb妯″潡鍦ㄤ簯鏈嶅姟鍣紙121.199.41.121锛変笂鐨勯厤缃�",
"web 233 鍛戒护鍚箟锛歸eb妯″潡鍦ㄤ簯鏈嶅姟鍣紙8.130.130.233锛変笂鐨勯厤缃�",
"exit 閫�鍑�",
--
Gitblit v1.8.0