工步调度业务完善

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

@@ -494,4 +494,81 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 工位程序交互时的业务类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STATION_BUSI_TYPE{
+        MESSAGE("message","返回信息"),
+        STEP_LIST("stepList","工步列表"),
+        STEP_CONTENT("stepContent","工步内容"),
+        MODULE_CONTENT("moduleContent","组件内容"),
+        TASK_COMPLETE("taskComplete","整个扫描完成");
+
+        private String value;
+        private String description;
+
+        STATION_BUSI_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (val.equals(values()[i].value) ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 工位程序交互时的数据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STATION_DATA_TYPE{
+        TABLE("table","表格"),
+        TEXT("text","正常文本"),
+        EXP_TEXT("exp_text","异常文本"),
+        IMAGE("image","图片"),
+        BUTTON("button","按钮");
+
+        private String value;
+        private String description;
+
+        STATION_DATA_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (val.equals(values()[i].value) ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class AttrBean implements Serializable {
+
+    @ApiParam("属性名称")
+    private String attrName;
+
+    @ApiParam("属性名称别名")
+    private String attrNameAlias;
+
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ButtonBean implements Serializable {
+    @ApiParam(value = "按钮名称")
+    private String buttonName;
+
+    // 执行类方法,sql,或者标记
+    @ApiParam(value = "执行内容")
+    private String methodContent;
+
+    @ApiParam(value = "按钮描述")
+    private String buttonDesc;
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java

@@ -47,7 +47,7 @@ public class StationRequestBean implements Serializable {
     private String userInfo;
 
     /**
-     * heartBit:心跳，scan：扫描
+     * doScan-扫描，doModule-处理组件,initModule-初始化组件
      */
     @ApiParam("业务类型")
     private String busiType;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : 工位结果bean
@@ -15,23 +16,32 @@ import java.util.List;
  * @Modify:
  **/
 @Data
-public class StationResultBean implements Serializable {
+public class StationResultBean<T> implements Serializable {
 
     /**
-     * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepHtml：工步内容
+     * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepContent：工步内容、
+     * moduleContent组件内容,taskComplete整个扫描完成
      */
-    @ApiParam("数据类型")
+    @ApiParam("业务类型")
-    private String flagType;
+    private String busiType;
 
-    @ApiParam("是否错误信息")
+    /**
-    private boolean error;
+     * 对于相同业务类型的数据，区分不同数据类型。
+     * 比如：包含table-表格，text-正常文本，expText-异常文本，button-按钮，
+     *       image-图片
+     */
+    @ApiParam("数据类型")
+    private String dataType;
 
     @ApiParam("执行结果信息")
     private String message;
 
-    @ApiParam("工步展示信息")
+    @ApiParam("List结果集")
-    private String stepHtml;
+    private List<T>  ResultList;
+
+    @ApiParam("Map结果集")
+    public Map<String, Object> resultMap;
 
-    @ApiParam("工步清单")
+    @ApiParam("List结果集的属性")
-    private List<MesStep>  stepList;
+    private List<AttrBean> dataAttrList;
 }