新增储罐管理，数据分析新增导出功能

fei.wang

2025-03-17 e8dc9598b482830ca7fa60c6869687a32448137d

 src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java

@@ -1,8 +1,11 @@
package com.hxzkmonitor.controller;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxzkmonitor.mapper.TbBaidumapMapper;
import com.hxzkmonitor.mapper.TbUserMapper;
import com.hxzkmonitor.pojo.*;
import com.hxzkmonitor.service.TbEquipmentService;
import com.hxzkmonitor.service.TbEvrydayweiyi2024Service;
@@ -43,6 +46,12 @@
    @Autowired
    TbEvrydayweiyi2024Service tbEvrydayweiyi2024Service;

    @Autowired
    TbBaidumapMapper tbBaidumapMapper;

    @Autowired
    TbUserMapper tbUserMapper;

    @ApiOperation(value = "分页查询", notes = "分页查询")
    @GetMapping("/api/everyday")
    public R everyday(Page page , String username) {
@@ -50,6 +59,8 @@

        return R.ok(ipage);
    }

    //根据当前登录人查设备，然后根据时间查询所查到所有设备当天的数据以list返回给前端

    @GetMapping("/api/searcheveryday")
    public R searcheveryday(Page page, String keyword , String username) {
@@ -132,10 +143,34 @@
//            list = tbEquipmentService.list(new QueryWrapper<TbEquipment>().eq("companyid",comId));
//        }
        List<TbSystem> list1 = tbSystemService.list( );
        QueryWrapper queryWrapper2 = new QueryWrapper<>();
        queryWrapper2.eq("username", username);
        TbUser tbUser = tbUserMapper.selectOne(queryWrapper2);

        QueryWrapper queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("companyname", tbUser.getCaname());
        TbBaidumap tbBaidumap =  tbBaidumapMapper.selectOne(queryWrapper);
        result.put("dataList", list);
        result.put("view", list1.get(0).getView());
        result.put("view", tbBaidumap.getCenter());
        result.put("shijiao", tbBaidumap.getShijiao());
//        result.put("view", tbBaidumap.getCenter());
//        result.put("view", list1.get(0).getView());
        return R.ok(result);
    }

    @GetMapping("/api/searchdevice")
    public R search(String username, String query ) {

        return R.ok(tbEquipmentService.search(username,query));
        // 执行搜索逻辑，并返回结果
        // List<Item> items = searchService.search(query);
        // return items.stream().map(Item::getName).collect(Collectors.toList());

        // 如果没有服务，可以使用静态数据进行演示
//        return Arrays.asList("Search Result 1", "Search Result 2", "Search Result 3").stream()
//                .filter(result -> result.contains(query))
//                .collect(Collectors.toList());
    }

}