From 15633bc28ec731c8665c7ac364f68ad07731626c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sat, 27 Mar 2021 23:17:46 +0800 Subject: [PATCH 01/22] tmp --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + .../i3plus/pojo/base/enumutil/ScreenEnumUtil.java | 37 +++++++++++++ ...Component.java => ScrComponentEventAction.java} | 25 ++++----- ...ModelField.java => ScrComponentModelField.java} | 30 +++++++++-- .../i3plus/pojo/screen/bean/ScrDataObject.java | 7 +++ .../pojo/screen/bean/ScrDataObjectProperty.java | 15 +++--- .../i3plus/pojo/screen/bean/ScrEventAction.java | 2 +- .../cn/estsh/i3plus/pojo/screen/bean/ScrFile.java | 53 ++++++++++++++++++- .../estsh/i3plus/pojo/screen/bean/ScrLayout.java | 16 +++--- .../i3plus/pojo/screen/bean/ScrLayoutColumn.java | 30 +++++++---- .../i3plus/pojo/screen/bean/ScrLayoutRow.java | 18 +++---- .../i3plus/pojo/screen/bean/ScrModelField.java | 4 ++ .../cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java | 6 +-- .../i3plus/pojo/screen/bean/ScrPanelComponent.java | 60 ++++++++++++++++++++++ .../pojo/screen/bean/ScrPanelLayoutColumn.java | 35 ------------- .../i3plus/pojo/screen/bean/ScrPanelModel.java | 45 ---------------- .../estsh/i3plus/pojo/screen/bean/ScrScreen.java | 6 +-- .../pojo/screen/bean/ScrScreenLayoutColumn.java | 36 ------------- .../i3plus/pojo/screen/bean/ScrScreenPanel.java | 56 ++++++++++++++++++++ .../BaseScreenBean.java} | 4 +- .../pojo/screen/component/base/BaseComponent.java | 24 +++++++++ .../base/BaseContainer.java} | 6 +-- .../pojo/screen/component/base/BaseView.java | 15 ++++++ .../pojo/screen/component/base/BaseWidget.java | 15 ++++++ .../screen/component/view/ScrViewBarChart.java | 26 ++++++++++ .../pojo/screen/component/view/ScrViewChart.java | 16 ++++++ .../Form.java => component/view/ScrViewForm.java} | 5 +- .../screen/component/view/ScrViewLineChart.java | 18 +++++++ .../screen/component/view/ScrViewPieChart.java | 16 ++++++ .../pojo/screen/component/view/ScrViewTable.java | 21 ++++++++ .../pojo/screen/component/view/ScrViewTree.java | 19 +++++++ .../widget/ScrWidgetButton.java} | 5 +- .../screen/component/widget/ScrWidgetCascader.java | 13 +++++ .../widget/ScrWidgetDatetimePicker.java} | 5 +- .../screen/component/widget/ScrWidgetLabel.java | 15 ++++++ .../widget/ScrWidgetPagination.java} | 4 +- .../widget/ScrWidgetPreview.java} | 5 +- .../widget/ScrWidgetSelector.java} | 5 +- .../widget/ScrWidgetText.java} | 5 +- .../widget/ScrWidgetUpload.java} | 5 +- .../i3plus/pojo/screen/model/PanelModelField.java | 23 --------- .../i3plus/pojo/screen/model/ScrLayoutModel.java | 22 ++++++++ .../pojo/screen/model/ScrRowColumnModel.java | 20 ++++++++ .../screen/model/component/AbstractComponent.java | 26 ---------- .../pojo/screen/model/component/AbstractView.java | 18 ------- .../screen/model/component/AbstractWidget.java | 15 ------ .../pojo/screen/model/component/BarChart.java | 18 ------- .../pojo/screen/model/component/Cascader.java | 12 ----- .../i3plus/pojo/screen/model/component/Chart.java | 14 ----- .../i3plus/pojo/screen/model/component/Label.java | 14 ----- .../pojo/screen/model/component/LineChart.java | 18 ------- .../pojo/screen/model/component/PieChart.java | 17 ------ .../i3plus/pojo/screen/model/component/Table.java | 22 -------- .../i3plus/pojo/screen/model/component/Tree.java | 20 -------- .../screen/repository/ScrActionRepository.java | 14 +++++ .../ScrComponentEventActionRepository.java | 14 +++++ .../ScrComponentModelFieldRepository.java | 14 +++++ .../screen/repository/ScrComponentRepository.java | 14 +++++ .../ScrDataObjectPropertyRepository.java | 14 +++++ .../screen/repository/ScrDataObjectRepository.java | 14 +++++ .../screen/repository/ScrDatasourceRepository.java | 14 +++++ .../repository/ScrEventActionRepository.java | 14 +++++ .../pojo/screen/repository/ScrEventRepository.java | 14 +++++ .../pojo/screen/repository/ScrFileRepository.java | 14 +++++ .../repository/ScrLayoutColumnRepository.java | 15 ++++++ .../screen/repository/ScrLayoutRepository.java | 14 +++++ .../screen/repository/ScrLayoutRowRepository.java | 15 ++++++ .../ScrModelFieldConstraintRepository.java | 14 +++++ .../screen/repository/ScrModelFieldRepository.java | 15 ++++++ .../repository/ScrModelFieldVirtualRepository.java | 15 ++++++ .../pojo/screen/repository/ScrModelRepository.java | 14 +++++ .../pojo/screen/repository/ScrPanelRepository.java | 15 ++++++ .../screen/repository/ScrScreenRepository.java | 14 +++++ 73 files changed, 842 insertions(+), 417 deletions(-) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{ScrPanelModelComponent.java => ScrComponentEventAction.java} (51%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{ScrPanelModelField.java => ScrComponentModelField.java} (74%) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelComponent.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelLayoutColumn.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModel.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenLayoutColumn.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenPanel.java rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{AbstractScreenBean.java => base/BaseScreenBean.java} (70%) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseComponent.java rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/{model/component/AbstractContainer.java => component/base/BaseContainer.java} (69%) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseView.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseWidget.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewBarChart.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewChart.java rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/{model/component/Form.java => component/view/ScrViewForm.java} (50%) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewLineChart.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewPieChart.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTable.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTree.java rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/{model/component/Button.java => component/widget/ScrWidgetButton.java} (55%) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetCascader.java rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/{model/component/DatetimePicker.java => component/widget/ScrWidgetDatetimePicker.java} (64%) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetLabel.java rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/{model/Pagination.java => component/widget/ScrWidgetPagination.java} (71%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/{model/component/Preview.java => component/widget/ScrWidgetPreview.java} (55%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/{model/component/Selector.java => component/widget/ScrWidgetSelector.java} (61%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/{model/component/Text.java => component/widget/ScrWidgetText.java} (54%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/{model/component/Upload.java => component/widget/ScrWidgetUpload.java} (60%) delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/PanelModelField.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractComponent.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractView.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractWidget.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/BarChart.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Cascader.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Chart.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Label.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/LineChart.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/PieChart.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Table.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Tree.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrActionRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentEventActionRepository.java create 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/ScrComponentRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectPropertyRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDatasourceRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventActionRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrFileRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldConstraintRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldVirtualRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrPanelRepository.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrScreenRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index aeaa624..1a4a845 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -73,6 +73,7 @@ public class CommonEnumUtil { GATEWAY(96, 9000, 0, 0, "impp-gateway", "服务网关"), CLOUD(97, 0, 0, 0, "i3cloud", "微服务"), CENTER(99, 8000, 1, 0, "icloud-server", "注册中心"), + SCREEN(100, 8950, 23, 0, "i3screen", "通用界面"), /** * 平台服务 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 9122d14..f598d6a 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 @@ -83,4 +83,41 @@ public class ScreenEnumUtil { } } + public enum LAYOUT_TYPE { + SCREEN(10, "SCREEN", "Screen布局"), + PANEL(20, "PANEL", "Panel布局"); + + private Integer value; + private String code; + private String description; + + LAYOUT_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; + } + } + } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModelComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentEventAction.java similarity index 51% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModelComponent.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentEventAction.java index e447112..49d6cda 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModelComponent.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentEventAction.java @@ -12,31 +12,28 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import java.io.Serializable; /** * @author Wynne.Lu - * @date 2021/3/22 下午8:42 + * @date 2021/3/25 上午9:56 * @desc */ @Entity -@Table(name = "SCR_PANEL_MODEL_COMPONENT") +@Table(name = "SCR_COMPONENT_EVENT_ACTION") @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor @Builder -@Api("Panel与Model组件的关系") -public class ScrPanelModelComponent extends BaseBean implements Serializable { - private static final long serialVersionUID = 2011504067317832781L; - - @Column(name = "PANEL_MODEL_CODE") - @ApiParam("Panel与Model的关系代码") - private String panelModelCode; - - @Column(name = "COMPONENT_CODE") - @ApiParam("组件代码") - private String componentCode; +@Api("组件事件动作") +public class ScrComponentEventAction extends BaseBean { + private static final long serialVersionUID = 7600064730551351570L; + @Column(name="COMPONENT_ID") + @ApiParam("组件Id") + private Integer componentId; + @Column(name="EVENT_ACTION_Id") + @ApiParam("事件动作Id") + private String eventActionId; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentModelField.java similarity index 74% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModelField.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentModelField.java index 0743062..2a7ccdc 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModelField.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentModelField.java @@ -20,24 +20,44 @@ import java.io.Serializable; * @desc */ @Entity -@Table(name = "SCR_PANEL_MODEL_FIELD") +@Table(name = "SCR_COMPONENT_MODEL_FIELD") @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor @Builder @Api("Panel与Model字段的关系") -public class ScrPanelModelField extends BaseBean implements Serializable { +public class ScrComponentModelField extends BaseBean implements Serializable { private static final long serialVersionUID = -3441031841089357196L; - @Column(name = "PANEL_MODEL_CODE") - @ApiParam("Panel与Model的关系代码") - private String panelModelCode; + @Column(name = "PANEL_CODE") + @ApiParam("Panel代码") + private String panelCode; + + @Column(name = "MODEL_CODE") + @ApiParam("model代码") + private String modelCode; + + @Column(name = "ROW_CODE") + @ApiParam("行代码") + private String rowCode; + + @Column(name = "COL_CODE") + @ApiParam("列代码") + private String colCode; + + @Column(name = "COMPONENT_CODE") + @ApiParam("组件代码") + private String componentCode; @Column(name = "FIELD_CODE") @ApiParam("字段代码") private String fieldCode; + @Column(name = "DISPLAY_NAME") + @ApiParam("字段名称") + private String displayName; + @Column(name = "IS_FUZZY_SEARCH") @ApiParam("是否支持模糊查询") private Boolean isFuzzySearch; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java index 8da3aeb..ee5da87 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -30,6 +32,11 @@ import java.io.Serializable; public class ScrDataObject extends BaseBean implements Serializable { private static final long serialVersionUID = -270662014158685376L; + @Column(name = "DATA_SOURCE_ID") + @ApiParam(value = "数据源ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long dataSourceId; + @Column(name = "DATA_OBJECT_CODE") @ApiParam(value = "数据对象代码") private String dataObjectCode; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java index 4b4caad..9e2fc86 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java @@ -32,26 +32,27 @@ public class ScrDataObjectProperty extends BaseBean implements Serializable { @Column(name = "DATA_OBJECT_CODE") @ApiParam(value = "数据对象ID") - private Long dataObjectCode; + private Long dataObjectId; @Column(name = "FIELD_CODE") @ApiParam(value = "字段代码") private String fieldCode; + @Column(name = "DISPLAY_NAME") + @ApiParam(value = "字段名称") + private String displayName; + @Column(name = "FIELD_TYPE") @ApiParam(value = "字段类型") private String fieldType; - @Column(name="IS_PRIMARY_KEY") - @ApiParam(value ="是否主键") + @Column(name = "IS_PRIMARY_KEY") + @ApiParam(value = "是否主键") private Integer isPrimaryKey; - @Column(name="IS_NULLABLE") + @Column(name = "IS_NULLABLE") @ApiParam(value = "是否允许为空") private Integer isNullable; - - - } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java index a442262..b26640f 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java @@ -31,7 +31,7 @@ public class ScrEventAction extends BaseBean implements Serializable { private static final long serialVersionUID = -6217007706865821613L; @Column(name = "EVENT_ACTION_CODE") - @ApiParam("事件动作代码") + @ApiParam("事件动作CODE") private String eventActionCode; @Column(name = "EVENT_ACTION_NAME") diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java index c1d4994..b57e540 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java @@ -1,9 +1,60 @@ 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.Table; +import java.io.Serializable; + /** * @author Wynne.Lu * @date 2021/3/22 下午9:59 * @desc */ -public class ScrFile { +@Entity +@Table(name = "SCR_FILE") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Api("文件") +public class ScrFile extends BaseBean implements Serializable { + private static final long serialVersionUID = 2343301746531746105L; + + @Column(name = "FILE_NAME") + @ApiParam("文件名称") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam("文件URL") + private String fileUrl; + + @Column(name = "GROUP_NAME") + @ApiParam("组名") + private String groupName; + + @Column(name = "FILE_ORIGIN_NAME") + @ApiParam("文件原名") + private String fileOriginName; + + @Column(name = "FILE_SIZE") + @ApiParam("文件大小") + private String fileSize; + + @Column(name = "FILE_TYPE") + @ApiParam("文件类型名称") + private String fileType; + + @Column(name = "SYNC_TAG") + @ApiParam("同步标记") + private Integer syncTag = 0; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java index 9e1542e..7cd0101 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java @@ -1,6 +1,7 @@ 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.ApiParam; import lombok.AllArgsConstructor; @@ -11,6 +12,8 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.Table; import java.io.Serializable; @@ -28,8 +31,8 @@ import java.io.Serializable; @Builder @Api("布局") public class ScrLayout extends BaseBean implements Serializable { - private static final long serialVersionUID = 3390463604300159807L; + @Column(name = "LAYOUT_CODE") @ApiParam("布局代码") private String layoutCode; @@ -38,12 +41,9 @@ public class ScrLayout extends BaseBean implements Serializable { @ApiParam("布局名称") private String layoutName; - @Column(name = "ROW_SEQ") - @ApiParam("行顺序") - private Integer rowSeq; - - @Column(name = "ROW_CODE") - @ApiParam("行代码") - private String rowCode; + @Column(name = "LAYOUT_TYPE") + @ApiParam("布局类型") + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.LAYOUT_TYPE layoutType; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java index f74295f..92dd09b 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java @@ -25,21 +25,33 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor -//@Builder -@Api("布局-列") +@Builder +@Api("布局-父类-列") public class ScrLayoutColumn extends BaseBean implements Serializable { private static final long serialVersionUID = 5001564292608042287L; - @Column(name = "COL_CODE") + @Column(name = "LAYOUT_CODE") + @ApiParam("布局代码") + private String layoutCode; + + @Column(name = "ROW_CODE") + @ApiParam("列代码") + private String rowCode; + + @Column(name = "COLUMN_CODE") @ApiParam("列代码") - private String colCode; + private String columnCode; - @Column(name ="COL_NAME") - @ApiParam("列名称") - private String colName; + @Column(name = "COLUMN_SEQ") + @ApiParam("列顺序") + private Integer columnSeq; - @Column(name ="COL_SPAN") + @Column(name = "COLUMN_SPAN") @ApiParam("列占位") - private Integer colSpan; + private Integer columnSpan; + + @Column(name = "ELEMENT_CODE") + @ApiParam("元素代码：panel or component") + private String elementCode; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java index 92c2cfd..9c8e451 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java @@ -30,25 +30,21 @@ import java.io.Serializable; public class ScrLayoutRow extends BaseBean implements Serializable { private static final long serialVersionUID = 6042010183759804616L; + @Column(name = "LAYOUT_CODE") + @ApiParam("布局代码") + private String layoutCode; + @Column(name = "ROW_CODE") @ApiParam("行代码") private String rowCode; - @Column(name = "ROW_NAME") - @ApiParam("行名称") - private String rowName; - @Column(name = "ROW_HEIGHT") @ApiParam("行高") private Double rowHeight; - @Column(name = "COL_SEQ") - @ApiParam("列序号") - private Integer colSeq; - - @Column(name = "COL_CODE") - @ApiParam("列代码") - private String colCode; + @Column(name = "ROW_SEQ") + @ApiParam("行顺序") + private Integer rowSeq; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java index efc9f3a..d50cf18 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java @@ -38,6 +38,10 @@ public class ScrModelField extends BaseBean implements Serializable { @ApiParam("字段代码") private String fieldCode; + @Column(name = "DISPLAY_NAME") + @ApiParam("字段名称") + private String displayName; + @Column(name = "IS_FUZZY_SEARCH") @ApiParam("是否支持模糊查询") private Boolean isFuzzySearch; 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 12003c0..703f62f 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.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.screen.component.base.BaseContainer; 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 BaseBean implements Serializable { +public class ScrPanel extends BaseContainer implements Serializable { @Column(name = "PANEL_CODE") @ApiParam("Panel代码") @@ -37,7 +37,7 @@ public class ScrPanel extends BaseBean implements Serializable { @ApiParam("Panel名称") private String panelName; - @Column(name = "LAYOUT_CODE") + @Column(name = "PANEL_LAYOUT_CODE") @ApiParam("布局代码") private String layoutCode; 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/ScrPanelComponent.java new file mode 100644 index 0000000..fe7abdc --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelComponent.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.screen.component.base.BaseComponent; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; + +/** + * @author Wynne.Lu + * @date 2021/3/25 下午4:33 + * @desc + */ +@Entity +@Table(name = "SCR_PANEL_COMPONENT") +@Data +@EqualsAndHashCode(callSuper = true) +@Api("组件") +public class ScrPanelComponent 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; + + @Column(name = "LAYOUT_CODE") + @ApiParam("布局代码") + private String layoutCode; + + @Column(name = "ROW_CODE") + @ApiParam("行代码") + private String rowCode; + + @Column(name = "COLUMN_CODE") + @ApiParam("列代码") + private String columnCode; + + @Lob + @Column(name = "COMPONENT_DESC") + @ApiParam(value = "组件描述") + private String componentDesc; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelLayoutColumn.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelLayoutColumn.java deleted file mode 100644 index e520792..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelLayoutColumn.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.bean; - -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.Table; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午5:01 - * @desc - */ -@Entity -@Table(name = "SCR_PANEL_LAYOUT_COLUMN") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Api("Panel布局-列") -public class ScrPanelLayoutColumn extends ScrLayoutColumn implements Serializable { - private static final long serialVersionUID = 6577099884589179886L; - - @Column(name = "COMPONENT_CODE") - @ApiParam("组件代码") - private String componentCode; -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModel.java deleted file mode 100644 index 90fe642..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModel.java +++ /dev/null @@ -1,45 +0,0 @@ -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.Table; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2021/3/22 下午8:42 - * @desc - */ -@Entity -@Table(name = "SCR_PANEL_MODEL") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Api("Panel与Model的关系") -public class ScrPanelModel extends BaseBean implements Serializable { - private static final long serialVersionUID = -6998319452471117206L; - - @Column(name = "PANEL_MODEL_CODE") - @ApiParam("Panel与Model的关系代码") - private String panelModelCode; - - @Column(name = "PANEL_CODE") - @ApiParam("Panel代码") - private String panelCode; - - @Column(name = "MODEL_CODE") - @ApiParam("Model代码") - private String modelCode; - -} 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 659d988..d231a32 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.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.screen.component.base.BaseContainer; 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 BaseBean implements Serializable { +public class ScrScreen extends BaseContainer implements Serializable { private static final long serialVersionUID = -6755902986892118213L; @Column(name = "SCREEN_CODE") @@ -42,7 +42,7 @@ public class ScrScreen extends BaseBean implements Serializable { @ApiParam("页面版本") private String screenVersion; - @Column(name = "LAYOUT_CODE") + @Column(name = "SCREEN_LAYOUT_CODE") @ApiParam("布局代码") private String layoutCode; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenLayoutColumn.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenLayoutColumn.java deleted file mode 100644 index 398c167..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenLayoutColumn.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.bean; - -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.Table; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午5:01 - * @desc - */ -@Entity -@Table(name = "SCR_SCREEN_LAYOUT_COLUMN") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Api("Screen布局-列") -public class ScrScreenLayoutColumn extends ScrLayoutColumn implements Serializable { - private static final long serialVersionUID = 4084273106415805804L; - - @Column(name = "PANEL_CODE") - @ApiParam("Panel代码") - private String panelCode; - -} 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/ScrScreenPanel.java new file mode 100644 index 0000000..4a9d8af --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenPanel.java @@ -0,0 +1,56 @@ +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.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @author Wynne.Lu + * @date 2021/3/25 下午4:33 + * @desc + */ +@Entity +@Table(name = "SCR_SCREEN_PANEL") +@Data +@EqualsAndHashCode(callSuper = true) +@Api("Screen与Panel的关系") +public class ScrScreenPanel 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; + + @Column(name = "LAYOUT_CODE") + @ApiParam("布局代码") + private String layoutCode; + + @Column(name = "ROW_CODE") + @ApiParam("行代码") + private String rowCode; + + @Column(name = "COLUMN_CODE") + @ApiParam("列代码") + private String columnCode; + + @Column(name = "PANEL_CODE") + @ApiParam(value = "panel代码") + private String panelCode; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/AbstractScreenBean.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/base/BaseScreenBean.java similarity index 70% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/AbstractScreenBean.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/base/BaseScreenBean.java index 4185d7c..97aaffe 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/AbstractScreenBean.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/base/BaseScreenBean.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.screen.bean; +package cn.estsh.i3plus.pojo.screen.bean.base; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @desc */ @Data -public abstract class AbstractScreenBean extends BaseBean { +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/component/base/BaseComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseComponent.java new file mode 100644 index 0000000..185dd7f --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseComponent.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.screen.component.base; + +import cn.estsh.i3plus.pojo.screen.bean.base.BaseScreenBean; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:32 + * @desc + */ +@Data +public abstract class BaseComponent extends BaseScreenBean { + + private static final long serialVersionUID = 6768391193506016205L; + + private String componentCode; + + private String cssStyle; + + private Integer tabIndex; + + private String componentType = this.getClass().getName(); + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractContainer.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseContainer.java similarity index 69% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractContainer.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseContainer.java index 7ad09b1..6c31a28 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractContainer.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseContainer.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.screen.model.component; +package cn.estsh.i3plus.pojo.screen.component.base; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction; @@ -12,13 +12,11 @@ import java.util.List; * @desc */ @Data -public abstract class AbstractContainer extends BaseBean { +public abstract class BaseContainer extends BaseBean { private static final long serialVersionUID = 7696523743371800661L; private String background; private String cssStyle; - private List eventAction; - } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseView.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseView.java new file mode 100644 index 0000000..6c3c057 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseView.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.component.base; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:30 + * @desc + */ +@Data +public abstract class BaseView extends BaseComponent { + + private String jsEnhance; + +} 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 new file mode 100644 index 0000000..c568dfd --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseWidget.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.component.base; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:30 + * @desc + */ +@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/component/view/ScrViewBarChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewBarChart.java new file mode 100644 index 0000000..1e65921 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewBarChart.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.screen.component.view; + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:31 + * @desc + */ +@Data +public class ScrViewBarChart extends ScrViewChart { + private static final long serialVersionUID = 7114030006928397461L; + + private List xAxis; + + private List yAxis; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewChart.java new file mode 100644 index 0000000..c96dc80 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewChart.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.screen.component.view; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseView; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:31 + * @desc + */ +@Data +public class ScrViewChart extends BaseView { + private static final long serialVersionUID = 3786868086148227665L; + private Integer autoRefreshInterval; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Form.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewForm.java similarity index 50% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Form.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewForm.java index 461c670..e673c57 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Form.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewForm.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.screen.model.component; +package cn.estsh.i3plus.pojo.screen.component.view; +import cn.estsh.i3plus.pojo.screen.component.base.BaseView; import lombok.Data; import java.util.Map; @@ -10,7 +11,7 @@ import java.util.Map; * @desc */ @Data -public class Form extends AbstractView{ +public class ScrViewForm extends BaseView { private Map fields; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewLineChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewLineChart.java new file mode 100644 index 0000000..bb61d04 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewLineChart.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.screen.component.view; + +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:31 + * @desc + */ +@Data +public class ScrViewLineChart extends ScrViewChart { + +// private List xAxis; +// +// private List yAxis; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewPieChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewPieChart.java new file mode 100644 index 0000000..e7a423a --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewPieChart.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.screen.component.view; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:31 + * @desc + */ + +@Data +public class ScrViewPieChart extends ScrViewChart { + private static final long serialVersionUID = -4334873164110780274L; + +// private Map data; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTable.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTable.java new file mode 100644 index 0000000..795c06e --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTable.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.screen.component.view; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseView; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:29 + * @desc + */ +@Data +public class ScrViewTable extends BaseView { + + private static final long serialVersionUID = -795585853717859678L; + private Integer autoRefreshInterval = 0; + + private Boolean isShowChoice; + + private Boolean isPagination; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTree.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTree.java new file mode 100644 index 0000000..a9f896b --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTree.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.screen.component.view; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseView; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:30 + * @desc + */ +@Data +public class ScrViewTree extends BaseView { + private static final long serialVersionUID = 3615560061167536377L; + + private String parentField; + + private String showField; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Button.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetButton.java similarity index 55% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Button.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetButton.java index 1c504e8..563e20a 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Button.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetButton.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.screen.model.component; +package cn.estsh.i3plus.pojo.screen.component.widget; +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; import lombok.Data; /** @@ -8,7 +9,7 @@ import lombok.Data; * @desc */ @Data -public class Button extends AbstractWidget { +public class ScrWidgetButton extends BaseWidget { private String icon; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetCascader.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetCascader.java new file mode 100644 index 0000000..2011a99 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetCascader.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.screen.component.widget; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:31 + * @desc + */ +@Data +public class ScrWidgetCascader extends BaseWidget { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/DatetimePicker.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetDatetimePicker.java similarity index 64% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/DatetimePicker.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetDatetimePicker.java index 5dfa581..7dd274c 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/DatetimePicker.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetDatetimePicker.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.screen.model.component; +package cn.estsh.i3plus.pojo.screen.component.widget; +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; import lombok.Data; /** @@ -8,7 +9,7 @@ import lombok.Data; * @desc */ @Data -public class DatetimePicker extends AbstractWidget { +public class ScrWidgetDatetimePicker extends BaseWidget { private String dateFormat; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetLabel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetLabel.java new file mode 100644 index 0000000..048f7bf --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetLabel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.component.widget; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:31 + * @desc + */ +@Data +public class ScrWidgetLabel extends BaseWidget { + + private String text; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/Pagination.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPagination.java similarity index 71% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/Pagination.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPagination.java index b0842fe..4d851ee 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/Pagination.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPagination.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.screen.model; +package cn.estsh.i3plus.pojo.screen.component.widget; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @desc */ @Data -public class Pagination { +public class ScrWidgetPagination { private Integer pageSize; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Preview.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPreview.java similarity index 55% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Preview.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPreview.java index 45ae498..78846c3 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Preview.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPreview.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.screen.model.component; +package cn.estsh.i3plus.pojo.screen.component.widget; +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; import lombok.Data; /** @@ -8,7 +9,7 @@ import lombok.Data; * @desc */ @Data -public class Preview extends AbstractWidget { +public class ScrWidgetPreview extends BaseWidget { private String type; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Selector.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetSelector.java similarity index 61% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Selector.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetSelector.java index 9aadd68..4269184 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Selector.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetSelector.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.screen.model.component; +package cn.estsh.i3plus.pojo.screen.component.widget; +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; import lombok.Data; /** @@ -8,7 +9,7 @@ import lombok.Data; * @desc */ @Data -public class Selector extends AbstractWidget { +public class ScrWidgetSelector extends BaseWidget { private String placeholder; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Text.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetText.java similarity index 54% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Text.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetText.java index c53ae78..d3ad441 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Text.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetText.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.screen.model.component; +package cn.estsh.i3plus.pojo.screen.component.widget; +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; import lombok.Data; /** @@ -8,7 +9,7 @@ import lombok.Data; * @desc */ @Data -public class Text extends AbstractWidget { +public class ScrWidgetText extends BaseWidget { private String placeholder; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Upload.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetUpload.java similarity index 60% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Upload.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetUpload.java index 4d0260b..38dd703 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Upload.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetUpload.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.screen.model.component; +package cn.estsh.i3plus.pojo.screen.component.widget; +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; import lombok.Data; /** @@ -8,7 +9,7 @@ import lombok.Data; * @desc */ @Data -public class Upload extends AbstractWidget { +public class ScrWidgetUpload extends BaseWidget { private Boolean isAllowDraw; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/PanelModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/PanelModelField.java deleted file mode 100644 index 0debaa9..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/PanelModelField.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model; - -import cn.estsh.i3plus.pojo.screen.bean.ScrModel; -import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; -import cn.estsh.i3plus.pojo.screen.model.component.AbstractComponent; -import lombok.Data; - -import java.util.List; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午1:14 - * @desc - */ -@Data -public class PanelModelField { - - private ScrModel model; - - private List modelFields; - - private AbstractComponent component; -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java new file mode 100644 index 0000000..8bda5bf --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/27 下午6:10 + * @desc + */ +@Data +public class ScrLayoutModel implements Serializable { + private static final long serialVersionUID = -2767386371499251918L; + + private ScrLayout layout; + + private List rowColumnModels; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java new file mode 100644 index 0000000..f9d7d2b --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutColumn; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow; +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/27 下午8:35 + * @desc + */ +@Data +public class ScrRowColumnModel { + + private ScrLayoutRow row; + + private List columns; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractComponent.java deleted file mode 100644 index 45ea88f..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractComponent.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model.component; - -import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction; -import lombok.Data; - -import java.util.List; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午12:32 - * @desc - */ -@Data -public abstract class AbstractComponent extends AbstractContainer { - - private static final long serialVersionUID = 6768391193506016205L; - private String cssStyle; - - private String name; - - private Integer tabIndex; - - private List eventAction; - - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractView.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractView.java deleted file mode 100644 index f0cc014..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractView.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model.component; - -import lombok.Data; - -import java.util.Map; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午12:30 - * @desc - */ -@Data -public abstract class AbstractView extends AbstractComponent { - - private String jsEnhance; - - private Map viewTemplateMap; -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractWidget.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractWidget.java deleted file mode 100644 index bf21cc4..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractWidget.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model.component; - -import lombok.Data; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午12:30 - * @desc - */ -@Data -public abstract class AbstractWidget extends AbstractComponent { - - private String labelText; - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/BarChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/BarChart.java deleted file mode 100644 index 0af2b92..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/BarChart.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model.component; - -import lombok.Data; - -import java.util.List; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午12:31 - * @desc - */ -@Data -public class BarChart extends Chart { - - private List xAxis; - - private List yAxis; -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Cascader.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Cascader.java deleted file mode 100644 index b2e36ab..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Cascader.java +++ /dev/null @@ -1,12 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model.component; - -import lombok.Data; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午12:31 - * @desc - */ -@Data -public class Cascader extends AbstractWidget{ -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Chart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Chart.java deleted file mode 100644 index e105736..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Chart.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model.component; - -import lombok.Data; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午12:31 - * @desc - */ -@Data -public class Chart extends AbstractWidget { - private Integer autoRefreshInterval; - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Label.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Label.java deleted file mode 100644 index a54c11f..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Label.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model.component; - -import lombok.Data; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午12:31 - * @desc - */ -@Data -public class Label extends AbstractWidget { - - private String text; -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/LineChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/LineChart.java deleted file mode 100644 index 11f05c2..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/LineChart.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model.component; - -import lombok.Data; - -import java.util.List; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午12:31 - * @desc - */ -@Data -public class LineChart extends Chart { - - private List xAxis; - - private List yAxis; -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/PieChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/PieChart.java deleted file mode 100644 index 3d402f3..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/PieChart.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model.component; - -import lombok.Data; - -import java.util.Map; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午12:31 - * @desc - */ - -@Data -public class PieChart extends Chart { - - private Map data; -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Table.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Table.java deleted file mode 100644 index 8784d5f..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Table.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model.component; - -import cn.estsh.i3plus.pojo.screen.model.Pagination; -import lombok.Data; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午12:29 - * @desc - */ -@Data -public class Table extends AbstractView { - - private Integer autoRefreshInterval = 0; - - private Boolean isShowChoice; - - private Boolean isPagination; - - private Pagination defaultPagination; - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Tree.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Tree.java deleted file mode 100644 index 87f29f5..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Tree.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model.component; - -import lombok.Data; - -import java.util.List; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午12:30 - * @desc - */ -@Data -public class Tree extends AbstractView { - - private String parentField; - - private String showField; - - private List data; -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrActionRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrActionRepository.java new file mode 100644 index 0000000..adeb27f --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrActionRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrAction; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrActionRepository extends BaseRepository { +} 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 new file mode 100644 index 0000000..e1a4ac6 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentEventActionRepository.java @@ -0,0 +1,14 @@ +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 new file mode 100644 index 0000000..0fc7e92 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentModelFieldRepository.java @@ -0,0 +1,14 @@ +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 new file mode 100644 index 0000000..7b8663b --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrPanelComponent; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrComponentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectPropertyRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectPropertyRepository.java new file mode 100644 index 0000000..d532b4c --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectPropertyRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectProperty; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrDataObjectPropertyRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectRepository.java new file mode 100644 index 0000000..08bd787 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrDataObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDatasourceRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDatasourceRepository.java new file mode 100644 index 0000000..7786ddd --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDatasourceRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrDatasourceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventActionRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventActionRepository.java new file mode 100644 index 0000000..88491b9 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventActionRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrEventActionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventRepository.java new file mode 100644 index 0000000..b558c8c --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrEvent; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrEventRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrFileRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrFileRepository.java new file mode 100644 index 0000000..cfeba7e --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrFileRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrFile; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrFileRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java new file mode 100644 index 0000000..3255b32 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutColumn; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrLayoutColumnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRepository.java new file mode 100644 index 0000000..78a4c00 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrLayoutRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java new file mode 100644 index 0000000..32a5636 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrLayoutRowRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldConstraintRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldConstraintRepository.java new file mode 100644 index 0000000..9da83bc --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldConstraintRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldConstraint; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrModelFieldConstraintRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java new file mode 100644 index 0000000..6effc84 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrModelFieldRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldVirtualRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldVirtualRepository.java new file mode 100644 index 0000000..8837d83 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldVirtualRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldConstraint; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldVirtual; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrModelFieldVirtualRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelRepository.java new file mode 100644 index 0000000..790db09 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrModel; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrModelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrPanelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrPanelRepository.java new file mode 100644 index 0000000..0d4ee36 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrPanelRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrAction; +import cn.estsh.i3plus.pojo.screen.bean.ScrPanel; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrPanelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrScreenRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrScreenRepository.java new file mode 100644 index 0000000..b1a72a7 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrScreenRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrScreen; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrScreenRepository extends BaseRepository { +} From 7767630fbb4e7651ed946e2a901717bde443f507 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 28 Mar 2021 02:16:25 +0800 Subject: [PATCH 02/22] 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 { +} From 714a32a994df2662856b0871c59b324c20dc984b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 31 Mar 2021 15:22:35 +0800 Subject: [PATCH 03/22] first commit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 3 +- .../i3plus/pojo/base/enumutil/ScreenEnumUtil.java | 160 +++++++++++++++++++++ .../i3plus/pojo/screen/annotation/ReferTo.java | 28 ++++ .../estsh/i3plus/pojo/screen/bean/ScrAction.java | 5 + .../i3plus/pojo/screen/bean/ScrComponent.java | 6 + .../i3plus/pojo/screen/bean/ScrDataObject.java | 6 +- .../pojo/screen/bean/ScrDataObjectProperty.java | 4 +- .../i3plus/pojo/screen/bean/ScrDatasource.java | 46 +++--- .../i3plus/pojo/screen/bean/ScrLayoutColumn.java | 4 - .../pojo/screen/bean/rel/ScrScreenPanelRel.java | 2 +- .../pojo/screen/component/base/BaseComponent.java | 4 + .../pojo/screen/component/view/ScrViewForm.java | 4 +- .../screen/component/widget/ScrWidgetButton.java | 2 +- ...odel.java => ScrPanelComponentCreateModel.java} | 11 +- .../screen/model/ScrPanelComponentQueryModel.java | 34 +++++ .../pojo/screen/model/ScrPanelLayoutModel.java | 20 +++ .../screen/model/ScrScreenPanelCreateModel.java | 26 ++++ 17 files changed, 324 insertions(+), 41 deletions(-) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/annotation/ReferTo.java rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/{ScrPanelComponentModel.java => ScrPanelComponentCreateModel.java} (64%) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelLayoutModel.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 1a4a845..e676df5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -2017,8 +2017,7 @@ public class CommonEnumUtil { "?autoReconnect=true" + "&useSSL=false" + "&characterEncoding=utf-8" + - "&allowPublicKeyRetrieval=true" + - "&serverTimezone=CST"; + "&allowPublicKeyRetrieval=true"; } private String getJDBCUrlOracle(String database, String host, Integer port) { 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 f598d6a..7a184e0 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 @@ -120,4 +120,164 @@ public class ScreenEnumUtil { } } + public enum DATASOURCE_CONNECTION_STATUS { + SUCCESS(10, "success", "连接成功"), + FAILED(20, "failed", "连接失败"); + + private Integer value; + private String code; + private String description; + + DATASOURCE_CONNECTION_STATUS(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 ACTION { + SEARCH(10, "search", "查询"), + CREATE(20, "create", "保存"), + UPDATE(30, "update", "更新"), + DELETE(40, "delete", "删除"), + VALID(50, "valid", "查询"), + INVALID(60, "inValid", "查询"), + SEARCH_PAGER(70, "searchPager", "查询"), + ENUM(80, "enum", "查询"), + DIRECT(90, "direct", "查询"), + DOWNLOAD(100, "download", "查询"), + UPLOAD(110, "upload", "查询"), + INVOKE(120, "invoke", "查询"); + + private Integer value; + private String code; + private String description; + + ACTION(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 COMMUNICATION_TYPE { + HTTP(10, "HTTP", "Http"), + WEBSOCKET(20, "WEBSOCKET", "WebSocket"); + + private Integer value; + private String code; + private String description; + + COMMUNICATION_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 DATA_RESOURCE_TYPE { + ENUM(10, "enum", "枚举"), + WEBSOCKET(20, "WEBSOCKET", "WebSocket"); + + private Integer value; + private String code; + private String description; + + DATA_RESOURCE_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; + } + } + + } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/annotation/ReferTo.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/annotation/ReferTo.java new file mode 100644 index 0000000..f550999 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/annotation/ReferTo.java @@ -0,0 +1,28 @@ +//package cn.estsh.i3plus.pojo.screen.annotation; +// +//import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; +// +//import java.lang.annotation.Documented; +//import java.lang.annotation.ElementType; +//import java.lang.annotation.Retention; +//import java.lang.annotation.RetentionPolicy; +//import java.lang.annotation.Target; +// +///** +// * @author Wynne.Lu +// * @date 2021/3/30 下午9:11 +// * @desc +// */ +//@Retention(RetentionPolicy.RUNTIME) +//@Target({ElementType.FIELD) +//@Documented +//public @interface ReferTo { +// +// ScreenEnumUtil.DATA_RESOURCE_TYPE refType() default ScreenEnumUtil.DATA_RESOURCE_TYPE.ENUM; +// +// String refWhere(); +// +// String refField(); +// +// +//} 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 06f0f19..00dd089 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 @@ -37,4 +37,9 @@ public class ScrAction extends BaseBean implements Serializable { @Column(name = "ACTION_NAME") @ApiParam("动作名称") private String actionName; + + @Column(name = "ACTION_TYPE") + @ApiParam("动作类型") + private String actionType; + } \ No newline at end of file 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 index b3fbad5..afa0a75 100644 --- 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 @@ -39,8 +39,14 @@ public class ScrComponent extends BaseBean implements Serializable { @ApiParam(value = "组件代码") private String componentType; + @Column(name = "MODEL_CODE") + @ApiParam(value = "model代码") + private String modelCode; + @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/ScrDataObject.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java index ee5da87..83141c4 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java @@ -45,13 +45,13 @@ public class ScrDataObject extends BaseBean implements Serializable { @ApiParam(value = "数据源编码") private String sourceCode; - @Column(name = "DATA_OBJECT_SOURCE") + @Column(name = "DATA_OBJECT_SOURCE_CODE") @ApiParam(value = "数据名称") - private String dataObjectSource; + private String dataObjectSourceCode; @Column(name = "DATA_TYPE") @ApiParam(value = "数据类型") - private Integer dataType; + private String dataType; @Column(name = "DESCRIPTION") @ApiParam(value = "描述") diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java index 9e2fc86..ea1d491 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java @@ -31,8 +31,8 @@ public class ScrDataObjectProperty extends BaseBean implements Serializable { private static final long serialVersionUID = 6954106365899677132L; @Column(name = "DATA_OBJECT_CODE") - @ApiParam(value = "数据对象ID") - private Long dataObjectId; + @ApiParam(value = "数据对象代码") + private String dataObjectCode; @Column(name = "FIELD_CODE") @ApiParam(value = "字段代码") diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java index bb01da4..dee82d7 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java @@ -1,6 +1,7 @@ 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.ApiParam; import lombok.AllArgsConstructor; @@ -11,6 +12,8 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.Table; import java.io.Serializable; @@ -31,43 +34,44 @@ import java.io.Serializable; public class ScrDatasource extends BaseBean implements Serializable { private static final long serialVersionUID = 2660387454249572573L; - @Column(name="SOURCE_NAME") - @ApiParam(value ="数据源名称") + @Column(name = "SOURCE_NAME") + @ApiParam(value = "数据源名称") private String sourceName; - @Column(name="SOURCE_CODE") - @ApiParam(value ="数据源代码") + @Column(name = "SOURCE_CODE") + @ApiParam(value = "数据源代码") private String sourceCode; - @Column(name="SOURCE_STATUS") - @ApiParam(value ="数据源状态",name = "状态：可用，不可用 看枚举当中是否存在") - private Integer sourceStatus; + @Column(name = "SOURCE_CONNECTION_STATUS") + @ApiParam(value = "数据源状态", name = "状态：可用，不可用 看枚举当中是否存在") + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.DATASOURCE_CONNECTION_STATUS sourceConnectionStatus; - @Column(name="SOURCE_TYPE") - @ApiParam(value ="数据源类型",name = "CommonEnumUtil.DATA_SOURCE_TYPE") + @Column(name = "SOURCE_TYPE") + @ApiParam(value = "数据源类型", name = "CommonEnumUtil.DATA_SOURCE_TYPE") private Integer sourceType; - @Column(name="SOURCE_HOST") - @ApiParam(value ="数据源连接地址") + @Column(name = "SOURCE_HOST") + @ApiParam(value = "数据源连接地址") private String sourceHost; - @Column(name="SOURCE_PORT") - @ApiParam(value ="数据源端口") + @Column(name = "SOURCE_PORT") + @ApiParam(value = "数据源端口") private Integer sourcePort; - @Column(name="SOURCE_DATA_BASE_NAME") - @ApiParam(value ="数据库名称") + @Column(name = "SOURCE_DATA_BASE_NAME") + @ApiParam(value = "数据库名称") private String sourceDataBaseName; - @Column(name="SOURCE_USER_NAME") - @ApiParam(value ="数据库用户名称") + @Column(name = "SOURCE_USER_NAME") + @ApiParam(value = "数据库用户名称") private String sourceUserName; - @Column(name="SOURCE_PASSWORD") - @ApiParam(value ="数据库用户密码") + @Column(name = "SOURCE_PASSWORD") + @ApiParam(value = "数据库用户密码") private String sourcePassword; - @Column(name="SOURCE_DESCRIPTION") - @ApiParam(value ="数据源描述") + @Column(name = "SOURCE_DESCRIPTION") + @ApiParam(value = "数据源描述") private String sourceDescription; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java index 92dd09b..b2ff882 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java @@ -50,8 +50,4 @@ public class ScrLayoutColumn extends BaseBean implements Serializable { @ApiParam("列占位") private Integer columnSpan; - @Column(name = "ELEMENT_CODE") - @ApiParam("元素代码：panel or component") - private String elementCode; - } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrScreenPanelRel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrScreenPanelRel.java index 3edc083..a042793 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrScreenPanelRel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrScreenPanelRel.java @@ -30,7 +30,7 @@ public class ScrScreenPanelRel extends BaseBean { private static final long serialVersionUID = 3459027655126916483L; @Column(name = "SCREEN_CODE") - @ApiParam("panel代码") + @ApiParam("Screen代码") private String screenCode; @Column(name = "LAYOUT_CODE") 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 9fcf4df..8e45669 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 @@ -15,10 +15,14 @@ public abstract class BaseComponent extends BaseScreenBean { private String componentCode; + private String modelCode; + private String cssStyle; private Integer tabIndex; private String componentType = this.getClass().getName(); + private String communicationType; + } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewForm.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewForm.java index e673c57..f0c58fd 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewForm.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewForm.java @@ -13,5 +13,7 @@ import java.util.Map; @Data public class ScrViewForm extends BaseView { - private Map fields; + private Map fields; + + private String action; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetButton.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetButton.java index 563e20a..29d7906 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetButton.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetButton.java @@ -17,5 +17,5 @@ public class ScrWidgetButton extends BaseWidget { private String size; - private String onClick; + private String action; } 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/ScrPanelComponentCreateModel.java similarity index 64% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentModel.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.java index a1c7a9e..1e8c0cf 100644 --- 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/ScrPanelComponentCreateModel.java @@ -1,16 +1,13 @@ 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; +import java.util.Map; /** * @author Wynne.Lu @@ -18,7 +15,7 @@ import java.util.List; * @desc */ @Data -public class ScrPanelComponentModel implements Serializable { +public class ScrPanelComponentCreateModel implements Serializable { private static final long serialVersionUID = -5832175256726333348L; private String panelCode; @@ -29,7 +26,9 @@ public class ScrPanelComponentModel implements Serializable { private String columnCode; - private BaseComponent component; + private Map baseComponent; + + private String modelCode; private List eventActions; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java new file mode 100644 index 0000000..06635a8 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.ScrComponent; +import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; +import cn.estsh.i3plus.pojo.screen.bean.ScrPanel; +import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentModelFieldRel; +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 ScrPanelComponentQueryModel implements Serializable { + private static final long serialVersionUID = 4133777603151273736L; + + private String rowCode; + + private String columnCode; + + private ScrComponent component; + + private List eventActions; + + private List modelFields; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelLayoutModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelLayoutModel.java new file mode 100644 index 0000000..0d29a73 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelLayoutModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.ScrPanel; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/28 下午2:23 + * @desc + */ +public class ScrPanelLayoutModel { + + private ScrPanel panel; + + private ScrLayout layout; + + private List rowColumnModels; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java new file mode 100644 index 0000000..1937279 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/28 上午12:42 + * @desc + */ +@Data +public class ScrScreenPanelCreateModel implements Serializable { + private static final long serialVersionUID = -5832175256726333348L; + + private String screenCode; + + private String layoutCode; + + private String rowCode; + + private String columnCode; + + private String panelCode; + +} From 64c2ed920fbd69c42c16d1e020429e0bba928525 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 31 Mar 2021 15:31:03 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=AB=AF=E5=8F=A3=20=E8=BF=98=E5=8E=9F?= =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E5=AD=97=E7=AC=A6=E4=B8=B2=E4=B8=AD=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index e676df5..98ff7a4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -73,7 +73,7 @@ public class CommonEnumUtil { GATEWAY(96, 9000, 0, 0, "impp-gateway", "服务网关"), CLOUD(97, 0, 0, 0, "i3cloud", "微服务"), CENTER(99, 8000, 1, 0, "icloud-server", "注册中心"), - SCREEN(100, 8950, 23, 0, "i3screen", "通用界面"), + SCREEN(100, 8110, 23, 0, "i3screen", "通用界面"), /** * 平台服务 @@ -2017,7 +2017,8 @@ public class CommonEnumUtil { "?autoReconnect=true" + "&useSSL=false" + "&characterEncoding=utf-8" + - "&allowPublicKeyRetrieval=true"; + "&allowPublicKeyRetrieval=true" + + "&serverTimezone=Asia/Shanghai"; } private String getJDBCUrlOracle(String database, String host, Integer port) { From 5b003a613b0b18780040d3ed33b0e6fefde62617 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 6 Apr 2021 15:07:00 +0800 Subject: [PATCH 05/22] =?UTF-8?q?screen=E4=BF=AE=E6=94=B9=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E8=A1=A8=E5=90=8D=20=E5=A2=9E=E5=8A=A0=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ScreenEnumUtil.java | 38 +++++++++----- .../estsh/i3plus/pojo/screen/bean/ScrAction.java | 12 +++-- .../i3plus/pojo/screen/bean/ScrComponent.java | 13 ++--- .../i3plus/pojo/screen/bean/ScrDataObject.java | 17 +++--- .../pojo/screen/bean/ScrDataObjectProperty.java | 17 +++--- .../i3plus/pojo/screen/bean/ScrDatasource.java | 25 ++++----- .../cn/estsh/i3plus/pojo/screen/bean/ScrEvent.java | 9 ++-- .../i3plus/pojo/screen/bean/ScrEventAction.java | 17 +++--- .../cn/estsh/i3plus/pojo/screen/bean/ScrFile.java | 19 +++---- .../estsh/i3plus/pojo/screen/bean/ScrLayout.java | 11 ++-- .../i3plus/pojo/screen/bean/ScrLayoutColumn.java | 15 +++--- .../i3plus/pojo/screen/bean/ScrLayoutRow.java | 13 ++--- .../cn/estsh/i3plus/pojo/screen/bean/ScrModel.java | 9 ++-- .../i3plus/pojo/screen/bean/ScrModelField.java | 33 ++++++------ .../pojo/screen/bean/ScrModelFieldConstraint.java | 13 ++--- .../pojo/screen/bean/ScrModelFieldVirtual.java | 15 +++--- .../cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java | 13 ++--- .../estsh/i3plus/pojo/screen/bean/ScrScreen.java | 13 ++--- .../i3plus/pojo/screen/bean/ScrScreenHistory.java | 50 ++++++++++++++++++ .../ScrComponentEventAction.java} | 16 +++--- .../ScrComponentModelField.java} | 60 ++++++++-------------- .../ScrPanelComponent.java} | 33 +++++++----- .../ScrScreenPanel.java} | 27 ++++++---- .../screen/model/ScrPanelComponentQueryModel.java | 10 ++-- .../screen/repository/ScrComponentRepository.java | 1 - ...java => ScrComponentEventActionRepository.java} | 4 +- ....java => ScrComponentModelFieldRepository.java} | 4 +- ...itory.java => ScrPanelComponentRepository.java} | 5 +- ...pository.java => ScrScreenPanelRepository.java} | 4 +- 29 files changed, 292 insertions(+), 224 deletions(-) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenHistory.java rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{rel/ScrComponentEventActionRel.java => relation/ScrComponentEventAction.java} (65%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{rel/ScrComponentModelFieldRel.java => relation/ScrComponentModelField.java} (57%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{rel/ScrPanelComponentRel.java => relation/ScrPanelComponent.java} (50%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{rel/ScrScreenPanelRel.java => relation/ScrScreenPanel.java} (58%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/{ScrComponentModelFieldRelRepository.java => ScrComponentEventActionRepository.java} (55%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/{ScrComponentEventActionRelRepository.java => ScrComponentModelFieldRepository.java} (54%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/{ScrPanelComponentRelRepository.java => ScrPanelComponentRepository.java} (51%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/{ScrScreenPanelRelRepository.java => ScrScreenPanelRepository.java} (58%) 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 7a184e0..31f1cf1 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 @@ -158,27 +158,29 @@ public class ScreenEnumUtil { } public enum ACTION { - SEARCH(10, "search", "查询"), - CREATE(20, "create", "保存"), - UPDATE(30, "update", "更新"), - DELETE(40, "delete", "删除"), - VALID(50, "valid", "查询"), - INVALID(60, "inValid", "查询"), - SEARCH_PAGER(70, "searchPager", "查询"), - ENUM(80, "enum", "查询"), - DIRECT(90, "direct", "查询"), - DOWNLOAD(100, "download", "查询"), - UPLOAD(110, "upload", "查询"), - INVOKE(120, "invoke", "查询"); + SEARCH(10, "search", "查询", "scrSearchActionStrategy"), + CREATE(20, "create", "保存", "scrCreateActionStrategy"), + UPDATE(30, "update", "更新", "scrUpdateActionStrategy"), + DELETE(40, "delete", "删除", "scrDeleteActionStrategy"), + VALID(50, "valid", "启用", "scrValidActionStrategy"), + INVALID(60, "invalid", "禁用", "scrInvalidActionStrategy"), + SEARCH_PAGER(70, "searchPager", "分页查询", "scrSearchPagerActionStrategy"), + ENUM(80, "enum", "枚举查询", "scrEnumActionStrategy"), + DIRECT(90, "direct", "跳转", "scrDirectActionStrategy"), + DOWNLOAD(100, "download", "下载", "scrDownloadActionStrategy"), + UPLOAD(110, "upload", "上传", "scrUploadActionStrategy"), + INVOKE(120, "invoke", "调用", "scrInvokeActionStrategy"); private Integer value; private String code; private String description; + private String beanName; - ACTION(Integer value, String code, String description) { + ACTION(Integer value, String code, String description, String beanName) { this.value = value; this.code = code; this.description = description; + this.beanName = beanName; } public Integer getValue() { @@ -193,6 +195,16 @@ public class ScreenEnumUtil { return description; } + public static String beanOfCode(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equalsIgnoreCase(code)) { + tmp = values()[i].beanName; + } + } + return tmp; + } + public static String codeOfDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { 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 00dd089..a7d22c0 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,7 +2,9 @@ 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,20 +28,20 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("动作") +@ApiModel("动作") public class ScrAction extends BaseBean implements Serializable { private static final long serialVersionUID = 3832856363595940018L; @Column(name = "ACTION_CODE") - @ApiParam("动作代码") + @ApiModelProperty("动作代码") private String actionCode; @Column(name = "ACTION_NAME") - @ApiParam("动作名称") + @ApiModelProperty("动作名称") private String actionName; @Column(name = "ACTION_TYPE") - @ApiParam("动作类型") + @ApiModelProperty("动作类型") private String actionType; } \ No newline at end of file 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 index afa0a75..2ccbb5c 100644 --- 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 @@ -2,7 +2,8 @@ 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -27,25 +28,25 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("组件") +@ApiModel("组件") public class ScrComponent extends BaseBean implements Serializable { private static final long serialVersionUID = 3832856363595940018L; @Column(name = "COMPONENT_CODE") - @ApiParam(value = "组件代码") + @ApiModelProperty(value = "组件代码") private String componentCode; @Column(name = "COMPONENT_TYPE") - @ApiParam(value = "组件代码") + @ApiModelProperty(value = "组件代码") private String componentType; @Column(name = "MODEL_CODE") - @ApiParam(value = "model代码") + @ApiModelProperty(value = "model代码") private String modelCode; @Lob @Column(name = "COMPONENT_PROPERTY") - @ApiParam(value = "组件描述") + @ApiModelProperty(value = "组件描述") private String componentProperty; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java index 83141c4..92e491e 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java @@ -4,7 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -28,33 +29,33 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("数据对象管理") +@ApiModel("数据对象管理") public class ScrDataObject extends BaseBean implements Serializable { private static final long serialVersionUID = -270662014158685376L; @Column(name = "DATA_SOURCE_ID") - @ApiParam(value = "数据源ID", example = "-1") + @ApiModelProperty(value = "数据源ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long dataSourceId; @Column(name = "DATA_OBJECT_CODE") - @ApiParam(value = "数据对象代码") + @ApiModelProperty(value = "数据对象代码") private String dataObjectCode; @Column(name = "SOURCE_CODE") - @ApiParam(value = "数据源编码") + @ApiModelProperty(value = "数据源编码") private String sourceCode; @Column(name = "DATA_OBJECT_SOURCE_CODE") - @ApiParam(value = "数据名称") + @ApiModelProperty(value = "数据名称") private String dataObjectSourceCode; @Column(name = "DATA_TYPE") - @ApiParam(value = "数据类型") + @ApiModelProperty(value = "数据类型") private String dataType; @Column(name = "DESCRIPTION") - @ApiParam(value = "描述") + @ApiModelProperty(value = "描述") private String description; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java index ea1d491..af6e885 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java @@ -2,7 +2,8 @@ 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,32 +27,32 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("数据对象属性") +@ApiModel("数据对象属性") public class ScrDataObjectProperty extends BaseBean implements Serializable { private static final long serialVersionUID = 6954106365899677132L; @Column(name = "DATA_OBJECT_CODE") - @ApiParam(value = "数据对象代码") + @ApiModelProperty(value = "数据对象代码") private String dataObjectCode; @Column(name = "FIELD_CODE") - @ApiParam(value = "字段代码") + @ApiModelProperty(value = "字段代码") private String fieldCode; @Column(name = "DISPLAY_NAME") - @ApiParam(value = "字段名称") + @ApiModelProperty(value = "字段名称") private String displayName; @Column(name = "FIELD_TYPE") - @ApiParam(value = "字段类型") + @ApiModelProperty(value = "字段类型") private String fieldType; @Column(name = "IS_PRIMARY_KEY") - @ApiParam(value = "是否主键") + @ApiModelProperty(value = "是否主键") private Integer isPrimaryKey; @Column(name = "IS_NULLABLE") - @ApiParam(value = "是否允许为空") + @ApiModelProperty(value = "是否允许为空") private Integer isNullable; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java index dee82d7..609e654 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java @@ -3,7 +3,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.ApiParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -30,48 +31,48 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("数据源管理") +@ApiModel("数据源管理") public class ScrDatasource extends BaseBean implements Serializable { private static final long serialVersionUID = 2660387454249572573L; @Column(name = "SOURCE_NAME") - @ApiParam(value = "数据源名称") + @ApiModelProperty(value = "数据源名称") private String sourceName; @Column(name = "SOURCE_CODE") - @ApiParam(value = "数据源代码") + @ApiModelProperty(value = "数据源代码") private String sourceCode; @Column(name = "SOURCE_CONNECTION_STATUS") - @ApiParam(value = "数据源状态", name = "状态：可用，不可用 看枚举当中是否存在") + @ApiModelProperty(value = "数据源状态", name = "状态：可用，不可用 看枚举当中是否存在") @Enumerated(EnumType.STRING) private ScreenEnumUtil.DATASOURCE_CONNECTION_STATUS sourceConnectionStatus; @Column(name = "SOURCE_TYPE") - @ApiParam(value = "数据源类型", name = "CommonEnumUtil.DATA_SOURCE_TYPE") + @ApiModelProperty(value = "数据源类型", name = "CommonEnumUtil.DATA_SOURCE_TYPE") private Integer sourceType; @Column(name = "SOURCE_HOST") - @ApiParam(value = "数据源连接地址") + @ApiModelProperty(value = "数据源连接地址") private String sourceHost; @Column(name = "SOURCE_PORT") - @ApiParam(value = "数据源端口") + @ApiModelProperty(value = "数据源端口") private Integer sourcePort; @Column(name = "SOURCE_DATA_BASE_NAME") - @ApiParam(value = "数据库名称") + @ApiModelProperty(value = "数据库名称") private String sourceDataBaseName; @Column(name = "SOURCE_USER_NAME") - @ApiParam(value = "数据库用户名称") + @ApiModelProperty(value = "数据库用户名称") private String sourceUserName; @Column(name = "SOURCE_PASSWORD") - @ApiParam(value = "数据库用户密码") + @ApiModelProperty(value = "数据库用户密码") private String sourcePassword; @Column(name = "SOURCE_DESCRIPTION") - @ApiParam(value = "数据源描述") + @ApiModelProperty(value = "数据源描述") private String sourceDescription; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEvent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEvent.java index 5988035..bb7c145 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEvent.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEvent.java @@ -2,7 +2,8 @@ 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,15 +27,15 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("事件") +@ApiModel("事件") public class ScrEvent extends BaseBean implements Serializable { private static final long serialVersionUID = -6217007706865821613L; @Column(name = "EVENT_CODE") - @ApiParam("事件代码") + @ApiModelProperty("事件代码") private String eventCode; @Column(name = "EVENT_NAME") - @ApiParam("事件名称") + @ApiModelProperty("事件名称") private String eventName; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java index b26640f..0732be5 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java @@ -2,7 +2,8 @@ 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,31 +27,31 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("事件动作") +@ApiModel("事件动作") public class ScrEventAction extends BaseBean implements Serializable { private static final long serialVersionUID = -6217007706865821613L; @Column(name = "EVENT_ACTION_CODE") - @ApiParam("事件动作CODE") + @ApiModelProperty("事件动作CODE") private String eventActionCode; @Column(name = "EVENT_ACTION_NAME") - @ApiParam("事件动作名称") + @ApiModelProperty("事件动作名称") private String eventActionName; @Column(name = "EVENT_CODE") - @ApiParam("事件代码") + @ApiModelProperty("事件代码") private String eventCode; @Column(name = "PRE_ACTION_CODE") - @ApiParam("执行前动作代码") + @ApiModelProperty("执行前动作代码") private String preActionCode; @Column(name = "EXECUTE_ACTION_CODE") - @ApiParam("执行的动作代码") + @ApiModelProperty("执行的动作代码") private String executeActionCode; @Column(name = "POST_ACTION_CODE") - @ApiParam("执行前动作代码") + @ApiModelProperty("执行前动作代码") private String postActionCode; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java index b57e540..762d5f3 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java @@ -2,7 +2,8 @@ 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,35 +27,35 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("文件") +@ApiModel("文件") public class ScrFile extends BaseBean implements Serializable { private static final long serialVersionUID = 2343301746531746105L; @Column(name = "FILE_NAME") - @ApiParam("文件名称") + @ApiModelProperty("文件名称") private String fileName; @Column(name = "FILE_URL") - @ApiParam("文件URL") + @ApiModelProperty("文件URL") private String fileUrl; @Column(name = "GROUP_NAME") - @ApiParam("组名") + @ApiModelProperty("组名") private String groupName; @Column(name = "FILE_ORIGIN_NAME") - @ApiParam("文件原名") + @ApiModelProperty("文件原名") private String fileOriginName; @Column(name = "FILE_SIZE") - @ApiParam("文件大小") + @ApiModelProperty("文件大小") private String fileSize; @Column(name = "FILE_TYPE") - @ApiParam("文件类型名称") + @ApiModelProperty("文件类型名称") private String fileType; @Column(name = "SYNC_TAG") - @ApiParam("同步标记") + @ApiModelProperty("同步标记") private Integer syncTag = 0; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java index 7cd0101..90f9535 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java @@ -3,7 +3,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.ApiParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -29,20 +30,20 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("布局") +@ApiModel("布局") public class ScrLayout extends BaseBean implements Serializable { private static final long serialVersionUID = 3390463604300159807L; @Column(name = "LAYOUT_CODE") - @ApiParam("布局代码") + @ApiModelProperty("布局代码") private String layoutCode; @Column(name = "LAYOUT_NAME") - @ApiParam("布局名称") + @ApiModelProperty("布局名称") private String layoutName; @Column(name = "LAYOUT_TYPE") - @ApiParam("布局类型") + @ApiModelProperty("布局类型") @Enumerated(EnumType.STRING) private ScreenEnumUtil.LAYOUT_TYPE layoutType; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java index b2ff882..d226159 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java @@ -2,7 +2,8 @@ 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,28 +27,28 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("布局-父类-列") +@ApiModel("布局-父类-列") public class ScrLayoutColumn extends BaseBean implements Serializable { private static final long serialVersionUID = 5001564292608042287L; @Column(name = "LAYOUT_CODE") - @ApiParam("布局代码") + @ApiModelProperty("布局代码") private String layoutCode; @Column(name = "ROW_CODE") - @ApiParam("列代码") + @ApiModelProperty("列代码") private String rowCode; @Column(name = "COLUMN_CODE") - @ApiParam("列代码") + @ApiModelProperty("列代码") private String columnCode; @Column(name = "COLUMN_SEQ") - @ApiParam("列顺序") + @ApiModelProperty("列顺序") private Integer columnSeq; @Column(name = "COLUMN_SPAN") - @ApiParam("列占位") + @ApiModelProperty("列占位") private Integer columnSpan; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java index 9c8e451..8a90a8b 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java @@ -2,7 +2,8 @@ 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,24 +27,24 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("布局-行") +@ApiModel("布局-行") public class ScrLayoutRow extends BaseBean implements Serializable { private static final long serialVersionUID = 6042010183759804616L; @Column(name = "LAYOUT_CODE") - @ApiParam("布局代码") + @ApiModelProperty("布局代码") private String layoutCode; @Column(name = "ROW_CODE") - @ApiParam("行代码") + @ApiModelProperty("行代码") private String rowCode; @Column(name = "ROW_HEIGHT") - @ApiParam("行高") + @ApiModelProperty("行高") private Double rowHeight; @Column(name = "ROW_SEQ") - @ApiParam("行顺序") + @ApiModelProperty("行顺序") private Integer rowSeq; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java index a607aaf..e174009 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java @@ -2,7 +2,8 @@ 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,16 +27,16 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("model") +@ApiModel("model") public class ScrModel extends BaseBean implements Serializable { private static final long serialVersionUID = -4609944173378718944L; @Column(name = "MODEL_CODE") - @ApiParam("model代码") + @ApiModelProperty("model代码") private String modelCode; @Column(name = "DATA_OBJECT_CODE") - @ApiParam("数据对象代码") + @ApiModelProperty("数据对象代码") private String dataObjectCode; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java index d50cf18..855efbe 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java @@ -2,7 +2,8 @@ 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,64 +27,64 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("model字段") +@ApiModel("model字段") public class ScrModelField extends BaseBean implements Serializable { private static final long serialVersionUID = 3893137576091823152L; @Column(name = "MODEL_CODE") - @ApiParam("model代码") + @ApiModelProperty("model代码") private String modelCode; @Column(name = "FIELD_CODE") - @ApiParam("字段代码") + @ApiModelProperty("字段代码") private String fieldCode; @Column(name = "DISPLAY_NAME") - @ApiParam("字段名称") + @ApiModelProperty("字段名称") private String displayName; @Column(name = "IS_FUZZY_SEARCH") - @ApiParam("是否支持模糊查询") + @ApiModelProperty("是否支持模糊查询") private Boolean isFuzzySearch; @Column(name = "IS_SHOW_IN_NEW") - @ApiParam("是否在新增时展示") + @ApiModelProperty("是否在新增时展示") private Boolean isShowInNew; @Column(name = "IS_SHOW_IN_EDIT") - @ApiParam("是否在编辑时展示") + @ApiModelProperty("是否在编辑时展示") private Boolean isShowInEdit; @Column(name = "IS_ALLOW_SORT") - @ApiParam("是否支持排序") + @ApiModelProperty("是否支持排序") private Boolean isAllowSort; @Column(name = "FORM_SEQ") - @ApiParam("表单顺序") + @ApiModelProperty("表单顺序") private Integer formSeq; @Column(name = "TABLE_SEQ") - @ApiParam("表格顺序") + @ApiModelProperty("表格顺序") private Integer tableSeq; @Column(name = "VALIDATION") - @ApiParam("校验") + @ApiModelProperty("校验") private String validation; @Column(name = "DICTIONARY") - @ApiParam("字典") + @ApiModelProperty("字典") private String dictionary; @Column(name = "IS_VIRTUAL") - @ApiParam("是否是虚拟的") + @ApiModelProperty("是否是虚拟的") private boolean isVirtual; @Column(name = "FIELD_NAME") - @ApiParam("字段名称") + @ApiModelProperty("字段名称") private String fieldName; @Column(name = "SPEL_VIRTUAL_VALUE") - @ApiParam("SPEL表达式虚拟属性") + @ApiModelProperty("SPEL表达式虚拟属性") private String spelVirtualValue; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldConstraint.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldConstraint.java index fc82a9b..4f3a0ed 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldConstraint.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldConstraint.java @@ -2,7 +2,8 @@ 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,23 +27,23 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("model字段约束") +@ApiModel("model字段约束") public class ScrModelFieldConstraint extends BaseBean implements Serializable { private static final long serialVersionUID = 5020158684534641672L; @Column(name = "MODEL_CODE") - @ApiParam("model代码") + @ApiModelProperty("model代码") private String modelCode; @Column(name = "CONSTRAINT_TYPE") - @ApiParam("约束类型") + @ApiModelProperty("约束类型") private String constraintType; @Column(name = "GROUP_NO") - @ApiParam("组号") + @ApiModelProperty("组号") private Integer groupNo; @Column(name = "FIELD_CODE") - @ApiParam("字段代码") + @ApiModelProperty("字段代码") private String fieldCode; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldVirtual.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldVirtual.java index 0a091b3..aa5817a 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldVirtual.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldVirtual.java @@ -2,7 +2,8 @@ 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,28 +27,28 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("model虚拟字段") +@ApiModel("model虚拟字段") public class ScrModelFieldVirtual extends BaseBean implements Serializable { private static final long serialVersionUID = -7756539161394751580L; @Column(name = "MODEL_CODE") - @ApiParam("model代码") + @ApiModelProperty("model代码") private String modelCode; @Column(name = "VIRTUAL_FIELD_NAME") - @ApiParam("虚拟字段名称") + @ApiModelProperty("虚拟字段名称") private String virtualFieldName; @Column(name = "SPEL_CALC_EXPRESSION") - @ApiParam("SPEL计算表达式") + @ApiModelProperty("SPEL计算表达式") private String spelCalcExpression; @Column(name = "GROUP_NO") - @ApiParam("组号") + @ApiModelProperty("组号") private Integer groupNo; @Column(name = "FIELD_CODE") - @ApiParam("字段代码") + @ApiModelProperty("字段代码") private String fieldCode; } 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 527865d..416af7c 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 @@ -2,7 +2,8 @@ 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,22 +27,22 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("Panel") +@ApiModel("Panel") public class ScrPanel extends BaseBean implements Serializable { @Column(name = "PANEL_CODE") - @ApiParam("Panel代码") + @ApiModelProperty("Panel代码") private String panelCode; @Column(name = "PANEL_NAME") - @ApiParam("Panel名称") + @ApiModelProperty("Panel名称") private String panelName; @Column(name = "PANEL_LAYOUT_CODE") - @ApiParam("布局代码") + @ApiModelProperty("布局代码") private String layoutCode; @Column(name = "USAGE_AMOUNT") - @ApiParam("使用数量") + @ApiModelProperty("使用数量") private Integer usageAmount; } 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 13f8bfe..1c973ec 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 @@ -2,7 +2,8 @@ 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,24 +27,24 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder -@Api("页面") +@ApiModel("页面") public class ScrScreen extends BaseBean implements Serializable { private static final long serialVersionUID = -6755902986892118213L; @Column(name = "SCREEN_CODE") - @ApiParam("页面代码") + @ApiModelProperty("页面代码") private String screenCode; @Column(name = "SCREEN_NAME") - @ApiParam("页面名称") + @ApiModelProperty("页面名称") private String screenName; @Column(name = "SCREEN_VERSION") - @ApiParam("页面版本") + @ApiModelProperty("页面版本") private String screenVersion; @Column(name = "SCREEN_LAYOUT_CODE") - @ApiParam("布局代码") + @ApiModelProperty("布局代码") private String layoutCode; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenHistory.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenHistory.java new file mode 100644 index 0000000..35639e4 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenHistory.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +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 下午1:27 + * @desc + */ +@Entity +@Table(name = "SCR_SCREEN_HISTORY") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("数据对象管理") +public class ScrScreenHistory extends BaseBean implements Serializable { + private static final long serialVersionUID = -2191090486124097302L; + + @Column(name = "SCREEN_CODE") + @ApiModelProperty(value = "界面代码") + private String screenCode; + + @Column(name = "SCREEN_VERSION") + @ApiModelProperty(value = "页面版本") + private String screenVersion; + + @Lob + @Column(name = "SCREEN_DETAIL") + @ApiModelProperty(value = "界面详情") + private String screenDetail; + + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentEventActionRel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentEventAction.java similarity index 65% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentEventActionRel.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentEventAction.java index eab43aa..8f19dbc 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentEventActionRel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentEventAction.java @@ -1,8 +1,8 @@ -package cn.estsh.i3plus.pojo.screen.bean.rel; +package cn.estsh.i3plus.pojo.screen.bean.relation; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,21 +19,21 @@ import javax.persistence.Table; * @desc */ @Entity -@Table(name = "SCR_COMPONENT_EVENT_ACTION_REL") +@Table(name = "SCR_COMPONENT_EVENT_ACTION") @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor @Builder -@Api("组件事件动作") -public class ScrComponentEventActionRel extends BaseBean { +@ApiModel("组件事件动作") +public class ScrComponentEventAction extends BaseBean { private static final long serialVersionUID = 7600064730551351570L; @Column(name = "COMPONENT_CODE") - @ApiParam("组件代码") + @ApiModelProperty("组件代码") private String componentCode; @Column(name = "EVENT_ACTION_CODE") - @ApiParam("事件动作代码") + @ApiModelProperty("事件动作代码") private String eventActionCode; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentModelFieldRel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentModelField.java similarity index 57% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentModelFieldRel.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentModelField.java index fc0521d..9e79e14 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentModelFieldRel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentModelField.java @@ -1,9 +1,8 @@ -package cn.estsh.i3plus.pojo.screen.bean.rel; +package cn.estsh.i3plus.pojo.screen.bean.relation; 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,11 +11,8 @@ 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 @@ -24,90 +20,78 @@ import java.util.List; * @desc */ @Entity -@Table(name = "SCR_COMPONENT_MODEL_FIELD_REL") +@Table(name = "SCR_COMPONENT_MODEL_FIELD") @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor @Builder -@Api("Panel与Model字段的关系") -public class ScrComponentModelFieldRel extends BaseBean implements Serializable { +@ApiModel("Panel与Model字段的关系") +public class ScrComponentModelField extends BaseBean implements Serializable { private static final long serialVersionUID = -3441031841089357196L; @Column(name = "PANEL_CODE") - @ApiParam("Panel代码") + @ApiModelProperty("Panel代码") private String panelCode; - @Column(name = "LAYOUT_CODE") - @ApiParam("布局代码") - private String layoutCode; - - @Column(name = "ROW_CODE") - @ApiParam("行代码") - private String rowCode; - - @Column(name = "COLUMN_CODE") - @ApiParam("列代码") - private String columnCode; - @Column(name = "COMPONENT_CODE") - @ApiParam("组件代码") + @ApiModelProperty("组件代码") private String componentCode; @Column(name = "MODEL_CODE") - @ApiParam("model代码") + @ApiModelProperty("model代码") private String modelCode; @Column(name = "FIELD_CODE") - @ApiParam("字段代码") + @ApiModelProperty("字段代码") private String fieldCode; @Column(name = "DISPLAY_NAME") - @ApiParam("字段名称") + @ApiModelProperty("字段名称") private String displayName; @Column(name = "IS_FUZZY_SEARCH") - @ApiParam("是否支持模糊查询") + @ApiModelProperty("是否支持模糊查询") private Boolean isFuzzySearch; @Column(name = "IS_SHOW_IN_NEW") - @ApiParam("是否在新增时展示") + @ApiModelProperty("是否在新增时展示") private Boolean isShowInNew; @Column(name = "IS_SHOW_IN_EDIT") - @ApiParam("是否在编辑时展示") + @ApiModelProperty("是否在编辑时展示") private Boolean isShowInEdit; @Column(name = "IS_ALLOW_SORT") - @ApiParam("是否支持排序") + @ApiModelProperty("是否支持排序") private Boolean isAllowSort; @Column(name = "FORM_SEQ") - @ApiParam("表单顺序") + @ApiModelProperty("表单顺序") private Integer formSeq; @Column(name = "TABLE_SEQ") - @ApiParam("表格顺序") + @ApiModelProperty("表格顺序") private Integer tableSeq; @Column(name = "VALIDATION") - @ApiParam("校验") + @ApiModelProperty("校验") private String validation; @Column(name = "DICTIONARY") - @ApiParam("字典") + @ApiModelProperty("字典") private String dictionary; @Column(name = "IS_VIRTUAL") - @ApiParam("是否是虚拟的") + @ApiModelProperty("是否是虚拟的") private boolean isVirtual; @Column(name = "FIELD_NAME") - @ApiParam("字段名称") + @ApiModelProperty("字段名称") private String fieldName; @Column(name = "SPEL_VIRTUAL_VALUE") - @ApiParam("SPEL表达式虚拟属性") + @ApiModelProperty("SPEL表达式虚拟属性") private String spelVirtualValue; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrPanelComponentRel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrPanelComponent.java similarity index 50% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrPanelComponentRel.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrPanelComponent.java index c3fe551..899086f 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrPanelComponentRel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrPanelComponent.java @@ -1,17 +1,16 @@ -package cn.estsh.i3plus.pojo.screen.bean.rel; +package cn.estsh.i3plus.pojo.screen.bean.relation; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.screen.component.base.BaseComponent; -import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Lob; +import javax.persistence.Index; import javax.persistence.Table; +import javax.persistence.UniqueConstraint; /** * @author Wynne.Lu @@ -19,30 +18,36 @@ import javax.persistence.Table; * @desc */ @Entity -@Table(name = "SCR_PANEL_COMPONENT_REL") +@Table(name = "SCR_PANEL_COMPONENT", +// indexes = { +// @Index(columnList = "PANEL_CODE")}, + uniqueConstraints = { + @UniqueConstraint(columnNames = {"PANEL_CODE", "LAYOUT_CODE"}) + } +) @Data @EqualsAndHashCode(callSuper = true) -@Api("Panel与组件的关系") -public class ScrPanelComponentRel extends BaseBean { +@ApiModel("Panel与组件的关系") +public class ScrPanelComponent extends BaseBean { private static final long serialVersionUID = 3459027655126916483L; @Column(name = "PANEL_CODE") - @ApiParam("panel代码") + @ApiModelProperty("panel代码") private String panelCode; @Column(name = "LAYOUT_CODE") - @ApiParam("布局代码") + @ApiModelProperty("布局代码") private String layoutCode; @Column(name = "ROW_CODE") - @ApiParam("行代码") + @ApiModelProperty("行代码") private String rowCode; @Column(name = "COLUMN_CODE") - @ApiParam("列代码") + @ApiModelProperty("列代码") private String columnCode; @Column(name = "COMPONENT_CODE") - @ApiParam(value = "组件代码") + @ApiModelProperty(value = "组件代码") private String componentCode; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrScreenPanelRel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrScreenPanel.java similarity index 58% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrScreenPanelRel.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrScreenPanel.java index a042793..70da97c 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrScreenPanelRel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrScreenPanel.java @@ -1,8 +1,8 @@ -package cn.estsh.i3plus.pojo.screen.bean.rel; +package cn.estsh.i3plus.pojo.screen.bean.relation; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,6 +12,7 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.UniqueConstraint; /** * @author Wynne.Lu @@ -19,33 +20,37 @@ import javax.persistence.Table; * @desc */ @Entity -@Table(name = "SCR_SCREEN_PANEL_REL") +@Table(name = "SCR_SCREEN_PANEL", + uniqueConstraints = { + @UniqueConstraint(columnNames = {"SCREEN_CODE", "LAYOUT_CODE"}) + } +) @Data @NoArgsConstructor @AllArgsConstructor @Builder @EqualsAndHashCode(callSuper = true) -@Api("Screen与Panel的关系") -public class ScrScreenPanelRel extends BaseBean { +@ApiModel("Screen与Panel的关系") +public class ScrScreenPanel extends BaseBean { private static final long serialVersionUID = 3459027655126916483L; @Column(name = "SCREEN_CODE") - @ApiParam("Screen代码") + @ApiModelProperty("Screen代码") private String screenCode; @Column(name = "LAYOUT_CODE") - @ApiParam("布局代码") + @ApiModelProperty("布局代码") private String layoutCode; @Column(name = "ROW_CODE") - @ApiParam("行代码") + @ApiModelProperty("行代码") private String rowCode; @Column(name = "COLUMN_CODE") - @ApiParam("列代码") + @ApiModelProperty("列代码") private String columnCode; @Column(name = "PANEL_CODE") - @ApiParam(value = "panel代码") + @ApiModelProperty(value = "panel代码") private String panelCode; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java index 06635a8..276e7ac 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java @@ -2,11 +2,7 @@ package cn.estsh.i3plus.pojo.screen.model; import cn.estsh.i3plus.pojo.screen.bean.ScrComponent; import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction; -import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; -import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; -import cn.estsh.i3plus.pojo.screen.bean.ScrPanel; -import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentModelFieldRel; -import cn.estsh.i3plus.pojo.screen.component.base.BaseComponent; +import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentModelField; import lombok.Data; import java.io.Serializable; @@ -27,8 +23,8 @@ public class ScrPanelComponentQueryModel implements Serializable { private ScrComponent component; - private List eventActions; + private ScrEventAction eventAction; - private List modelFields; + private List modelFields; } 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 cee476f..562d104 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 @@ -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.ScrComponent; -import cn.estsh.i3plus.pojo.screen.bean.rel.ScrPanelComponentRel; /** * @Description : 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/ScrComponentEventActionRepository.java similarity index 55% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRelRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRepository.java index 0e2dd3f..985642d 100644 --- 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/ScrComponentEventActionRepository.java @@ -1,7 +1,7 @@ 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; +import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentEventAction; /** * @Description : @@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentModelFieldRel; * @CreateDate : 20-5-28 下午3:39 * @Modify: **/ -public interface ScrComponentModelFieldRelRepository extends BaseRepository { +public interface ScrComponentEventActionRepository 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/ScrComponentModelFieldRepository.java similarity index 54% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRelRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRepository.java index 2191440..e441be7 100644 --- 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/ScrComponentModelFieldRepository.java @@ -1,7 +1,7 @@ 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; +import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentModelField; /** * @Description : @@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentEventActionRel; * @CreateDate : 20-5-28 下午3:39 * @Modify: **/ -public interface ScrComponentEventActionRelRepository extends BaseRepository { +public interface ScrComponentModelFieldRepository 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/ScrPanelComponentRepository.java similarity index 51% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRelRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRepository.java index 0262987..4512ece 100644 --- 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/ScrPanelComponentRepository.java @@ -1,8 +1,7 @@ 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; +import cn.estsh.i3plus.pojo.screen.bean.relation.ScrPanelComponent; /** * @Description : @@ -11,5 +10,5 @@ import cn.estsh.i3plus.pojo.screen.bean.rel.ScrPanelComponentRel; * @CreateDate : 20-5-28 下午3:39 * @Modify: **/ -public interface ScrPanelComponentRelRepository extends BaseRepository { +public interface ScrPanelComponentRepository 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/ScrScreenPanelRepository.java similarity index 58% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRelRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRepository.java index 610c14f..cfe08b3 100644 --- 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/ScrScreenPanelRepository.java @@ -1,7 +1,7 @@ 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; +import cn.estsh.i3plus.pojo.screen.bean.relation.ScrScreenPanel; /** * @Description : @@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.screen.bean.rel.ScrScreenPanelRel; * @CreateDate : 20-5-28 下午3:39 * @Modify: **/ -public interface ScrScreenPanelRelRepository extends BaseRepository { +public interface ScrScreenPanelRepository extends BaseRepository { } From b688f4aff5e4ca808329a5eede6bd24efbc5ef26 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 6 Apr 2021 17:26:52 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E3=80=9014905=2020027-=E8=B0=83=E8=A7=92?= =?UTF-8?q?=E5=99=A8BH-=E5=BD=95=E5=85=A5=E6=A3=80=E6=B5=8B=E5=80=BC-=20?= =?UTF-8?q?=E7=86=94=E6=B7=B1=E7=BB=93=E6=9E=9C=E5=88=B7=E6=96=B0=E6=9C=89?= =?UTF-8?q?=E8=AF=AF=20-20210404=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 4 ++ .../i3plus/pojo/wms/modelbean/WmsBatchModel.java | 46 ++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index 3c36fe5..ae4fa00 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -104,6 +104,10 @@ public class WmsSerialSnTrans extends BaseBean { @ApiParam("操作类型") private List transTypeLst; + public int getIsOkVal() { + return this.isOk == null ? 0 : this.isOk; + } + public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) { this.organizeCode = wmsSerialSn.getOrganizeCode(); this.batchNo = wmsSerialSn.getBatchNo(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java new file mode 100644 index 0000000..5d6f4d1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : Batch数据模型 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2021-04-05 14:53 + * @Modify: + **/ +@Data +@Api("Batch数据模型") +public class WmsBatchModel { + + @ApiParam("二维条码集合") + private List wmsSerialSns; + + @ApiParam("条码集合") + private List wmsStockSnList; + + @ApiParam("Batch号") + private String bhCode; + + @ApiParam("上一个熔深Batch号") + private String firstSnBatch; + + @ApiParam("新事务单号") + private String moveNo; + + @ApiParam("是否正常件") + private boolean flag; + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("操作人") + private String userName; + +} From 6ffd5862749c26418e5a1cb6f2e1c5f6e913908d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 6 Apr 2021 18:04:37 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E3=80=9014903=2019108+=20PCN=E3=80=90?= =?UTF-8?q?=E4=B8=8A=E8=A3=85=E5=B7=A5=E4=BD=8D=E3=80=91=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20+2021-04-03=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index d4d2787..7072531 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -6625,4 +6625,32 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum THA_MONITOR_STATUS { + MONITORING(10, "MONITORING", "监听中"), + MONITOR_COMPLETE(20, "MONITOR_COMPLETE", "监听完成"); + + private int value; + private String code; + private String description; + + THA_MONITOR_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + } From 63dc4a2f9f71995cdc84cc1894fbe821c2c4617e Mon Sep 17 00:00:00 2001 From: github33 <337942886@qq.com> Date: Wed, 7 Apr 2021 13:39:30 +0800 Subject: [PATCH 08/22] =?UTF-8?q?14850=2020027-mes=E6=9F=A5=E8=AF=A2=20wms?= =?UTF-8?q?=E7=9A=84=E7=86=94=E6=B7=B1batch=E7=9A=84=E6=8E=A5=E5=8F=A3-202?= =?UTF-8?q?10409?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsTestResultSummary.java | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index 150116a..5d03e6d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -16,6 +16,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.Map; /** * @Description :检测结果汇总表 @@ -97,9 +98,23 @@ public class WmsTestResultSummary extends BaseBean { private String sn; @Transient + @ApiParam("库存条码") + private Map bhTypes; + + @Transient @ApiParam("库存条码二维码") private String serialSn; + @Transient + @ApiParam("是否合格最大值") + private Integer maxQualified; + + + @Transient + @ApiParam("是否合格最小值") + private Integer minQualified; + + public WmsTestResultSummary(String organizeCode, String bhCode, String workCenterCode, String partNo, String partName, String flagNo, Integer isQualified, @@ -135,6 +150,14 @@ public class WmsTestResultSummary extends BaseBean { this.bhType = bhType; } + public WmsTestResultSummary(Integer bhType, Integer maxQualified, Integer minQualified, String workCenterCode, String partNo) { + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.bhType = bhType; + this.maxQualified = maxQualified; + this.minQualified = minQualified; + } + public WmsTestResultSummary() { } } From 6030c6702134a14548b9c05dfaa0af1bc173ac43 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 7 Apr 2021 14:35:59 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java index db0a2af..14fbae8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java @@ -4,14 +4,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; /** @@ -59,4 +59,11 @@ public class WmsPrintingQueue extends BaseBean{ @Column(name="VENDOR_NO") @ApiParam("供应商编码") private String vendorNo; + + public WmsPrintingQueue() { + } + + public WmsPrintingQueue(Long id) { + this.id = id; + } } \ No newline at end of file From be26c0920f4e8cf1e3634a6c01e397cac57194e2 Mon Sep 17 00:00:00 2001 From: github33 <337942886@qq.com> Date: Wed, 7 Apr 2021 18:01:18 +0800 Subject: [PATCH 10/22] =?UTF-8?q?14850=2020027-mes=E6=9F=A5=E8=AF=A2=20wms?= =?UTF-8?q?=E7=9A=84=E7=86=94=E6=B7=B1batch=E7=9A=84=E6=8E=A5=E5=8F=A3-202?= =?UTF-8?q?10409?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index 5d03e6d..5327553 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -98,8 +98,8 @@ public class WmsTestResultSummary extends BaseBean { private String sn; @Transient - @ApiParam("库存条码") - private Map bhTypes; + @ApiParam("BH号集合") + private Map bhTypes; @Transient @ApiParam("库存条码二维码") From afc0138e83036f62a65e1c21dd1a1f7bcc9a4bdb Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 7 Apr 2021 20:33:27 +0800 Subject: [PATCH 11/22] =?UTF-8?q?refactor(core):=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E8=BF=87=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit1 21.4.7 --- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 104 +++++++++++---------- 1 file changed, 54 insertions(+), 50 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 835b626..2e48409 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -28,92 +28,96 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_USER") -@Api(value="账号登陆表",description = "账号登陆系统账户。") +@Table(name = "SYS_USER") +@Api(value = "账号登陆表", description = "账号登陆系统账户。") public class SysUser extends BaseBean { private static final long serialVersionUID = 3721769401146979123L; - @Column(name="USER_INFO_ID") - @ApiParam(value ="人员ID" , example = "-1") + @Column(name = "USER_INFO_ID") + @ApiParam(value = "人员ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long userInfoId; - @Column(name="LANGUAGE_CODE") - @ApiParam(value ="用户语言") + @Column(name = "LANGUAGE_CODE") + @ApiParam(value = "用户语言") private String languageCode; - @Column(name="USER_NAME_RDD") - @ApiParam(value ="用户名称" , access ="账号名称") + @Column(name = "USER_NAME_RDD") + @ApiParam(value = "用户名称", access = "账号名称") private String userName; - @Column(name="USER_LOGIN_NAME") - @ApiParam(value ="登陆名称" , access ="登陆名称") + @Column(name = "USER_LOGIN_NAME") + @ApiParam(value = "登陆名称", access = "登陆名称") private String userLoginName; - @Column(name="USER_EMP_NO") - @ApiParam(value ="工号") + @Column(name = "USER_EMP_NO") + @ApiParam(value = "工号") private String userEmpNo; @Deprecated // 废弃密码新 , 使用ID作为密码信息, 改密码作为数据传输使用 - @Column(name="USER_LOGIN_PASSWORD") - @ApiParam(value ="登陆密码") + @Column(name = "USER_LOGIN_PASSWORD") + @ApiParam(value = "登陆密码") private String userLoginPassword; - @Column(name="USER_LOGIN_PASSWORD_ID") - @ApiParam(value ="密码ID" , example = "-1") + @Column(name = "USER_LOGIN_PASSWORD_ID") + @ApiParam(value = "密码ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long userLoginPasswordId; - @Column(name="USER_TYPE") - @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") + @Column(name = "USER_PASSWORD_LAST_MODIFY_TIME") + @ApiParam(value = "用户最后一次修改密码时间") + private String userPasswordLastModifyTime; + + @Column(name = "USER_TYPE") + @ApiParam(value = "账号类型（枚举，待定）", example = "-1") private Integer userType; - @Column(name="USER_EMAIL") - @ApiParam(value ="邮箱" , access ="邮箱") + @Column(name = "USER_EMAIL") + @ApiParam(value = "邮箱", access = "邮箱") private String userEmail; - @Column(name="USER_PHONE") - @ApiParam(value ="手机号" , access ="手机号") + @Column(name = "USER_PHONE") + @ApiParam(value = "手机号", access = "手机号") private String userPhone; - @Column(name="USER_WECHAT_NO") - @ApiParam(value ="微信号") + @Column(name = "USER_WECHAT_NO") + @ApiParam(value = "微信号") private String userWeChatNo; - @Column(name="USER_STATUS") - @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") + @Column(name = "USER_STATUS") + @ApiParam(value = "账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)", example = "-1") private Integer userStatus; - @Column(name="USER_LOGIN_NUM") - @ApiParam(value ="登录次数",example = "0") + @Column(name = "USER_LOGIN_NUM") + @ApiParam(value = "登录次数", example = "0") private Integer userLoginNum; @Deprecated - @Column(name="USER_LOGIN_LAST_DATE_TIME") - @ApiParam(value ="账号最后登录时间") + @Column(name = "USER_LOGIN_LAST_DATE_TIME") + @ApiParam(value = "账号最后登录时间") private String userLoginLastDateTime; -/********************************** 关系信息 ********************************/ + /********************************** 关系信息 ********************************/ - @Column(name="DEPARTMENT_ID") - @ApiParam(value ="部门ID" , example ="-1") + @Column(name = "DEPARTMENT_ID") + @ApiParam(value = "部门ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long departmentId; - @Column(name="ORGANIZE_ID") - @ApiParam(value ="组织ID" , example = "0") + @Column(name = "ORGANIZE_ID") + @ApiParam(value = "组织ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long organizeId; -/********************************** 冗余信息 ********************************/ + /********************************** 冗余信息 ********************************/ - @Column(name="DEPARTMENT_NAME_RDD") - @ApiParam(value ="部门名称" , access ="部门名称") + @Column(name = "DEPARTMENT_NAME_RDD") + @ApiParam(value = "部门名称", access = "部门名称") private String departmentNameRdd; - @Column(name="ORGANIZE_NAME_RDD") - @ApiParam(value ="组织名称" , access ="组织名称") + @Column(name = "ORGANIZE_NAME_RDD") + @ApiParam(value = "组织名称", access = "组织名称") private String organizeNameRdd; // @Lob @@ -131,44 +135,44 @@ public class SysUser extends BaseBean { // @ApiParam(value ="组织名称集合") // private String organizeNamesRdd; -/********************************** 非数据库信息 ********************************/ + /********************************** 非数据库信息 ********************************/ @Transient - @ApiParam(value ="用户部门信息") + @ApiParam(value = "用户部门信息") private SysDepartment department; @Transient - @ApiParam(value ="用户组织信息") + @ApiParam(value = "用户组织信息") private SysOrganize organize; @Transient - @ApiParam(value ="账号所有操作组织信息") + @ApiParam(value = "账号所有操作组织信息") private List organizeList; @Transient - @ApiParam(value ="账号所有操作部门 Id 集合") + @ApiParam(value = "账号所有操作部门 Id 集合") private List departmentIdList; @Transient - @ApiParam(value ="账号所有操作部门信息") + @ApiParam(value = "账号所有操作部门信息") private List departmentList; @Transient - @ApiParam(value ="角色ID" , example = "0") + @ApiParam(value = "角色ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long roleId; @Transient - @ApiParam(value ="角色ID集合" , example = "0") + @ApiParam(value = "角色ID集合", example = "0") @JsonSerialize(using = ToStringSerializer.class) private List roleIdList; @Transient - @ApiParam(value ="账号所有角色信息") + @ApiParam(value = "账号所有角色信息") private List roleList; @Transient - @ApiParam(value ="账号所有操作权限信息") + @ApiParam(value = "账号所有操作权限信息") private List menuList; /*** test ***/ From 9c4b233975c13d4a555c1b071ea51d1599a20443 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 8 Apr 2021 15:00:59 +0800 Subject: [PATCH 12/22] =?UTF-8?q?refactor(core):=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E8=BF=87=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Finish 21.4.8 --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 865a2d9..7e34af8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1084,7 +1084,8 @@ public class ImppEnumUtil { LOG(7, "日志配置"), WORK_WECHAT(8, "企业微信配置"), SMS(9, "短信配置"), - SSO(10, "单点登录配置"); + SSO(10, "单点登录配置"), + PASSWORD_EXPIRE(11, "密码过期策略"); private final int value; private final String description; From 48546737542e1c2d800209c55a8590a742a17147 Mon Sep 17 00:00:00 2001 From: github33 <337942886@qq.com> Date: Thu, 8 Apr 2021 17:46:38 +0800 Subject: [PATCH 13/22] =?UTF-8?q?14850=2020027-mes=E6=9F=A5=E8=AF=A2=20wms?= =?UTF-8?q?=E7=9A=84=E7=86=94=E6=B7=B1batch=E7=9A=84=E6=8E=A5=E5=8F=A3-202?= =?UTF-8?q?10409?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index 5327553..60b5370 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -16,6 +16,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; import java.util.Map; /** @@ -106,6 +107,10 @@ public class WmsTestResultSummary extends BaseBean { private String serialSn; @Transient + @ApiParam("返回给mes") + private List wmsForMes; + + @Transient @ApiParam("是否合格最大值") private Integer maxQualified; From 77f66de188d0509688018a0b7e5a13023bd03c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 9 Apr 2021 17:18:54 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E3=80=9014930=2020027-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E7=94=9F=E4=BA=A7=E5=8C=85=E8=A3=85=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=BA=A7=E5=93=81=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=A0=B9=E6=8D=AE=E4=BA=A7=E5=93=81=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=87=BA=E5=8C=85=E8=A3=85=E6=9D=A1=E7=A0=81?= =?UTF-8?q?-20210409=E3=80=91=20=E3=80=9014884=2020027--=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=AE=A1=E5=88=92--=E7=BC=96=E8=BE=91=E4=B8=AD=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=B8=80=E8=A1=8C=E6=95=B0=E6=8D=AE=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8E=EF=BC=8C=E4=B8=8D=E5=81=9A=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=9B=B4=E6=96=B0=E3=80=82-2021-04-06=E3=80=91=20?= =?UTF-8?q?=E3=80=9014848=2020027--=E6=8E=A7=E5=88=B6=E8=AE=A1=E5=88=92--?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=B8=AD=E8=BE=93=E5=85=A5=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E6=9D=A1=E4=BB=B6=E6=B2=A1=E6=9C=89=E7=94=9F?= =?UTF-8?q?=E6=95=88=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E6=8C=89=E7=85=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E6=98=BE=E7=A4=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C-2021-04-02=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 89307ed..d0ed327 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -207,6 +207,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("工序名称") private String processName; + @Transient + @ApiParam("产品条码") + private String productSn; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java index 4dab68a..d3f4b25 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java @@ -40,6 +40,9 @@ public class MesControlPlanModel { @ApiParam("是否启用") private Integer isEnable; + @ApiParam("是否删除") + private Integer isCutOut; + @ApiParam("质量标准数组") private List standardList; From 39b716d2a1356ef3a5e9ab1507ecc725c3829fea Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 12 Apr 2021 14:47:32 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java index 14fbae8..19ed55a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java @@ -63,7 +63,7 @@ public class WmsPrintingQueue extends BaseBean{ public WmsPrintingQueue() { } - public WmsPrintingQueue(Long id) { - this.id = id; + public WmsPrintingQueue(String printIdentification) { + this.printIdentification = printIdentification; } } \ No newline at end of file From a24b40d8ecdb616ef0620016c84c23a4b2c658af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 12 Apr 2021 18:01:02 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E5=96=9C=E5=BE=B7=E4=BB=BB=E5=8A=A1#3349?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 42 ++++++++++++++-------- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 10 +++++- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 2ae023d..dc8ee3f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -8,8 +8,10 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; + import javax.persistence.Inheritance; import javax.persistence.InheritanceType; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -114,43 +116,43 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, -dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", - searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code") public String srcWhNo; @Column(name = "SRC_ZONE_NO") @ApiParam("源存储区代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, -dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", - searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") public String srcZoneNo; @Column(name = "SRC_LOCATE_NO") @ApiParam("源库位代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, -dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", - searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") public String srcLocateNo; @Column(name = "DEST_WH_NO") @ApiParam("目标仓库代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, -dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", - searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code") public String destWhNo; @Column(name = "DEST_ZONE_NO") @ApiParam("目标存储区代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, -dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", - searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") public String destZoneNo; @Column(name = "DEST_LOCATE_NO") @ApiParam("目标库位代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, -dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", - searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") public String destLocateNo; /** @@ -195,11 +197,22 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomVersion; - @ApiParam(value = "待出库数量", example = "0") + + @ApiParam(value = "源库位余额") + @ColumnDefault("0") + @Column(name = "SRC_LOCATE_REST_QTY", columnDefinition = "decimal(18,8)") + private Double srcLocateRestQty = 0D; + + @ApiParam(value = "目标库位余额") + @ColumnDefault("0") + @Column(name = "DEST_LOCATE_REST_QTY", columnDefinition = "decimal(18,8)") + private Double destLocateRestQty = 0D; + + @ApiParam(value = "待出库数量") @Transient private Long waitingCounts; - @ApiParam(value = "已出库数量", example = "0") + @ApiParam(value = "已出库数量") @Transient private Long finishedCounts; @@ -371,6 +384,7 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } + public Double getHandledQtyVal() { return this.handledQty == null ? 0 : this.handledQty.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index de87f69..9eddcc6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -4,8 +4,10 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; + import javax.persistence.Inheritance; import javax.persistence.InheritanceType; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -179,7 +181,7 @@ public class WmsStockQuan extends BaseBean { @Transient @ApiParam(value = "差异数量MAP") - private Map> differenceQtyMap; + private Map> differenceQtyMap; public Integer getIsSnapshot() { @@ -190,6 +192,10 @@ public class WmsStockQuan extends BaseBean { return areaNo; } + public Double getTotalQty() { + return qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty; + } + public Double getQtyVal() { return this.qty == null ? 0 : this.qty; } @@ -295,6 +301,7 @@ public class WmsStockQuan extends BaseBean { this.prodCfgTypeName = prodCfgTypeName; this.scrapQty = scrapQty; } + public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.qty = qty; this.failQty = failQty; @@ -378,6 +385,7 @@ public class WmsStockQuan extends BaseBean { this.partNameRdd = partNameRdd; this.qty = qty; } + public WmsStockQuan(String whNo, String zoneNo, String locateNo, String partNo, String partNameRdd) { this.whNo = whNo; this.zoneNo = zoneNo; From 091a5b36783784cb996c989b5a6726654e84f626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 13 Apr 2021 14:00:17 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=8F=90=E7=A4=BA+=E5=96=9C=E5=BE=B7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A13349?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 9eddcc6..886e8de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -193,7 +193,8 @@ public class WmsStockQuan extends BaseBean { } public Double getTotalQty() { - return qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty; + return this.getQtyVal() + this.getFailQtyVal()+ this.getHoldQtyVal()+ this.getQcQtyVal() + + this.getRinQtyVal()+ this.getFreezeQtyVal()+ this.getConsignQtyVal()+ this.getScrapQtyVal(); } public Double getQtyVal() { From e1f366f654f0e20ed35d33fba9d19b5aecec5515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 13 Apr 2021 16:11:52 +0800 Subject: [PATCH 18/22] =?UTF-8?q?=E5=96=9C=E5=BE=B7=E4=BB=BB=E5=8A=A1#3349?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 886e8de..fed5744 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -192,7 +192,7 @@ public class WmsStockQuan extends BaseBean { return areaNo; } - public Double getTotalQty() { + public Double getTotalQtyVal() { return this.getQtyVal() + this.getFailQtyVal()+ this.getHoldQtyVal()+ this.getQcQtyVal() + this.getRinQtyVal()+ this.getFreezeQtyVal()+ this.getConsignQtyVal()+ this.getScrapQtyVal(); } From c0ff7ce9869317e79d755269d3cf92892a2aab9a Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 14 Apr 2021 16:16:57 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B1=A0=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java | 15 ++++++++------- .../cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java | 14 ++++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java | 14 ++++++++------ 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java index 4632486..3ac9292 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java @@ -6,16 +6,13 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; import java.io.Serializable; /** @@ -29,7 +26,11 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "IF_EDI_INITIAL_DATA") +@Table(name = "IF_EDI_INITIAL_DATA", indexes = { + @Index(columnList = "PROGRAM_DATA"), + @Index(columnList = "CONTENT"), + @Index(columnList = "SYNC_STATUS") +}) @Api("EDI_初始数据表") public class IfEdiInitialData extends BaseBean implements Serializable { private static final long serialVersionUID = -523843818485699827L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java index 5974160..80bf60d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java @@ -4,15 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -27,7 +25,11 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_JIT_LOCK_CACHE") +@Table(name = "MES_JIT_LOCK_CACHE", indexes = { + @Index(columnList = "JIT_ACTUAL_NO"), + @Index(columnList = "WO_TYPE"), + @Index(columnList = "STATUS") +}) @Api("MES_JIT队列锁定池") public class MesJitLockCache extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java index e2766d7..834816f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java @@ -4,15 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -27,7 +25,11 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_JIT_ORDER_CACHE") +@Table(name = "MES_JIT_ORDER_CACHE", indexes = { + @Index(columnList = "JIT_ACTUAL_NO"), + @Index(columnList = "WO_TYPE"), + @Index(columnList = "STATUS") +}) @Api("MES_JIT队列订单池") public class MesJitOrderCache extends BaseBean implements Serializable { private static final long serialVersionUID = -613326904053045367L; From 87f3031a3d3a893caf1912ff2a4dad46b198b8f6 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 14 Apr 2021 19:27:17 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=AF=E9=80=82?= =?UTF-8?q?=E9=85=8D=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 61f52e9..98cb42f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -11,10 +11,10 @@ public class WmsInterfaceEnumUtil { MES2WMS(30, "MES2WMS", "MES --> WMS"), WMS2MES(40, "WMS2MES", "WMS --> MES"), SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"), - SWEB2SAP(50, "SWEB2SAP", "SWEB --> SAP"), - WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"), - SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"), - SAP2MES(60, "SAP2MES", "SAP --> WMS"), + SWEB2SAP(60, "SWEB2SAP", "SWEB --> SAP"), + WMS2SWEB(70, "WMS2SWEB", "WMS --> SWEB"), + SAP2SWEB(80, "SAP2SWEB", "SAP --> SWEB"), + SAP2MES(90, "SAP2MES", "SAP --> WMS"), ; private int value; From fd18ec063f177700247ddd12a1fabe0c04814fe3 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 16 Apr 2021 16:29:28 +0800 Subject: [PATCH 21/22] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index 8e3bbf9..ba16832 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -125,6 +125,10 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("采集结果") private Integer result; + @Transient + @ApiParam("物料名称") + private String partName; + public double getKeyDataCountVal() { return this.keyDataCount == null ? 0 : this.keyDataCount; From 9241c60f07046b882d3889ba8c6246f8752b9bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 16 Apr 2021 17:45:49 +0800 Subject: [PATCH 22/22] =?UTF-8?q?feat(mdm):=E9=80=9A=E7=94=A8=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA=E5=8F=8A=E5=A4=96=E9=83=A8=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E6=89=A9=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MdmEnumUtil.java | 59 ++++++++++-- .../i3plus/pojo/mdm/bean/base/BaseMdmBean.java | 12 +-- .../pojo/mdm/bean/base/BaseMdmBusiExtdBean.java | 11 +-- .../pojo/mdm/bean/base/BaseMdmBusiModelBean.java | 6 +- .../i3plus/pojo/mdm/bean/base/MdmSyncData.java | 54 ++++++----- .../pojo/mdm/bean/busi/MdmDataSubscribe.java | 100 +++++++++++++++++++++ .../pojo/mdm/bean/busi/MdmDataSubscribeDetail.java | 57 ++++++++++++ .../i3plus/pojo/mdm/bean/busi/MdmExternalApp.java | 49 ++++++++++ .../mdm/bean/busi/core/MdmGearCoreBusiExtd.java | 8 +- .../estsh/i3plus/pojo/mdm/bean/master/MdmGear.java | 6 +- .../busi/MdmDataSubscribeDetailRepository.java | 14 +++ .../busi/MdmDataSubscribeRepository.java | 16 ++++ .../repository/busi/MdmExternalAppRepository.java | 16 ++++ .../estsh/i3plus/pojo/mdm/sqlpack/MdmHqlPack.java | 71 +++++++++++++++ .../i3plus/pojo/model/mes/ExcelImportModel.java | 5 ++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 3 +- 16 files changed, 436 insertions(+), 51 deletions(-) create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribeDetail.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeDetailRepository.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeRepository.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/MdmHqlPack.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java index 84e7427..c40e09d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java @@ -16,8 +16,8 @@ public class MdmEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MDM_OPERATE_TYPE { - INSERT(1, "新增"), - UPDATE(2, "修改"); + INSERT(1, "新增"), + UPDATE(2, "修改"); private int value; private String description; @@ -120,10 +120,10 @@ public class MdmEnumUtil { /** * mdm */ - public enum MDM_SYNC_TYPE{ - INSERT(1, "新增"), - UPDATE(2, "修改"), - DELETE(3, "删除"); + public enum MDM_SYNC_TYPE { + INSERT(1, "新增"), + UPDATE(2, "修改"), + DELETE(3, "删除"); private int value; private String description; @@ -162,4 +162,51 @@ public class MdmEnumUtil { } } + /** + * MDM 同步应用类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MDM_SYNC_APP_TYPE { + INTERNAL(1, "内部系统"), + EXTERNAL(2, "外部系统"); + + private int value; + private String description; + + private MDM_SYNC_APP_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static MdmEnumUtil.MDM_SYNC_APP_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + + } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java index 3fef7c4..b549407 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java @@ -7,7 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; @@ -29,12 +29,12 @@ public abstract class BaseMdmBean extends BaseBean { private static final long serialVersionUID = 3957595289035947441L; @Transient - @ApiModelProperty("是否主数据") + @ApiParam("是否主数据") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true) public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); @Column(name = "MDM_VERSION") - @ApiModelProperty("mdm数据版本") + @ApiParam("mdm数据版本") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) private Long mdmVersion; @@ -50,12 +50,12 @@ public abstract class BaseMdmBean extends BaseBean { } @Column(name = "IS_MDM_PUBLISHED") - @ApiModelProperty("是否发布") + @ApiParam("是否发布") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true) private Integer isMdmPublished; @Column(name = "MDM_OPERATE_TYPE") - @ApiModelProperty("操作类型") + @ApiParam("操作类型") @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class,hidden = true) private Integer mdmOperateType; @@ -68,7 +68,7 @@ public abstract class BaseMdmBean extends BaseBean { } @Column(name = "MDM_REF_ID") - @ApiModelProperty("关联id") + @ApiParam("关联id") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) private Long mdmRefId; diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java index ef84a68..a35e1f0 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java @@ -5,7 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; @@ -27,23 +27,24 @@ public class BaseMdmBusiExtdBean extends BaseMdmBean { private static final long serialVersionUID = 4267453020130810967L; @Transient - @ApiModelProperty("是否主数据") + @ApiParam("是否主数据") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true) public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); @Transient - @ApiModelProperty("主数据Class") + @ApiParam("主数据Class") @AnnoOutputColumn(hidden = true) protected static Class mdmMasterClass = BaseMdmBean.class; @Transient - @ApiModelProperty("软件模块") + @ApiParam("软件模块") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true) protected static Integer mdmSoftType; @Column(name = "MDM_MASTER_ID") - @ApiModelProperty("主数据id") + @ApiParam("主数据id") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) public Long mdmMasterId; } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java index 1fe17c1..a4096d2 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.mdm.bean.base; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; /** * @Description :MDM模型bean @@ -16,10 +16,10 @@ public abstract class BaseMdmBusiModelBean syncDataId; - @ApiModelProperty("同步数据用户名") + @ApiParam("同步数据用户名") private String syncDateUserName; - @ApiModelProperty("同步时间") + @ApiParam("同步时间") private String syncDateTime; - @ApiModelProperty("同步失败键") + @ApiParam("同步失败键") private String syncFailKey; - @ApiModelProperty("同步失败时间") + @ApiParam("同步失败时间") private String syncFailDateTime; - @ApiModelProperty("同步失败信息") + @ApiParam("同步失败信息") private String syncFailMessage; } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java new file mode 100644 index 0000000..b9cb717 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.mdm.bean.busi; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-03-29 17:37 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MDM_DATA_SUBSCRIBE") +@ApiModel("数据订阅信息") +public class MdmDataSubscribe extends BaseBean { + + private static final long serialVersionUID = 8821827445193232389L; + + @Column(name = "MDM_CLASS_NAME") + @ApiParam("主数据类名") + private String mdmClassName; + + @Column(name = "MDM_NAME") + @ApiParam("主数据名称") + private String mdmName; + + @Column(name = "INTERNAL_APP_NUM") + @ApiParam("内部订阅应用数量") + private Integer internalAppNum; + + public long addInternalAppNum() { + if (internalAppNum == null) { + internalAppNum = 1; + } else { + internalAppNum++; + } + return internalAppNum; + } + + @Column(name = "EXTERNAL_APP_NUM") + @ApiParam("外部订阅应用数量") + private Integer externalAppNum; + + public long addExternalAppNum() { + if (externalAppNum == null) { + externalAppNum = 1; + } else { + externalAppNum++; + } + return externalAppNum; + } + + @Transient + @ApiParam("内部订阅信息") + private List internalAppSubList; + + public List getInternalAppSubList() { + return internalAppSubList == null ? new ArrayList<>() : internalAppSubList; + } + + public void addInternalApp(MdmDataSubscribeDetail detail) { + if (internalAppSubList == null) { + internalAppSubList = new ArrayList<>(); + } + internalAppSubList.add(detail); + } + + @Transient + @ApiParam("外部订阅信息") + private List externalAppSubList; + + public List getExternalAppSubList() { + return externalAppSubList == null ? new ArrayList<>() : externalAppSubList; + } + + public void addExternalApp(MdmDataSubscribeDetail detail) { + if (externalAppSubList == null) { + externalAppSubList = new ArrayList<>(); + } + externalAppSubList.add(detail); + } + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribeDetail.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribeDetail.java new file mode 100644 index 0000000..05be14b --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribeDetail.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mdm.bean.busi; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-03-29 17:37 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MDM_DATA_SUBSCRIBE_DETAIL") +@ApiModel("数据订阅明细") +public class MdmDataSubscribeDetail extends BaseBean { + + private static final long serialVersionUID = -741233265567034262L; + + @Column(name = "DATA_SUBSCRIBE_ID") + @ApiParam("数据订阅id") + @JsonSerialize(using = ToStringSerializer.class) + private Long dataSubscribeId; + + @Column(name = "APP_ID") + @ApiParam("应用id") + @JsonSerialize(using = ToStringSerializer.class) + private Long appId; + + @Column(name = "APP_TYPE") + @ApiParam("应用类型") + private Integer appType; + + public int getAppTypeVal() { + return appType == null ? MdmEnumUtil.MDM_SYNC_APP_TYPE.INTERNAL.getValue() : appType; + } + + @Column(name = "APP_NAME") + @ApiParam("应用名称") + private String appName; +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java new file mode 100644 index 0000000..8a05c07 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mdm.bean.busi; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-03-29 17:41 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MDM_EXTERNAL_APP") +@ApiModel("外部应用信息") +public class MdmExternalApp extends BaseBean { + + private static final long serialVersionUID = -5344361274535836969L; + + @Column(name = "APP_NAME") + @ApiParam("应用名称") + private String appName; + + @Column(name = "APP_CODE") + @ApiParam("应用代码") + private String appCode; + + @Column(name = "CALL_TOKEN") + @ApiParam("调用令牌") + private String callToken; + + @Column(name = "CALLBACK_URL") + @ApiParam("回调地址") + private String callbackUrl; + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java index 7c498ef..b46e36a 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java @@ -5,7 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean; import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; @@ -35,17 +35,17 @@ public class MdmGearCoreBusiExtd extends BaseMdmBusiExtdBean { private static final long serialVersionUID = -3535174942277452194L; @Transient - @ApiModelProperty("主数据Class") + @ApiParam("主数据Class") @AnnoOutputColumn(hidden = true) public static Class mdmMasterClass = MdmGear.class; @Transient - @ApiModelProperty("软件模块") + @ApiParam("软件模块") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true) public static Integer mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue(); @Column(name = "CORE_NUM") - @ApiModelProperty("核心数量") + @ApiParam("核心数量") public String coreNum; } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java index 18dbcb1..bd07162 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.mdm.bean.master; import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; @@ -31,11 +31,11 @@ public class MdmGear extends BaseMdmBean { private static final long serialVersionUID = -7580444601811207793L; @Column(name="NAME") - @ApiModelProperty("齿轮名称") + @ApiParam("齿轮名称") private String name; @Column(name="GEAR_MODEL") - @ApiModelProperty("齿轮规格") + @ApiParam("齿轮规格") private String gearModel; } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeDetailRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeDetailRepository.java new file mode 100644 index 0000000..480bf9a --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mdm.repository.busi; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmDataSubscribeDetail; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-04-14 10:56 + * @Modify: + **/ +public interface MdmDataSubscribeDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeRepository.java new file mode 100644 index 0000000..752f798 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mdm.repository.busi; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmDataSubscribe; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-03-29 17:44 + * @Modify: + **/ +@Repository +public interface MdmDataSubscribeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java new file mode 100644 index 0000000..7d89f14 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mdm.repository.busi; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmExternalApp; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-03-29 17:52 + * @Modify: + **/ +@Repository +public interface MdmExternalAppRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/MdmHqlPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/MdmHqlPack.java new file mode 100644 index 0000000..5d1aae3 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/MdmHqlPack.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.mdm.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmDataSubscribe; +import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmExternalApp; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-04-14 19:33 + * @Modify: + **/ +public class MdmHqlPack { + + /** + * mdm订阅信息查询条件拼接 + * + * @param mdmDataSubscribe + * @return + */ + public static DdlPackBean packHqlMdmDataSubscribe(MdmDataSubscribe mdmDataSubscribe) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmDataSubscribe); + + DdlPreparedPack.getStringLikerPack(mdmDataSubscribe.getMdmName(), "mdmName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(mdmDataSubscribe.getMdmClassName(), "mdmClassName", ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlCheckMdmDataSubscribeOnly(MdmDataSubscribe mdmDataSubscribe) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmDataSubscribe); + + DdlPreparedPack.getNumNOEqualPack(mdmDataSubscribe.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(mdmDataSubscribe.getMdmClassName(), "mdmClassName", ddlPackBean); + + return ddlPackBean; + } + + /** + * 外部应用查询条件拼接 + * + * @param mdmExternalApp + * @return + */ + public static DdlPackBean packHqlMdmExternalApp(MdmExternalApp mdmExternalApp) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmExternalApp); + + DdlPreparedPack.getStringLikerPack(mdmExternalApp.getAppName(), "appName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(mdmExternalApp.getAppCode(), "appCode", ddlPackBean); + + return ddlPackBean; + } + + /** + * 数据对象查询条件拼接 + * + * @param mdmExternalApp + * @return + */ + public static DdlPackBean packHqlCheckMdmExternalAppOnly(MdmExternalApp mdmExternalApp) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmExternalApp); + + DdlPreparedPack.getNumNOEqualPack(mdmExternalApp.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(mdmExternalApp.getAppCode(), "appCode", ddlPackBean); + + return ddlPackBean; + } + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java index d49ea8c..e3bc848 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java @@ -51,6 +51,11 @@ public class ExcelImportModel implements Serializable { result = true; } + public ExcelImportModel(List excelList) { + result = true; + this.excelList = excelList; + } + public void addErrorMsg(ImportErrorModel errorModel) { if (importErrorModels == null) { importErrorModels = new ArrayList<>(); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index b5b3a86..48f81e2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -98,8 +98,7 @@ public class CoreHqlPack { DdlPreparedPack.getNumEqualPack(resource.getResourceType(), "resourceType", result); // 是否多类型查询 if (StringUtils.isNotBlank(resource.getResourceTypes())) { - DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result); - } + DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result); } DdlPreparedPack.getNumEqualPack(resource.getSoftType(), "softType", result); DdlPreparedPack.getNumEqualPack(resource.getIsSystem(), "isSystem", result);