Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java

@@ -25,7 +25,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="ANDON_MANAGE_ATTACH")
-@Api(value="安灯任务附属信息")
+@Api(value="安灯附属表")
 public class AndonQueueAttach extends BaseBean {
 
     @Column(name="PROD_INFO")

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

@@ -11,6 +11,54 @@ import org.apache.commons.lang3.StringUtils;
  * @Modify:
  **/
 public class AndonEnumUtil {
+    /**
+     * 语音播报类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ANDON_VOICE_TYPE{
+        MIC_EN("10","Microsoft Anna - English (United States)"),
+        MIC_LILI("20","Microsoft Lili - Chinese (China)"),
+        AI_MALE("30","Aisound_male"),
+        AI_FEMALE("40","Aisound_female"),
+        MIC_ZIRE_EN("50","Microsoft Zira Desktop - English (United States)"),
+        MIC_HUI_CH("60","Microsoft Huihui Desktop - Chinese (Simplified)");
+
+        private String value;
+        private String description;
+
+        ANDON_VOICE_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 (StringUtils.equalsIgnoreCase(values()[i].value,val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 
     /**
      * 标准处理 = 10，自处理 = 20