diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index a465d80..41e6e7e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -607,7 +607,7 @@ public class PtlPcnEnumUtil { DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"), - INIT_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"); + INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"); // 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", "亮灯明细"); @@ -739,7 +739,7 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PtlControlStatus { + public enum CONTROL_STATUS { CONNECT(10, "CONNECT", "连接"), DISCONNECT(20, "DISCONNECT", "断开"); @@ -747,7 +747,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - PtlControlStatus(int value, String code, String description) { + CONTROL_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -767,7 +767,7 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SectionTaskDetailStatus { + public enum AREA_SECTION_TASK_DETAIL_STATUS { CREATE(10, "CREATE", "创建"), COMPLETE(20, "COMPLETE", "完成"); @@ -775,7 +775,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - SectionTaskDetailStatus(int value, String code, String description) { + AREA_SECTION_TASK_DETAIL_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -901,7 +901,7 @@ public class PtlPcnEnumUtil { * PTL_区段、区域亮灯任务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum AREA_SECTION_TASKL_STATUS { + public enum AREA_SECTION_TASK_STATUS { CREATE(10, "CREATE", "新建"), RECEIPT(20, "RECEIPT", "执行中"), RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"); @@ -910,7 +910,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - AREA_SECTION_TASKL_STATUS(int value, String code, String description) { + AREA_SECTION_TASK_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java new file mode 100644 index 0000000..cd3cec6 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-02-27 5:32 下午 + * @Modify: + **/ +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +@ApiModel("actor消息类型及属性") +public class AreaSectionTaskDetailModel { + + private Long id; + + @ApiParam("ip地址") + private String ip; + + @ApiParam("端口") + private String port; + + @ApiParam("亮灯方式") + private Integer lightMode; + + @ApiParam("亮灯颜色") + private Integer lightColor; + + @ApiParam("标签编号") + private Integer tagNo; + + @ApiParam("是否蜂鸣") + private Integer isBuzzing; + + @ApiParam("音乐类型") + private Integer musicType; + + @ApiParam("显示内容") + private String displayContent; + + @ApiParam("任务状态") + private Integer status; +}