From 2b0a7198a5a66b6b4600e87643a50b580bc4232c Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Wed, 9 Jun 2021 09:23:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(impp-framework=20core=20block):=20=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

还原pom
添加界面 icloud
升级mysql 驱动版本
添加松下日志切面
---
 .../i3plus/pojo/base/enumutil/ScreenEnumUtil.java  | 74 +++++++++++-----------
 .../pojo/model/common/ImppCustomizeMessage.java    | 21 ++++++
 .../estsh/i3plus/pojo/screen/bean/ScrAction.java   |  2 -
 .../screen/repository/ScrDataAuthRepository.java   |  1 -
 4 files changed, 58 insertions(+), 40 deletions(-)
 create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppCustomizeMessage.java

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java
index 0b799c4..3db1a34 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java
@@ -105,43 +105,6 @@ public class ScreenEnumUtil {
         }
     }
 
-    public enum ACTION_TYPE {
-        FRONT(10, "FRONT", "前端"),
-        BACKEND(20, "BACKEND", "后端");
-
-        private Integer value;
-        private String code;
-        private String description;
-
-        ACTION_TYPE(Integer value, String code, String description) {
-            this.value = value;
-            this.code = code;
-            this.description = description;
-        }
-
-        public Integer getValue() {
-            return value;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String codeOfDescription(String code) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].code.equals(code)) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
     public enum NULLABLE {
         YES(10, "YES", "允许为空"),
         NO(20, "NO", "不允许为空");
@@ -266,6 +229,43 @@ public class ScreenEnumUtil {
         }
     }
 
+    public enum ACTION_TYPE {
+        FRONT(10, "FRONT", "前端动作"),
+        BACK(20, "BACK", "后端动作");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        ACTION_TYPE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     public enum LAYOUT_TYPE {
         SCREEN(10, "SCREEN", "Screen布局"),
         PANEL(20, "PANEL", "Panel布局");
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppCustomizeMessage.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppCustomizeMessage.java
new file mode 100644
index 0000000..6ca08d6
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppCustomizeMessage.java
@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.model.common;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/6/8 18:33
+ * @desc
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ImppCustomizeMessage implements Serializable {
+    private static final long serialVersionUID = -4090213916925922596L;
+
+    private String uuid;
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java
index 25e3878..b62b2a4 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java
@@ -2,10 +2,8 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataAuthRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataAuthRepository.java
index c70323a..a466bc7 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataAuthRepository.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataAuthRepository.java
@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.screen.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.screen.bean.ScrDataAuth;
-import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject;
 
 /**
  * @Description :