66

lxw

2023-10-18 16a15e21c1df46a97af3b9ac741412f10f375ec4

66

 src/main/java/com/whyc/mapper/BattalarmDataHistoryMapper.java

@@ -15,7 +15,7 @@
    //分页查询所有的历史告警
    List<AlarmRes> serchByInfo(AlarmPar par);

    int getCount(AlarmPar param);
    //int getCount(AlarmPar param);

    //List<AlarmRes> getList2(AlarmPar data);


 src/main/java/com/whyc/util/SubTablePageInfoUtils.java

@@ -83,7 +83,8 @@
                param.setAlmStartTime(queryTime.get(0));
                param.setAlmStartTime1(queryTime.get(1));
                param.setRecordYear(tableName);
                int currentCount = battAlarmDataHistoryMapper.getCount(param);
                //int currentCount = battAlarmDataHistoryMapper.getCount(param);
                int currentCount = subService.getCount(param);
                queryCountMap.put(tableYear,currentCount);
            }
            else if (pojo instanceof DevAlarmPar) {
@@ -319,7 +320,8 @@
                    param.setAlmStartTime(queryTime.get(0));
                    param.setAlmStartTime1(queryTime.get(1));
                    param.setRecordYear(tableName);
                    int currentCount = battAlarmDataHistoryMapper.getCount(param);
                    //int currentCount = battAlarmDataHistoryMapper.getCount(param);
                    int currentCount = subService.getCount(param);
                    queryCountMap.put(tableYear, currentCount);
                } else if (pojo instanceof DevAlarmPar) {
                    //DevAlarmPar param = (DevAlarmPar) pojo;

 src/main/resources/mapper/BattalarmDataHistoryMapper.xml

@@ -89,9 +89,9 @@
        order by history.alm_start_time desc,history.monnum asc limit #{limitStart},#{limitEnd}
    </select>
-->
    <select id="getCount" resultType="java.lang.Integer">
   <!-- <select id="getCount" resultType="java.lang.Integer">
        select
            <!--count(*)-->
            &lt;!&ndash;count(*)&ndash;&gt;
        count(distinct history.num)
        from db_alarm.${recordYear} history,db_battinf.tb_battinf
        <where>
@@ -118,7 +118,7 @@
            and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid and db_user.tb_user_inf.uid=#{uId}
            )
        </where>
    </select>
    </select>-->

    <select id="serchByLevel" resultType="java.lang.Integer">
        select count(*) as countLevel