From ab33c86571fb15516aab7960d123bfc34c291bc9 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 12 十一月 2024 15:13:54 +0800
Subject: [PATCH] 调整语法不兼容
---
src/main/resources/mapper/PwrdevDataHistoryMapper.xml | 6 +++++-
src/main/resources/mapper/BattRtstateMapper.xml | 25 ++++++++++++++++++-------
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/BattRtstateMapper.xml b/src/main/resources/mapper/BattRtstateMapper.xml
index a15408f..e316ad3 100644
--- a/src/main/resources/mapper/BattRtstateMapper.xml
+++ b/src/main/resources/mapper/BattRtstateMapper.xml
@@ -33,9 +33,9 @@
<resultMap id="BaseResultMap1" type="com.whyc.dto.BattState">
<association property="bstate" javaType="com.whyc.pojo.BattRtstate">
<id column="num" jdbcType="BIGINT" property="num" />
- <result column="BattRtstate.BattGroupId" jdbcType="INTEGER" property="battGroupId" />
+ <result column="BattRtstate_BattGroupId" jdbcType="INTEGER" property="battGroupId" />
<result column="batt_count" jdbcType="INTEGER" property="battCount" />
- <result column="BattRtstate.rec_datetime" jdbcType="TIMESTAMP" property="recDatetime" />
+ <result column="BattRtstate_rec_datetime" jdbcType="TIMESTAMP" property="recDatetime" />
<result column="online_vol" jdbcType="REAL" property="onlineVol" />
<result column="group_vol" jdbcType="REAL" property="groupVol" />
<result column="group_tmp" jdbcType="REAL" property="groupTmp" />
@@ -95,8 +95,8 @@
</select>
<select id="searchBattLife" resultMap="BaseResultMap1">
- SELECT tb_batt_rtstate.BattGroupId as 'BattRtstate.BattGroupId', batt_count, tb_batt_rtstate.rec_datetime
- 'BattRtstate.rec_datetime', online_vol, group_vol, group_curr,
+ SELECT tb_batt_rtstate.BattGroupId as BattRtstate_BattGroupId, batt_count, tb_batt_rtstate.rec_datetime
+ as BattRtstate_rec_datetime, online_vol, group_vol, group_curr,
batt_state, batt_test_type, batt_test_starttime, batt_test_recordtime, batt_test_tlong, batt_test_cap,
batt_real_cap, batt_rest_cap, batt_rest_power1_time, batt_rest_power2_time, tb_batt_rtdata.BattGroupId,
tb_batt_rtdata.rec_datetime,
@@ -124,8 +124,10 @@
db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid and db_user.tb_user_inf.uid=#{uId} )
<if test="binf.stationName!=null and binf.stationName!=''">
- AND db_battinf.tb_battinf.stationname like CONCAT('%',#{binf.stationname},'%')
- AND db_battinf.tb_battinf.stationname1 like CONCAT('%',#{binf.stationname1},'%')
+ AND db_battinf.tb_battinf.stationname like CONCAT('%',#{binf.stationName},'%')
+ </if>
+ <if test="binf.stationName1!=null and binf.stationName1!=''">
+ AND db_battinf.tb_battinf.stationname1 like CONCAT('%',#{binf.stationName1},'%')
</if>
<if test="binf.num==100">
AND batt_state!=#{binf.num}
@@ -133,7 +135,16 @@
<if test="binf.num!=100">
AND batt_state=#{binf.num}
</if>
- GROUP BY tb_batt_rtstate.BattGroupId
+<!-- GROUP BY tb_batt_rtstate.BattGroupId-->
+ GROUP BY tb_batt_rtstate.BattGroupId, batt_count,
+ tb_batt_rtstate.rec_datetime, online_vol, group_vol, group_curr,
+ batt_state, batt_test_type, batt_test_starttime, batt_test_recordtime, batt_test_tlong, batt_test_cap,
+ batt_real_cap, batt_rest_cap, batt_rest_power1_time, batt_rest_power2_time, tb_batt_rtdata.BattGroupId,
+ tb_batt_rtdata.rec_datetime,
+ mon_num, mon_vol, mon_tmp, mon_res, mon_ser, mon_conn_res, mon_cap,
+ db_battinf.tb_battinf.moncapstd, db_battinf.tb_battinf.monvolstd, db_battinf.tb_battinf.stationname,
+ db_battinf.tb_battinf.stationname1, db_battinf.tb_battinf.BattGroupName,
+ db_battinf.tb_battinf.deviceName
</select>
diff --git a/src/main/resources/mapper/PwrdevDataHistoryMapper.xml b/src/main/resources/mapper/PwrdevDataHistoryMapper.xml
index 65b53a7..62f5722 100644
--- a/src/main/resources/mapper/PwrdevDataHistoryMapper.xml
+++ b/src/main/resources/mapper/PwrdevDataHistoryMapper.xml
@@ -4,7 +4,11 @@
<select id="getTableNameList" resultType="java.lang.String">
- select TABLE_NAME from information_schema.TABLES t where t.TABLE_SCHEMA ='db_pwrdev_data_history' and t.TABLE_NAME like CONCAT('%',#{deviceIdEnd},'%')
+<!-- select TABLE_NAME from information_schema.TABLES t where t.TABLE_SCHEMA ='db_pwrdev_data_history' and t.TABLE_NAME like CONCAT('%',#{deviceIdEnd},'%')-->
+ select
+ table_name
+ from SYS.USER_TABLES
+ where TABLE_NAME like #{deviceIdEnd} limit 1
</select>
<!--<select id="getGtStartTime" resultType="com.whyc.pojo.PwrdevDataHistory">
select * from db_pwrdev_data_history.${tableName} where record_time>=#{startTime}
--
Gitblit v1.9.1