fix监测参数查询时间按日期

module_ems/src/main/java/org/jeecg/modules/dataCurrent/mapper/xml/DataCurrentMapper.xml

@@ -39,12 +39,9 @@
         MAX(CASE WHEN tagname like '%C相电流%' THEN tagvalue END) AS ctagvalue
         FROM ems_data_current
         <where>
-            <if test="equipmentid != null and equipmentid != ''"> and equipmentid = #{equipmentid}</if>
-            <if test="logtimebegin != null "><!-- 开始时间检索 -->
-                and logtime &gt;= #{logtimebegin}
-            </if>
-            <if test="logtimeend != null "><!-- 结束时间检索 -->
-                and logtime &lt;= #{logtimeend}
+            <if test="equipmentid != null and equipmentid != ''"> and equipmentid = #{equipmentid} </if>
+            <if test="logtimebegin != null and logtimeend != null"><!-- 开始时间检索 -->
+                and DATE(logtime)  BETWEEN #{logtimebegin} AND #{logtimeend}
             </if>
         </where>
         GROUP BY logtime

module_ems/src/main/java/org/jeecg/modules/dataDemand/mapper/xml/DataDemandMapper.xml

@@ -8,12 +8,9 @@
         SELECT logtime, tagvalue
         FROM ems_data_demand
         <where>
-            <if test="equipmentid != null and equipmentid != ''"> and equipmentid = #{equipmentid}</if>
-            <if test="logtimebegin != null "><!-- 开始时间检索 -->
-                and logtime &gt;= #{logtimebegin}
-            </if>
-            <if test="logtimeend != null "><!-- 结束时间检索 -->
-                and logtime &lt;= #{logtimeend}
+            <if test="equipmentid != null and equipmentid != ''"> and equipmentid = #{equipmentid} </if>
+            <if test="logtimebegin != null and logtimeend != null"><!-- 开始时间检索 -->
+                and DATE(logtime)  BETWEEN #{logtimebegin} AND #{logtimeend}
             </if>
         </where>
         order by id asc

module_ems/src/main/java/org/jeecg/modules/dataElectricity/mapper/xml/DataElectricityMapper.xml

@@ -67,15 +67,21 @@
         SELECT logtime, tagvalue
         FROM ems_data_electricity
         <where>
-            <if test="equipmentid != null and equipmentid != ''"> and equipmentid = #{equipmentid}</if>
-            <if test="logtimebegin != null "><!-- 开始时间检索 -->
-                and logtime &gt;= #{logtimebegin}
-            </if>
-            <if test="logtimeend != null "><!-- 结束时间检索 -->
-                and logtime &lt;= #{logtimeend}
+            <if test="equipmentid != null and equipmentid != ''"> and equipmentid = #{equipmentid} </if>
+            <if test="logtimebegin != null and logtimeend != null"><!-- 开始时间检索 -->
+                and DATE(logtime)  BETWEEN #{logtimebegin} AND #{logtimeend}
             </if>
         </where>
         order by id asc
     </select>
 
+    <!--获取某天的分时段能源信息-->
+    <select id="selectHourElectricityByDay" resultType="Float">
+        select sum(e.tagvalue2) as hourSum
+        from ems_data_electricity as e
+        where e.day=#{day} and e.time &gt;= #{beginTime} and e.time &lt;= #{endTime} and equipmentid in (
+            select id from tpm_equipment where equipmentcode=#{equipmentcode}
+        )
+    </select>
+
 </mapper>

module_ems/src/main/java/org/jeecg/modules/dataPower/mapper/xml/DataPowerMapper.xml

@@ -35,12 +35,9 @@
         SELECT logtime, tagvalue
         FROM ems_data_power
         <where>
-            <if test="equipmentid != null and equipmentid != ''"> and equipmentid = #{equipmentid}</if>
-            <if test="logtimebegin != null "><!-- 开始时间检索 -->
-                and logtime &gt;= #{logtimebegin}
-            </if>
-            <if test="logtimeend != null "><!-- 结束时间检索 -->
-                and logtime &lt;= #{logtimeend}
+            <if test="equipmentid != null and equipmentid != ''"> and equipmentid = #{equipmentid} </if>
+            <if test="logtimebegin != null and logtimeend != null"><!-- 开始时间检索 -->
+                and DATE(logtime)  BETWEEN #{logtimebegin} AND #{logtimeend}
             </if>
         </where>
         order by id asc

module_ems/src/main/java/org/jeecg/modules/dataVoltage/mapper/xml/DataVoltageMapper.xml

@@ -39,12 +39,9 @@
         MAX(CASE WHEN tagname like '%C相电压%' THEN tagvalue END) AS ctagvalue
         FROM ems_data_voltage
         <where>
-            <if test="equipmentid != null and equipmentid != ''"> and equipmentid = #{equipmentid}</if>
-            <if test="logtimebegin != null "><!-- 开始时间检索 -->
-                and logtime &gt;= #{logtimebegin}
-            </if>
-            <if test="logtimeend != null "><!-- 结束时间检索 -->
-                and logtime &lt;= #{logtimeend}
+            <if test="equipmentid != null and equipmentid != ''"> and equipmentid = #{equipmentid} </if>
+            <if test="logtimebegin != null and logtimeend != null"><!-- 开始时间检索 -->
+                and DATE(logtime)  BETWEEN #{logtimebegin} AND #{logtimeend}
             </if>
         </where>
         GROUP BY logtime