v2.0.2，更新时间4.16

fei.wang

2025-04-16 c386374de5ff4a65904124ef839e6862518d27fa

v2.0.2，更新时间4.16

 src/main/java/com/hxzkmonitor/config/SggCodeGenerator.java

@@ -35,7 +35,7 @@

        // 3、数据源配置
        DataSourceConfig dsc = new DataSourceConfig();
        dsc.setUrl("jdbc:mysql://192.168.31.109:3306/hxzksm?serverTimezone=GMT%2B8");
        dsc.setUrl("jdbc:mysql://192.168.5.121:3306/hxzksm?serverTimezone=GMT%2B8");
        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
        dsc.setUsername("root");
        dsc.setPassword("123456");

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

@@ -47,6 +47,11 @@
        return R.ok(tbAlarmrecordService.delAlarmrecord(id));
    }

    @GetMapping("/api/delAlarmrecordAll")
    public R delAlarmrecordAll(TbAlarmrecord tbAlarmrecord) {
        return R.ok(tbAlarmrecordService.delAlarmrecordAll());
    }

    @GetMapping("/api/recordsall")
    public R recordsall(TbAlarmrecord tbAlarmrecord) {
        return R.ok(tbAlarmrecordService.recordsall(tbAlarmrecord));

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

@@ -65,5 +65,19 @@
//                .collect(Collectors.toList());
    }

    @GetMapping("/api/searchfive")
    public R searchfive( ) {

        return R.ok(tbCompanyService.searchfive());
        // æ‰§è¡Œæœç´¢é€»è¾‘，并返回结果
        // 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/TbDuanxinController.java

@@ -52,5 +52,17 @@
        return R.ok(tbDuanxinService.searchDuanxin(page,keyword));
    }


    @GetMapping("/api/getDuanxin")
    public R getDuanxin(String query) {
        return R.ok(tbDuanxinService.getDuanxin(query));
    }

    @GetMapping("/api/getDuanxinfive")
    public R getDuanxinfive() {
        return R.ok(tbDuanxinService.getDuanxinfive());
    }


}


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

@@ -7,10 +7,8 @@
import com.hxzkmonitor.mapper.TbBaidumapMapper;
import com.hxzkmonitor.mapper.TbUserMapper;
import com.hxzkmonitor.pojo.*;
import com.hxzkmonitor.service.TbEquipmentService;
import com.hxzkmonitor.service.TbEvrydayweiyi2024Service;
import com.hxzkmonitor.service.TbSystemOperationLogService;
import com.hxzkmonitor.service.TbSystemService;
import com.hxzkmonitor.service.*;
import com.hxzkmonitor.udp.Udp_Out;
import com.hxzkmonitor.util.DateUtil;
import com.hxzkmonitor.util.R;
import io.swagger.annotations.ApiOperation;
@@ -52,9 +50,12 @@
    @Autowired
    TbUserMapper tbUserMapper;

    @Autowired
    TbGuangboService tbGuangboService;

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

        return R.ok(ipage);
@@ -63,7 +64,7 @@
    //根据当前登录人查设备，然后根据时间查询所查到所有设备当天的数据以list返回给前端

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

@@ -76,7 +77,7 @@
    }

    @PostMapping("/api/addorupEquipment")
    public R addorupEquipment(TbEquipment tbEquipment) throws Exception{
    public R addorupEquipment(TbEquipment tbEquipment) throws Exception {
        if (tbEquipmentService.addorupEquipment(tbEquipment) == -1) {
            return R.failed("当前编号已存在");
        } else {
@@ -107,32 +108,37 @@
    }

    @GetMapping("/api/getEquipment")
    public R getEquipment(Integer type,String username,String phone) {
        return R.ok(tbEquipmentService.getEquipment(type,username,phone));
    public R getEquipment(Integer type, String username, String phone) {
        return R.ok(tbEquipmentService.getEquipment(type, username, phone));
    }

    @GetMapping("/api/getEquipmentmonitor")
    public R getEquipmentmonitor(String username,String phone) {
        return R.ok(tbEquipmentService.getEquipmentmonitor( username, phone));
    public R getEquipmentmonitor(String username, String phone) {
        return R.ok(tbEquipmentService.getEquipmentmonitor(username, phone));
    }

    @GetMapping("/api/getEquipmenttwo")
    public R getEquipmenttwo(String username,String phone) {
        return R.ok(tbEquipmentService.getEquipmenttwo( username, phone));
    public R getEquipmenttwo(String username, String phone) {
        return R.ok(tbEquipmentService.getEquipmenttwo(username, phone));
    }





    @PostMapping("/api/alldevice")
    public R alldevice(String username,String phone) {
    public R alldevice(String username, String phone) {
//        TbUser user = tbUserService.getByUsername(SeachRole.name());
        Map<String, Object> result = new HashMap<>();
        List<TbEquipment> list = new ArrayList<>();
//        TbCompany tbCompany = new TbCompany();
//        if (user.getRole().equals("超级管理员")) {
        list = tbEquipmentService.getalldevice( username, phone);
        list = tbEquipmentService.getalldevice(username, phone);

        Map<String, Object> resultg = new HashMap<>();
        List<TbGuangbo> listg = new ArrayList<>();
//        TbCompany tbCompany = new TbCompany();
//        if (user.getRole().equals("超级管理员")) {
        listg = tbGuangboService.getallguangbo(username, phone);


//        } else {
//            //获取登陆人公司名称，
//            String SeachName = user.getCaname();
@@ -142,15 +148,17 @@
//            Integer comId = tbCompany.getId();
//            list = tbEquipmentService.list(new QueryWrapper<TbEquipment>().eq("companyid",comId));
//        }
        List<TbSystem> list1 = tbSystemService.list( );
        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);
        TbBaidumap tbBaidumap = tbBaidumapMapper.selectOne(queryWrapper);
        result.put("dataList", list);
        result.put("gbList", listg);

        result.put("view", tbBaidumap.getCenter());
        result.put("shijiao", tbBaidumap.getShijiao());
//        result.put("view", tbBaidumap.getCenter());
@@ -159,9 +167,9 @@
    }

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

        return R.ok(tbEquipmentService.search(username,query));
        return R.ok(tbEquipmentService.search(username, query));
        // æ‰§è¡Œæœç´¢é€»è¾‘，并返回结果
        // List<Item> items = searchService.search(query);
        // return items.stream().map(Item::getName).collect(Collectors.toList());
@@ -172,5 +180,53 @@
//                .collect(Collectors.toList());
    }

    @GetMapping("/api/resetinitv")
    public R resetinitv(String tagid, String initv) {

        String xieyi = "$setbegvalue," + tagid + "," + initv + ",END";
        Udp_Out.udp_to_cs(xieyi);
        return R.ok();
    }

    @GetMapping("/api/resetzuobiao")
    public R resetzuobiao(String tagid ) {

        String xieyi = "$setbaselock," + tagid  + ",END";
        Udp_Out.udp_to_cs(xieyi);
        return R.ok();
    }

    @GetMapping("/api/jzsearch")
    public R jzsearch( String query,String type) {

        return R.ok(tbEquipmentService.jzsearch(query,type));
        // æ‰§è¡Œæœç´¢é€»è¾‘，并返回结果
        // 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());
    }

    @GetMapping("/api/jzsearchfive")
    public R jzsearchfive(String type ) {

        return R.ok(tbEquipmentService.jzsearchfive(type));
        // æ‰§è¡Œæœç´¢é€»è¾‘，并返回结果
        // 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

@@ -176,30 +176,8 @@

    @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/TbSystemController.java

@@ -1,28 +1,43 @@
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.TbDuanxinMapper;
import com.hxzkmonitor.pojo.TbDuanxin;
import com.hxzkmonitor.pojo.TbDuanxinlog;
import com.hxzkmonitor.pojo.TbEquipment;
import com.hxzkmonitor.pojo.TbSystem;
import com.hxzkmonitor.service.TbDuanxinlogService;
import com.hxzkmonitor.service.TbSystemService;
import com.hxzkmonitor.util.R;
import com.tencentcloudapi.common.Credential;
import com.tencentcloudapi.common.exception.TencentCloudSDKException;
import com.tencentcloudapi.common.profile.ClientProfile;
import com.tencentcloudapi.common.profile.HttpProfile;
import com.tencentcloudapi.sms.v20210111.SmsClient;
import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest;
import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
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;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.text.SimpleDateFormat;
import java.time.Duration;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;

/**
 * <p>
 *  å‰ç«¯æŽ§åˆ¶å™¨
 * å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author wangfei
@@ -30,17 +45,24 @@
 */
@RestController
@RequestMapping("/")
@Component
public class TbSystemController {

    @Autowired
    com.hxzkmonitor.service.TbSystemService TbSystemService;


    @Autowired
    TbDuanxinMapper tbDuanxinMapper;
    private String SecretId = "AKIDrjZOI4e6KLZu9FAsSRN8eOwSt52lbMBz";
    private String SecretKey = "xnRtHUL3YqdMyOLVSBjKkz1pQoxujS4d";
    @Autowired
    TbDuanxinlogService tbDuanxinlogService;
    Integer st = -1;

    @ApiOperation(value = "分页查询", notes = "分页查询")
    @GetMapping("/api/getSystemPage")
    public R getSystem(Page page) {
        IPage<TbSystem> ipage = TbSystemService.getSystemPage( page);
        IPage<TbSystem> ipage = TbSystemService.getSystemPage(page);

        return R.ok(ipage);
    }
@@ -52,9 +74,91 @@

    @GetMapping("/api/getSystemOne")
    public R getSystemOne() {
        List<TbSystem> list1 = TbSystemService.list();

        List<TbSystem> list1 = TbSystemService.findsystem();
        return R.ok(list1);
    }
    

    public static boolean isDifferenceGreaterThan60Seconds(String timeStr) {
        // å®šä¹‰æ—¥æœŸæ—¶é—´æ ¼å¼
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        // å°†å­—符串时间解析为 LocalDateTime å¯¹è±¡
        LocalDateTime givenTime = LocalDateTime.parse(timeStr, formatter);
        // èŽ·å–当前时间
        LocalDateTime currentTime = LocalDateTime.now();
        // è®¡ç®—两个时间之间的差值
        Duration duration = Duration.between(givenTime, currentTime);
        // åˆ¤æ–­å·®å€¼æ˜¯å¦å¤§äºŽ 60 ç§’
        return duration.getSeconds() > 60;
    }

//    @Scheduled(cron = "0 24 15 * * ?")
@Scheduled(cron = "*/10 * * * * ?")//测试10一次
//    @Scheduled(cron = "0 0/10 8-22 * * ?")//8点到10点每10分钟执行一次
    public void sms() throws Exception {
        System.out.println("短信定时器执行============》》》》》》》》》》》》》》》》");
        //查询数据库中所有的公司数据
        List<TbSystem> list1 = TbSystemService.list();

        System.out.println(list1.get(0).getAlerttime());//当前时间-获取时间大于60
        boolean result = isDifferenceGreaterThan60Seconds(list1.get(0).getAlerttime());
        System.out.println("时间差是否大于 60 ç§’: " + result);
        //获取当前年月日时间
        if (result) {
            if (st == 1){
                try {
                    Credential cred = new Credential(this.SecretId, this.SecretKey);
                    HttpProfile httpProfile = new HttpProfile();
                    httpProfile.setEndpoint("sms.tencentcloudapi.com");
                    ClientProfile clientProfile = new ClientProfile();
                    clientProfile.setHttpProfile(httpProfile);
                    SmsClient client = new SmsClient(cred, "ap-beijing", clientProfile);
                    SendSmsRequest req = new SendSmsRequest();
//                String[] phoneNumberSet1 = new String[]{GsPhone.split("[,，]")[p]};
                    QueryWrapper sms = new QueryWrapper();
                    sms.eq("type", "引擎离线报警");
                    List<TbDuanxin> managerList = tbDuanxinMapper.selectList(sms);
                    for (int s = 0; s < managerList.size(); s++) {
//                        System.out.println(managerList.get(s).getPhone());
//                        phoneNumberSet1[s] = managerList.get(s).getPhone();
                        String[] phoneNumberSet12 = {managerList.get(s).getPhone()};
                        System.out.println(phoneNumberSet12);
                        req.setPhoneNumberSet(phoneNumberSet12);

                        req.setSmsSdkAppId("1400838975");
                        req.setSignName("北京华星北斗智控");
                        req.setTemplateId("2082020");

//                    String[] templateParamSet1 = {String.valueOf(+num11 / 24 / 60 / 60 / 1000)};
                        String[] templateParamSet1 = new String[]{managerList.get(s).getDuanxin()};
                        req.setTemplateParamSet(templateParamSet1);
                        // è¿”回的resp是一个SendSmsResponse的实例，与请求对象对应
                        SendSmsResponse resp = client.SendSms(req);
                        TbDuanxinlog duanxinlog = new TbDuanxinlog();
                        duanxinlog.setName(managerList.get(s).getManager());
                        duanxinlog.setPhone(managerList.get(s).getPhone());

                        duanxinlog.setMsg("告警提示:" + managerList.get(s).getDuanxin() + ",请尽快处理，如已处理请忽略该提示信息，如需退订短信可联系管理员删除");
                        tbDuanxinlogService.addorupDuanxinlog(duanxinlog);
                    }
//                req.setPhoneNumberSet(phoneNumberSet1);
//                req.setSmsSdkAppId("1400838975");
//                req.setSignName("北京华星北斗智控");
//                req.setTemplateId("1908206");
//                String[] templateParamSet1 = new String[]{cardNum, "150MB"};
//                req.setTemplateParamSet(templateParamSet1);
//                SendSmsResponse resp = client.SendSms(req);
//                System.out.println(SendSmsResponse.toJsonString(resp));
                } catch (TencentCloudSDKException var15) {
                    System.out.println(var15.toString());
                }
                st = 0;
            }


        }else{
            st=1;
        }
    }
}


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

@@ -78,6 +78,21 @@
    @TableField("hdav")
    private String hdav;

    @ApiModelProperty(value = "继电器id")
    @TableField("guangboid")
    private String guangboid;

    @ApiModelProperty(value = "告警手机号")
    @TableField("phone")
    private String phone;



    @TableField(exist = false)
    private String company;

    @TableField(exist = false)
    private String guangboname;


}

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

@@ -150,4 +150,15 @@

    @TableField(exist = false)
    private String company;

    @TableField(exist = false)
    private String ed;

    @TableField(exist = false)
    private String nd;

    @TableField(exist = false)
    private String td;


}

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

@@ -18,6 +18,10 @@
    IPage<TbAlarmrecord> searchAlarmrecord(Page page, String keyword ,String username);
    Integer delAlarmrecord(Integer id);

    Integer delAlarmrecordAll();



    Integer addorupAlarmrecord(TbAlarmrecord tbEquipment);

    Integer recordsall(TbAlarmrecord tbAlarmrecord);

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

@@ -26,5 +26,7 @@

    List<TbCompany> search(String query);

    List<TbCompany> searchfive();


}

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

@@ -6,6 +6,8 @@
import com.hxzkmonitor.pojo.TbDuanxin;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
 *  æœåŠ¡ç±»
@@ -23,4 +25,9 @@

    IPage<TbDuanxin> getDuanxinPage(Page page );

    List<String> getDuanxin(String query);

    List<String> getDuanxinfive();

}


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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxzkmonitor.pojo.Tb24jiancedata;
import com.hxzkmonitor.pojo.TbCompany;
import com.hxzkmonitor.pojo.TbEquipment;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hxzkmonitor.pojo.TbTank;
@@ -41,4 +42,8 @@
    TbEquipment getByTagid(String tagid);

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

    List<TbEquipment> jzsearch(String query,String type);

    List<TbEquipment> jzsearchfive(String type);
}

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

@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.hxzkmonitor.pojo.TbSystem;

import java.util.List;

/**
 * <p>
 *  æœåŠ¡ç±»
@@ -17,5 +19,9 @@
public interface TbSystemService extends IService<TbSystem> {
    Integer addorupSystem(TbSystem tbSystem);

    List<TbSystem> findsystem();

    IPage<TbSystem> getSystemPage(Page page );


}

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

@@ -132,6 +132,13 @@
    }

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

    @Override
    public Integer recordsall(TbAlarmrecord tbAlarmrecord) {
        QueryWrapper queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("status", "未处理");

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

@@ -4,12 +4,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxzkmonitor.mapper.TbCompanyMapper;
import com.hxzkmonitor.mapper.TbGuangboMapper;
import com.hxzkmonitor.mapper.TbUserMapper;
import com.hxzkmonitor.pojo.TbAlarmsystem;
import com.hxzkmonitor.pojo.*;
import com.hxzkmonitor.mapper.TbAlarmsystemMapper;
import com.hxzkmonitor.pojo.TbAlarmsystem;
import com.hxzkmonitor.pojo.TbCompany;
import com.hxzkmonitor.pojo.TbUser;
import com.hxzkmonitor.service.TbAlarmsystemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
@@ -34,6 +33,9 @@
public class TbAlarmsystemServiceImpl extends ServiceImpl<TbAlarmsystemMapper, TbAlarmsystem> implements TbAlarmsystemService {
    private final TbCompanyMapper tbCompanyMapper;
    private final TbUserMapper tbUserMapper;

    private final TbGuangboMapper tbGuangboMapper;

    @Override
    public IPage<TbAlarmsystem> searchAlarmsystem(Page page, String keyword,String username) {
        QueryWrapper queryWrapperu = new QueryWrapper<>();
@@ -113,11 +115,20 @@

    @Override
    public Integer addorupAlarmsystem(TbAlarmsystem tbAlarmsystem) {
        if (tbAlarmsystem.getId() != null) {
            return baseMapper.updateById(tbAlarmsystem);
        } else {
            return baseMapper.insert(tbAlarmsystem);

            if (tbAlarmsystem.getId() != null) {
                return baseMapper.updateById(tbAlarmsystem);
            } else {
                QueryWrapper queryWrapper = new QueryWrapper<>();
                queryWrapper.eq("tagid", tbAlarmsystem.getTagid());
                baseMapper.selectList(queryWrapper);
                if ( baseMapper.selectList(queryWrapper).size()>0){
                    return -1;
                }else{
                return baseMapper.insert(tbAlarmsystem);
            }
        }

    }

    @Override
@@ -133,6 +144,14 @@
                queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
                TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());

                QueryWrapper queryWrapper2 = new QueryWrapper<>();
                queryWrapper2.eq("tagid",userPage.getRecords().get(i).getGuangboid());
                TbGuangbo tbGuangbo =  tbGuangboMapper.selectOne(queryWrapper2);
                if (tbGuangbo!=null){
                    userPage.getRecords().get(i).setGuangboname(tbGuangbo.getName());
                }

            }
            return userPage;
        }else{
@@ -144,6 +163,15 @@
                queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
                TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());

                QueryWrapper queryWrapper2 = new QueryWrapper<>();
                queryWrapper2.eq("tagid",userPage.getRecords().get(i).getGuangboid());
                TbGuangbo tbGuangbo =  tbGuangboMapper.selectOne(queryWrapper2);
                if (tbGuangbo!=null){
                    userPage.getRecords().get(i).setGuangboname(tbGuangbo.getName());
                }

//                guangboname
            }
            return userPage;
        }

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

@@ -93,6 +93,17 @@

        queryWrapper.like("companyname", query);
        queryWrapper.orderByDesc("addtime");
//        queryWrapper.last("LIMIT 5");
        return baseMapper.selectList(queryWrapper);
    }

    @Override
    public List<TbCompany> searchfive() {
        QueryWrapper queryWrapper = new QueryWrapper<>();

//        queryWrapper.like("companyname", query);
        queryWrapper.orderByDesc("addtime");
        queryWrapper.last("LIMIT 5");
        return baseMapper.selectList(queryWrapper);
    }


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

@@ -6,11 +6,13 @@
import com.hxzkmonitor.pojo.TbDuanxin;
import com.hxzkmonitor.pojo.TbDuanxin;
import com.hxzkmonitor.mapper.TbDuanxinMapper;
import com.hxzkmonitor.pojo.TbGuangbo;
import com.hxzkmonitor.service.TbDuanxinService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

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

@@ -73,4 +75,32 @@
        IPage<TbDuanxin> userPage = baseMapper.selectPage(page, queryWrapper);
        return userPage;
    }

    @Override
    public List<String> getDuanxin(String query) {
        QueryWrapper queryWrapper = new QueryWrapper<>();
        queryWrapper.like("phone", query);
        List<TbDuanxin> voicetips = baseMapper.selectList(queryWrapper);
        List<String> strings = new ArrayList<>();
        for (int i = 0; i < voicetips.size(); i++) {
            strings.add(voicetips.get(i).getPhone());
        }

        return strings;
    }

    @Override
    public List<String> getDuanxinfive( ) {
        QueryWrapper queryWrapper = new QueryWrapper<>();
//        queryWrapper.like("phone", query);
        queryWrapper.orderByDesc("addtime");
        queryWrapper.last("LIMIT 5");
        List<TbDuanxin> voicetips = baseMapper.selectList(queryWrapper);
        List<String> strings = new ArrayList<>();
        for (int i = 0; i < voicetips.size(); i++) {
            strings.add(voicetips.get(i).getPhone());
        }

        return strings;
    }
}

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

@@ -8,6 +8,7 @@
import com.hxzkmonitor.service.TbEquipmentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hxzkmonitor.service.TbSystemService;
import com.hxzkmonitor.util.DateUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,7 +18,7 @@

/**
 * <p>
 *  æœåŠ¡å®žçŽ°ç±»
 * æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author wangfei
@@ -35,263 +36,265 @@

    private final TbUserMapper tbUserMapper;

    private final TbEvrydayweiyi2024Mapper tbEvrydayweiyi2024Mapper;

    private final TbAlarmsystemMapper tbAlarmsystemMapper;



    @Autowired
    TbSystemService tbSystemService;

    @Override
    public IPage<TbEquipment> searcheveryday(Page page,String keyword ,String username) {
    public IPage<TbEquipment> searcheveryday(Page page, String keyword, String username) {
        QueryWrapper queryWrapperu = new QueryWrapper<>();
        queryWrapperu.eq("username",username);
        TbUser tbUser=  tbUserMapper.selectOne(queryWrapperu);
        if (Objects.equals(tbUser.getRole(), "超级管理员")){
        queryWrapperu.eq("username", username);
        TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
        if (Objects.equals(tbUser.getRole(), "超级管理员")) {
            QueryWrapper<TbEquipment> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("tagid",keyword);
            queryWrapper.eq("type",1);
            queryWrapper.eq("tagid", keyword);
            queryWrapper.eq("type", 1);
            queryWrapper.orderByDesc("addtime");
            QueryWrapper<TbEquipment> queryWrapper2 = new QueryWrapper<>();
            queryWrapper2.eq("anchorname",keyword);
            queryWrapper2.eq("type",1);
            queryWrapper2.eq("anchorname", keyword);
            queryWrapper2.eq("type", 1);
            queryWrapper.orderByDesc("addtime");
            QueryWrapper<TbEquipment> queryWrapper3 = new QueryWrapper<>();
            queryWrapper3.eq("cid",keyword);
            queryWrapper3.eq("type",1);
            queryWrapper3.eq("cid", keyword);
            queryWrapper3.eq("type", 1);
            queryWrapper.orderByDesc("addtime");
            List<TbEquipment> tagid1= baseMapper.selectList(queryWrapper);
            List<TbEquipment> tagid1 = baseMapper.selectList(queryWrapper);
            List<TbEquipment> anchorname1 = baseMapper.selectList(queryWrapper2);
            List<TbEquipment> cid1= baseMapper.selectList(queryWrapper3);
            if (tagid1.size()>0){
                IPage<TbEquipment> tagid= baseMapper.selectPage(page,queryWrapper);
            List<TbEquipment> cid1 = baseMapper.selectList(queryWrapper3);
            if (tagid1.size() > 0) {
                IPage<TbEquipment> tagid = baseMapper.selectPage(page, queryWrapper);
                for (int i = 0; i < tagid.getRecords().size(); i++) {
                    QueryWrapper queryWrapper1 = new QueryWrapper<>();
                    queryWrapper1.eq("id",tagid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany!=null){
                    queryWrapper1.eq("id", tagid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany != null) {
                        tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                    }
//                tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                return tagid;
            }else if (anchorname1.size()>0){
                IPage<TbEquipment> anchorname = baseMapper.selectPage(page,queryWrapper2);
            } else if (anchorname1.size() > 0) {
                IPage<TbEquipment> anchorname = baseMapper.selectPage(page, queryWrapper2);
                for (int i = 0; i < anchorname.getRecords().size(); i++) {
                    QueryWrapper queryWrapper1 = new QueryWrapper<>();
                    queryWrapper1.eq("id",anchorname.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany!=null){
                    queryWrapper1.eq("id", anchorname.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany != null) {
                        anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                    }
//                anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                return anchorname;

            }else if (cid1.size()>0){
                IPage<TbEquipment> cid= baseMapper.selectPage(page,queryWrapper3);
            } else if (cid1.size() > 0) {
                IPage<TbEquipment> cid = baseMapper.selectPage(page, queryWrapper3);
                for (int i = 0; i < cid.getRecords().size(); i++) {
                    QueryWrapper queryWrapper1 = new QueryWrapper<>();
                    queryWrapper1.eq("id",cid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany!=null){
                    queryWrapper1.eq("id", cid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany != null) {
                        cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                    }
//                cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                return cid;

            }else{
            } else {
                return null;
            }
        }else{
        } else {
            QueryWrapper<TbEquipment> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("tagid",keyword);
            queryWrapper.eq("type",1);
            queryWrapper.eq("companyid",tbUser.getCsname());
            queryWrapper.eq("tagid", keyword);
            queryWrapper.eq("type", 1);
            queryWrapper.eq("companyid", tbUser.getCsname());
            queryWrapper.orderByDesc("addtime");
            QueryWrapper<TbEquipment> queryWrapper2 = new QueryWrapper<>();
            queryWrapper2.eq("anchorname",keyword);
            queryWrapper2.eq("type",1);
            queryWrapper.eq("companyid",tbUser.getCsname());
            queryWrapper2.eq("anchorname", keyword);
            queryWrapper2.eq("type", 1);
            queryWrapper.eq("companyid", tbUser.getCsname());
            queryWrapper.orderByDesc("addtime");
            QueryWrapper<TbEquipment> queryWrapper3 = new QueryWrapper<>();
            queryWrapper3.eq("cid",keyword);
            queryWrapper3.eq("type",1);
            queryWrapper.eq("companyid",tbUser.getCsname());
            queryWrapper3.eq("cid", keyword);
            queryWrapper3.eq("type", 1);
            queryWrapper.eq("companyid", tbUser.getCsname());
            queryWrapper.orderByDesc("addtime");
            List<TbEquipment> tagid1= baseMapper.selectList(queryWrapper);
            List<TbEquipment> tagid1 = baseMapper.selectList(queryWrapper);
            List<TbEquipment> anchorname1 = baseMapper.selectList(queryWrapper2);
            List<TbEquipment> cid1= baseMapper.selectList(queryWrapper3);
            if (tagid1.size()>0){
                IPage<TbEquipment> tagid= baseMapper.selectPage(page,queryWrapper);
            List<TbEquipment> cid1 = baseMapper.selectList(queryWrapper3);
            if (tagid1.size() > 0) {
                IPage<TbEquipment> tagid = baseMapper.selectPage(page, queryWrapper);
                for (int i = 0; i < tagid.getRecords().size(); i++) {
                    QueryWrapper queryWrapper1 = new QueryWrapper<>();
                    queryWrapper1.eq("id",tagid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany!=null){
                    queryWrapper1.eq("id", tagid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany != null) {
                        tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                    }
//                tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                return tagid;
            }else if (anchorname1.size()>0){
                IPage<TbEquipment> anchorname = baseMapper.selectPage(page,queryWrapper2);
            } else if (anchorname1.size() > 0) {
                IPage<TbEquipment> anchorname = baseMapper.selectPage(page, queryWrapper2);
                for (int i = 0; i < anchorname.getRecords().size(); i++) {
                    QueryWrapper queryWrapper1 = new QueryWrapper<>();
                    queryWrapper1.eq("id",anchorname.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany!=null){
                    queryWrapper1.eq("id", anchorname.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany != null) {
                        anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                    }
//                anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                return anchorname;

            }else if (cid1.size()>0){
                IPage<TbEquipment> cid= baseMapper.selectPage(page,queryWrapper3);
            } else if (cid1.size() > 0) {
                IPage<TbEquipment> cid = baseMapper.selectPage(page, queryWrapper3);
                for (int i = 0; i < cid.getRecords().size(); i++) {
                    QueryWrapper queryWrapper1 = new QueryWrapper<>();
                    queryWrapper1.eq("id",cid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany!=null){
                    queryWrapper1.eq("id", cid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany != null) {
                        cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                    }
//                cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                return cid;

            }else{
            } else {
                return null;
            }
        }




    }

    @Override
    public IPage<TbEquipment> searchEquipment(Page page,String keyword,String type,String username) {
    public IPage<TbEquipment> searchEquipment(Page page, String keyword, String type, String username) {
        QueryWrapper queryWrapperu = new QueryWrapper<>();
        queryWrapperu.eq("username",username);
        TbUser tbUser=  tbUserMapper.selectOne(queryWrapperu);
        if (Objects.equals(tbUser.getRole(), "超级管理员")){
        queryWrapperu.eq("username", username);
        TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
        if (Objects.equals(tbUser.getRole(), "超级管理员")) {
            QueryWrapper<TbEquipment> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("tagid",keyword);
            queryWrapper.eq("type",type);
            queryWrapper.eq("tagid", keyword);
            queryWrapper.eq("type", type);
            queryWrapper.orderByDesc("addtime");
            QueryWrapper<TbEquipment> queryWrapper2 = new QueryWrapper<>();
            queryWrapper2.eq("anchorname",keyword);
            queryWrapper2.eq("type",type);
            queryWrapper2.eq("anchorname", keyword);
            queryWrapper2.eq("type", type);
            queryWrapper.orderByDesc("addtime");
            QueryWrapper<TbEquipment> queryWrapper3 = new QueryWrapper<>();
            queryWrapper3.eq("cid",keyword);
            queryWrapper3.eq("type",type);
            queryWrapper3.eq("cid", keyword);
            queryWrapper3.eq("type", type);
            queryWrapper.orderByDesc("addtime");
            List<TbEquipment> tagid1= baseMapper.selectList(queryWrapper);
            List<TbEquipment> tagid1 = baseMapper.selectList(queryWrapper);
            List<TbEquipment> anchorname1 = baseMapper.selectList(queryWrapper2);
            List<TbEquipment> cid1= baseMapper.selectList(queryWrapper3);
            if (tagid1.size()>0){
                IPage<TbEquipment> tagid= baseMapper.selectPage(page,queryWrapper);
            List<TbEquipment> cid1 = baseMapper.selectList(queryWrapper3);
            if (tagid1.size() > 0) {
                IPage<TbEquipment> tagid = baseMapper.selectPage(page, queryWrapper);
                for (int i = 0; i < tagid.getRecords().size(); i++) {
                    QueryWrapper queryWrapper1 = new QueryWrapper<>();
                    queryWrapper1.eq("id",tagid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany!=null){
                    queryWrapper1.eq("id", tagid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany != null) {
                        tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                    }
//                tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                return tagid;
            }else if (anchorname1.size()>0){
                IPage<TbEquipment> anchorname = baseMapper.selectPage(page,queryWrapper2);
            } else if (anchorname1.size() > 0) {
                IPage<TbEquipment> anchorname = baseMapper.selectPage(page, queryWrapper2);
                for (int i = 0; i < anchorname.getRecords().size(); i++) {
                    QueryWrapper queryWrapper1 = new QueryWrapper<>();
                    queryWrapper1.eq("id",anchorname.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany!=null){
                    queryWrapper1.eq("id", anchorname.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany != null) {
                        anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                    }
//                anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                return anchorname;

            }else if (cid1.size()>0){
                IPage<TbEquipment> cid= baseMapper.selectPage(page,queryWrapper3);
            } else if (cid1.size() > 0) {
                IPage<TbEquipment> cid = baseMapper.selectPage(page, queryWrapper3);
                for (int i = 0; i < cid.getRecords().size(); i++) {
                    QueryWrapper queryWrapper1 = new QueryWrapper<>();
                    queryWrapper1.eq("id",cid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany!=null){
                    queryWrapper1.eq("id", cid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany != null) {
                        cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                    }
//                cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                return cid;

            }else{
            } else {
                return null;
            }
        }else{
        } else {
            QueryWrapper<TbEquipment> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("tagid",keyword);
            queryWrapper.eq("type",type);
            queryWrapper.eq("companyid",tbUser.getCsname());
            queryWrapper.eq("tagid", keyword);
            queryWrapper.eq("type", type);
            queryWrapper.eq("companyid", tbUser.getCsname());
            queryWrapper.orderByDesc("addtime");
            QueryWrapper<TbEquipment> queryWrapper2 = new QueryWrapper<>();
            queryWrapper2.eq("anchorname",keyword);
            queryWrapper2.eq("type",type);
            queryWrapper.eq("companyid",tbUser.getCsname());
            queryWrapper2.eq("anchorname", keyword);
            queryWrapper2.eq("type", type);
            queryWrapper.eq("companyid", tbUser.getCsname());
            queryWrapper.orderByDesc("addtime");
            QueryWrapper<TbEquipment> queryWrapper3 = new QueryWrapper<>();
            queryWrapper3.eq("cid",keyword);
            queryWrapper3.eq("type",type);
            queryWrapper.eq("companyid",tbUser.getCsname());
            queryWrapper3.eq("cid", keyword);
            queryWrapper3.eq("type", type);
            queryWrapper.eq("companyid", tbUser.getCsname());
            queryWrapper.orderByDesc("addtime");
            List<TbEquipment> tagid1= baseMapper.selectList(queryWrapper);
            List<TbEquipment> tagid1 = baseMapper.selectList(queryWrapper);
            List<TbEquipment> anchorname1 = baseMapper.selectList(queryWrapper2);
            List<TbEquipment> cid1= baseMapper.selectList(queryWrapper3);
            if (tagid1.size()>0){
                IPage<TbEquipment> tagid= baseMapper.selectPage(page,queryWrapper);
            List<TbEquipment> cid1 = baseMapper.selectList(queryWrapper3);
            if (tagid1.size() > 0) {
                IPage<TbEquipment> tagid = baseMapper.selectPage(page, queryWrapper);
                for (int i = 0; i < tagid.getRecords().size(); i++) {
                    QueryWrapper queryWrapper1 = new QueryWrapper<>();
                    queryWrapper1.eq("id",tagid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany!=null){
                    queryWrapper1.eq("id", tagid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany != null) {
                        tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                    }
//                tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                return tagid;
            }else if (anchorname1.size()>0){
                IPage<TbEquipment> anchorname = baseMapper.selectPage(page,queryWrapper2);
            } else if (anchorname1.size() > 0) {
                IPage<TbEquipment> anchorname = baseMapper.selectPage(page, queryWrapper2);
                for (int i = 0; i < anchorname.getRecords().size(); i++) {
                    QueryWrapper queryWrapper1 = new QueryWrapper<>();
                    queryWrapper1.eq("id",anchorname.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany!=null){
                    queryWrapper1.eq("id", anchorname.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany != null) {
                        anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                    }
//                anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                return anchorname;

            }else if (cid1.size()>0){
                IPage<TbEquipment> cid= baseMapper.selectPage(page,queryWrapper3);
            } else if (cid1.size() > 0) {
                IPage<TbEquipment> cid = baseMapper.selectPage(page, queryWrapper3);
                for (int i = 0; i < cid.getRecords().size(); i++) {
                    QueryWrapper queryWrapper1 = new QueryWrapper<>();
                    queryWrapper1.eq("id",cid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany!=null){
                    queryWrapper1.eq("id", cid.getRecords().get(i).getCompanyid());
                    TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                    if (tbCompany != null) {
                        cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                    }
//                cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                return cid;

            }else{
            } else {
                return null;
            }
        }




    }
@@ -299,7 +302,7 @@
    @Override
    public TbEquipment delEquipment(Integer id) {
        QueryWrapper queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("id",id);
        queryWrapper.eq("id", id);
        baseMapper.delete(queryWrapper);
        return baseMapper.selectOne(queryWrapper);
    }
@@ -309,16 +312,16 @@
        Date date = new Date();
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        tbEquipment.setAddtime(formatter.format(date));
        if (tbEquipment.getId()!=null){
        if (tbEquipment.getId() != null) {
            return baseMapper.updateById(tbEquipment);
        }else{
        } else {
            QueryWrapper queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("type",tbEquipment.getType());
            queryWrapper.eq("tagid",tbEquipment.getTagid());
            queryWrapper.eq("type", tbEquipment.getType());
            queryWrapper.eq("tagid", tbEquipment.getTagid());
//            baseMapper.selectOne(queryWrapper);
            if (baseMapper.selectList(queryWrapper).size()>0){
            if (baseMapper.selectList(queryWrapper).size() > 0) {
                return -1;
            }else{
            } else {
                return baseMapper.insert(tbEquipment);
            }

@@ -326,37 +329,118 @@
    }

    @Override
    public IPage<TbEquipment> everyday(Page page,String username) {
    public IPage<TbEquipment> everyday(Page page, String username) {
        QueryWrapper queryWrapper2 = new QueryWrapper<>();
        queryWrapper2.eq("username",username);
        TbUser tbUser=  tbUserMapper.selectOne(queryWrapper2);
        if (Objects.equals(tbUser.getRole(), "超级管理员")){
        queryWrapper2.eq("username", username);
        TbUser tbUser = tbUserMapper.selectOne(queryWrapper2);
        if (Objects.equals(tbUser.getRole(), "超级管理员")) {
            QueryWrapper queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("type",1);
            queryWrapper.eq("type", 1);
            queryWrapper.orderByDesc("addtime");
            IPage<TbEquipment> userPage = baseMapper.selectPage(page,queryWrapper);
            IPage<TbEquipment> userPage = baseMapper.selectPage(page, queryWrapper);
            for (int i = 0; i < userPage.getRecords().size(); i++) {
                QueryWrapper queryWrapper1 = new QueryWrapper<>();
                queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
                TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                if (tbCompany!=null){
                queryWrapper1.eq("id", userPage.getRecords().get(i).getCompanyid());
                TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                if (tbCompany != null) {
                    userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
//             userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                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;
                System.out.println(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s));
                if (tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s) != null) {
                    userPage.getRecords().get(i).setEd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getEd());
                    userPage.getRecords().get(i).setNd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getNd());
                    userPage.getRecords().get(i).setTd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getTd());
                } else {
                    userPage.getRecords().get(i).setEd("0");
                    userPage.getRecords().get(i).setNd("0");
                    userPage.getRecords().get(i).setTd("0");
                }

            }

            return userPage;
        } else {
            QueryWrapper queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("type", 1);
            queryWrapper.eq("companyid", tbUser.getCsname());
            queryWrapper.orderByDesc("addtime");
            IPage<TbEquipment> userPage = baseMapper.selectPage(page, queryWrapper);
            for (int i = 0; i < userPage.getRecords().size(); i++) {
                QueryWrapper queryWrapper1 = new QueryWrapper<>();
                queryWrapper1.eq("id", userPage.getRecords().get(i).getCompanyid());
                TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                if (tbCompany != null) {
                    userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
                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;
                System.out.println(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s));
                if (tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s)!=null){
                    userPage.getRecords().get(i).setEd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getEd());
                    userPage.getRecords().get(i).setNd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getNd());
                    userPage.getRecords().get(i).setTd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getTd());
                }

            }
            return userPage;
        }


    }

    @Override
    public IPage<TbEquipment> getEquipmentPage(Page page, String type, 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.eq("type", type);
            queryWrapper.orderByDesc("addtime");
            IPage<TbEquipment> userPage = baseMapper.selectPage(page, queryWrapper);
            for (int i = 0; i < userPage.getRecords().size(); i++) {
                QueryWrapper queryWrapper1 = new QueryWrapper<>();
                queryWrapper1.eq("id", userPage.getRecords().get(i).getCompanyid());
                TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                if (tbCompany != null) {
                    userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
//             userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());

            }
            return userPage;
        }else{
        } else {
            QueryWrapper queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("type",1);
            queryWrapper.eq("companyid",tbUser.getCsname());
            queryWrapper.eq("type", type);
            queryWrapper.eq("companyid", tbUser.getCsname());
            queryWrapper.orderByDesc("addtime");
            IPage<TbEquipment> userPage = baseMapper.selectPage(page,queryWrapper);
            IPage<TbEquipment> userPage = baseMapper.selectPage(page, queryWrapper);
            for (int i = 0; i < userPage.getRecords().size(); i++) {
                QueryWrapper queryWrapper1 = new QueryWrapper<>();
                queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
                TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
                if (tbCompany!=null){
                queryWrapper1.eq("id", userPage.getRecords().get(i).getCompanyid());
                TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
                if (tbCompany != null) {
                    userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
//             userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
@@ -367,86 +451,44 @@

    }

    @Override
    public IPage<TbEquipment> getEquipmentPage(Page page,String type,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.eq("type",type);
           queryWrapper.orderByDesc("addtime");
           IPage<TbEquipment> userPage = baseMapper.selectPage(page,queryWrapper);
           for (int i = 0; i < userPage.getRecords().size(); i++) {
               QueryWrapper queryWrapper1 = new QueryWrapper<>();
               queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
               TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
               if (tbCompany!=null){
                   userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
               }
//             userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());

           }
           return userPage;
       }else{
           QueryWrapper queryWrapper = new QueryWrapper<>();
           queryWrapper.eq("type",type);
           queryWrapper.eq("companyid",tbUser.getCsname());
           queryWrapper.orderByDesc("addtime");
           IPage<TbEquipment> userPage = baseMapper.selectPage(page,queryWrapper);
           for (int i = 0; i < userPage.getRecords().size(); i++) {
               QueryWrapper queryWrapper1 = new QueryWrapper<>();
               queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
               TbCompany tbCompany =  tbCompanyMapper.selectOne(queryWrapper1);
               if (tbCompany!=null){
                   userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
               }
//             userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
           }
           return userPage;
        }


    }


    @Override
    public Map<String,Object> getEquipment(Integer type,String username,String phone) {
    public Map<String, Object> getEquipment(Integer type, String username, String phone) {
        QueryWrapper queryWrapperu = new QueryWrapper<>();
        queryWrapperu.eq("username",username);
        queryWrapperu.eq("adminphone",phone);
        TbUser tbUser=  tbUserMapper.selectOne(queryWrapperu);
        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());
        if (!Objects.equals(tbUser.getRole(), "超级管理员")) {
            queryWrapper.eq("companyid", tbUser.getCsname());
        }

        queryWrapper.eq("type",'1');
        queryWrapper.eq("type", '1');
        queryWrapper.orderByDesc("addtime");
        List<TbEquipment> monitorNum = baseMapper.selectList(queryWrapper);

        QueryWrapper queryWrapper1 = new QueryWrapper<>();
        if (!Objects.equals(tbUser.getRole(), "超级管理员")){
            queryWrapper1.eq("companyid",tbUser.getCsname());
        if (!Objects.equals(tbUser.getRole(), "超级管理员")) {
            queryWrapper1.eq("companyid", tbUser.getCsname());
        }
        queryWrapper1.eq("type",'0');
        queryWrapper1.eq("type", '0');
        queryWrapper1.orderByDesc("addtime");
        List<TbEquipment> standardNum = baseMapper.selectList(queryWrapper1);

        QueryWrapper queryWrapper2 = new QueryWrapper<>();
        if (!Objects.equals(tbUser.getRole(), "超级管理员")){
            queryWrapper2.eq("companyid",tbUser.getCsname());
        if (!Objects.equals(tbUser.getRole(), "超级管理员")) {
            queryWrapper2.eq("companyid", tbUser.getCsname());
        }
        queryWrapper2.eq("onlie",'0');
        queryWrapper2.eq("onlie", '0');
        queryWrapper2.orderByDesc("addtime");
        List<TbEquipment> offlineNum = baseMapper.selectList(queryWrapper2);

        QueryWrapper queryWrapper3 = new QueryWrapper<>();
        if (!Objects.equals(tbUser.getRole(), "超级管理员")){
            queryWrapper3.eq("companyid",tbUser.getCsname());
        if (!Objects.equals(tbUser.getRole(), "超级管理员")) {
            queryWrapper3.eq("companyid", tbUser.getCsname());
        }
        queryWrapper3.eq("status","未处理");
        queryWrapper3.eq("status", "未处理");

        queryWrapper3.orderByDesc("alarmtime");
        List<TbAlarmrecord> alarmNum = tbAlarmrecordMapper.selectList(queryWrapper3);
@@ -455,44 +497,71 @@
        List<TbSystem> messageNum = tbSystemMapper.selectList(queryWrapper4);

        List<TbSystem> list1 = tbSystemService.list();
        Map<String,Object> map = new HashMap<>();
        map.put("monitorNumList",monitorNum);
        map.put("monitorNum",monitorNum.size());
        map.put("standardNumList",standardNum);
        map.put("standardNum",standardNum.size());
        map.put("offlineNumList",offlineNum);
        map.put("offlineNum",offlineNum.size());
        map.put("alarmNumList",alarmNum);
        map.put("alarmNum",alarmNum.size());
        map.put("alerttime",list1.get(0).getAlerttime());
        map.put("messageNum",Integer.parseInt(messageNum.get(0).getDatanum()));
        Map<String, Object> map = new HashMap<>();
        map.put("monitorNumList", monitorNum);
        map.put("monitorNum", monitorNum.size());
        map.put("standardNumList", standardNum);
        map.put("standardNum", standardNum.size());
        map.put("offlineNumList", offlineNum);
        map.put("offlineNum", offlineNum.size());
        map.put("alarmNumList", alarmNum);
        map.put("alarmNum", alarmNum.size());
        map.put("alerttime", list1.get(0).getAlerttime());
        map.put("messageNum", Integer.parseInt(messageNum.get(0).getDatanum()));
        return map;
    }
    @Override
    public List<TbEquipment> getEquipmentmonitor(String username,String phone) {
        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);
        return baseMapper.selectList(queryWrapper);
    }

    @Override
    public List<TbEquipment> getEquipmenttwo(String username,String phone) {
    public List<TbEquipment> getEquipmentmonitor(String username, String phone) {
        QueryWrapper queryWrapperu = new QueryWrapper<>();
        queryWrapperu.eq("username",username);
        queryWrapperu.eq("adminphone",phone);
        TbUser tbUser=  tbUserMapper.selectOne(queryWrapperu);
        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());
        if (!Objects.equals(tbUser.getRole(), "超级管理员")) {
            queryWrapper.eq("companyid", tbUser.getCsname());
        }
        queryWrapper.eq("type",1);
        queryWrapper.eq("type", 1);
        List<TbEquipment> tbEquipments = baseMapper.selectList(queryWrapper);
        for (int i = 0; i < tbEquipments.size(); i++) {
            QueryWrapper queryWrapperas = new QueryWrapper<>();
            queryWrapperas.eq("tagid", tbEquipments.get(i).getTagid());
            tbAlarmsystemMapper.selectOne(queryWrapperas);
            String ed = "N";
            String nd = "N";
            String hd = "N";
            if ( tbAlarmsystemMapper.selectOne(queryWrapperas)!=null && tbAlarmsystemMapper.selectOne(queryWrapperas).getEdsv()!=null){
                ed = tbAlarmsystemMapper.selectOne(queryWrapperas).getEdsv();
            }
            if ( tbAlarmsystemMapper.selectOne(queryWrapperas)!=null && tbAlarmsystemMapper.selectOne(queryWrapperas).getNdsv()!=null){
                nd = tbAlarmsystemMapper.selectOne(queryWrapperas).getNdsv();
            }
            if ( tbAlarmsystemMapper.selectOne(queryWrapperas)!=null && tbAlarmsystemMapper.selectOne(queryWrapperas).getHdsv()!=null){
                hd = tbAlarmsystemMapper.selectOne(queryWrapperas).getHdsv();
            }
//if (tbEquipments.get(i).getEdmm()!=null){
    tbEquipments.get(i).setEdmm(tbEquipments.get(i).getEdmm()+"/"+ed );
    tbEquipments.get(i).setNdmm(tbEquipments.get(i).getNdmm()+"/"+ nd);
    tbEquipments.get(i).setHdmm(tbEquipments.get(i).getHdmm()+"/"+hd );
//}

        }


        return tbEquipments;
    }

    @Override
    public List<TbEquipment> getEquipmenttwo(String username, String phone) {
        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.orderByDesc("jxtime");
        queryWrapper.last("LIMIT 20");
        return baseMapper.selectList(queryWrapper);
@@ -500,14 +569,14 @@


    @Override
    public List<TbEquipment> getalldevice(String username,String phone) {
    public List<TbEquipment> getalldevice(String username, String phone) {
        QueryWrapper queryWrapperu = new QueryWrapper<>();
        queryWrapperu.eq("username",username);
        queryWrapperu.eq("adminphone",phone);
        TbUser tbUser=  tbUserMapper.selectOne(queryWrapperu);
        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());
        if (!Objects.equals(tbUser.getRole(), "超级管理员")) {
            queryWrapper.eq("companyid", tbUser.getCsname());
        }
//        queryWrapper.eq("type",1);
//        queryWrapper.orderByDesc("jxtime");
@@ -518,25 +587,53 @@
    @Override
    public TbEquipment getByTagid(String tagid) {
        QueryWrapper queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("tagid",tagid);
        queryWrapper.eq("tagid", tagid);
        TbEquipment standardNum = baseMapper.selectOne(queryWrapper);
        if (standardNum != null) {
            QueryWrapper queryWrapper1 = new QueryWrapper<>();
            queryWrapper1.eq("id", standardNum.getCompanyid());
            TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
            standardNum.setCompany(tbCompany.getCompanyname());
        }

        return standardNum;
    }

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

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


    @Override
    public List<TbEquipment> jzsearch(String query,String type) {
        QueryWrapper queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("type", type);
        queryWrapper.like("tagid", query);
        queryWrapper.orderByDesc("addtime");
//        queryWrapper.last("LIMIT 5");
        return baseMapper.selectList(queryWrapper);
    }

    @Override
    public List<TbEquipment> jzsearchfive(String type) {
        QueryWrapper queryWrapper = new QueryWrapper<>();

        queryWrapper.eq("type", type);
        queryWrapper.orderByDesc("addtime");
        queryWrapper.last("LIMIT 5");
        return baseMapper.selectList(queryWrapper);
    }
}

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

@@ -373,16 +373,21 @@
            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();
            QueryWrapper queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("tagid", tagid.split(",")[i]);
            TbEquipment tbEquipment = tbEquipmentMapper.selectOne(queryWrapper);

            if (tbEquipment!=null){

                hd[i] = tbEquipment.getHdmm();
                ed[i] = tbEquipment.getEdmm();
                nd[i] =tbEquipment.getNdmm();
//                x[i] = tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getFilename();
            }else{
                hd[i] = "0";
                ed[i] = "0";
                nd[i] ="0";
                x[i] = "0";
//                x[i] = "0";
            }
        }
        result.put("ed", ed);

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxzkmonitor.mapper.TbCompanyMapper;
import com.hxzkmonitor.mapper.TbDuanxinMapper;
import com.hxzkmonitor.mapper.TbUserMapper;
import com.hxzkmonitor.pojo.TbCompany;
import com.hxzkmonitor.pojo.TbSystem;
@@ -14,6 +15,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -31,6 +34,7 @@

    @Autowired
 TbCompanyMapper tbCompanyMapper;

    @Override
    public Integer addorupSystem(TbSystem tbSystem) {
//        QueryWrapper queryWrapper = new QueryWrapper<>();
@@ -62,4 +66,11 @@
        return userPage;
    }

    @Override
    public List<TbSystem> findsystem() {
        QueryWrapper queryWrapper = new QueryWrapper<>();
        return baseMapper.selectList(queryWrapper);
    }


}

 src/main/java/com/hxzkmonitor/udp/Udp_Out.java

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


import com.hxzkmonitor.pojo.TbSystem;
import com.hxzkmonitor.service.TbSystemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.*;
import java.nio.charset.StandardCharsets;
import java.util.List;


/** è¯¥ç±»ç”¨äºŽUDP转发数据到指定端口地址 */
@Component
public class Udp_Out {

    @Autowired
    private TbSystemService systemService;
    public static Udp_Out udpout;

    @PostConstruct  //关键四：通过@PostConstruct注解实现注入
    public void init() {
        udpout = this;
    }
    /**
     * å®žçŽ°UDP转发
     *
     * @param data
     *            éœ€è¦è½¬å‘的数据
     * @param lenth需要转发的数据长度
     * @param type需要转发的数量类型
     * @throws IOException
     */

    /**将数据发送cs端*/
    public static void udp_to_cs(String message) {
        DatagramPacket packet=null;
        DatagramSocket socket =null;
        InetAddress address=null;
        List<TbSystem> system = udpout.systemService.findsystem();
        int port = Integer.parseInt(system.get(0).getUdpport());
        String ip = "127.0.0.1";
        byte[] data = null;
        try {
            data = message.getBytes(StandardCharsets.UTF_8);
        } catch (Exception e1) {
            // TODO è‡ªåŠ¨ç”Ÿæˆçš„ catch å—
            e1.printStackTrace();
        }
        int length=data.length;

        try {
            address=InetAddress.getByName(ip);
        } catch (UnknownHostException e) {
            e.printStackTrace();
        }
        //如果数据类型相同
        try {
            socket = new DatagramSocket();
        } catch (SocketException e) {
            e.printStackTrace();
        }
        packet=new DatagramPacket(data, length, address, port);


        try {
            socket.send(packet);
        } catch (IOException e) {
            e.printStackTrace();
        }
        socket.close();
    }

}

 src/main/java/com/hxzkmonitor/util/MyFile.java

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

import org.apache.commons.io.IOUtils;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;

public class MyFile {
    //添加系统图标
    public static String addImage(MultipartFile fileicon, HttpServletRequest request,String newName) throws IOException {
        ServletContext context = request.getSession().getServletContext();
        String uploadDirectory = context.getRealPath("/Icon");  // èŽ·å–项目中的绝对路径
        if (!fileicon.isEmpty()) {
            String originalFileName = fileicon.getOriginalFilename();
            String fileExtension = getFileExtension(originalFileName);
            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
            Path filePath = Paths.get(uploadDirectory, newFileName);


            Files.write(filePath, fileicon.getBytes());
        }
//        éƒ¨ç½²å‰ï¼Œéœ€è¦æŠŠä¸‹æ–¹ä»£ç è¿›è¡Œæ³¨é‡Š
//        ServletContext context1 = request.getSession().getServletContext();
//        String uploadDirectory1 = "C:\\Users\\Dell\\Desktop\\IDEA项目空间\\NewBs\\src\\main\\webapp\\Icon";  // èŽ·å–项目中的绝对路径
//        if (!fileicon.isEmpty()) {
//            String originalFileName = fileicon.getOriginalFilename();
//            String fileExtension = getFileExtension(originalFileName);
//            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
//            Path filePath = Paths.get(uploadDirectory1, newFileName);
//            Files.write(filePath, fileicon.getBytes());
//        }
        return "success";
    }

    public static String addWeichatImage(MultipartFile fileicon) throws IOException {
//        ServletContext context = request.getSession().getServletContext();
//        String uploadDirectory = context.getRealPath("/Icon");  // èŽ·å–项目中的绝对路径
//        if (!fileicon.isEmpty()) {
//            String originalFileName = fileicon.getOriginalFilename();
//            String fileExtension = getFileExtension(originalFileName);
//            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
//            Path filePath = Paths.get(uploadDirectory, newFileName);
//            Files.write(filePath, fileicon.getBytes());
//        }C:\Users\Administrator\Desktop\wechat\img
//        éƒ¨ç½²å‰ï¼Œéœ€è¦æŠŠä¸‹æ–¹ä»£ç è¿›è¡Œæ³¨é‡Š
//        ServletContext context = request.getSession().getServletContext();
//        String uploadDirectory = context.getRealPath("/img");
//        D:\hxzkboot\hxzkwechat\src\main\resources\static
//        String uploadDirectory = "D:\\hxzkboot\\hxzkwechat\\src\\main\\resources\\static";
        String uploadDirectory = "D:\\hxzkMonitor\\hxzkMonitor-boot\\src\\main\\resources\\static";  // èŽ·å–项目中的绝对路径
        if (!fileicon.isEmpty()) {
            String originalFileName = fileicon.getOriginalFilename();
            String fileExtension = getFileExtension(originalFileName);
            String newFileName =  "11111111111"+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
            Path filePath = Paths.get(uploadDirectory, newFileName);

            byte[] data = imagesFiler.compressUnderSize(fileicon.getBytes(), 600 * 1024);
//            Assert.assertTrue(data.length < 600 * 1024);
            Files.write(filePath, data);
//            FileUtils.writeByteArrayToFile(fileicon.getBytes(), data);
//            Thumbnails.of(uploadDirectory)
//                    .size(200,150)
//                    .keepAspectRatio(false)
//                    .toFile(uploadDirectory);
        }
        return "success";
    }
    private byte[] readInByteArray(File imgFile) {
        try {
            return IOUtils.toByteArray(new FileInputStream(imgFile));

        } catch (IOException e) {
            throw new IllegalStateException("读取待压缩图片过程中出错，请及时联系管理员！", e);

        }
    }


    private static String getFileExtension(String fileName) {
        int dotIndex = fileName.lastIndexOf(".");
        if (dotIndex > 0 && dotIndex < fileName.length() - 1) {
            return fileName.substring(dotIndex);
        }
        return "";
    }

    //添加地图
    public static String addMap(MultipartFile fileicon, HttpServletRequest request,String newName) throws IOException {
        ServletContext context = request.getSession().getServletContext();
        String uploadDirectory = context.getRealPath("/Home/HomePingMian");  // èŽ·å–项目中的绝对路径
        if (!fileicon.isEmpty()) {
            String originalFileName = fileicon.getOriginalFilename();
            String fileExtension = getFileExtension(originalFileName);
            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
            Path filePath = Paths.get(uploadDirectory, newFileName);
            Files.write(filePath, fileicon.getBytes());
        }
        //部署前，需要把下方代码进行注释
//        ServletContext context1 = request.getSession().getServletContext();
//        String uploadDirectory1 = "C:\\Users\\Dell\\Desktop\\IDEA项目空间\\NewBs\\src\\main\\webapp\\Home\\HomePingMian";  // èŽ·å–项目中的绝对路径
//        if (!fileicon.isEmpty()) {
//            String originalFileName = fileicon.getOriginalFilename();
//            String fileExtension = getFileExtension(originalFileName);
//            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
//            Path filePath = Paths.get(uploadDirectory1, newFileName);
//            Files.write(filePath, fileicon.getBytes());
//        }
        return "success";
    }
    //添加人员照片
    public static String addPerson(MultipartFile fileicon, HttpServletRequest request,String newName) throws IOException {
        ServletContext context = request.getSession().getServletContext();
        String uploadDirectory = context.getRealPath("/Icon/人员照片");  // èŽ·å–项目中的绝对路径
        if (!fileicon.isEmpty()) {
            String originalFileName = fileicon.getOriginalFilename();
            String fileExtension = getFileExtension(originalFileName);
            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
            Path filePath = Paths.get(uploadDirectory, newFileName);
            Files.write(filePath, fileicon.getBytes());
        }
//        éƒ¨ç½²å‰ï¼Œéœ€è¦æŠŠä¸‹æ–¹ä»£ç è¿›è¡Œæ³¨é‡Š
//        ServletContext context1 = request.getSession().getServletContext();
//        String uploadDirectory1 = "C:\\Users\\Dell\\Desktop\\IDEA项目空间\\NewBs\\src\\main\\webapp\\Icon\\人员照片";  // èŽ·å–项目中的绝对路径
//        if (!fileicon.isEmpty()) {
//            String originalFileName = fileicon.getOriginalFilename();
//            String fileExtension = getFileExtension(originalFileName);
//            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
//            Path filePath = Paths.get(uploadDirectory1, newFileName);
//            Files.write(filePath, fileicon.getBytes());
//        }
        return "success";
    }


    //添加车辆照片
    public static String addCar(MultipartFile fileicon, HttpServletRequest request,String newName) throws IOException {
        ServletContext context = request.getSession().getServletContext();
        String uploadDirectory = context.getRealPath("/Icon/车辆照片");  // èŽ·å–项目中的绝对路径
        if (!fileicon.isEmpty()) {
            String originalFileName = fileicon.getOriginalFilename();
            String fileExtension = getFileExtension(originalFileName);
            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
            Path filePath = Paths.get(uploadDirectory, newFileName);
            Files.write(filePath, fileicon.getBytes());
        }
//        éƒ¨ç½²å‰ï¼Œéœ€è¦æŠŠä¸‹æ–¹ä»£ç è¿›è¡Œæ³¨é‡Š
//        ServletContext context1 = request.getSession().getServletContext();
//        String uploadDirectory1 = "C:\\Users\\Dell\\Desktop\\IDEA项目空间\\NewBs\\src\\main\\webapp\\Icon\\车辆照片";  // èŽ·å–项目中的绝对路径
//        if (!fileicon.isEmpty()) {
//            String originalFileName = fileicon.getOriginalFilename();
//            String fileExtension = getFileExtension(originalFileName);
//            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
//            Path filePath = Paths.get(uploadDirectory1, newFileName);
//            Files.write(filePath, fileicon.getBytes());
//        }
        return "success";
    }


    //添加物资照片
    public static String addWuZi(MultipartFile fileicon, HttpServletRequest request,String newName) throws IOException {
        ServletContext context = request.getSession().getServletContext();
        String uploadDirectory = context.getRealPath("/Icon/物资照片");  // èŽ·å–项目中的绝对路径
        if (!fileicon.isEmpty()) {
            String originalFileName = fileicon.getOriginalFilename();
            String fileExtension = getFileExtension(originalFileName);
            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
            Path filePath = Paths.get(uploadDirectory, newFileName);
            Files.write(filePath, fileicon.getBytes());
        }
//        éƒ¨ç½²å‰ï¼Œéœ€è¦æŠŠä¸‹æ–¹ä»£ç è¿›è¡Œæ³¨é‡Š
//        ServletContext context1 = request.getSession().getServletContext();
//        String uploadDirectory1 = "C:\\Users\\Dell\\Desktop\\IDEA项目空间\\NewBs\\src\\main\\webapp\\Icon\\物资照片";  // èŽ·å–项目中的绝对路径
//        if (!fileicon.isEmpty()) {
//            String originalFileName = fileicon.getOriginalFilename();
//            String fileExtension = getFileExtension(originalFileName);
//            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
//            Path filePath = Paths.get(uploadDirectory1, newFileName);
//            Files.write(filePath, fileicon.getBytes());
//        }
        return "success";
    }

    //添加主题和地图
    public static String addZhuTiMap(MultipartFile fileicon, HttpServletRequest request,String newName) throws IOException {
        ServletContext context = request.getSession().getServletContext();
        String uploadDirectory = context.getRealPath("/Icon/主题地图/地图");  // èŽ·å–项目中的绝对路径
        if (!fileicon.isEmpty()) {
            String originalFileName = fileicon.getOriginalFilename();
            String fileExtension = getFileExtension(originalFileName);
            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
            Path filePath = Paths.get(uploadDirectory, newFileName);
            Files.write(filePath, fileicon.getBytes());
        }
        //部署前，需要把下方代码进行注释
//        ServletContext context1 = request.getSession().getServletContext();
//        String uploadDirectory1 = "C:\\Users\\Dell\\Desktop\\IDEA项目空间\\NewBs\\src\\main\\webapp\\Icon\\主题地图\\地图";  // èŽ·å–项目中的绝对路径
//        if (!fileicon.isEmpty()) {
//            String originalFileName = fileicon.getOriginalFilename();
//            String fileExtension = getFileExtension(originalFileName);
//            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
//            Path filePath = Paths.get(uploadDirectory1, newFileName);
//            Files.write(filePath, fileicon.getBytes());
//        }
        return "success";
    }

    public static String addZhuTiMap1(MultipartFile fileicon, HttpServletRequest request,String newName) throws IOException {
        ServletContext context = request.getSession().getServletContext();
        String uploadDirectory = context.getRealPath("/Icon/主题地图/主题");  // èŽ·å–项目中的绝对路径
        if (!fileicon.isEmpty()) {
            String originalFileName = fileicon.getOriginalFilename();
            String fileExtension = getFileExtension(originalFileName);
            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
            Path filePath = Paths.get(uploadDirectory, newFileName);
            Files.write(filePath, fileicon.getBytes());
        }
        //部署前，需要把下方代码进行注释
//        ServletContext context1 = request.getSession().getServletContext();
//        String uploadDirectory1 = "C:\\Users\\Dell\\Desktop\\IDEA项目空间\\NewBs\\src\\main\\webapp\\Icon\\主题地图\\主题";  // èŽ·å–项目中的绝对路径
//        if (!fileicon.isEmpty()) {
//            String originalFileName = fileicon.getOriginalFilename();
//            String fileExtension = getFileExtension(originalFileName);
//            String newFileName =  newName+ fileExtension;  // æ–°çš„文件名，将保留原始文件格式
//            Path filePath = Paths.get(uploadDirectory1, newFileName);
//            Files.write(filePath, fileicon.getBytes());
//        }
        return "success";
    }
}

 src/main/java/com/hxzkmonitor/util/imagesFiler.java

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

import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Arrays;

public class imagesFiler {

    /**
     * å°†å›¾ç‰‡åŽ‹ç¼©åˆ°æŒ‡å®šå¤§å°ä»¥å†…
     *
     * @param srcImgData æºå›¾ç‰‡æ•°æ®
     * @param maxSize    ç›®çš„图片大小
     * @return åŽ‹ç¼©åŽçš„图片数据
     */
    public static byte[] compressUnderSize(byte[] srcImgData, long maxSize) {
        double scale = 0.15f;
        byte[] imgData = Arrays.copyOf(srcImgData, srcImgData.length);

        if (imgData.length > maxSize) {
            do {
                try {
                    imgData = compress(imgData, scale);

                } catch (IOException e) {
                    throw new IllegalStateException("压缩图片过程中出错，请及时联系管理员！", e);
                }

            } while (imgData.length > maxSize);
        }

        return imgData;
    }

    /**
     * æŒ‰ç…§ å®½é«˜ æ¯”例压缩
     *
     * @param imgIs å¾…压缩图片输入流
     * @param scale åŽ‹ç¼©åˆ»åº¦
     * @param out   è¾“出
     * @return åŽ‹ç¼©åŽå›¾ç‰‡æ•°æ®
     * @throws IOException åŽ‹ç¼©å›¾ç‰‡è¿‡ç¨‹ä¸­å‡ºé”™
     */
    public static byte[] compress(byte[] srcImgData, double scale) throws IOException {
        BufferedImage bi = ImageIO.read(new ByteArrayInputStream(srcImgData));
        int width = (int) (bi.getWidth() * scale); // æºå›¾å®½åº¦
        int height = (int) (bi.getHeight() * scale); // æºå›¾é«˜åº¦

        Image image = bi.getScaledInstance(width, height, Image.SCALE_SMOOTH);
        BufferedImage tag = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);

        Graphics g = tag.getGraphics();
        g.setColor(Color.RED);
        g.drawImage(image, 0, 0, null); // ç»˜åˆ¶å¤„理后的图
        g.dispose();

        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
        ImageIO.write(tag, "JPEG", bOut);

        return bOut.toByteArray();
    }
}

 src/main/resources/application.yml

@@ -48,11 +48,13 @@

  datasource:
    driver-class-name: com.mysql.cj.jdbc.Driver
    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
#    url: jdbc:mysql://192.168.5.121:3306/hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
#    url: jdbc:mysql://127.0.0.1:3307/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
    password: 123456
    password: hxzk20151102
#    password: 123456
#    password: blueiot
  jackson:
    date-format: yyyy-MM-dd HH:mm:ss