代码优化

fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/DeviceInstructDto.java

@@ -11,6 +11,6 @@ public class DeviceInstructDto {
     /**
      *  下发指令
      */
-    private Object instructValue;
+    private String instructValue;
 
 }

fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java

@@ -13,7 +13,6 @@ import com.fuyuanshen.app.domain.dto.APPReNameDTO;
 import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
 import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
 import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
-import com.fuyuanshen.app.domain.vo.AppDeviceBindRecordVo;
 import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
 import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
 import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper;
@@ -38,12 +37,9 @@ import com.fuyuanshen.equipment.enums.BindingStatusEnum;
 import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
-
-import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.*;
-import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
-
 import com.fuyuanshen.equipment.utils.c.ReliableTextToBitmap;
 import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import com.fuyuanshen.global.mqtt.constants.MqttConstants;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -53,6 +49,11 @@ import org.springframework.web.multipart.MultipartFile;
 import java.time.Duration;
 import java.util.*;
 
+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;
+
 
 @Slf4j
 @Service
@@ -117,6 +118,31 @@ public class AppDeviceBizService {
             bo.setBindingUserId(userId);
         }
         Page<AppDeviceVo> result = deviceMapper.queryAppBindDeviceList(pageQuery.build(), bo);
+        List<AppDeviceVo> records = result.getRecords();
+        if(records != null && !records.isEmpty()){
+            records.forEach(item -> {
+                if(item.getCommunicationMode()!=null && item.getCommunicationMode() == 0){
+
+                    //设备在线状态
+                    String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX + item.getDeviceImei());
+                    if(StringUtils.isNotBlank(onlineStatus)){
+
+                        item.setOnlineStatus(1);
+                    }else{
+                        item.setOnlineStatus(0);
+                    }
+                    String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX + item.getDeviceImei());
+                    // 获取电量
+                    if(StringUtils.isNotBlank(deviceStatus)){
+                        JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+                        item.setBattery(jsonObject.getString("batteryPercentage"));
+                    }else{
+                        item.setBattery("0");
+                    }
+
+                }
+            });
+        }
         return TableDataInfo.build(result);
     }
 
@@ -275,44 +301,28 @@ public class AppDeviceBizService {
             AppPersonnelInfoVo personnelInfoVo = MapstructUtils.convert(appPersonnelInfo, AppPersonnelInfoVo.class);
             vo.setPersonnelInfo(personnelInfoVo);
         }
+        //设备在线状态
+        String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX + device.getDeviceImei());
+        if(StringUtils.isNotBlank(onlineStatus)){
+            vo.setOnlineStatus(1);
+        }else{
+            vo.setOnlineStatus(0);
+        }
+        String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX + device.getDeviceImei());
+        // 获取电量
+        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");
+        }
         return vo;
     }
 
-    public static void main(String[] args) {
-        byte[] unitName = generateFixedBitmapData("富源晟科技", 120);
-        byte[] position = generateFixedBitmapData("研发", 120);
-        byte[] name = generateFixedBitmapData("张三", 120);
-        byte[] id = generateFixedBitmapData("123456", 120);
-//        int[] intUnitNames = Bitmap80x12Generator.convertHexToDecimal(unitName);
-//        int[] intPosition = Bitmap80x12Generator.convertHexToDecimal(position);
-//        int[] intNames = Bitmap80x12Generator.convertHexToDecimal(position);
-//        int[] intIds = Bitmap80x12Generator.convertHexToDecimal(position);
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("instruct", 2);
-//        System.out.println(JSON.toJSONString( map));
-//        StringBuilder sb = new StringBuilder();
-//        sb.append("[")
-//        buildStr(unitName, sb);
-//        System.out.println(sb.toString());
-//        Object[] arr = new Object[]{2, Bitmap80x12Generator , Arrays.toString(name), Arrays.toString(id)};
-
-//        System.out.println(Arrays.deepToString(arr));
-//        int[] a = new int[]{6,6,6,6,6,6};
-        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);
-        System.out.println(JSON.toJSONString(map));
-    }
-
 
     public boolean registerPersonInfo(AppPersonnelInfoBo bo) {
         Long deviceId = bo.getDeviceId();
@@ -373,9 +383,9 @@ public class AppDeviceBizService {
             System.out.println("原始数据大小: " + largeData.length + " 字节");
 
             int[] ints = convertHexToDecimal(largeData);
-            RedisUtils.setCacheObject("app_logo_data:" + device.getDeviceImei(), Arrays.toString(ints), Duration.ofSeconds(30 * 60L));
+            RedisUtils.setCacheObject(GLOBAL_REDIS_KEY+"app_logo_data:" + device.getDeviceImei(), Arrays.toString(ints), Duration.ofSeconds(30 * 60L));
 
-            String data = RedisUtils.getCacheObject("app_logo_data:" + device.getDeviceImei());
+            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+"app_logo_data:" + device.getDeviceImei());
 
             byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
             byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, 0, 512);
@@ -410,7 +420,7 @@ public class AppDeviceBizService {
             if(device == null){
                 throw new ServiceException("设备不存在");
             }
-            Integer instructValue = (Integer) params.getInstructValue();
+            Integer instructValue =  Integer.parseInt(params.getInstructValue());
             ArrayList<Integer> intData = new ArrayList<>();
             intData.add(1);
             intData.add(instructValue);
@@ -434,7 +444,7 @@ public class AppDeviceBizService {
             if(device == null){
                 throw new ServiceException("设备不存在");
             }
-            String instructValue = (String)params.getInstructValue();
+            String instructValue = params.getInstructValue();
             ArrayList<Integer> intData = new ArrayList<>();
             intData.add(5);
             String[] values = instructValue.split("\\.");
@@ -466,7 +476,7 @@ public class AppDeviceBizService {
             if(device == null){
                 throw new ServiceException("设备不存在");
             }
-            Integer instructValue = (Integer) params.getInstructValue();
+            Integer instructValue = Integer.parseInt(params.getInstructValue());
             ArrayList<Integer> intData = new ArrayList<>();
             intData.add(4);
             intData.add(instructValue);

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/DeviceRedisKeyConstants.java

@@ -0,0 +1,12 @@
+package com.fuyuanshen.global.mqtt.constants;
+
+public class DeviceRedisKeyConstants {
+    // 将设备上报状态
+    public static final String DEVICE_STATUS_KEY_PREFIX = "device:status:";
+    // 在线状态
+    public static final String DEVICE_ONLINE_STATUS_KEY_PREFIX = "device:onlineStatus:";
+    // 将设备状态信息存储到Redis中
+    public static final String DEVICE_LOCATION_KEY_PREFIX = "device:location:";
+    // 存储到一个列表中，保留历史位置信息
+    public static final String DEVICE_LOCATION_HISTORY_KEY_PREFIX = "device:location:history:";
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/ActiveReportingDeviceDataRule.java

@@ -1,10 +1,12 @@
 package com.fuyuanshen.global.mqtt.rule;
 
+import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.json.utils.JsonUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
 import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
 import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
 import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -78,11 +80,14 @@ public class ActiveReportingDeviceDataRule implements MqttMessageRule {
                 deviceInfo.put("timestamp", System.currentTimeMillis());
 
                 // 将设备状态信息存储到Redis中
-                String deviceRedisKey = "device:status:" + deviceImei;
+                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX + deviceImei;
                 String deviceInfoJson = JsonUtils.toJsonString(deviceInfo);
 
                 // 存储到Redis，设置过期时间（例如24小时）
-                RedisUtils.setCacheObject(deviceRedisKey, deviceInfoJson, Duration.ofSeconds(24 * 60 * 60));
+                RedisUtils.setCacheObject(deviceRedisKey, deviceInfoJson);
+                //在线状态
+                String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX + deviceImei;
+                RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1");
 
                 log.info("设备状态信息已异步发送到Redis: device={}, mainLightMode={}, laserLightMode={}, batteryPercentage={}",
                         deviceImei, mainLightMode, laserLightMode, batteryPercentage);

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/DeviceBootLogoRule.java

@@ -1,5 +1,6 @@
 package com.fuyuanshen.global.mqtt.rule;
 
+import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
 import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.json.utils.JsonUtils;
@@ -26,13 +27,13 @@ import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHex
 @Component
 @RequiredArgsConstructor
 @Slf4j
-public class PersonnelInfoRule implements MqttMessageRule {
+public class DeviceBootLogoRule implements MqttMessageRule {
     
     private final MqttGateway mqttGateway;
 
     @Override
     public String getCommandType() {
-        return LightingCommandTypeConstants.PERSONNEL_INFO;
+        return LightingCommandTypeConstants.BOOT_LOGO;
     }
 
     @Override
@@ -43,7 +44,7 @@ public class PersonnelInfoRule implements MqttMessageRule {
                 return;
             }
 
-            String data = RedisUtils.getCacheObject("894078:app_logo_data:" + context.getDeviceImei());
+            String data = RedisUtils.getCacheObject(GlobalConstants.GLOBAL_REDIS_KEY+"app_logo_data:" + context.getDeviceImei());
             if (StringUtils.isEmpty(data)) {
                 return;
             }

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java

@@ -1,5 +1,6 @@
 package com.fuyuanshen.global.mqtt.rule;
 
+import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.json.utils.JsonUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
@@ -8,6 +9,7 @@ import com.fuyuanshen.equipment.utils.map.LngLonUtil;
 import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
 import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
 import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
 import com.fuyuanshen.global.mqtt.constants.MqttConstants;
 import lombok.RequiredArgsConstructor;
@@ -118,12 +120,16 @@ public class LocationDataRule implements MqttMessageRule {
 
 
                 // 将位置信息存储到Redis中
-                String redisKey = "device:location:" + deviceImei;
+                String redisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX + deviceImei;
                 String locationJson = JsonUtils.toJsonString(locationInfo);
 
                 // 存储到Redis
-                RedisUtils.setCacheObject(redisKey, locationJson, Duration.ofSeconds(24 * 60 * 60));
+                RedisUtils.setCacheObject(redisKey, locationJson);
 
+                // 存储到一个列表中，保留历史位置信息
+                String locationHistoryKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_LOCATION_HISTORY_KEY_PREFIX + deviceImei;
+                RedisUtils.addCacheList(locationHistoryKey, locationJson);
+                RedisUtils.expire(locationHistoryKey, Duration.ofDays(90));
                 log.info("位置信息已异步发送到Redis: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
             } catch (Exception e) {
                 log.error("异步发送位置信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
@@ -138,9 +144,11 @@ public class LocationDataRule implements MqttMessageRule {
         ArrayList<Integer> intData = new ArrayList<>();
         intData.add(11);
         intData.add(Integer.parseInt(latArr[0]));
-        intData.add(Integer.parseInt(latArr[1]));
+        String str1 = latArr[1];
+        intData.add(Integer.parseInt(str1.substring(0,4)));
+        String str2 = lonArr[1];
         intData.add(Integer.parseInt(lonArr[0]));
-        intData.add(Integer.parseInt(lonArr[1]));
+        intData.add(Integer.parseInt(str2.substring(0,4)));
         
         Map<String, Object> map = new HashMap<>();
         map.put("instruct", intData);

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceDetailVo.java

@@ -16,11 +16,6 @@ public class AppDeviceDetailVo {
     @ExcelProperty(value = "设备ID")
     private Long deviceId;
 
-    /**
-     * 手机号
-     */
-    @ExcelProperty(value = "手机号")
-    private String phonenumber;
 
     /**
      * 设备名称
@@ -74,4 +69,25 @@ public class AppDeviceDetailVo {
      * 发送信息
      */
     private String sendMsg;
+
+    //"{\"deviceImei\":\"AA\",\"mainLightMode\":\"1\",\"laserLightMode\":\"0\",\"batteryPercentage\":\"60\",\"chargeState\":\"1\",\"batteryRemainingTime\":\"200\",\"timestamp\":1753871635241}"
+    //设备主灯档位
+    private String mainLightMode;
+
+    //激光灯档位
+    private String laserLightMode;
+
+    //电量百分比
+    private String batteryPercentage;
+
+    //充电状态（0没有充电，1正在充电，2为已充满）
+    private String chargeState;
+
+    //电池剩余续航时间200分钟
+    private String batteryRemainingTime;
+
+    /**
+     * 在线状态(0离线，1在线)
+     */
+    private Integer onlineStatus;
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java

@@ -57,4 +57,13 @@ public class AppDeviceVo implements Serializable {
      */
     private Date bindingTime;
 
+    /**
+     * 在线状态(0离线，1在线)
+     */
+    private Integer onlineStatus;
+
+    /**
+     * 电量 百分比
+     */
+    private String battery;
 }