设备

hx-service-api/syringe-production-api/src/main/java/com/fjhx/enums/ProductEnum.java

@@ -13,9 +13,9 @@ import java.util.Map;
 @Getter
 public enum ProductEnum {
     // 经编机
-    JBJ("6350ae233ec34a6d03c89020", "jbj_001", "经编机"),
+    JBJ("6350ae233ec34a6d03c89020", "经编机"),
     // 验布机
-    YBJ("635897db3ec34a6d03c9616a", "ybj_001", "验布机"),
+    YBJ("635897db3ec34a6d03c9616a", "验布机"),
     ;
 
     /**
@@ -23,17 +23,12 @@ public enum ProductEnum {
      */
     private final String productId;
     /**
-     * 设备编号
-     */
-    private final String equipmentNo;
-    /**
      * 设备名称
      */
     private final String productName;
 
-    ProductEnum(String productId, String equipmentNo, String productName) {
+    ProductEnum(String productId, String productName) {
         this.productId = productId;
-        this.equipmentNo = equipmentNo;
         this.productName = productName;
     }
 

hx-service/syringe-production/src/main/java/com/fjhx/listener/IotDataListener.java

@@ -92,7 +92,7 @@ public class IotDataListener {
 
             ProductEnum productEnum = ProductEnum.getEnumByProductId(productId);
             if (productEnum != null) {
-                appointProductHandle(productEnum, message, services);
+                appointProductHandle(header.getDeviceId(), message, services);
             } else {
                 upperComputerHandle(message, services);
             }
@@ -108,14 +108,12 @@ public class IotDataListener {
     /**
      * 指定设备处理方式
      *
-     * @param productEnum 产品枚举
-     * @param message     message
-     * @param services    设备消息列表
+     * @param deviceId 设备id
+     * @param message  message
+     * @param services 设备消息列表
      */
-    private void appointProductHandle(ProductEnum productEnum, Message message, List<MessageBody.Service> services) {
-        // 获取设备编号
-        String equipmentNo = productEnum.getEquipmentNo();
-        String redisKey = RedisConstant.DEVICE_PREFIX + equipmentNo;
+    private void appointProductHandle(String deviceId, Message message, List<MessageBody.Service> services) {
+        String redisKey = RedisConstant.DEVICE_PREFIX + deviceId;
 
         MessageBody.Service oldService = redisCache.get(redisKey);
         MessageBody.Service newService = services.get(0);