16

lxw

2023-10-17 19516e371e9b2bc3389a32111e45f0b28a43b82a

16

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

@@ -17,7 +17,7 @@

    //int getCount(DevAlarmPar param);

    List<DevalarmDataHistory> getList2(DevAlarmPar data);
   //List<DevalarmDataHistory> getList2(DevAlarmPar data);

    List getDevAlarmHistory(List deviceIds);


 src/main/java/com/whyc/service/StandardFeatureCurveService.java

@@ -187,7 +187,7 @@
        int count=subService.getCount(data);
        List list=new ArrayList();
        list.add(count);*/
        /*10
        /*13
        DevAlarmPar param=new DevAlarmPar();
        param.setRecordYear("tb_devalarm_data_history_2023_03");
        param.setAlmStartTime(date1);
@@ -198,8 +198,19 @@
        int count=subService.getCount(param);
        List list=new ArrayList();
        list.add(count);*/
        /*15*/
        List list=subService.getList(1002,"tb_pwrdev_alarm_param_115000001");
        /*15
        List list=subService.getList(1002,"tb_pwrdev_alarm_param_115000001");*/
        /*16*/
        DevAlarmPar param=new DevAlarmPar();
        param.setRecordYear("tb_devalarm_data_history_2023_03");
        param.setAlmStartTime(date1);
        param.setAlmStartTime1(date2);
        param.setStationName("");
        param.setStationName1("");
        param.setLimitStart(0);
        param.setLimitEnd(10);
        param.setUId(1002);
        List list=subService.getList2(param);
        return  list;
    }
}

 src/main/java/com/whyc/service/SubTablePageInfoService.java

@@ -702,4 +702,64 @@
        });
        return list;
    }

    //16-SubTablePageInfoUtils.java;188行
    public List getList2(DevAlarmPar param){
        String sql=" SELECT   history.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,alm_severity,  " +
                "        db_battinf.tb_battinf.stationName,stationName1,stationName2,stationName3,stationName5,db_battinf.tb_battinf.FbsDeviceName as dev_name  " +
                "        FROM db_alarm."+param.getRecordYear()+" history,db_battinf.tb_battinf  " +
                " where history.dev_id=db_battinf.tb_battinf.FbsDeviceId  ";
        if(param.getStationName1()!=null){
            if(param.getStationName1().equals("")){
                sql+=" and stationName1!='"+param.getStationName1()+"' ";
            }else{
                sql+=" and stationName1='"+param.getStationName1()+"' ";
            }
        }
        if(param.getStationName()!=null){
            if(param.getStationName().equals("")){
                sql+=" and stationName!='"+param.getStationName()+"' ";
            }else{
                sql+=" and stationName='"+param.getStationName()+"' ";
            }
        }
        sql+="  and alm_start_time  >='"+ActionUtil.sdf.format(param.getAlmStartTime())+"' and alm_start_time  <='"+ActionUtil.sdf.format(param.getAlmStartTime1())+"' ";
        sql+=" and history.dev_id in(select distinct db_battinf.tb_battinf.FbsDeviceId  " +
                "            from  " +
                "            db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf  " +
                "            where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId  " +
                "            and  " +
                "            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="+param.getUId()+") " +
                "  ORDER BY alm_start_time desc ,dev_name asc limit "+param.getLimitStart()+","+param.getLimitEnd()+" ";
        List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List<DevalarmDataHistory> list=new ArrayList<>();
                while (rs.next()){
                    DevalarmDataHistory ph=new DevalarmDataHistory();
                    ph.setNum(rs.getLong("num"));
                    ph.setDevId(rs.getInt("dev_id"));
                    ph.setDevIp(rs.getString("dev_ip"));
                    ph.setAlmType(rs.getInt("alm_type"));
                    ph.setAlmLevel(rs.getInt("alm_level"));
                    ph.setAlmStartTime(rs.getTimestamp("alm_start_time"));
                    ph.setAlmEndTime(rs.getTimestamp("alm_end_time"));
                    ph.setAlmIsConfirmed(rs.getInt("alm_is_confirmed"));
                    ph.setAlmConfirmedTime(rs.getTimestamp("alm_confirmed_time"));
                    ph.setAlmClearedType(rs.getInt("alm_cleared_type"));
                    ph.setDevName(rs.getString("dev_name"));
                    ph.setStationName(rs.getString("stationName"));
                    ph.setStationName1(rs.getString("stationName1"));
                    ph.setStationName2(rs.getString("stationName2"));
                    ph.setStationName3(rs.getString("stationName3"));
                    ph.setStationName5(rs.getString("stationName5"));
                    list.add(ph);
                }
                return list;
            }
        });
        return list;
    }
}

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

@@ -193,7 +193,9 @@
                data.setLimitStart(limitList.get(0));
                data.setLimitEnd(limitList.get(1));
                data.setRecordYear(recordYear);
                List<DevalarmDataHistory> list = devAlarmDataHistoryMapper.getList2(data);
                //List<DevalarmDataHistory> list = devAlarmDataHistoryMapper.getList2(data);
                List<DevalarmDataHistory> list =  subService.getList2(data);

                dataList.addAll(list);
            }
            else if (pojo instanceof PwrdevAlarmHistory) {
@@ -433,7 +435,8 @@
                data.setLimitStart(limitList.get(0));
                data.setLimitEnd(limitList.get(1));
                data.setRecordYear(recordYear);
                List<DevalarmDataHistory> list = devAlarmDataHistoryMapper.getList2(data);
                //List<DevalarmDataHistory> list = devAlarmDataHistoryMapper.getList2(data);
                List<DevalarmDataHistory> list =  subService.getList2(data);
                dataList.addAll(list);
            }
            else if (pojo instanceof PwrdevAlarmHistory) {

 src/main/resources/mapper/DevalarmDataHistoryMapper.xml

@@ -84,7 +84,7 @@
        </where>
    </select>-->

    <select id="getList2" resultMap="devAlarmRes">
    <!--<select id="getList2" resultMap="devAlarmRes">
        SELECT
        history.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,alm_severity,
        db_battinf.tb_battinf.stationName,stationName1,stationName2,stationName3,stationName5,db_battinf.tb_battinf.FbsDeviceName as dev_name
@@ -114,7 +114,7 @@
            and db_user.tb_user_inf.uid=#{uId})
        </where>
        ORDER BY alm_start_time desc ,dev_name asc limit #{limitStart},#{limitEnd}
    </select>
    </select>-->

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