ptl

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java

@@ -417,6 +417,15 @@ public class PtlPcnEnumUtil {
             this.description = description;
         }
 
+        public static TAG_LIGHT_TYPE getByValue(int value) {
+            for (TAG_LIGHT_TYPE tagLightType : values()) {
+                if (tagLightType.getValue() == value) {
+                    return tagLightType;
+                }
+            }
+            return null;
+        }
+
         public int getValue() {
             return value;
         }
@@ -687,7 +696,8 @@ public class PtlPcnEnumUtil {
         LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"),
         LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"),
         CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"),
-        INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回");
+        INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"),
+        REFRESH_CONTROL_CMD(70, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新");
 
         private int value;
         private String code;
@@ -737,7 +747,7 @@ public class PtlPcnEnumUtil {
         REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"),
         SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"),
         INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"),
-        GET_CONTROL_DATA_CONTROL_CMD(50, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据");
+        GET_CONTROL_DATA_CONTROL_CMD(60, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据");
 //        UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"),
 //        LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"),
 //        LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细");

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java

@@ -1,18 +1,41 @@
 package cn.estsh.i3plus.pojo.ptl.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.ToString;
 
 import java.io.Serializable;
 
 /**
- * @author Wynne.Lu
+ * @author wangjie
  * @date 2020/2/15 15:42
  * @desc
  */
 @Data
-@ToString
+@ApiModel("亮灯model")
 public class LightOnModel implements Serializable {
     private static final long serialVersionUID = -1089361557513425229L;
 
+    @ApiParam("标签地址，范围1~250,设置null即为所有标签")
+    private Integer tagNo;
+
+    @ApiParam("内容：字母，数字，字符")
+    private String content;
+
+    @ApiParam("颜色指令:枚举获取，TAG_LIGHT_COLOR_CMD")
+    private String colorCmd;
+
+    @ApiParam("亮灯方式")
+    private Integer lightType;
+
+    @ApiParam("音乐编号指令:枚举获取，FINISH_TAG_LIGHT_MUSIC_CMD")
+    private String musicCmd;
+
+    @ApiParam("音量值指令:枚举获取，FINISH_TAG_LIGHT_VOLUME_CMD")
+    private String volumeCmd;
+
+    @ApiParam("是否蜂鸣")
+    private Integer buzz;
+
 }