V定制1.0 1：对讲功能 2：计算经纬度控制器systemcontrollen

fei.wang

2024-04-16 70223b3ef4df02622869425fed4ba9b290e1aa74

 src/main/java/com/hxzk/service/impl/TbHistoryPowerServiceImpl.java

@@ -35,11 +35,16 @@

    @Override
    public PageInfo<com.hxzk.pojo.TbHistoryPower> findSearch(Integer page, Integer limit, com.hxzk.pojo.TbHistoryPower historyPower) {
        QueryWrapper queryWrapper = new QueryWrapper<>();
        queryWrapper.like("tagid",historyPower.getTagid());
        queryWrapper.orderByDesc("time");
        PageHelper.startPage(page,limit);
        List<com.hxzk.pojo.TbHistoryPower> cardList = baseMapper.selectList(queryWrapper);
        List<com.hxzk.pojo.TbHistoryPower> cardList = null;
        if (historyPower.getTime() == null || historyPower.getTime() == ""){
            LocalDate currentDate = LocalDate.now();
            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
            String formattedDate = currentDate.format(formatter);
            historyPower.setTime(formattedDate);
            cardList = tbHistoryPower.findSearch(historyPower);
        }else{
            cardList = tbHistoryPower.findSearch(historyPower);
        }
        PageInfo<com.hxzk.pojo.TbHistoryPower> info = new PageInfo<>(cardList);
        return info;
    }