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

fei.wang

2025-03-17 e8dc9598b482830ca7fa60c6869687a32448137d

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

 pom.xml

@@ -20,6 +20,16 @@
            <version>3.4.0</version>
        </dependency>
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi</artifactId>
            <version>4.1.2</version>
        </dependency>
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml</artifactId>
            <version>4.1.2</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-security</artifactId>
        </dependency>

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

@@ -31,8 +31,8 @@

    @ApiOperation(value = "分页查询", notes = "分页查询")
    @GetMapping("/api/getBaidumapPage")
    public R getBaidumapPage(Page page) {
        IPage<TbBaidumap> ipage = tbBaidumapService.getBaidumapPage( page);
    public R getBaidumapPage(Page page, String username) {
        IPage<TbBaidumap> ipage = tbBaidumapService.getBaidumapPage( page,username);

        return R.ok(ipage);
    }

 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());
    }

}


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

@@ -1,6 +1,7 @@
package com.hxzkmonitor.controller;


import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxzkmonitor.pojo.TbEvrydayweiyi2024;
@@ -111,18 +112,18 @@
        String[] ed = new String[size];
        String[] nd = new String[size];
        String[] x = new String[size];
        List<JSONObject> list = new ArrayList<>();
        for (int i = 0; i < size; i++) {
            hd[i] = data.get(i).getTdmm();
            ed[i] = data.get(i).getEdmm();
            nd[i] = data.get(i).getNdmm();
            x[i] = data.get(i).getFilename();
            LinkedHashMap<String, Object> json = new LinkedHashMap<>();
            json.put("编号", data.get(i).getTagid());
            json.put("设备名称", data.get(i).getAnchorname());
            json.put("东位移", data.get(i).getEdmm());
            json.put("北位移", data.get(i).getNdmm());
            json.put("天位移", data.get(i).getTdmm());
            json.put("添加时间", data.get(i).getAddtime());
            list.add(new JSONObject(json));
        }
        Map<String, Object> result = new HashMap<>();
        result.put("ed", ed);
        result.put("nd", nd);
        result.put("hd", hd);
        result.put("x", x);
        return R.ok(result);
        return R.ok(list);
    }

    @PostMapping("/api/handlechartupdate3")
@@ -155,5 +156,50 @@
        return R.ok(result);
    }


    @GetMapping("/api/getweiyi")
    public R getweiyi(String tagid) {
        TbEvrydayweiyi2024 data = new TbEvrydayweiyi2024();
            data = tbEvrydayweiyi2024Service.getweiyi( tagid);
        JSONObject json = new JSONObject();
        if (data!=null){
            json.put("东位移", data.getEdmm());
            json.put("北位移", data.getNdmm());
            json.put("天位移", data.getTdmm());
            json.put("编号", tagid);
            json.put("是否在线", data.getOnlie());
        }

        return R.ok(json);
    }


    @GetMapping("/api/gettagidweiyi")
    public R gettagidweiyi(String tagid) {
//        Map<String, Object> data = new ArrayList<>();
        Map<String, Object> data = tbEvrydayweiyi2024Service.gettagidweiyi( tagid);
        JSONObject json = new JSONObject();
//        if (data.size()>0){
//            int size = data.size();
//            String[] hd = new String[size];
//            String[] ed = new String[size];
//            String[] nd = new String[size];
//            String[] x = new String[size];
//            for (int i = 0; i < size; i++) {
//                hd[i] = data.get(i).getTdmm();
//                ed[i] = data.get(i).getEdmm();
//                nd[i] = data.get(i).getNdmm();
//                x[i] = data.get(i).getFilename();
//            }
//            Map<String, Object> result = new HashMap<>();
//            result.put("ed", ed);
//            result.put("nd", nd);
//            result.put("hd", hd);
//            result.put("x", x);
            return R.ok(data);
//        }

//        return R.ok(json);
    }
}


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
package com.hxzkmonitor.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxzkmonitor.pojo.TbTank;
import com.hxzkmonitor.service.TbTankService;
import com.hxzkmonitor.util.R;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/")
public class TbTankController {

    @Autowired
    TbTankService tbTankService;

    @ApiOperation(value = "分页查询", notes = "分页查询")
    @GetMapping("/api/getTbTank")
    public R getSystemWin(Page page, String username) {
        IPage<TbTank> ipage = tbTankService.getTbTankPage( page,username);

        return R.ok(ipage);
    }

    @GetMapping("/api/searchTbTank")
    public R searchTbTank(Page page, String keyword, String username) {
        return R.ok(tbTankService.searchTbTank(page, keyword, username));
    }

    @PostMapping("/api/addorupTbTank")
    public R addorupTbTank(TbTank tbTank) {
        return R.ok(tbTankService.addorupTbTank(tbTank));
    }

    @GetMapping("/api/delTbTank")
    public R delTbTank(Integer id) {
        return R.ok(tbTankService.delTbTank(id));
    }

}

 src/main/java/com/hxzkmonitor/mapper/TbEvrydayweiyi2024Mapper.java

@@ -29,12 +29,14 @@
    public List<TbEvrydayweiyi2024> listall(@Param("companyid")Integer companyid );


    @Select("select id,tagid,ed,nd,td,end,edmm,ndmm,tdmm,endmm,gpsnum,filename,power,jingdu,weidu,gaodu,addtime from tb_evrydayweiyi_${datey} where  filename BETWEEN #{date1} AND #{date2}")
    @Select("select id,tagid,ed,nd,td,end,edmm,ndmm,tdmm,endmm,gpsnum,filename,power,jingdu,weidu,gaodu,addtime,anchorname from tb_evrydayweiyi_${datey} where  filename BETWEEN #{date1} AND #{date2}")
    public List<TbEvrydayweiyi2024> listx2(@Param("datey")String datey , @Param("date1")String date1, @Param("date2")String date2);

    @Select("select id,tagid,ed,nd,td,end,edmm,ndmm,tdmm,endmm,gpsnum,filename,power,jingdu,weidu,gaodu,addtime from tb_evrydayweiyi_${datey} where tagid=#{tagid} AND filename BETWEEN #{date1} AND #{date2}")
    @Select("select id,tagid,ed,nd,td,end,edmm,ndmm,tdmm,endmm,gpsnum,filename,power,jingdu,weidu,gaodu,addtime,anchorname from tb_evrydayweiyi_${datey} where tagid=#{tagid} AND filename BETWEEN #{date1} AND #{date2}")
    public List<TbEvrydayweiyi2024> listx3(@Param("datey")String datey ,@Param("tagid")String tagid, @Param("date1")String date1, @Param("date2")String date2);

    @Select("select e.*,TbEquipment.onlie from tb_evrydayweiyi_${datey} e JOIN tb_equipment TbEquipment ON TbEquipment.tagid = e.tagid where e.tagid=#{tagid} AND e.filename = #{date1} ")
    public TbEvrydayweiyi2024 getweiyi(@Param("datey")String datey ,@Param("tagid")String tagid, @Param("date1")String date1);

    @Select("select id,tagid,ed,nd,td,end,edmm,ndmm,tdmm,endmm,gpsnum,filename,power,jingdu,weidu,gaodu,addtime from tb_evrydayweiyi_${date} where tagid=#{tagid} order by filename desc limit 1")
    public TbEvrydayweiyi2024 getonedesc(@Param("date")String date,@Param("tagid")String tagid);

 src/main/java/com/hxzkmonitor/mapper/TbTankMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
package com.hxzkmonitor.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hxzkmonitor.pojo.TbSystemWin;
import com.hxzkmonitor.pojo.TbTank;

public interface TbTankMapper extends BaseMapper<TbTank> {
}

 src/main/java/com/hxzkmonitor/pojo/TbBaidumap.java

@@ -72,5 +72,12 @@
    @TableField("moshi")
    private String moshi;

    @ApiModelProperty(value = "公司名称")
    @TableField("companyname")
    private String companyname;





}

 src/main/java/com/hxzkmonitor/pojo/TbTank.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
package com.hxzkmonitor.pojo;


import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;

@Data
@EqualsAndHashCode(callSuper = false)
@TableName("tb_tank")
@ApiModel(value="TbTank对象", description="")
public class TbTank implements Serializable {


    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "编号")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "储罐名称")
    @TableField("tankname")
    private String tankname;

    @ApiModelProperty(value = "监测终端")
    @TableField("monitor")
    private String monitor;

    @ApiModelProperty(value = "添加时间")
    @TableField("addtime")
    private String addtime;

    @ApiModelProperty(value = "公司名称")
    @TableField("companyname")
    private String companyname;


}

 src/main/java/com/hxzkmonitor/service/TbBaidumapService.java

@@ -20,5 +20,5 @@

    Integer addorupBaidumap(TbBaidumap tbEquipment);

    IPage<TbBaidumap> getBaidumapPage(Page page );
    IPage<TbBaidumap> getBaidumapPage(Page page , String username);
}

 src/main/java/com/hxzkmonitor/service/TbEquipmentService.java

@@ -5,6 +5,7 @@
import com.hxzkmonitor.pojo.Tb24jiancedata;
import com.hxzkmonitor.pojo.TbEquipment;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hxzkmonitor.pojo.TbTank;

import java.util.List;
import java.util.Map;
@@ -38,4 +39,6 @@
    List<TbEquipment> getalldevice(String username,String phone);

    TbEquipment getByTagid(String tagid);

    List<TbEquipment> search(String username,String query);
}

 src/main/java/com/hxzkmonitor/service/TbEvrydayweiyi2024Service.java

@@ -38,4 +38,9 @@
    public List<TbEvrydayweiyi2024> listx3(String datey ,String username,String date1,String date2,String tagid);


    public TbEvrydayweiyi2024 getweiyi(String tagid);
    public Map<String, Object> gettagidweiyi(String tagid);



}

 src/main/java/com/hxzkmonitor/service/TbTankService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.hxzkmonitor.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxzkmonitor.pojo.TbCompany;
import com.hxzkmonitor.pojo.TbEquipment;
import com.hxzkmonitor.pojo.TbSystemWin;
import com.hxzkmonitor.pojo.TbTank;

import java.util.List;

public interface TbTankService {

    Integer addorupTbTank(TbTank tbEquipment);

    IPage<TbTank> getTbTankPage(Page page , String username);

    IPage<TbTank> searchTbTank(Page page, String keyword, String username );



    TbTank delTbTank(Integer id);
}

 src/main/java/com/hxzkmonitor/service/impl/TbBaidumapServiceImpl.java

@@ -3,16 +3,22 @@
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.TbUserMapper;
import com.hxzkmonitor.pojo.TbBaidumap;
import com.hxzkmonitor.pojo.TbBaidumap;
import com.hxzkmonitor.mapper.TbBaidumapMapper;
import com.hxzkmonitor.pojo.TbDuanxinlog;
import com.hxzkmonitor.pojo.TbUser;
import com.hxzkmonitor.service.TbBaidumapService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * <p>
@@ -23,7 +29,10 @@
 * @since 2024-08-22
 */
@Service
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class TbBaidumapServiceImpl extends ServiceImpl<TbBaidumapMapper, TbBaidumap> implements TbBaidumapService {

    private final TbUserMapper tbUserMapper;
    @Override
    public IPage<TbBaidumap> searchBaidumap(Page page, String keyword) {
        QueryWrapper<TbBaidumap> queryWrapper = new QueryWrapper<>();
@@ -65,9 +74,26 @@
    }

    @Override
    public IPage<TbBaidumap> getBaidumapPage(Page page) {
        QueryWrapper queryWrapper = new QueryWrapper<>();
        IPage<TbBaidumap> userPage = baseMapper.selectPage(page, queryWrapper);
        return userPage;
    public IPage<TbBaidumap> getBaidumapPage(Page page, String username) {

        QueryWrapper queryWrapper2 = new QueryWrapper<>();
        queryWrapper2.eq("username", username);
        TbUser tbUser = tbUserMapper.selectOne(queryWrapper2);
        if (Objects.equals(tbUser.getRole(), "超级管理员")) {
            QueryWrapper queryWrapper = new QueryWrapper<>();
            queryWrapper.orderByDesc("addtime");
            IPage<TbBaidumap> userPage = baseMapper.selectPage(page, queryWrapper);
            return userPage;

        } else {
            QueryWrapper queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("companyname", tbUser.getCaname());
            queryWrapper.orderByDesc("addtime");
            IPage<TbBaidumap> userPage = baseMapper.selectPage(page, queryWrapper);
            return userPage;
        }
//        QueryWrapper queryWrapper = new QueryWrapper<>();
//        IPage<TbBaidumap> userPage = baseMapper.selectPage(page, queryWrapper);
//        return userPage;
    }
}

 src/main/java/com/hxzkmonitor/service/impl/TbCompanyServiceImpl.java

@@ -3,11 +3,15 @@
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.pojo.TbBaidumap;
import com.hxzkmonitor.pojo.TbCompany;
import com.hxzkmonitor.mapper.TbCompanyMapper;
import com.hxzkmonitor.pojo.TbCompany;
import com.hxzkmonitor.service.TbBaidumapService;
import com.hxzkmonitor.service.TbCompanyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.text.SimpleDateFormat;
@@ -24,6 +28,12 @@
 */
@Service
public class TbCompanyServiceImpl extends ServiceImpl<TbCompanyMapper, TbCompany> implements TbCompanyService {

    @Autowired
    TbBaidumapService tbBaidumapService;

    @Autowired
    TbBaidumapMapper tbBaidumapMapper;
    @Override
    public IPage<TbCompany> searchCompany(Page page, String keyword) {
        QueryWrapper<TbCompany> queryWrapper = new QueryWrapper<>();
@@ -36,6 +46,11 @@
    public Integer delCompany(Integer id) {
        QueryWrapper queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("id", id);
        TbCompany tbCompany = baseMapper.selectOne(queryWrapper);
        QueryWrapper queryWrapper2 = new QueryWrapper<>();
        queryWrapper2.eq("companyname", tbCompany.getCompanyname());
//        tbBaidumapMapper.selectOne(queryWrapper2);
        tbBaidumapMapper.delete(queryWrapper2);
        return baseMapper.delete(queryWrapper);
    }

@@ -47,6 +62,19 @@
        if (tbCompany.getId() != null) {
            return baseMapper.updateById(tbCompany);
        } else {
            TbBaidumap tbBaidumap = new TbBaidumap();
            tbBaidumap.setMapname("百度地图");
            tbBaidumap.setIsshow("在线地图");
            tbBaidumap.setLevel("19");
            tbBaidumap.setCenter("105.86159832032634;37.245153887456491");
            tbBaidumap.setFile("/hxzkuwb/tiles");
            tbBaidumap.setShijiao("64.5");
            tbBaidumap.setHeig("60");
            tbBaidumap.setIshow("显示");
            tbBaidumap.setZhuanhuan("百度");
            tbBaidumap.setMoshi("0");
            tbBaidumap.setCompanyname(tbCompany.getCompanyname());
            tbBaidumapService.addorupBaidumap(tbBaidumap);
            return baseMapper.insert(tbCompany);
        }
    }

 src/main/java/com/hxzkmonitor/service/impl/TbEquipmentServiceImpl.java

@@ -522,4 +522,21 @@
        TbEquipment standardNum = baseMapper.selectOne(queryWrapper);
        return standardNum;
    }

    @Override
    public List<TbEquipment> search(String username,String query) {

        QueryWrapper queryWrapperu = new QueryWrapper<>();
        queryWrapperu.eq("username",username);
//        queryWrapperu.eq("adminphone",phone);
        TbUser tbUser=  tbUserMapper.selectOne(queryWrapperu);
        QueryWrapper queryWrapper = new QueryWrapper<>();
        if (!Objects.equals(tbUser.getRole(), "超级管理员")){
            queryWrapper.eq("companyid",tbUser.getCsname());
        }
        queryWrapper.eq("type",1);
        queryWrapper.like("tagid", query);
        queryWrapper.orderByDesc("addtime");
        return baseMapper.selectList(queryWrapper);
    }
}

 src/main/java/com/hxzkmonitor/service/impl/TbEvrydayweiyi2024ServiceImpl.java

@@ -20,6 +20,7 @@
import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;

import java.text.SimpleDateFormat;
import java.util.*;

/**
@@ -56,7 +57,7 @@
    public IPage<TbEvrydayweiyi2024> geteveryday(Page page, String keyword, String username, String time, String isdp) {
        Calendar calendar = Calendar.getInstance();
        String datey = DateUtil.formatDate4(calendar.getTime(), "yyyy-MM-dd");
        int i1 = (Integer.parseInt(datey.split("-")[2])) - 1;
        int i1 = (Integer.parseInt(datey.split("-")[2])-1) ;
        String s = datey.split("-")[0] + "-" + datey.split("-")[1] + "-" + i1;

        QueryWrapper queryWrapper2 = new QueryWrapper<>();
@@ -145,7 +146,7 @@
    public List<TbEvrydayweiyi2024> geteverydaydp(String username) {
        Calendar calendar = Calendar.getInstance();
        String datey = DateUtil.formatDate4(calendar.getTime(), "yyyy-MM-dd");
        int i1 = (Integer.parseInt(datey.split("-")[2])) - 1;
        int i1 = (Integer.parseInt(datey.split("-")[2])-1) ;
        String s = datey.split("-")[0] + "-" + datey.split("-")[1] + "-" + i1;

        QueryWrapper queryWrapper2 = new QueryWrapper<>();
@@ -337,6 +338,61 @@
    }

    @Override
    public TbEvrydayweiyi2024 getweiyi( String tagid) {
        Calendar calendar = Calendar.getInstance();
        String datey = DateUtil.formatDate4(calendar.getTime(), "yyyy");
//        Calendar date = Calendar.getInstance();
//        String date1 = DateUtil.formatDate(calendar.getTime(), "yyyy-MM-dd");
        Date date = new Date();
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");

//        Calendar calendar = Calendar.getInstance();
        String dated = DateUtil.formatDate4(calendar.getTime(), "yyyy-MM-dd");
        int i1 = (Integer.parseInt(dated.split("-")[2])-1) ;
        String s = dated.split("-")[0] + "-" + dated.split("-")[1] + "-" + i1;
            return tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid, s);
    }

    @Override
    public Map<String, Object> gettagidweiyi( String tagid) {
//        List<TbEvrydayweiyi2024> tbEvrydayweiyi2024s = new ArrayList<>();
        Map<String, Object> result = new HashMap<>();
        String[] hd = new String[tagid.split(",").length];
        String[] ed = new String[tagid.split(",").length];
        String[] nd = new String[tagid.split(",").length];
        String[] x = new String[tagid.split(",").length];
        for (int i = 0; i < tagid.split(",").length; i++) {
            Calendar calendar = Calendar.getInstance();
            String datey = DateUtil.formatDate4(calendar.getTime(), "yyyy");
//        Calendar date = Calendar.getInstance();
//        String date1 = DateUtil.formatDate(calendar.getTime(), "yyyy-MM-dd");
            Date date = new Date();
            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");

//        Calendar calendar = Calendar.getInstance();
            String dated = DateUtil.formatDate4(calendar.getTime(), "yyyy-MM-dd");
            int i1 = (Integer.parseInt(dated.split("-")[2])-1) ;
            String s = dated.split("-")[0] + "-" + dated.split("-")[1] + "-" + i1;
            if (tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s)!=null){
                hd[i] = tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getTdmm();
                ed[i] = tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getEdmm();
                nd[i] =tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getNdmm();
                x[i] = tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getFilename();
            }else{
                hd[i] = "0";
                ed[i] = "0";
                nd[i] ="0";
                x[i] = "0";
            }
        }
        result.put("ed", ed);
        result.put("nd", nd);
        result.put("hd", hd);
//            result.put("x", x);
        return result;
    }

    @Override
    public IPage<TbEvrydayweiyi2024> searcheveryday(Page page, String keyword, String username, String time) {


@@ -360,7 +416,7 @@
                }
            }
            if (time != null) {
                int i1 = (Integer.parseInt(time.split("-")[2])) - 1;
                int i1 = (Integer.parseInt(time.split("-")[2])-1) ;
                String s = time.split("-")[0] + "-" + time.split("-")[1] + "-" + i1;
                queryWrapper.eq("filename", s);

@@ -409,7 +465,7 @@
                    }
                }
                if (time != null) {
                    int i1 = (Integer.parseInt(time.split("-")[2])) - 1;
                    int i1 = (Integer.parseInt(time.split("-")[2])-1) ;
                    String s = time.split("-")[0] + "-" + time.split("-")[1] + "-" + i1;
                    queryWrapper1.eq("filename", s);
                }

 src/main/java/com/hxzkmonitor/service/impl/TbTankServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,145 @@
package com.hxzkmonitor.service.impl;

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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hxzkmonitor.mapper.TbCompanyMapper;
import com.hxzkmonitor.mapper.TbSystemWinMapper;
import com.hxzkmonitor.mapper.TbTankMapper;
import com.hxzkmonitor.mapper.TbUserMapper;
import com.hxzkmonitor.pojo.*;
import com.hxzkmonitor.service.TbSystemWinService;
import com.hxzkmonitor.service.TbTankService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Objects;

@Service
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class TbTankServiceImpl extends ServiceImpl<TbTankMapper, TbTank> implements TbTankService {

    @Autowired
    TbTankMapper tbTankMapper;


    private final TbUserMapper tbUserMapper;

    private final TbCompanyMapper tbCompanyMapper;

    @Override
    public Integer addorupTbTank(TbTank tank) {


        Date date = new Date();
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        tank.setAddtime(formatter.format(date));
        if (tank.getId() != null) {
            return baseMapper.updateById(tank);
        } else {
            QueryWrapper queryWrapper2 = new QueryWrapper<>();
            queryWrapper2.eq("username", tank.getCompanyname());
            TbUser tbUser = tbUserMapper.selectOne(queryWrapper2);
            tank.setCompanyname(tbUser.getCaname());
            QueryWrapper<TbTank> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("tankname", tank.getTankname());
            queryWrapper.eq("companyname", tank.getCompanyname());
            List<TbTank> tagid1 = baseMapper.selectList(queryWrapper);
            if (tagid1.size()>0){
                return -1;
            }else{
                return baseMapper.insert(tank);
            }

        }
    }

    @Override
    public IPage<TbTank> getTbTankPage(Page page, String username) {

        QueryWrapper queryWrapper2 = new QueryWrapper<>();
        queryWrapper2.eq("username", username);
        TbUser tbUser = tbUserMapper.selectOne(queryWrapper2);
        if (Objects.equals(tbUser.getRole(), "超级管理员")) {
            QueryWrapper queryWrapper = new QueryWrapper<>();
            queryWrapper.orderByDesc("addtime");
            IPage<TbTank> userPage = baseMapper.selectPage(page, queryWrapper);
            return userPage;

        } else {
            QueryWrapper queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("companyname", tbUser.getCaname());
            queryWrapper.orderByDesc("addtime");
            IPage<TbTank> userPage = baseMapper.selectPage(page, queryWrapper);
            return userPage;
        }
    }

    @Override
    public IPage<TbTank> searchTbTank(Page page, String keyword, String username) {

        QueryWrapper queryWrapperu = new QueryWrapper<>();
        queryWrapperu.eq("username",username);
        TbUser tbUser=  tbUserMapper.selectOne(queryWrapperu);
        if (Objects.equals(tbUser.getRole(), "超级管理员")){
            QueryWrapper<TbTank> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("tankname", keyword);
            queryWrapper.orderByDesc("addtime");
            List<TbTank> tagid1 = baseMapper.selectList(queryWrapper);

            if (tagid1.size() > 0) {
                IPage<TbTank> tagid = baseMapper.selectPage(page, queryWrapper);
                for (int i = 0; i < tagid.getRecords().size(); i++) {
                    QueryWrapper queryWrapper1 = new QueryWrapper<>();
                    queryWrapper1.eq("companyname",tagid.getRecords().get(i).getCompanyname());
                    TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany!=null){
                        tagid.getRecords().get(i).setCompanyname(tbCompany.getCompanyname());
                    }
//                tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                return tagid;
            }  else {
                return null;
            }
        }else{


            QueryWrapper<TbTank> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("tankname", keyword);
            queryWrapper.eq("companyname",tbUser.getCaname());
            queryWrapper.orderByDesc("addtime");
            List<TbTank> tagid1 = baseMapper.selectList(queryWrapper);

            if (tagid1.size() > 0) {
                IPage<TbTank> tagid = baseMapper.selectPage(page, queryWrapper);
                for (int i = 0; i < tagid.getRecords().size(); i++) {
                    QueryWrapper queryWrapper1 = new QueryWrapper<>();
                    queryWrapper1.eq("companyname",tagid.getRecords().get(i).getTankname());
                    TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany!=null){
                        tagid.getRecords().get(i).setCompanyname(tbCompany.getCompanyname());
                    }
//                tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                return tagid;
            }  else {
                return null;
            }
        }
    }

    @Override
    public TbTank delTbTank(Integer id) {
        QueryWrapper queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("id",id);
        baseMapper.delete(queryWrapper);
        return baseMapper.selectOne(queryWrapper);
    }

}

 src/main/resources/application.yml

@@ -48,7 +48,7 @@

  datasource:
    driver-class-name: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://192.168.31.98:3306/hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
    url: jdbc:mysql://192.168.5.56:3306/hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
#    url: jdbc:mysql:///hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
    username: root
#    password: hxzk20151102