添加告警处理逻辑3

fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceHBYController.java

@@ -1,112 +0,0 @@
-package com.fuyuanshen.app.controller.device;
-
-import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
-import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
-import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
-import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
-import com.fuyuanshen.common.core.domain.R;
-import com.fuyuanshen.common.core.validate.AddGroup;
-import com.fuyuanshen.common.web.core.BaseController;
-import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
-import com.fuyuanshen.web.service.device.DeviceBizService;
-import jakarta.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * HBY210设备控制类
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/app/hby/device")
-public class AppDeviceHBYController extends BaseController {
-
-    private final DeviceBizService appDeviceService;
-
-
-    /**
-     * 获取设备详细信息
-     *
-     * @param id 主键
-     */
-    @GetMapping("/{id}")
-    public R<AppDeviceDetailVo> getInfo(@NotNull(message = "主键不能为空")
-                                             @PathVariable Long id) {
-        return R.ok(appDeviceService.getInfo(id));
-    }
-
-    /**
-     * 人员信息登记
-     */
-    @PostMapping(value = "/registerPersonInfo")
-    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
-        return toAjax(appDeviceService.registerPersonInfo(bo));
-    }
-
-    /**
-     * 发送信息
-     */
-    @PostMapping(value = "/sendMessage")
-    public R<Void> sendMessage(@RequestBody AppDeviceSendMsgBo bo) {
-        return toAjax(appDeviceService.sendMessage(bo));
-    }
-
-    /**
-     * 上传设备logo图片
-     */
-    @PostMapping("/uploadLogo")
-    public R<Void> upload(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
-
-        MultipartFile file = bo.getFile();
-        if(file.getSize()>1024*1024*2){
-            return R.warn("图片不能大于2M");
-        }
-        appDeviceService.uploadDeviceLogo(bo);
-
-        return R.ok();
-    }
-
-    /**
-     * 灯光模式
-     * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）
-     */
-    @PostMapping("/lightModeSettings")
-    public R<Void> lightModeSettings(@RequestBody DeviceInstructDto params) {
-        // params 转 JSONObject
-        appDeviceService.lightModeSettings(params);
-        return R.ok();
-    }
-
-    /**
-     * 灯光亮度设置
-     *
-     */
-    @PostMapping("/lightBrightnessSettings")
-    public R<Void> lightBrightnessSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService.lightBrightnessSettings(params);
-        return R.ok();
-    }
-
-    /**
-     * 激光模式设置
-     *
-     */
-    @PostMapping("/laserModeSettings")
-    public R<Void> laserModeSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService.laserModeSettings(params);
-        return R.ok();
-    }
-
-    /**
-     * 地图逆解析
-     *
-     */
-    @PostMapping("/mapReverseGeocoding")
-    public R<Void> mapReverseGeocoding(@RequestBody DeviceInstructDto params) {
-        String mapJson = appDeviceService.mapReverseGeocoding(params);
-        return R.ok(mapJson);
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java

@@ -1,35 +1,27 @@
 package com.fuyuanshen.web.service.device;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuyuanshen.app.domain.AppDeviceBindRecord;
-import com.fuyuanshen.app.domain.AppPersonnelInfo;
-import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
 import com.fuyuanshen.app.domain.dto.APPReNameDTO;
-import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
 import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
 import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
 import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
-import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
-import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
 import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper;
 import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
 import com.fuyuanshen.app.mapper.equipment.APPDeviceMapper;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.core.exception.ServiceException;
-import com.fuyuanshen.common.core.utils.*;
+import com.fuyuanshen.common.core.utils.ObjectUtils;
+import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
 import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.domain.DeviceType;
 import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
-import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
 import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
 import com.fuyuanshen.equipment.enums.BindingStatusEnum;
@@ -37,27 +29,19 @@ import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
 import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
-import com.fuyuanshen.equipment.service.DeviceService;
 import com.fuyuanshen.global.mqtt.config.MqttGateway;
 import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
-import com.fuyuanshen.global.mqtt.constants.MqttConstants;
 import com.fuyuanshen.web.service.device.status.base.DeviceStatusRule;
 import com.fuyuanshen.web.service.device.status.base.RealTimeStatusEngine;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.time.Duration;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
-import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.buildArr;
-import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.generateFixedBitmapData;
-import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
 import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
 
 
@@ -68,9 +52,6 @@ public class DeviceBizService {
 
     private final APPDeviceMapper appDeviceMapper;
     private final DeviceMapper deviceMapper;
-    private final AppPersonnelInfoMapper appPersonnelInfoMapper;
-    private final DeviceTypeMapper deviceTypeMapper;
-    private final MqttGateway mqttGateway;
     private final AppDeviceBindRecordMapper appDeviceBindRecordMapper;
     private final RealTimeStatusEngine realTimeStatusEngine;
     private final DeviceLogMapper deviceLogMapper;
@@ -91,60 +72,6 @@ public class DeviceBizService {
     }
 
 
-    public int sendMessage(AppDeviceSendMsgBo bo) {
-        List<Long> deviceIds = bo.getDeviceIds();
-        if (deviceIds == null || deviceIds.isEmpty()) {
-            throw new ServiceException("请选择设备");
-        }
-        for (Long deviceId : deviceIds) {
-            Device device = deviceMapper.selectById(deviceId);
-            if (device == null) {
-                throw new ServiceException("设备不存在" + deviceId);
-            }
-
-            try {
-                ClassPathResource resource = new ClassPathResource("image/background.png");
-                InputStream inputStream = resource.getInputStream();
-
-//                String backgroundImagePath = "D:\\background.png"; // 替换为实际背景图片路径
-                byte[] largeData = ImageWithTextGenerate.generate160x80ImageWithText2(bo.getSendMsg(), inputStream, 25600);
-                int[] ints = convertHexToDecimal(largeData);
-                RedisUtils.setCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_SEND_MESSAGE_KEY_PREFIX , Arrays.toString(ints), Duration.ofSeconds(30 * 60L));
-
-                String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_SEND_MESSAGE_KEY_PREFIX);
-
-                byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
-                byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, 0, 512);
-                log.info("发送信息第0块数据大小: {} 字节",specificChunk.length);
-//                log.info("第0块数据: {}", Arrays.toString(specificChunk));
-
-                ArrayList<Integer> intData = new ArrayList<>();
-                intData.add(6);
-                intData.add(1);
-                ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk),intData);
-                intData.add(0);
-                intData.add(0);
-                intData.add(0);
-                intData.add(0);
-                Map<String, Object> map = new HashMap<>();
-                map.put("instruct", intData);
-                mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
-                log.info("发送信息点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
-
-                UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
-                updateWrapper.eq("id", deviceId)
-                        .eq("binding_user_id", AppLoginHelper.getUserId())
-                        .set("send_msg", bo.getSendMsg());
-                deviceMapper.update(updateWrapper);
-            } catch (Exception e) {
-                log.info("发送信息设备发送信息失败:{}" ,deviceId);
-            }
-
-        }
-        return 1;
-    }
-
-
     public TableDataInfo<AppDeviceVo> queryAppDeviceList(DeviceQueryCriteria bo, PageQuery pageQuery) {
         if (bo.getBindingUserId() == null) {
             Long userId = AppLoginHelper.getUserId();
@@ -316,247 +243,6 @@ public class DeviceBizService {
         return 1;
     }
 
-
-    public AppDeviceDetailVo getInfo(Long id) {
-        Device device = deviceMapper.selectById(id);
-        if (device == null) {
-            throw new RuntimeException("请先将设备入库！！！");
-        }
-        AppDeviceDetailVo vo = new AppDeviceDetailVo();
-        vo.setDeviceId(device.getId());
-        vo.setDeviceName(device.getDeviceName());
-        vo.setDevicePic(device.getDevicePic());
-        vo.setDeviceImei(device.getDeviceImei());
-        vo.setDeviceMac(device.getDeviceMac());
-        vo.setDeviceStatus(device.getDeviceStatus());
-        DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
-        if (deviceType != null) {
-            vo.setCommunicationMode(Integer.valueOf(deviceType.getCommunicationMode()));
-            vo.setTypeName(deviceType.getTypeName());
-        }
-        vo.setBluetoothName(device.getBluetoothName());
-
-        vo.setSendMsg(device.getSendMsg());
-
-        QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>()
-                .eq("device_id", device.getId());
-        AppPersonnelInfo appPersonnelInfo = appPersonnelInfoMapper.selectOne(qw);
-        if (appPersonnelInfo != null) {
-            AppPersonnelInfoVo personnelInfoVo = MapstructUtils.convert(appPersonnelInfo, AppPersonnelInfoVo.class);
-            vo.setPersonnelInfo(personnelInfoVo);
-        }
-        //设备在线状态
-        String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
-        if(StringUtils.isNotBlank(onlineStatus)){
-            vo.setOnlineStatus(1);
-        }else{
-            vo.setOnlineStatus(0);
-        }
-        String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
-        // 获取电量
-        if(StringUtils.isNotBlank(deviceStatus)){
-            JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
-            vo.setMainLightMode(jsonObject.getString("mainLightMode"));
-            vo.setLaserLightMode(jsonObject.getString("laserLightMode"));
-            vo.setBatteryPercentage(jsonObject.getString("batteryPercentage"));
-            vo.setChargeState(jsonObject.getString("chargeState"));
-            vo.setBatteryRemainingTime(jsonObject.getString("batteryRemainingTime"));
-        }else{
-            vo.setBatteryPercentage("0");
-        }
-
-        // 获取经度纬度
-        String locationKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_LOCATION_KEY_PREFIX;
-        String locationInfo = RedisUtils.getCacheObject(locationKey);
-        if(StringUtils.isNotBlank(locationInfo)){
-            JSONObject jsonObject = JSONObject.parseObject(locationInfo);
-            vo.setLongitude(jsonObject.get("longitude").toString());
-            vo.setLatitude(jsonObject.get("latitude").toString());
-            vo.setAddress((String)jsonObject.get("address"));
-        }
-
-        return vo;
-    }
-
-
-    public boolean registerPersonInfo(AppPersonnelInfoBo bo) {
-        Long deviceId = bo.getDeviceId();
-        Device deviceObj = deviceMapper.selectById(deviceId);
-        if (deviceObj == null) {
-            throw new RuntimeException("请先将设备入库！！！");
-        }
-        QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>()
-                .eq("device_id", deviceId);
-        List<AppPersonnelInfoVo> appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw);
-//        unitName,position,name,id
-        byte[] unitName = generateFixedBitmapData(bo.getUnitName(), 120);
-        byte[] position = generateFixedBitmapData(bo.getPosition(), 120);
-        byte[] name = generateFixedBitmapData(bo.getName(), 120);
-        byte[] id = generateFixedBitmapData(bo.getCode(), 120);
-        ArrayList<Integer> intData = new ArrayList<>();
-        intData.add(2);
-        buildArr(convertHexToDecimal(unitName), intData);
-        buildArr(convertHexToDecimal(position), intData);
-        buildArr(convertHexToDecimal(name), intData);
-        buildArr(convertHexToDecimal(id), intData);
-        intData.add(0);
-        intData.add(0);
-        intData.add(0);
-        intData.add(0);
-        Map<String, Object> map = new HashMap<>();
-        map.put("instruct", intData);
-        mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei(), 1, JSON.toJSONString(map));
-        log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei(), bo);
-
-        if (ObjectUtils.length(appPersonnelInfoVos) == 0) {
-            AppPersonnelInfo appPersonnelInfo = MapstructUtils.convert(bo, AppPersonnelInfo.class);
-            return appPersonnelInfoMapper.insertOrUpdate(appPersonnelInfo);
-        } else {
-            UpdateWrapper<AppPersonnelInfo> uw = new UpdateWrapper<>();
-            uw.eq("device_id", deviceId)
-                    .set("name", bo.getName())
-                    .set("position", bo.getPosition())
-                    .set("unit_name", bo.getUnitName())
-                    .set("code", bo.getCode());
-            return appPersonnelInfoMapper.update(null, uw) > 0;
-        }
-
-
-    }
-
-    public static void main(String[] args) throws IOException {
-        byte[] largeData = ImageToCArrayConverter.convertImageToCArray("E:\\workspace\\demo.png", 160, 80, 25600);
-        System.out.println("长度：" + largeData.length);
-
-        System.out.println("原始数据大小: " + largeData.length + " 字节");
-
-        int[] ints = convertHexToDecimal(largeData);
-        System.out.println("转换后的数据: " + Arrays.toString(ints));
-    }
-
-    public void uploadDeviceLogo(AppDeviceLogoUploadDto bo) {
-        try {
-            Device device = deviceMapper.selectById(bo.getDeviceId());
-            if (device == null) {
-                throw new ServiceException("设备不存在");
-            }
-            MultipartFile file = bo.getFile();
-
-            byte[] largeData = ImageToCArrayConverter.convertImageToCArray(file.getInputStream(), 160, 80, 25600);
-            log.info("长度：" + largeData.length);
-
-            log.info("原始数据大小: {} 字节", largeData.length);
-
-            int[] ints = convertHexToDecimal(largeData);
-            RedisUtils.setCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_BOOT_LOGO_KEY_PREFIX, Arrays.toString(ints), Duration.ofSeconds(30 * 60L));
-
-            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei()  + DEVICE_BOOT_LOGO_KEY_PREFIX);
-
-            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
-            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, 0, 512);
-            log.info("第0块数据大小: {} 字节", specificChunk.length);
-//            log.info("第0块数据: {}", Arrays.toString(specificChunk));
-
-            ArrayList<Integer> intData = new ArrayList<>();
-            intData.add(3);
-            intData.add(1);
-            ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk),intData);
-            intData.add(0);
-            intData.add(0);
-            intData.add(0);
-            intData.add(0);
-            Map<String, Object> map = new HashMap<>();
-            map.put("instruct", intData);
-            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
-            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
-        } catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 灯光模式
-     * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）
-     */
-    public void lightModeSettings(DeviceInstructDto params) {
-        try {
-            Long deviceId = params.getDeviceId();
-            Device device = deviceMapper.selectById(deviceId);
-            if(device == null){
-                throw new ServiceException("设备不存在");
-            }
-            Integer instructValue =  Integer.parseInt(params.getInstructValue());
-            ArrayList<Integer> intData = new ArrayList<>();
-            intData.add(1);
-            intData.add(instructValue);
-            intData.add(0);
-            intData.add(0);
-            intData.add(0);
-            Map<String, Object> map = new HashMap<>();
-            map.put("instruct", intData);
-            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
-            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
-        } catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    //灯光亮度设置
-    public void lightBrightnessSettings(DeviceInstructDto params) {
-        try {
-            Long deviceId = params.getDeviceId();
-            Device device = deviceMapper.selectById(deviceId);
-            if(device == null){
-                throw new ServiceException("设备不存在");
-            }
-            String instructValue = params.getInstructValue();
-            ArrayList<Integer> intData = new ArrayList<>();
-            intData.add(5);
-            String[] values = instructValue.split("\\.");
-            String value1 = values[0];
-            String value2 = values[1];
-            if(StringUtils.isNoneBlank(value1)){
-                intData.add(Integer.parseInt(value1));
-            }
-            if(StringUtils.isNoneBlank(value2)){
-                intData.add(Integer.parseInt(value2));
-            }
-            intData.add(0);
-            intData.add(0);
-            intData.add(0);
-            Map<String, Object> map = new HashMap<>();
-            map.put("instruct", intData);
-            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
-            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
-        } catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    //激光模式设置
-    public void laserModeSettings(DeviceInstructDto params) {
-        try {
-            Long deviceId =  params.getDeviceId();
-            Device device = deviceMapper.selectById(deviceId);
-            if(device == null){
-                throw new ServiceException("设备不存在");
-            }
-            Integer instructValue = Integer.parseInt(params.getInstructValue());
-            ArrayList<Integer> intData = new ArrayList<>();
-            intData.add(4);
-            intData.add(instructValue);
-            intData.add(0);
-            intData.add(0);
-            intData.add(0);
-            Map<String, Object> map = new HashMap<>();
-            map.put("instruct", intData);
-            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
-            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
-        } catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
     public String mapReverseGeocoding(DeviceInstructDto params) {
 //        Long deviceId = params.getDeviceId();
 //        Device device = deviceMapper.selectById(deviceId);
@@ -569,47 +255,6 @@ public class DeviceBizService {
         return RedisUtils.getCacheObject("device:location:" + devices.get(0).getDeviceImei());
     }
 
-    public int sendAlarmMessage(AppDeviceSendMsgBo bo) {
-        try {
-            List<Long> deviceIds = bo.getDeviceIds();
-            if (deviceIds == null || deviceIds.isEmpty()) {
-                throw new ServiceException("请选择设备");
-            }
-            for (Long deviceId : deviceIds) {
-                Device device = deviceMapper.selectById(deviceId);
-                if (device == null) {
-                    throw new ServiceException("设备不存在" + deviceId);
-                }
-
-                try {
-                    ArrayList<Integer> intData = new ArrayList<>();
-                    intData.add(7);
-                    intData.add(Integer.parseInt(bo.getInstructValue()));
-                    intData.add(0);
-                    intData.add(0);
-                    intData.add(0);
-                    intData.add(0);
-                    Map<String, Object> map = new HashMap<>();
-                    map.put("instruct", intData);
-                    mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
-                    log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
-
-                    UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
-                    updateWrapper.eq("id", deviceId)
-                            .eq("binding_user_id", AppLoginHelper.getUserId())
-                            .set("send_msg", bo.getSendMsg());
-                    deviceMapper.update(updateWrapper);
-                } catch (Exception e) {
-                    log.info("设备发送信息失败:{}" ,deviceId);
-                }
-
-            }
-        } catch (Exception e){
-            e.printStackTrace();
-        }
-        return 1;
-    }
-
     public Map<String, Object> getRealTimeStatus(AppRealTimeStatusDto statusDto) {
         try {
             String commandType = statusDto.getTypeName()+"_" + statusDto.getFunctionMode();