lxw
2023-10-30 b2109017bae8b0776bfd063cfba4a32944dc72d1
中-10-BattalarmDataHistoryMapper.xml;224行
5个文件已修改
63 ■■■■ 已修改文件
src/main/java/com/whyc/mapper/BattalarmDataHistoryMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattalarmDataHistoryService.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/StandardFeatureCurveService.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/SubTablePageInfoService.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BattalarmDataHistoryMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattalarmDataHistoryMapper.java
@@ -32,6 +32,6 @@
    List<BattalarmDataHistory> getDataBeforeRetentionMonth(@Param("retentionTime") Date retentionTime);
    List<BattalarmDataHistory> getListByStationId(Date startTime, Date endTime, String stationId,String tableName);
    //List<BattalarmDataHistory> getListByStationId(Date startTime, Date endTime, String stationId,String tableName);
}
src/main/java/com/whyc/service/BattalarmDataHistoryService.java
@@ -16,6 +16,7 @@
import com.whyc.util.ActionUtil;
import com.whyc.util.MessageUtils;
import com.whyc.util.SubTablePageInfoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +37,9 @@
    @Resource
    private CommonMapper commonMapper;
    @Autowired
    private SubTablePageInfoService subService;
    //分页查询所有的历史告警
@@ -137,7 +141,9 @@
    }
    public List<BattalarmDataHistory> getListByStationId(Date startTime, Date endTime, String stationId,String tableName) {
        return mapper.getListByStationId(startTime,endTime,stationId,tableName);
        //List<BattalarmDataHistory> list=mapper.getListByStationId(startTime,endTime,stationId,tableName);
        List<BattalarmDataHistory> list=subService.getListByStationId(startTime,endTime,stationId,tableName);
        return list;
    }
    public Response getLevelList() {
src/main/java/com/whyc/service/StandardFeatureCurveService.java
@@ -516,8 +516,12 @@
        subService.createTable("123v150ah_0.15c");*/
        /*6
        subService.delete(1000094,1);*/
        /*7*/
        subService.deleteByNum("tb_eleprice_1014",5);
        return  new Response().setII(1,true,null,null);
        /*7
        subService.deleteByNum("tb_eleprice_1014",5);*/
        /*10*/
        Date date5=ThreadLocalUtil.parse("2023-08-01 11:19:20",1);
        Date date6=ThreadLocalUtil.parse("2023-08-03 04:42:35",1);
        List list=subService.getListByStationId(date5,date6,"42010011","tb_battalarm_data_history_2023_08");
        return  new Response().setII(1,true,list,null);
    }
}
src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -1983,4 +1983,43 @@
        String sql=" delete from web_site."+tableName+" where num = "+num+" ";
        sqlExecuteService.execute(sql);
    }
    //10-BattalarmDataHistoryMapper.xml;224行
    public List<BattalarmDataHistory> getListByStationId(Date startTime, Date endTime, String stationId,String tableName){
        String sql="select h.*,b.StationName1,b.StationName2,b.StationName3,b.StationName5 from db_alarm."+tableName+" h,db_battinf.tb_battinf b " +
                "        where h.BattGroupId = b.BattGroupId " ;
        if(stationId!=null&&!stationId.isEmpty()){
            sql+=" and b.stationId = '"+stationId+"' ";
        }
        sql+=" and h.alm_start_time >='"+ThreadLocalUtil.format(startTime,1)+"' and h.alm_start_time <= '"+ThreadLocalUtil.format(endTime,1)+"' ";
        List<BattalarmDataHistory> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List<BattalarmDataHistory> list=new ArrayList<>();
                while (rs.next()){
                    BattalarmDataHistory data=new BattalarmDataHistory();
                    data.setNum(rs.getLong("num"));
                    data.setMonNum(rs.getInt("MonNum"));
                    data.setRecordId(rs.getLong("Record_Id"));
                    data.setBattGroupId(rs.getInt("BattGroupId"));
                    data.setAlmSignalId(rs.getInt("alm_signal_id"));
                    data.setAlmValue(rs.getFloat("alm_value"));
                    data.setAlmLevel(rs.getInt("alm_level"));
                    data.setAlmIsConfirmed(rs.getInt("alm_is_confirmed"));
                    data.setAlmConfirmedTime(rs.getTimestamp("alm_confirmed_time"));
                    data.setAlmStartTime(rs.getTimestamp("alm_start_time"));
                    data.setAlmEndTime(rs.getTimestamp("alm_end_time"));
                    data.setUsrId(rs.getInt("usr_Id"));
                    data.setAlmSeverity(rs.getInt("alm_severity"));
                    data.setStationName1(rs.getString("StationName1"));
                    data.setStationName2(rs.getString("StationName2"));
                    data.setStationName3(rs.getString("StationName3"));
                    data.setStationName5(rs.getString("StationName5"));
                    list.add(data);
                }
                return list;
            }
        });
        return list;
    }
}
src/main/resources/mapper/BattalarmDataHistoryMapper.xml
@@ -222,7 +222,7 @@
        )
    </select>-->
    <select id="getListByStationId" resultType="com.whyc.pojo.BattalarmDataHistory">
    <!--<select id="getListByStationId" resultType="com.whyc.pojo.BattalarmDataHistory">
        select h.*,b.StationName1,b.StationName2,b.StationName3,b.StationName5 from db_alarm.${tableName} h,db_battinf.tb_battinf b
        where h.BattGroupId = b.BattGroupId
        <if test="stationId !=null and stationId !=''">
@@ -230,6 +230,6 @@
        </if>
        and h.alm_start_time &gt;= #{startTime}
        and h.alm_start_time &lt;= #{endTime}
    </select>
    </select>-->
</mapper>