Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test

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

@@ -746,8 +746,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_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"),
-        GET_CONTROL_DATA_CONTROL_CMD(60, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据");
+        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", "亮灯明细");

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

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.model;
 
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -32,6 +34,12 @@ public class WsResultBean<T> implements Serializable {
     @ApiParam("数据类型")
     private String dataType;
 
+    @ApiParam("是否需要获取数据,默认展示")
+    private Integer isInitData = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    @ApiParam("执行结果信息是否需要展示,默认展示")
+    private Integer isShow = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+
     @ApiParam("执行结果信息")
     private String message;