58

lxw

2023-10-18 ec81078d693776ee6fd5fcaff6ff3e7d1bb84066

58

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

@@ -33,7 +33,7 @@

    void insertBatch4UserLogByYear(@Param("year")String year, List<UserLog> userLogs);

    void createTable4PowerAlarmHistoryByYear(@Param("year") String year);
    //void createTable4PowerAlarmHistoryByYear(@Param("year") String year);

    //void insertBatch4PowerAlarmHistoryByYear(String year, List<PwrdevAlarmHistory> temp);


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

@@ -65,7 +65,8 @@
        for (String year : yearKeySet){
            String tableNameExists = commonMapper.existTable("db_pwrdev_alarm", "tb_pwrdev_alarm_history_" + year);
            if(tableNameExists == null) {
                commonMapper.createTable4PowerAlarmHistoryByYear(year);
                //commonMapper.createTable4PowerAlarmHistoryByYear(year);
                subService.createTable4PowerAlarmHistoryByYear(year);
            }
            List<PwrdevAlarmHistory> data = map.get(year);
            List<PwrdevAlarmHistory> temp = new LinkedList<>();

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

@@ -376,7 +376,7 @@
        List list=subService.serchByCondition(realdata);*/
        /*52
        subService.createTable4UserLogByYear("2021");*/
        /*56*/
        /*56
        BattmonTestcap btcp=new BattmonTestcap();
        btcp.setTableName("tb_battmon_testcap_2_1000_15");
        btcp.setMonvolstd(2);
@@ -389,7 +389,9 @@
        btcp.setTestRecordCount(1);
        int flag=subService.add(btcp);
        List list=new ArrayList();
        list.add(flag);
        return  list;
        list.add(flag);*/
        /*58
        subService.createTable4PowerAlarmHistoryByYear("2019");*/
        return  null;
    }
}

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

@@ -1086,7 +1086,7 @@
        return num;
    }

    //35,38-SubTablePageInfoUtils.java;176行
    //35,38,57-SubTablePageInfoUtils.java;176行
    public List<AlarmRes> getList2(AlarmPar param){
        String sql="select history.BattGroupId,history.num,alm_signal_id,history.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time  " +
                "        ,alm_severity,stationname,StationName1,StationName2,StationName3,StationName5,battgroupname  " +
@@ -1398,4 +1398,33 @@
        int flag=sqlExecuteService.executeUpdate(sql,new Object[]{});
        return flag;
    }

    //58-HistoryDataArchivingService.java;65行
    public void createTable4PowerAlarmHistoryByYear(String year){
        String sql="CREATE TABLE db_pwrdev_alarm.`tb_pwrdev_alarm_history_"+year+"` ( " +
                "        `num` bigint(20) NOT NULL AUTO_INCREMENT, " +
                "        `record_id` bigint(20) NOT NULL DEFAULT '0', " +
                "        `PowerDeviceId` bigint(20) NOT NULL DEFAULT '0', " +
                "        `alm_type` int(11) NOT NULL DEFAULT '0', " +
                "        `alm_level` int(11) NOT NULL DEFAULT '0', " +
                "        `alm_source` int(11) NOT NULL DEFAULT '0', " +
                "        `alm_index` int(11) NOT NULL DEFAULT '0', " +
                "        `alm_start_time` datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
                "        `alm_end_time` datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
                "        `alm_value` float NOT NULL DEFAULT '0', " +
                "        `alm_is_confirmed` tinyint(1) NOT NULL DEFAULT '0', " +
                "        `alm_confirmed_time` datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
                "        `alm_cleared_type` int(11) NOT NULL DEFAULT '0', " +
                "        `usr_Id` int(11) NOT NULL DEFAULT '0', " +
                "        `alm_trigger` int(11) NOT NULL DEFAULT '0', " +
                "        `alm_severity` int(11) NOT NULL DEFAULT '0', " +
                "        PRIMARY KEY (`num`), " +
                "        KEY `index_record_id` (`record_id`), " +
                "        KEY `index_pwrdev_id` (`PowerDeviceId`), " +
                "        KEY `index_alm_type` (`alm_type`), " +
                "        KEY `index_alm_start_time` (`alm_start_time`), " +
                "        KEY `index_alm_cleared_type` (`alm_cleared_type`) " +
                "        ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8";
        sqlExecuteService.execute(sql);
    }
}

 src/main/resources/mapper/CommonMapper.xml

@@ -37,7 +37,7 @@
         #{item.operationMsg},#{item.operationDetail},#{item.readFlag})
        </foreach>
    </insert>
    <insert id="createTable4PowerAlarmHistoryByYear">
    <!--<insert id="createTable4PowerAlarmHistoryByYear">
        CREATE TABLE db_pwrdev_alarm.`tb_pwrdev_alarm_history_${year}` (
        `num` bigint(20) NOT NULL AUTO_INCREMENT,
        `record_id` bigint(20) NOT NULL DEFAULT '0',
@@ -62,7 +62,7 @@
        KEY `index_alm_start_time` (`alm_start_time`),
        KEY `index_alm_cleared_type` (`alm_cleared_type`)
        ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8
    </insert>
    </insert>-->
   <!-- <insert id="insertBatch4PowerAlarmHistoryByYear">
        insert into db_pwrdev_alarm.`tb_pwrdev_alarm_history_${year}`
        (record_id,PowerDeviceId,alm_type,alm_level,alm_source,alm_index,alm_start_time,alm_end_time,alm_value,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,usr_Id,alm_severity,alm_trigger)