From 7767630fbb4e7651ed946e2a901717bde443f507 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 28 Mar 2021 02:16:25 +0800 Subject: [PATCH] tmp --- .../screen/bean/{base => }/BaseScreenBean.java | 3 +- .../i3plus/pojo/screen/bean/ScrComponent.java | 46 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java | 4 +- .../estsh/i3plus/pojo/screen/bean/ScrScreen.java | 4 +- .../ScrComponentEventActionRel.java} | 18 ++++----- .../ScrComponentModelFieldRel.java} | 25 ++++++++---- .../ScrPanelComponentRel.java} | 26 ++++-------- .../ScrScreenPanelRel.java} | 23 +++++------ .../pojo/screen/component/base/BaseComponent.java | 2 +- .../pojo/screen/component/base/BaseContainer.java | 22 ----------- .../pojo/screen/component/base/BaseWidget.java | 2 - .../pojo/screen/model/ScrPanelComponentModel.java | 38 ++++++++++++++++++ .../ScrComponentEventActionRepository.java | 14 ------- .../ScrComponentModelFieldRepository.java | 14 ------- .../screen/repository/ScrComponentRepository.java | 5 ++- .../rel/ScrComponentEventActionRelRepository.java | 14 +++++++ .../rel/ScrComponentModelFieldRelRepository.java | 14 +++++++ .../rel/ScrPanelComponentRelRepository.java | 15 +++++++ .../rel/ScrScreenPanelRelRepository.java | 14 +++++++ 19 files changed, 192 insertions(+), 111 deletions(-) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{base => }/BaseScreenBean.java (78%) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.java rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{ScrComponentEventAction.java => rel/ScrComponentEventActionRel.java} (63%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{ScrComponentModelField.java => rel/ScrComponentModelFieldRel.java} (83%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{ScrPanelComponent.java => rel/ScrPanelComponentRel.java} (59%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{ScrScreenPanel.java => rel/ScrScreenPanelRel.java} (67%) delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseContainer.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentModel.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentEventActionRepository.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentModelFieldRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRelRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRelRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRelRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRelRepository.java diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/base/BaseScreenBean.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/BaseScreenBean.java similarity index 78% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/base/BaseScreenBean.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/BaseScreenBean.java index 97aaffe..1485a11 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/base/BaseScreenBean.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/BaseScreenBean.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.screen.bean.base; +package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import lombok.Data; @@ -12,5 +12,4 @@ import lombok.Data; public abstract class BaseScreenBean extends BaseBean { private static final long serialVersionUID = 3535186340743573771L; - private Integer version; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.java new file mode 100644 index 0000000..b3fbad5 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/22 上午10:43 + * @desc + */ +@Entity +@Table(name = "SCR_COMPONENT") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Api("组件") +public class ScrComponent extends BaseBean implements Serializable { + private static final long serialVersionUID = 3832856363595940018L; + + @Column(name = "COMPONENT_CODE") + @ApiParam(value = "组件代码") + private String componentCode; + + @Column(name = "COMPONENT_TYPE") + @ApiParam(value = "组件代码") + private String componentType; + + @Lob + @Column(name = "COMPONENT_PROPERTY") + @ApiParam(value = "组件描述") + private String componentProperty; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java index 703f62f..527865d 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; -import cn.estsh.i3plus.pojo.screen.component.base.BaseContainer; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -27,7 +27,7 @@ import java.io.Serializable; @AllArgsConstructor @Builder @Api("Panel") -public class ScrPanel extends BaseContainer implements Serializable { +public class ScrPanel extends BaseBean implements Serializable { @Column(name = "PANEL_CODE") @ApiParam("Panel代码") diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java index d231a32..13f8bfe 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; -import cn.estsh.i3plus.pojo.screen.component.base.BaseContainer; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -27,7 +27,7 @@ import java.io.Serializable; @AllArgsConstructor @Builder @Api("页面") -public class ScrScreen extends BaseContainer implements Serializable { +public class ScrScreen extends BaseBean implements Serializable { private static final long serialVersionUID = -6755902986892118213L; @Column(name = "SCREEN_CODE") diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentEventAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentEventActionRel.java similarity index 63% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentEventAction.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentEventActionRel.java index 49d6cda..eab43aa 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentEventAction.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentEventActionRel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.screen.bean; +package cn.estsh.i3plus.pojo.screen.bean.rel; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -19,21 +19,21 @@ import javax.persistence.Table; * @desc */ @Entity -@Table(name = "SCR_COMPONENT_EVENT_ACTION") +@Table(name = "SCR_COMPONENT_EVENT_ACTION_REL") @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor @Builder @Api("组件事件动作") -public class ScrComponentEventAction extends BaseBean { +public class ScrComponentEventActionRel extends BaseBean { private static final long serialVersionUID = 7600064730551351570L; - @Column(name="COMPONENT_ID") - @ApiParam("组件Id") - private Integer componentId; + @Column(name = "COMPONENT_CODE") + @ApiParam("组件代码") + private String componentCode; - @Column(name="EVENT_ACTION_Id") - @ApiParam("事件动作Id") - private String eventActionId; + @Column(name = "EVENT_ACTION_CODE") + @ApiParam("事件动作代码") + private String eventActionCode; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentModelFieldRel.java similarity index 83% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentModelField.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentModelFieldRel.java index 2a7ccdc..fc0521d 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentModelField.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentModelFieldRel.java @@ -1,6 +1,7 @@ -package cn.estsh.i3plus.pojo.screen.bean; +package cn.estsh.i3plus.pojo.screen.bean.rel; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -11,8 +12,11 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; import javax.persistence.Table; import java.io.Serializable; +import java.util.List; /** * @author Wynne.Lu @@ -20,36 +24,40 @@ import java.io.Serializable; * @desc */ @Entity -@Table(name = "SCR_COMPONENT_MODEL_FIELD") +@Table(name = "SCR_COMPONENT_MODEL_FIELD_REL") @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor @Builder @Api("Panel与Model字段的关系") -public class ScrComponentModelField extends BaseBean implements Serializable { +public class ScrComponentModelFieldRel extends BaseBean implements Serializable { private static final long serialVersionUID = -3441031841089357196L; @Column(name = "PANEL_CODE") @ApiParam("Panel代码") private String panelCode; - @Column(name = "MODEL_CODE") - @ApiParam("model代码") - private String modelCode; + @Column(name = "LAYOUT_CODE") + @ApiParam("布局代码") + private String layoutCode; @Column(name = "ROW_CODE") @ApiParam("行代码") private String rowCode; - @Column(name = "COL_CODE") + @Column(name = "COLUMN_CODE") @ApiParam("列代码") - private String colCode; + private String columnCode; @Column(name = "COMPONENT_CODE") @ApiParam("组件代码") private String componentCode; + @Column(name = "MODEL_CODE") + @ApiParam("model代码") + private String modelCode; + @Column(name = "FIELD_CODE") @ApiParam("字段代码") private String fieldCode; @@ -102,4 +110,5 @@ public class ScrComponentModelField extends BaseBean implements Serializable { @ApiParam("SPEL表达式虚拟属性") private String spelVirtualValue; + } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrPanelComponentRel.java similarity index 59% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelComponent.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrPanelComponentRel.java index fe7abdc..c3fe551 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelComponent.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrPanelComponentRel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.screen.bean; +package cn.estsh.i3plus.pojo.screen.bean.rel; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.screen.component.base.BaseComponent; @@ -19,24 +19,13 @@ import javax.persistence.Table; * @desc */ @Entity -@Table(name = "SCR_PANEL_COMPONENT") +@Table(name = "SCR_PANEL_COMPONENT_REL") @Data @EqualsAndHashCode(callSuper = true) -@Api("组件") -public class ScrPanelComponent extends BaseBean { +@Api("Panel与组件的关系") +public class ScrPanelComponentRel extends BaseBean { private static final long serialVersionUID = 3459027655126916483L; - public ScrPanelComponent() { - } - - public ScrPanelComponent(String panelCode, String layoutCode, String rowCode, String columnCode, BaseComponent baseComponent) { - this.panelCode = panelCode; - this.layoutCode = layoutCode; - this.rowCode = rowCode; - this.columnCode = columnCode; - this.componentDesc = JSON.toJSONString(baseComponent); - } - @Column(name = "PANEL_CODE") @ApiParam("panel代码") private String panelCode; @@ -53,8 +42,7 @@ public class ScrPanelComponent extends BaseBean { @ApiParam("列代码") private String columnCode; - @Lob - @Column(name = "COMPONENT_DESC") - @ApiParam(value = "组件描述") - private String componentDesc; + @Column(name = "COMPONENT_CODE") + @ApiParam(value = "组件代码") + private String componentCode; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenPanel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrScreenPanelRel.java similarity index 67% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenPanel.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrScreenPanelRel.java index 4a9d8af..3edc083 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenPanel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrScreenPanelRel.java @@ -1,10 +1,13 @@ -package cn.estsh.i3plus.pojo.screen.bean; +package cn.estsh.i3plus.pojo.screen.bean.rel; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; @@ -16,24 +19,16 @@ import javax.persistence.Table; * @desc */ @Entity -@Table(name = "SCR_SCREEN_PANEL") +@Table(name = "SCR_SCREEN_PANEL_REL") @Data +@NoArgsConstructor +@AllArgsConstructor +@Builder @EqualsAndHashCode(callSuper = true) @Api("Screen与Panel的关系") -public class ScrScreenPanel extends BaseBean { +public class ScrScreenPanelRel extends BaseBean { private static final long serialVersionUID = 3459027655126916483L; - public ScrScreenPanel() { - } - - public ScrScreenPanel(String screenCode, String layoutCode, String rowCode, String columnCode, String panelCode) { - this.screenCode = screenCode; - this.layoutCode = layoutCode; - this.rowCode = rowCode; - this.columnCode = columnCode; - this.panelCode = panelCode; - } - @Column(name = "SCREEN_CODE") @ApiParam("panel代码") private String screenCode; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseComponent.java index 185dd7f..9fcf4df 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseComponent.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseComponent.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.screen.component.base; -import cn.estsh.i3plus.pojo.screen.bean.base.BaseScreenBean; +import cn.estsh.i3plus.pojo.screen.bean.BaseScreenBean; import lombok.Data; /** diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseContainer.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseContainer.java deleted file mode 100644 index 6c31a28..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseContainer.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.component.base; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction; -import lombok.Data; - -import java.util.List; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午12:27 - * @desc - */ -@Data -public abstract class BaseContainer extends BaseBean { - private static final long serialVersionUID = 7696523743371800661L; - - private String background; - - private String cssStyle; - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseWidget.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseWidget.java index c568dfd..94f45bd 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseWidget.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseWidget.java @@ -10,6 +10,4 @@ import lombok.Data; @Data public abstract class BaseWidget extends BaseComponent { - private String widgetType=this.getClass().getName(); - } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentModel.java new file mode 100644 index 0000000..a1c7a9e --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.ScrComponent; +import cn.estsh.i3plus.pojo.screen.bean.ScrModel; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; +import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentEventActionRel; +import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentModelFieldRel; +import cn.estsh.i3plus.pojo.screen.bean.rel.ScrPanelComponentRel; +import cn.estsh.i3plus.pojo.screen.component.base.BaseComponent; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/28 上午12:42 + * @desc + */ +@Data +public class ScrPanelComponentModel implements Serializable { + private static final long serialVersionUID = -5832175256726333348L; + + private String panelCode; + + private String layoutCode; + + private String rowCode; + + private String columnCode; + + private BaseComponent component; + + private List eventActions; + + private List modelFields; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentEventActionRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentEventActionRepository.java deleted file mode 100644 index e1a4ac6..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentEventActionRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.ScrComponentEventAction; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 20-5-28 下午3:39 - * @Modify: - **/ -public interface ScrComponentEventActionRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentModelFieldRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentModelFieldRepository.java deleted file mode 100644 index 0fc7e92..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentModelFieldRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.ScrComponentModelField; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 20-5-28 下午3:39 - * @Modify: - **/ -public interface ScrComponentModelFieldRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java index 7b8663b..cee476f 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.screen.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.ScrPanelComponent; +import cn.estsh.i3plus.pojo.screen.bean.ScrComponent; +import cn.estsh.i3plus.pojo.screen.bean.rel.ScrPanelComponentRel; /** * @Description : @@ -10,5 +11,5 @@ import cn.estsh.i3plus.pojo.screen.bean.ScrPanelComponent; * @CreateDate : 20-5-28 下午3:39 * @Modify: **/ -public interface ScrComponentRepository extends BaseRepository { +public interface ScrComponentRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRelRepository.java new file mode 100644 index 0000000..2191440 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRelRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository.rel; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentEventActionRel; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrComponentEventActionRelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRelRepository.java new file mode 100644 index 0000000..0e2dd3f --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRelRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository.rel; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentModelFieldRel; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrComponentModelFieldRelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRelRepository.java new file mode 100644 index 0000000..0262987 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRelRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.repository.rel; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrPanel; +import cn.estsh.i3plus.pojo.screen.bean.rel.ScrPanelComponentRel; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrPanelComponentRelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRelRepository.java new file mode 100644 index 0000000..610c14f --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRelRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository.rel; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.rel.ScrScreenPanelRel; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrScreenPanelRelRepository extends BaseRepository { +}