blame | history | patch | commit | commitdiff | ignore whitespace
jinpengyong
2021-12-22 b085a13260ad46142af47cd58ac641c69a354cb1 
 screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java


@@ -16,6 +16,7 @@


import com.moral.util.DateUtils;




import com.moral.util.MybatisPLUSUtils;




import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.data.redis.core.RedisTemplate;


import org.springframework.stereotype.Service;


@@ -58,6 +59,11 @@


    @Override


    public void createTable(String timeUnits) {


        historyHourlyMapper.createTable(timeUnits);


    }




    @Override


    public void createTableComplete(String timeUnits) {


        historyHourlyMapper.createTableComplete(timeUnits);


    }




    @Override


@@ -236,10 +242,10 @@


     * @Date: 2021/9/23


     */


    @Override


    public List<HistoryHourly> getValueByMacAndTime(String mac, Date startDate, Date endDate){


    public List<HistoryHourly> getValueByMacAndTime(String mac, Date startDate, Date endDate) {


        QueryWrapper<HistoryHourly> wrapper = new QueryWrapper<>();


        wrapper.eq("mac",mac);


        wrapper.between("time",startDate,endDate);


        wrapper.eq("mac", mac);


        wrapper.between("time", startDate, endDate);


        List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);


        List<HistoryHourly> datas = multiTableQuery(wrapper, tableNames);


        return datas;


@@ -252,7 +258,7 @@


     * @Author: 陈凯裕


     * @Date: 2021/9/23


     */


    private List<HistoryHourly> multiTableQuery(QueryWrapper<HistoryHourly> wrapper,List<String> tableNames){


    private List<HistoryHourly> multiTableQuery(QueryWrapper<HistoryHourly> wrapper, List<String> tableNames) {


        List<HistoryHourly> result = new ArrayList<>();


        for (String tableName : tableNames) {


            MybatisPlusConfig.tableName.set(tableName);