23

lxw

2023-10-17 df7684221a6b30edccd985e32952e2959fff65ce

23

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

@@ -23,7 +23,7 @@

    int getCountForInterface(InterfaceParam param);

    List getListForInterface(InterfaceParam param);
    //List getListForInterface(InterfaceParam param);

    //查询分级告警的个数
    int serchByLevel(@Param("alarmLevel") int alarmLevel, @Param("uId") int uId);

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

@@ -114,8 +114,8 @@
        Date date1 = null;
        Date date2 = null;
        try {
            date1 = ActionUtil.sdf.parse("2022-05-10 09:20:09" );
            date2 = ActionUtil.sdf.parse("2022-05-21 16:21:53");
            date1 = ActionUtil.sdf.parse("2023-03-01 09:34:27" );
            date2 = ActionUtil.sdf.parse("2023-03-01 17:05:17");
        } catch (ParseException e) {
            e.printStackTrace();
        }
@@ -211,7 +211,7 @@
        param.setLimitEnd(10);
        param.setUId(1002);
        List list=subService.getList2(param);*/
        /*21*/
        /*21 "2022-05-10 09:20:09"  2022-05-21 16:21:53
        UserLog userLog=new UserLog();
        userLog.setRecordYear("tb_user_log_2022");
        userLog.setOperationTime(date1);
@@ -220,7 +220,19 @@
        userLog.setOperationType(31);
        userLog.setLimitStart(0);
        userLog.setLimitEnd(10);
        List list= subService.getList2(userLog);
        List list= subService.getList2(userLog);*/
        /*23*/
        InterfaceParam param=new InterfaceParam();
        param.setRecordYear("tb_devalarm_data_history_2023_03");
        param.setStartTime(date1);
        param.setEndTime(date2);
        List devList=new ArrayList();
        devList.add(618500017);
        devList.add(481500011);
        param.setDeviceIds(devList);
        param.setLimitStart(0);
        param.setLimitEnd(10);
        List list=subService.getListForInterface_dev(param);
        return  list;
    }
}

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

@@ -849,4 +849,58 @@
        });
        return list;
    }

    //23-SubTablePageInfoUtils.java;469行
    public List<DevalarmDataHistory> getListForInterface_dev(InterfaceParam 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,  " +
                "        db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.stationName1,db_battinf.tb_battinf.stationName2,db_battinf.tb_battinf.stationName3," +
                "        db_battinf.tb_battinf.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.getDeviceIds()!=null&&param.getDeviceIds().size()>0){
            sql+=" and history.dev_id in( ";
            for (int i=0;i<param.getDeviceIds().size();i++) {
                sql+=param.getDeviceIds().get(i);
                if(i!=(param.getDeviceIds().size()-1)){
                    sql+=",";
                }
            }
            sql+=")";
        }
        if(param.getStartTime()!=null){
            sql+=" and alm_start_time  >='"+ActionUtil.sdf.format(param.getStartTime())+"' ";
        }
        if(param.getEndTime()!=null){
            sql+=" and alm_start_time  <='"+ActionUtil.sdf.format(param.getEndTime())+"' ";
        }
        sql+="   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

@@ -246,7 +246,8 @@
                    data.setLimitStart(limitList.get(0));
                    data.setLimitEnd(limitList.get(1));
                    data.setRecordYear(recordYear);
                    List<AlarmRes> list = devAlarmDataHistoryMapper.getListForInterface(data);
                    //List<AlarmRes> list = devAlarmDataHistoryMapper.getListForInterface(data);
                    List list = subService.getListForInterface_dev(data);
                    dataList.addAll(list);
                }
            }
@@ -488,7 +489,8 @@
                    data.setLimitStart(limitList.get(0));
                    data.setLimitEnd(limitList.get(1));
                    data.setRecordYear(recordYear);
                    List<AlarmRes> list = devAlarmDataHistoryMapper.getListForInterface(data);
                    //List<AlarmRes> list = devAlarmDataHistoryMapper.getListForInterface(data);
                    List list = subService.getListForInterface_dev(data);
                    dataList.addAll(list);
                }
            }

 src/main/resources/mapper/DevalarmDataHistoryMapper.xml

@@ -168,7 +168,7 @@
            </if>
        </where>
    </select>
    <select id="getListForInterface" resultMap="devAlarmRes">
   <!-- <select id="getListForInterface" 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,
        db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName as dev_name
@@ -187,7 +187,7 @@
            </if>
        </where>
        ORDER BY alm_start_time desc ,dev_name asc limit #{limitStart},#{limitEnd}
    </select>
    </select>-->

    <select id="getDataBeforeRetentionMonth" resultType="com.whyc.pojo.DevalarmDataHistory">
        select *,DATE_FORMAT(alm_start_time,"%Y")  as recordYear from db_alarm.tb_devalarm_data_history where alm_start_time &lt; #{retentionTime};