更新

whycrzg

2021-04-23 2f5fc7aa63da6ba252e5c547d22f1c19b1cd187a

更新

 src/main/java/com/whyc/app/service/UPSCommService.java

@@ -39,9 +39,15 @@

    public Response<PageInfo<UPSComm>> getHistory(int pageNum, int pageSize, int devId) {
        List<String> tableNames = commonMapper.getTableName("db_3.5mw_motor_history", "tb_ups_comm_" + devId);
        PageHelper.startPage(pageNum,pageSize);
        List<UPSComm> uPSComms = historyMapper.getHistory(tableNames);
        PageInfo<UPSComm> uPSCommPageInfo = new PageInfo<>(uPSComms);
        return new Response<PageInfo<UPSComm>>().set(1,uPSCommPageInfo);
        PageHelper.startPage(pageNum, pageSize);

        if (tableNames != null && tableNames.size() > 0) {
            List<UPSComm>   uPSComms = historyMapper.getHistory(tableNames);
            PageInfo<UPSComm> uPSCommPageInfo = new PageInfo<>(uPSComms);
            return new Response<PageInfo<UPSComm>>().set(1, uPSCommPageInfo);

        } else {
            return new Response<PageInfo<UPSComm>>().set(1, null);
        }
    }
}

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

@@ -41,8 +41,14 @@
    public Response<PageInfo<UPSComm>> getHistory(int pageNum, int pageSize, int devId) {
        List<String> tableNames = commonMapper.getTableName("db_3.5mw_motor_history", "tb_ups_comm_" + devId);
        PageHelper.startPage(pageNum,pageSize);
        List<UPSComm> uPSComms = historyMapper.getHistory(tableNames);
        PageInfo<UPSComm> uPSCommPageInfo = new PageInfo<>(uPSComms);
        return new Response<PageInfo<UPSComm>>().set(1,uPSCommPageInfo);

        if (tableNames != null && tableNames.size() > 0) {
            List<UPSComm> uPSComms = historyMapper.getHistory(tableNames);
            PageInfo<UPSComm> uPSCommPageInfo = new PageInfo<>(uPSComms);
            return new Response<PageInfo<UPSComm>>().set(1, uPSCommPageInfo);

        } else {
            return new Response<PageInfo<UPSComm>>().set(1, null);
        }
    }
}