From bb88851f17def940bd34760c275f8b48a121c569 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 25 Jun 2021 17:46:39 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 4 ++-- modules/i3plus-pojo-aps/pom.xml | 4 ++-- modules/i3plus-pojo-base/pom.xml | 4 ++-- modules/i3plus-pojo-bsp/pom.xml | 4 ++-- modules/i3plus-pojo-form/pom.xml | 4 ++-- modules/i3plus-pojo-hardswitch/pom.xml | 4 ++-- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 4 ++-- modules/i3plus-pojo-lac/pom.xml | 4 ++-- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- modules/i3plus-pojo-platform/pom.xml | 4 ++-- modules/i3plus-pojo-ptl/pom.xml | 4 ++-- modules/i3plus-pojo-report/pom.xml | 4 ++-- modules/i3plus-pojo-screen/pom.xml | 4 ++-- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 4 ++-- modules/i3plus-pojo-wms/pom.xml | 4 ++-- modules/i3plus-pojo-workflow/pom.xml | 4 ++-- pom.xml | 4 ++-- 22 files changed, 42 insertions(+), 42 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..2ab69b8 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -32,7 +32,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..b73ac3b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -36,7 +36,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 0272934..6a2a6dd 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -49,7 +49,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-bsp/pom.xml b/modules/i3plus-pojo-bsp/pom.xml index 390e79a..2453f02 100644 --- a/modules/i3plus-pojo-bsp/pom.xml +++ b/modules/i3plus-pojo-bsp/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -35,7 +35,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 3937425..ee93af0 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -34,7 +34,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index cf1a42a..b6822e2 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -26,7 +26,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index c338f71..2de88b5 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..d1f5529 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -26,7 +26,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..0c4fd62 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -32,7 +32,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..7f94617 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index bf96e57..eaaf018 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -32,7 +32,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index a758a6a..ab3d9f0 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -32,7 +32,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 4988104..0fb3892 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -82,7 +82,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index dba12cc..2e2e59e 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -32,7 +32,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 81670b2..66b4907 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -32,7 +32,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..840238c 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -33,7 +33,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 48930f8..92947f2 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT 4.0.0 @@ -34,7 +34,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index eaf2544..c5d4c40 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -33,7 +33,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0f615b6..703ac5f 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -32,7 +32,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 183a03c..7095411 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -50,7 +50,7 @@ test - TEST + DEV diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0fea52b..0a11dee 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -26,7 +26,7 @@ test - TEST + DEV diff --git a/pom.xml b/pom.xml index 1bf2019..b8fd5af 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base @@ -251,7 +251,7 @@ test - TEST + DEV From ead752212598ffe31a27fc89450c5ef0f75fdcbf Mon Sep 17 00:00:00 2001 From: nies Date: Mon, 28 Jun 2021 16:08:57 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java index 6d5bddf..1625cce 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java @@ -37,4 +37,8 @@ public class MethodRegistryParam implements Serializable { @ApiParam("方法参数的验证逻辑") private String[] validation; + private String createdDatetime; + private String updatedDatetime; + private String[] changeLog; + private String markdownFilePath; } From 79f199ce106c9087d2228e82478f9989546b30f3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 30 Jun 2021 17:43:03 +0800 Subject: [PATCH 03/26] test merge dev --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 37d8ae0..8c37b31 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -7,7 +7,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 8791ead24aec0e73ed5d96a3e1bacd6c6bc5e2cd Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 7 Jul 2021 15:03:44 +0800 Subject: [PATCH 04/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9bsp=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E7=9A=84=E6=B3=A8=E5=86=8C=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsp/client/bean/po/MethodRegistryParam.java | 27 ++++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java index 1625cce..0587f9b 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java @@ -30,15 +30,22 @@ public class MethodRegistryParam implements Serializable { private List parameterList; @ApiParam("方法的版本") private String version; - @ApiParam("方法影响了那些表") - private String[] affectTableClassName; - @ApiParam("方法的处理逻辑") - private String[] systemProcess; - @ApiParam("方法参数的验证逻辑") - private String[] validation; - private String createdDatetime; - private String updatedDatetime; - private String[] changeLog; - private String markdownFilePath; +// @ApiParam("方法影响了那些表") +// private String[] affectTableClassName; +// @ApiParam("方法的处理逻辑") +// private String[] systemProcess; +// @ApiParam("方法参数的验证逻辑") +// private String[] validation; +// @ApiParam("创建时间") +// private String createdDatetime; +// @ApiParam("更新时间") +// private String updatedDatetime; +// @ApiParam("更新日志") +// private String[] changeLog; +// @ApiParam("markdown 文件的路径") +// private String markdownFilePath; + + @ApiParam("markdown 的文字内容") + private String markdownContent; } From c55875e129d7f90142f5aca5ab625c02e639a73b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 7 Jul 2021 22:02:25 +0800 Subject: [PATCH 05/26] =?UTF-8?q?feat(screen):=207.7=20=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=B8=8E=E5=89=8D=E7=AB=AF=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7.7 通用界面与前端完成回显 --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 10 + .../i3plus/pojo/base/enumutil/ScreenEnumUtil.java | 264 +++++++++++++++++---- .../estsh/i3plus/pojo/screen/bean/ScrAction.java | 4 + .../i3plus/pojo/screen/bean/ScrComponentParam.java | 52 ---- .../pojo/screen/bean/ScrComponentParamDetail.java | 47 ---- .../estsh/i3plus/pojo/screen/bean/ScrDataAuth.java | 4 + .../i3plus/pojo/screen/bean/ScrDataObject.java | 4 + .../pojo/screen/bean/ScrDataObjectIndex.java | 4 + .../pojo/screen/bean/ScrDataObjectProperty.java | 6 +- .../i3plus/pojo/screen/bean/ScrDatasource.java | 4 + .../cn/estsh/i3plus/pojo/screen/bean/ScrEvent.java | 5 +- .../i3plus/pojo/screen/bean/ScrEventAction.java | 5 +- .../cn/estsh/i3plus/pojo/screen/bean/ScrFile.java | 5 +- .../i3plus/pojo/screen/bean/ScrLayoutColumn.java | 54 ----- .../i3plus/pojo/screen/bean/ScrLayoutRow.java | 51 ---- .../cn/estsh/i3plus/pojo/screen/bean/ScrMenu.java | 8 +- .../cn/estsh/i3plus/pojo/screen/bean/ScrModel.java | 4 + .../i3plus/pojo/screen/bean/ScrModelField.java | 32 +-- .../pojo/screen/bean/ScrModelFieldIndex.java | 10 +- .../pojo/screen/bean/ScrModelFieldVirtual.java | 5 +- .../i3plus/pojo/screen/bean/ScrScreenHistory.java | 6 +- .../screen/bean/{ => diagram}/ScrComponent.java | 24 +- .../pojo/screen/bean/{ => diagram}/ScrLayout.java | 11 +- .../pojo/screen/bean/diagram/ScrLayoutItem.java | 64 +++++ .../pojo/screen/bean/{ => diagram}/ScrPanel.java | 23 +- .../screen/bean/diagram/ScrPanelComponent.java | 57 +++++ .../pojo/screen/bean/{ => diagram}/ScrScreen.java | 24 +- .../bean/{relation => diagram}/ScrScreenPanel.java | 36 ++- .../bean/relation/ScrComponentEventAction.java | 39 --- .../bean/relation/ScrComponentModelField.java | 98 -------- .../screen/bean/relation/ScrPanelComponent.java | 53 ----- .../pojo/screen/model/ScrClassInfoModel.java | 33 +++ .../i3plus/pojo/screen/model/ScrDisplayModel.java | 31 +++ .../pojo/screen/model/ScrInnerMessageModel.java | 35 +++ .../i3plus/pojo/screen/model/ScrLayoutModel.java | 7 +- .../screen/model/ScrPanelComponentCreateModel.java | 46 ---- .../pojo/screen/model/ScrPanelComponentModel.java | 39 +++ .../screen/model/ScrPanelComponentQueryModel.java | 38 --- .../pojo/screen/model/ScrPanelLayoutModel.java | 32 +++ .../pojo/screen/model/ScrRowColumnModel.java | 27 --- .../screen/model/ScrScreenPanelCreateModel.java | 34 --- .../pojo/screen/model/ScrScreenPanelModel.java | 44 ++++ .../repository/ScrLayoutColumnRepository.java | 15 -- .../screen/repository/ScrLayoutRowRepository.java | 15 -- .../screen/repository/ScrModelFieldRepository.java | 1 - .../{ => diagram}/ScrComponentRepository.java | 4 +- .../diagram/ScrLayoutItemRepository.java | 14 ++ .../{ => diagram}/ScrLayoutRepository.java | 4 +- .../ScrPanelComponentRepository.java | 4 +- .../{ => diagram}/ScrPanelRepository.java | 5 +- .../{rel => diagram}/ScrScreenPanelRepository.java | 4 +- .../{ => diagram}/ScrScreenRepository.java | 4 +- .../rel/ScrComponentEventActionRepository.java | 14 -- .../rel/ScrComponentModelFieldRepository.java | 14 -- 54 files changed, 733 insertions(+), 744 deletions(-) delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParam.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParamDetail.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{ => diagram}/ScrComponent.java (68%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{ => diagram}/ScrLayout.java (78%) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrLayoutItem.java rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{ => diagram}/ScrPanel.java (63%) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrPanelComponent.java rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{ => diagram}/ScrScreen.java (71%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/{relation => diagram}/ScrScreenPanel.java (53%) delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentEventAction.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentModelField.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrPanelComponent.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrClassInfoModel.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDisplayModel.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrInnerMessageModel.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.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/model/ScrPanelComponentQueryModel.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelLayoutModel.java delete 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/ScrScreenPanelCreateModel.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelModel.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/{ => diagram}/ScrComponentRepository.java (68%) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrLayoutItemRepository.java rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/{ => diagram}/ScrLayoutRepository.java (68%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/{rel => diagram}/ScrPanelComponentRepository.java (68%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/{ => diagram}/ScrPanelRepository.java (62%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/{rel => diagram}/ScrScreenPanelRepository.java (68%) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/{ => diagram}/ScrScreenRepository.java (68%) delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRepository.java delete mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRepository.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 a8f259c..989b6c0 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 @@ -2159,6 +2159,16 @@ public class CommonEnumUtil { return tmp; } + 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 int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { 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 8fb4674..e02966c 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 @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.base.enumutil; import java.math.BigDecimal; import java.net.URL; import java.sql.*; +import java.util.List; +import java.util.Map; /** * @author Wynne.Lu @@ -68,15 +70,15 @@ public class ScreenEnumUtil { } } - public enum SCREEN_TYPE { + public enum DEVICE_TYPE { PC(10, "PC", "PC端"), - PDA(20, "PDA", "PDA手持端"); + APP(20, "APP", "移动端"); private Integer value; private String code; private String description; - SCREEN_TYPE(Integer value, String code, String description) { + DEVICE_TYPE(Integer value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -268,46 +270,10 @@ 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; - } - } - public enum DATASOURCE_CONNECTION_STATUS { - SUCCESS(10, "success", "连接成功"), - FAILED(20, "failed", "连接失败"); + TEST(10, "test", "待连接测试"), + SUCCESS(20, "success", "连接成功"), + FAILED(30, "failed", "连接失败"); private Integer value; private String code; @@ -450,7 +416,7 @@ public class ScreenEnumUtil { } public enum DATA_RESOURCE_TYPE { - ENUM(10, "enum", "枚举"), + ENUM(10, "ENUM", "枚举"), WEBSOCKET(20, "WEBSOCKET", "WebSocket"); private Integer value; @@ -489,7 +455,7 @@ public class ScreenEnumUtil { public enum MODEL_TYPE { DATA_OBJECT(10, "DATA_OBJECT", "数据库对应类型"), INNER_MODEL(20, "INNER_MODEL", "程序内部对应类型"), - CUSTOMIZE(30, "CUSTOMIZE", "程序内部对应类型"); + CUSTOMIZE(30, "CUSTOMIZE", "用户自定义类型"); private Integer value; private String code; @@ -741,11 +707,14 @@ public class ScreenEnumUtil { DOUBLE(70, "Double", Double.class), FLOAT(80, "Float", Float.class), BIG_DECIMAL(90, "BigDecimal", BigDecimal.class), - STRING(100, "String", BigDecimal.class), + STRING(100, "String", String.class), DATE(110, "Date", Date.class), TIME(120, "Time", Time.class), TIMESTAMP(130, "Timestamp", Timestamp.class), - ARRAY(140, "Array", Array.class); + ARRAY(140, "Array", Array.class), + LIST(150, "List", List.class), + MAP(160, "Map", Map.class), + OBJECT(170, "Object", Object.class); private Integer value; private String code; @@ -788,6 +757,19 @@ public class ScreenEnumUtil { } return tmp; } + + public static JAVA_TYPES clazzOfEnum(Class clazz) { + JAVA_TYPES tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].clazz.equals(clazz)) { + tmp = values()[i]; + } + } + if (tmp == null) { + return OBJECT; + } + return tmp; + } } public enum AUTH_ACCESS_TYPE { @@ -864,4 +846,194 @@ public class ScreenEnumUtil { } } + public enum INNER_MESSAGE_TYPE { + DATASOURCE_BEAN_REFRESH(10, "DATASOURCE_BEAN_REFRESH", "刷新Spring容器中的数据源Bean"); + + private Integer value; + private String code; + private String description; + + INNER_MESSAGE_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 static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum OPERATION_TYPE { + CREATE(10, "create", "新增"), + UPDATE(20, "update", "修改"), + DELETE(30, "delete", "删除"), + WEAKLY_DELETE(40, "invalid", "弱删"), + VALID(50, "valid", "启用"), + INVALID(60, "invalid", "禁用"); + + private Integer value; + private String code; + private String description; + + OPERATION_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 OPERATION_TYPE valueOfEnum(Integer value) { + OPERATION_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i]; + } + } + return tmp; + } + + 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 TEMPLATE_TYPE { + EMPTY(10, "empty", "空白模板"), + SPA(20, "spa", "单页应用模板"); + + private Integer value; + private String code; + private String description; + + TEMPLATE_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 TEMPLATE_TYPE valueOfEnum(Integer value) { + TEMPLATE_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i]; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum LAYOUT_REF_TYPE { + PANEL(10, "Panel", "容器"), + SCREEN(20, "Screen", "页面"); + + private Integer value; + private String code; + private String description; + + LAYOUT_REF_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 LAYOUT_REF_TYPE valueOfEnum(Integer value) { + LAYOUT_REF_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i]; + } + } + return tmp; + } + + 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/ScrAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java index 676ea57..876771d 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 @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("动作") public class ScrAction extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParam.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParam.java deleted file mode 100644 index c9de45f..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParam.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -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/5/20 17:51 - * @desc - */ -@Entity -@Table(name = "SCR_COMPONENT_PARAM") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@ApiModel("组件参数") -public class ScrComponentParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -3232417792617757722L; - - @Column(name = "COMPONENT_TYPE") - @ApiModelProperty(value = "组件类型") - private String componentType; - - @Column(name = "PARAM_NAME") - @ApiModelProperty(value = "参数名") - private String paramName; - - @Column(name = "SEARCH_NAME") - @ApiModelProperty(value = "搜索名称") - private String searchName; - - @Lob - @Column(name = "SEARCH_WHERE") - @ApiModelProperty(value = "搜索条件") - private String searchWhere; - - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParamDetail.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParamDetail.java deleted file mode 100644 index 9425a4c..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParamDetail.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -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/5/20 17:51 - * @desc - */ -@Entity -@Table(name = "SCR_COMPONENT_PARAM_DETAIL") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@ApiModel("组件参数配置") -public class ScrComponentParamDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 4771034700299839870L; - - @Column(name = "COMPONENT_CODE") - @ApiModelProperty(value = "组件代码") - private String componentCode; - - @Column(name = "COMPONENT_TYPE") - @ApiModelProperty(value = "组件类型") - private String componentType; - - @Lob - @Column(name = "COMPONENT_PARAM_DETAIL") - @ApiModelProperty(value = "组件参数信息") - private String componentParamDetail; - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java index 49f1dba..a9ab9e6 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("数据权限") public class ScrDataAuth extends BaseBean implements Serializable { 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 b542882..248b351 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 @@ -10,6 +10,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -28,6 +30,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("数据对象管理") public class ScrDataObject extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java index 3062320..19d64b9 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("数据对象约束管理") public class ScrDataObjectIndex extends BaseBean implements Serializable { 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 03bc465..1bf31e7 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 @@ -1,8 +1,6 @@ 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; @@ -10,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -27,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("数据对象管理") public class ScrDataObjectProperty extends BaseBean implements Serializable { 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 6d28b02..cf17203 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 @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -26,6 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("数据源管理") public class ScrDatasource extends BaseBean implements Serializable { 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 bb7c145..0166c10 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -27,6 +28,8 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder +@DynamicUpdate +@DynamicInsert @ApiModel("事件") public class ScrEvent extends BaseBean implements Serializable { private static final long serialVersionUID = -6217007706865821613L; 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 469c22b..683f2d8 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -26,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("事件动作") public class ScrEventAction extends BaseBean implements Serializable { 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 762d5f3..9d366c2 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,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -26,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("文件") public class ScrFile extends BaseBean implements Serializable { 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 deleted file mode 100644 index d226159..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java +++ /dev/null @@ -1,54 +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.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.Table; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午5:01 - * @desc - */ -@Entity -@Table(name = "SCR_LAYOUT_COLUMN") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@ApiModel("布局-父类-列") -public class ScrLayoutColumn extends BaseBean implements Serializable { - private static final long serialVersionUID = 5001564292608042287L; - - @Column(name = "LAYOUT_CODE") - @ApiModelProperty("布局代码") - private String layoutCode; - - @Column(name = "ROW_CODE") - @ApiModelProperty("列代码") - private String rowCode; - - @Column(name = "COLUMN_CODE") - @ApiModelProperty("列代码") - private String columnCode; - - @Column(name = "COLUMN_SEQ") - @ApiModelProperty("列顺序") - private Integer columnSeq; - - @Column(name = "COLUMN_SPAN") - @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 deleted file mode 100644 index 8a90a8b..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java +++ /dev/null @@ -1,51 +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.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.Table; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午5:01 - * @desc - */ -@Entity -@Table(name = "SCR_LAYOUT_ROW") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@ApiModel("布局-行") -public class ScrLayoutRow extends BaseBean implements Serializable { - private static final long serialVersionUID = 6042010183759804616L; - - @Column(name = "LAYOUT_CODE") - @ApiModelProperty("布局代码") - private String layoutCode; - - @Column(name = "ROW_CODE") - @ApiModelProperty("行代码") - private String rowCode; - - @Column(name = "ROW_HEIGHT") - @ApiModelProperty("行高") - private Double rowHeight; - - @Column(name = "ROW_SEQ") - @ApiModelProperty("行顺序") - private Integer rowSeq; - - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrMenu.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrMenu.java index c7c2c4b..782c864 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrMenu.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrMenu.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; 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.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -17,7 +16,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Lob; import javax.persistence.Table; import javax.persistence.Transient; @@ -35,6 +33,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicInsert +@DynamicUpdate @Builder @ApiModel("通用界面-功能目录") public class ScrMenu extends BaseBean implements Serializable { @@ -98,10 +98,6 @@ public class ScrMenu extends BaseBean implements Serializable { @ApiParam(value = "所属模块") private Integer softType; - @Column(name = "MENU_STATUS") - @ApiParam(value = "菜单状态") - private Integer menuStatus; - @Transient @ApiParam(value = "菜单子集") private List menuList; 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 bde977a..4832182 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 @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("model") public class ScrModel extends BaseBean implements Serializable { 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 954be8f..64c0116 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 @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -26,6 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("model字段") public class ScrModelField extends BaseBean implements Serializable { @@ -39,39 +43,39 @@ public class ScrModelField extends BaseBean implements Serializable { @ApiModelProperty("字段代码") private String fieldCode; - @Column(name = "DISPLAY_NAME") - @ApiModelProperty("显示名称") - private String displayName; - @Column(name = "FIELD_NAME") @ApiModelProperty("字段名称") private String fieldName; + @Column(name = "DISPLAY_NAME") + @ApiModelProperty("显示名称") + private String displayName; + @Column(name = "FIELD_TYPE") @ApiModelProperty(value = "字段类型") - private String fieldType; + private Integer fieldType; @Column(name = "IS_FUZZY_SEARCH") @ApiModelProperty("是否支持模糊查询") - private Boolean isFuzzySearch = false; + private Integer isFuzzySearch; @Column(name = "IS_SHOW_IN_NEW") @ApiModelProperty("是否在新增时展示") - private Boolean isShowInNew = true; + private Integer isShowInNew; @Column(name = "IS_SHOW_IN_EDIT") @ApiModelProperty("是否在编辑时展示") - private Boolean isShowInEdit = true; + private Integer isShowInEdit; @Column(name = "IS_ALLOW_SORT") @ApiModelProperty("是否支持排序") - private Boolean isAllowSort = false; + private Integer isAllowSort; @Column(name = "IS_REQUIRED") @ApiModelProperty("是否必填") - private Boolean isRequired = false; + private Integer isRequired; - @Column(name = "SEQ",columnDefinition = "int(11) default 0") + @Column(name = "SEQ", columnDefinition = "int(11) default 0") @ApiModelProperty("表单顺序") private Integer seq; @@ -81,7 +85,7 @@ public class ScrModelField extends BaseBean implements Serializable { @Column(name = "IS_VIRTUAL") @ApiModelProperty("是否是虚拟的") - private Boolean isVirtual; + private Integer isVirtual; @Column(name = "MODEL_FIELD_DATASOURCE") @ApiModelProperty("字段数据来源") @@ -91,10 +95,6 @@ public class ScrModelField extends BaseBean implements Serializable { @ApiModelProperty("model字段来源属性") private String modelFieldDatasourceProps; - @Column(name = "DATA_ROW_AUTH") - @ApiModelProperty("数据列权限") - private String dataRowAuth; - @Transient private Object fieldValue; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java index 645802f..bb5738a 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,11 +8,11 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; 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,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("model字段约束") public class ScrModelFieldIndex extends BaseBean implements Serializable { @@ -51,8 +52,7 @@ public class ScrModelFieldIndex extends BaseBean implements Serializable { @Column(name = "IS_USER_CREATED") @ApiModelProperty("是否是用户创建的") - @Enumerated(EnumType.STRING) - private CommonEnumUtil.TRUE_OR_FALSE isUserCreated; + private Integer isUserCreated; @Column(name = "PRIMARY_KEY_SWITCH") @ApiModelProperty("model主键唯一检查开关") 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 aa5817a..b37a5d5 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -26,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("model虚拟字段") public class ScrModelFieldVirtual extends BaseBean implements Serializable { 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 index 35639e4..8291676 100644 --- 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 @@ -1,8 +1,6 @@ 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; @@ -10,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -28,6 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("数据对象管理") public class ScrScreenHistory extends BaseBean implements Serializable { 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/diagram/ScrComponent.java similarity index 68% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrComponent.java index 0c711f3..bbfcb5f 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/diagram/ScrComponent.java @@ -1,7 +1,6 @@ -package cn.estsh.i3plus.pojo.screen.bean; +package cn.estsh.i3plus.pojo.screen.bean.diagram; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -18,7 +19,7 @@ import java.io.Serializable; /** * @author Wynne.Lu - * @date 2021/3/22 上午10:43 + * @date 2021/3/22 下午7:47 * @desc */ @Entity @@ -27,27 +28,24 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("组件") public class ScrComponent extends BaseBean implements Serializable { - private static final long serialVersionUID = 3832856363595940018L; + private static final long serialVersionUID = 989032210658930856L; @Column(name = "COMPONENT_CODE") - @ApiModelProperty(value = "组件代码") + @ApiModelProperty("组件代码") private String componentCode; @Column(name = "COMPONENT_TYPE") - @ApiModelProperty(value = "组件类型") + @ApiModelProperty("组件类型") private String componentType; - @Column(name = "MODEL_CODE") - @ApiModelProperty(value = "model代码") - private String modelCode; - @Lob @Column(name = "COMPONENT_PROPERTY") - @ApiModelProperty(value = "组件描述") + @ApiModelProperty("组件属性") 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/ScrLayout.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrLayout.java similarity index 78% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrLayout.java index 6c1d0da..c966298 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/diagram/ScrLayout.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.screen.bean; +package cn.estsh.i3plus.pojo.screen.bean.diagram; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiModel; @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("布局") public class ScrLayout extends BaseBean implements Serializable { @@ -42,4 +46,9 @@ public class ScrLayout extends BaseBean implements Serializable { @ApiModelProperty("布局类型") private Integer layoutType; + @Column(name = "IS_CUSTOMIZE") + @ApiModelProperty("是否为自定义布局") + private Integer isCustomize; + + } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrLayoutItem.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrLayoutItem.java new file mode 100644 index 0000000..1041279 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrLayoutItem.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.screen.bean.diagram; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 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; + +/** + * @author Wynne.Lu + * @date 2021/7/2 14:05 + * @desc + */ +@Entity +@Table(name = "SCR_LAYOUT_ITEM") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@DynamicUpdate +@DynamicInsert +@Builder +@ApiModel("布局信息") +public class ScrLayoutItem extends BaseBean implements Serializable { + private static final long serialVersionUID = -4379591189797358245L; + + @Column(name = "LAYOUT_CODE") + @ApiModelProperty("布局代码") + private String layoutCode; + + @Column(name = "LAYOUT_ITEM_CODE") + @ApiModelProperty("布局单块代码") + private String layoutItemCode; + + @Column(name = "HORIZONTAL_COORDINATE") + @ApiModelProperty("x轴") + private Integer horizontalCoordinate; + + @Column(name = "VERTICAL_COORDINATE") + @ApiModelProperty("y轴") + private Integer verticalCoordinate; + + @Column(name = "WIDTH") + @ApiModelProperty("宽度") + private Integer width; + + @Column(name = "HEIGHT") + @ApiModelProperty("高度") + private Integer height; + + @Column(name = "IS_STATIC") + @ApiModelProperty("是否静态固定") + private Integer isStatic; +} 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/diagram/ScrPanel.java similarity index 63% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrPanel.java index 416af7c..a0fb566 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/diagram/ScrPanel.java @@ -1,7 +1,6 @@ -package cn.estsh.i3plus.pojo.screen.bean; +package cn.estsh.i3plus.pojo.screen.bean.diagram; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,9 +8,12 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +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; @@ -26,9 +28,12 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("Panel") public class ScrPanel extends BaseBean implements Serializable { + private static final long serialVersionUID = -5363041058961623658L; @Column(name = "PANEL_CODE") @ApiModelProperty("Panel代码") @@ -38,11 +43,13 @@ public class ScrPanel extends BaseBean implements Serializable { @ApiModelProperty("Panel名称") private String panelName; - @Column(name = "PANEL_LAYOUT_CODE") - @ApiModelProperty("布局代码") - private String layoutCode; + @Column(name = "IS_TEMPLATE") + @ApiModelProperty("是否为模板") + private Integer isTemplate; + + @Lob + @Column(name = "PANEL_PROPERTY") + @ApiModelProperty("Panel属性") + private String panelProperty; - @Column(name = "USAGE_AMOUNT") - @ApiModelProperty("使用数量") - private Integer usageAmount; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrPanelComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrPanelComponent.java new file mode 100644 index 0000000..7e7299f --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrPanelComponent.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.screen.bean.diagram; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 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; + +/** + * @author Wynne.Lu + * @date 2021/3/22 下午7:50 + * @desc + */ +@Entity +@Table(name = "SCR_PANEL_COMPONENT") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@DynamicUpdate +@DynamicInsert +@Builder +@ApiModel("panel与组件的关系") +public class ScrPanelComponent extends BaseBean implements Serializable { + private static final long serialVersionUID = -9070313428476817410L; + + @Column(name = "PANEL_CODE") + @ApiModelProperty("Panel代码") + private String panelCode; + + @Column(name = "LAYOUT_CODE") + @ApiModelProperty("布局代码") + private String layoutCode; + + @Column(name = "LAYOUT_ITEM_CODE") + @ApiModelProperty("布局单元代码") + private String layoutItemCode; + + @Column(name = "COMPONENT_CODE") + @ApiModelProperty("组件代码") + private String componentCode; + + @Column(name = "SEQ") + @ApiModelProperty("组件顺序") + private Integer seq; + +} 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/diagram/ScrScreen.java similarity index 71% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrScreen.java index daa60a5..be072a5 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/diagram/ScrScreen.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.screen.bean; +package cn.estsh.i3plus.pojo.screen.bean.diagram; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiModel; @@ -8,9 +8,12 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +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; @@ -25,6 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("页面") public class ScrScreen extends BaseBean implements Serializable { @@ -42,16 +47,21 @@ public class ScrScreen extends BaseBean implements Serializable { @ApiModelProperty("页面版本") private String screenVersion; - @Column(name = "SCREEN_LAYOUT_CODE") - @ApiModelProperty("布局代码") - private String layoutCode; + @Column(name = "DEVICE_TYPE") + @ApiModelProperty("设备类型") + private Integer deviceType; - @Column(name = "SCREEN_TYPE") - @ApiModelProperty("页面类型") - private Integer screenType; + @Column(name = "TEMPLATE_TYPE") + @ApiModelProperty("模板类型") + private Integer templateType; @Column(name = "SCREEN_OWNING_SYSTEM") @ApiModelProperty("界面所属系统") private Integer screenOwningSystem; + @Lob + @Column(name = "SCREEN_PROPERTY") + @ApiModelProperty("布局代码") + private String screenProperty; + } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrScreenPanel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrScreenPanel.java similarity index 53% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrScreenPanel.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrScreenPanel.java index 70da97c..1b902a7 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrScreenPanel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrScreenPanel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.screen.bean.relation; +package cn.estsh.i3plus.pojo.screen.bean.diagram; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiModel; @@ -8,31 +8,31 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +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.UniqueConstraint; +import java.io.Serializable; /** * @author Wynne.Lu - * @date 2021/3/25 下午4:33 + * @date 2021/3/22 下午7:50 * @desc */ @Entity -@Table(name = "SCR_SCREEN_PANEL", - uniqueConstraints = { - @UniqueConstraint(columnNames = {"SCREEN_CODE", "LAYOUT_CODE"}) - } -) +@Table(name = "SCR_SCREEN_PANEL") @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder -@EqualsAndHashCode(callSuper = true) -@ApiModel("Screen与Panel的关系") -public class ScrScreenPanel extends BaseBean { - private static final long serialVersionUID = 3459027655126916483L; +@ApiModel("screen与panel的关系") +public class ScrScreenPanel extends BaseBean implements Serializable { + private static final long serialVersionUID = 2586321557100106523L; @Column(name = "SCREEN_CODE") @ApiModelProperty("Screen代码") @@ -42,15 +42,11 @@ public class ScrScreenPanel extends BaseBean { @ApiModelProperty("布局代码") private String layoutCode; - @Column(name = "ROW_CODE") - @ApiModelProperty("行代码") - private String rowCode; - - @Column(name = "COLUMN_CODE") - @ApiModelProperty("列代码") - private String columnCode; + @Column(name = "LAYOUT_ITEM_CODE") + @ApiModelProperty("布局单元代码") + private String layoutItemCode; @Column(name = "PANEL_CODE") - @ApiModelProperty(value = "panel代码") + @ApiModelProperty("panel代码") private String panelCode; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentEventAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentEventAction.java deleted file mode 100644 index 8f19dbc..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentEventAction.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.bean.relation; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -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.Table; - -/** - * @author Wynne.Lu - * @date 2021/3/25 上午9:56 - * @desc - */ -@Entity -@Table(name = "SCR_COMPONENT_EVENT_ACTION") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@ApiModel("组件事件动作") -public class ScrComponentEventAction extends BaseBean { - private static final long serialVersionUID = 7600064730551351570L; - - @Column(name = "COMPONENT_CODE") - @ApiModelProperty("组件代码") - private String componentCode; - - @Column(name = "EVENT_ACTION_CODE") - @ApiModelProperty("事件动作代码") - private String eventActionCode; -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentModelField.java deleted file mode 100644 index 9e79e14..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentModelField.java +++ /dev/null @@ -1,98 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.bean.relation; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -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.Table; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2021/3/22 下午8:42 - * @desc - */ -@Entity -@Table(name = "SCR_COMPONENT_MODEL_FIELD") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@ApiModel("Panel与Model字段的关系") -public class ScrComponentModelField extends BaseBean implements Serializable { - private static final long serialVersionUID = -3441031841089357196L; - - @Column(name = "PANEL_CODE") - @ApiModelProperty("Panel代码") - private String panelCode; - - @Column(name = "COMPONENT_CODE") - @ApiModelProperty("组件代码") - private String componentCode; - - @Column(name = "MODEL_CODE") - @ApiModelProperty("model代码") - private String modelCode; - - @Column(name = "FIELD_CODE") - @ApiModelProperty("字段代码") - private String fieldCode; - - @Column(name = "DISPLAY_NAME") - @ApiModelProperty("字段名称") - private String displayName; - - @Column(name = "IS_FUZZY_SEARCH") - @ApiModelProperty("是否支持模糊查询") - private Boolean isFuzzySearch; - - @Column(name = "IS_SHOW_IN_NEW") - @ApiModelProperty("是否在新增时展示") - private Boolean isShowInNew; - - @Column(name = "IS_SHOW_IN_EDIT") - @ApiModelProperty("是否在编辑时展示") - private Boolean isShowInEdit; - - @Column(name = "IS_ALLOW_SORT") - @ApiModelProperty("是否支持排序") - private Boolean isAllowSort; - - @Column(name = "FORM_SEQ") - @ApiModelProperty("表单顺序") - private Integer formSeq; - - @Column(name = "TABLE_SEQ") - @ApiModelProperty("表格顺序") - private Integer tableSeq; - - @Column(name = "VALIDATION") - @ApiModelProperty("校验") - private String validation; - - @Column(name = "DICTIONARY") - @ApiModelProperty("字典") - private String dictionary; - - @Column(name = "IS_VIRTUAL") - @ApiModelProperty("是否是虚拟的") - private boolean isVirtual; - - @Column(name = "FIELD_NAME") - @ApiModelProperty("字段名称") - private String fieldName; - - @Column(name = "SPEL_VIRTUAL_VALUE") - @ApiModelProperty("SPEL表达式虚拟属性") - private String spelVirtualValue; - - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrPanelComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrPanelComponent.java deleted file mode 100644 index 899086f..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrPanelComponent.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.bean.relation; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -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.Index; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -/** - * @author Wynne.Lu - * @date 2021/3/25 下午4:33 - * @desc - */ -@Entity -@Table(name = "SCR_PANEL_COMPONENT", -// indexes = { -// @Index(columnList = "PANEL_CODE")}, - uniqueConstraints = { - @UniqueConstraint(columnNames = {"PANEL_CODE", "LAYOUT_CODE"}) - } -) -@Data -@EqualsAndHashCode(callSuper = true) -@ApiModel("Panel与组件的关系") -public class ScrPanelComponent extends BaseBean { - private static final long serialVersionUID = 3459027655126916483L; - - @Column(name = "PANEL_CODE") - @ApiModelProperty("panel代码") - private String panelCode; - - @Column(name = "LAYOUT_CODE") - @ApiModelProperty("布局代码") - private String layoutCode; - - @Column(name = "ROW_CODE") - @ApiModelProperty("行代码") - private String rowCode; - - @Column(name = "COLUMN_CODE") - @ApiModelProperty("列代码") - private String columnCode; - - @Column(name = "COMPONENT_CODE") - @ApiModelProperty(value = "组件代码") - private String componentCode; -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrClassInfoModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrClassInfoModel.java new file mode 100644 index 0000000..89d6465 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrClassInfoModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2021/6/29 21:54 + * @desc + */ +@Data +@NoArgsConstructor +@ApiModel("类信息") +public class ScrClassInfoModel { + + private String classSimpleName; + + private String classDescription; + + private Class clazz; + + public ScrClassInfoModel(Class clazz) { + this.clazz = clazz; + + this.classSimpleName = clazz.getSimpleName(); + + ApiModel apiModel = clazz.getAnnotation(ApiModel.class); + if (apiModel != null) { + this.classDescription = apiModel.value(); + } + } +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDisplayModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDisplayModel.java new file mode 100644 index 0000000..c3e8a6a --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDisplayModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/7/7 16:15 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("通用界面回显model") +public class ScrDisplayModel implements Serializable { + private static final long serialVersionUID = 5679787673783301941L; + + @ApiModelProperty("页面与容器的关系") + private ScrScreenPanelModel screenPanelModel; + + @ApiModelProperty("容器与组件的关系") + private List panelComponentModels; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrInnerMessageModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrInnerMessageModel.java new file mode 100644 index 0000000..dfb3f35 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrInnerMessageModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/6/29 17:18 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("通用界面内部消息队列处理消息") +public class ScrInnerMessageModel implements Serializable { + private static final long serialVersionUID = -6049477827975249515L; + + @ApiModelProperty("消息类型") + private Integer messageType; + + @ApiModelProperty("信息") + private String payload; + + @ApiModelProperty + private Integer operation; + + +} 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 index b34cf2a..b401ee4 100644 --- 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.screen.model; -import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -21,7 +22,7 @@ public class ScrLayoutModel implements Serializable { @ApiModelProperty("布局") private ScrLayout layout; - @ApiModelProperty("布局中的行列关系") - private List rowColumnModels; + @ApiModelProperty("布局中的单元关系") + private List layoutItems; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.java deleted file mode 100644 index 6fb3ee3..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model; - -import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * @author Wynne.Lu - * @date 2021/3/28 上午12:42 - * @desc - */ -@Data -@ApiModel("Panel与组件关系的创建model") -public class ScrPanelComponentCreateModel implements Serializable { - private static final long serialVersionUID = -5832175256726333348L; - - @ApiModelProperty("panel代码") - private String panelCode; - - @ApiModelProperty("布局代码") - private String layoutCode; - - @ApiModelProperty("行序号") - private Integer rowSeq; - - @ApiModelProperty("列序号") - private Integer columnSeq; - - @ApiModelProperty("组件参数信息") - private Map baseComponent; - - @ApiModelProperty("model代码") - private String modelCode; - - @ApiModelProperty("该组件的事件动作集合") - private List eventActions; - - @ApiModelProperty("组件使用到的model字段集合") - private List modelFields; - -} 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..a439f10 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrComponent; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; + +import java.io.Serializable; +import java.util.LinkedHashMap; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/28 上午12:42 + * @desc + */ +@Data +@Builder +@ApiModel("Panel与组件关系的创建model") +public class ScrPanelComponentModel implements Serializable { + private static final long serialVersionUID = -5832175256726333348L; + + @ApiModelProperty("panel") + private ScrPanel panel; + + @ApiModelProperty("布局") + private ScrLayout layout; + + @ApiModelProperty("布局单元") + private List layoutItems; + + @ApiModelProperty("布局单元与组件集合的对应map") + private LinkedHashMap> componentsMap; + +} 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 deleted file mode 100644 index 2a10b3c..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java +++ /dev/null @@ -1,38 +0,0 @@ -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.relation.ScrComponentModelField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @author Wynne.Lu - * @date 2021/3/28 上午12:42 - * @desc - */ -@Data -@ApiModel("Panel和组件的查询model") -public class ScrPanelComponentQueryModel implements Serializable { - private static final long serialVersionUID = 4133777603151273736L; - - @ApiModelProperty("行代码") - private String rowCode; - - @ApiModelProperty("列代码") - private String columnCode; - - @ApiModelProperty("组件") - private ScrComponent component; - - @ApiModelProperty("动作事件") - private ScrEventAction eventAction; - - @ApiModelProperty("组件与model字段的关系") - 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..89ec5b0 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelLayoutModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/27 下午6:10 + * @desc + */ +@Data +@ApiModel("容器布局model") +public class ScrPanelLayoutModel implements Serializable { + private static final long serialVersionUID = 3311398396212346985L; + + @ApiModelProperty("panel") + private ScrPanel panel; + + @ApiModelProperty("布局") + private ScrLayout layout; + + @ApiModelProperty("布局中的单元关系") + private List layoutItems; + +} 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 deleted file mode 100644 index 12f782b..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model; - -import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutColumn; -import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @author Wynne.Lu - * @date 2021/3/27 下午8:35 - * @desc - */ -@Data -@ApiModel("行列Model") -public class ScrRowColumnModel implements Serializable { - private static final long serialVersionUID = 7450630220924238356L; - - @ApiModelProperty("行") - private ScrLayoutRow row; - - @ApiModelProperty("行中的列") - private List columns; -} 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 deleted file mode 100644 index ead4f1e..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2021/3/28 上午12:42 - * @desc - */ -@Data -@ApiModel("Screen与Panel的创建Model") -public class ScrScreenPanelCreateModel implements Serializable { - private static final long serialVersionUID = -5832175256726333348L; - - @ApiModelProperty("screen代码") - private String screenCode; - - @ApiModelProperty("布局代码") - private String layoutCode; - - @ApiModelProperty("行代码") - private String rowCode; - - @ApiModelProperty("列代码") - private String columnCode; - - @ApiModelProperty("panel代码") - private String panelCode; - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelModel.java new file mode 100644 index 0000000..d8f37cb --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanel; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrScreen; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.LinkedHashMap; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/28 上午12:42 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("Screen与Panel的创建Model") +public class ScrScreenPanelModel implements Serializable { + private static final long serialVersionUID = -5832175256726333348L; + + @ApiModelProperty("页面") + private ScrScreen screen; + + @ApiModelProperty("布局") + private ScrLayout layout; + + @ApiModelProperty("布局单元") + private List layoutItems; + + @ApiModelProperty("布局单元与容器") + private LinkedHashMap panelsMap; + + +} 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 deleted file mode 100644 index 3255b32..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java +++ /dev/null @@ -1,15 +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.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/ScrLayoutRowRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java deleted file mode 100644 index 32a5636..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java +++ /dev/null @@ -1,15 +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.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/ScrModelFieldRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java index 6effc84..104ba82 100644 --- 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 @@ -1,7 +1,6 @@ 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; /** 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/diagram/ScrComponentRepository.java similarity index 68% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrComponentRepository.java index 562d104..b40b7b0 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/diagram/ScrComponentRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.screen.repository; +package cn.estsh.i3plus.pojo.screen.repository.diagram; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.ScrComponent; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrComponent; /** * @Description : diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrLayoutItemRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrLayoutItemRepository.java new file mode 100644 index 0000000..1f8ac81 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrLayoutItemRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository.diagram; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrLayoutItemRepository 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/diagram/ScrLayoutRepository.java similarity index 68% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrLayoutRepository.java index 78a4c00..2c40d3f 100644 --- 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/diagram/ScrLayoutRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.screen.repository; +package cn.estsh.i3plus.pojo.screen.repository.diagram; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout; /** * @Description : diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrPanelComponentRepository.java similarity index 68% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrPanelComponentRepository.java index 4512ece..fdcf313 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRepository.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrPanelComponentRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.screen.repository.rel; +package cn.estsh.i3plus.pojo.screen.repository.diagram; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.relation.ScrPanelComponent; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanelComponent; /** * @Description : 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/diagram/ScrPanelRepository.java similarity index 62% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrPanelRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrPanelRepository.java index 0d4ee36..deb3115 100644 --- 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/diagram/ScrPanelRepository.java @@ -1,8 +1,7 @@ -package cn.estsh.i3plus.pojo.screen.repository; +package cn.estsh.i3plus.pojo.screen.repository.diagram; 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; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanel; /** * @Description : diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrScreenPanelRepository.java similarity index 68% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrScreenPanelRepository.java index cfe08b3..7e6d6a7 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRepository.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrScreenPanelRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.screen.repository.rel; +package cn.estsh.i3plus.pojo.screen.repository.diagram; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.relation.ScrScreenPanel; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrScreenPanel; /** * @Description : 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/diagram/ScrScreenRepository.java similarity index 68% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrScreenRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrScreenRepository.java index b1a72a7..f696f48 100644 --- 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/diagram/ScrScreenRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.screen.repository; +package cn.estsh.i3plus.pojo.screen.repository.diagram; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.ScrScreen; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrScreen; /** * @Description : diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRepository.java deleted file mode 100644 index 985642d..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.repository.rel; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.relation.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/rel/ScrComponentModelFieldRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRepository.java deleted file mode 100644 index e441be7..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.repository.rel; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentModelField; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 20-5-28 下午3:39 - * @Modify: - **/ -public interface ScrComponentModelFieldRepository extends BaseRepository { -} From d8ad92fe246ac433593fab8076b66a8f81299a2c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 9 Jul 2021 17:40:29 +0800 Subject: [PATCH 06/26] =?UTF-8?q?merge=20test=20=E8=BF=98=E5=8E=9Fpom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-bsp/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-screen/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 7fdc84c..2ab69b8 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 99a4195..b73ac3b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 3411cbc..6a2a6dd 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-bsp/pom.xml b/modules/i3plus-pojo-bsp/pom.xml index 254b452..2453f02 100644 --- a/modules/i3plus-pojo-bsp/pom.xml +++ b/modules/i3plus-pojo-bsp/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37bf889..ee93af0 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 048d5cd..b6822e2 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index c338f71..2de88b5 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1ed6d53..d1f5529 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 93d4237..0c4fd62 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..7f94617 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 0ee0761..eaaf018 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 4519749..ab3d9f0 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 1c581bc..0fb3892 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 657abba..2e2e59e 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 504b0e7..66b4907 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26e173f..840238c 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 48930f8..6bef2bc 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 9e00793..c5d4c40 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index f73c5b2..703ac5f 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 1bf205d..7095411 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index ca147a4..0a11dee 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 478033a..b8fd5af 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base From 55af273ea79bb1301d4898863d45f88e2e1e5f18 Mon Sep 17 00:00:00 2001 From: Wynne Date: Tue, 20 Jul 2021 13:57:59 +0800 Subject: [PATCH 07/26] =?UTF-8?q?feat(Screen):=20=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 界面回显 --- .../i3plus/pojo/base/enumutil/ScreenEnumUtil.java | 83 +++++++++++++++++++--- .../i3plus/pojo/screen/bean/ScrModelField.java | 12 ++-- .../i3plus/pojo/screen/model/ScrRequestModel.java | 9 ++- .../i3plus/pojo/screen/model/ScrResponseModel.java | 2 - 4 files changed, 87 insertions(+), 19 deletions(-) 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 e02966c..9b51dbe 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 @@ -530,21 +530,20 @@ public class ScreenEnumUtil { } } - public enum MODEL_FIELD_DATASOURCE { - FROM_TEXT(10, "TEXT", "文本"), - FROM_NUMBER(20, "NUMBER", "数字"), - FROM_PASSWORD(30, "PASSWORD", "密码"), - FROM_DATETIME(40, "DATETIME", "时间"), - FROM_PICK_UP(50, "PICK_UP", "拾取"), - FROM_ENUM(60, "ENUM", "枚举"), - FROM_DICTIONARY(70, "DICTIONARY", "字典"), - FROM_API(80, "API", "API调用"); + public enum MODEL_FIELD_SOURCE { + FORM_TEXT(10, "TEXT", "文本"), + FORM_NUMBER(20, "NUMBER", "数字"), + FORM_PASSWORD(30, "PASSWORD", "密码"), + FORM_DATETIME(40, "DATETIME", "时间"), + FORM_PICK_UP(50, "PICK_UP", "拾取"), + FORM_ENUM(60, "ENUM", "枚举"), + FORM_DICTIONARY(70, "DICTIONARY", "字典"); private Integer value; private String code; private String description; - MODEL_FIELD_DATASOURCE(Integer value, String code, String description) { + MODEL_FIELD_SOURCE(Integer value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -1036,4 +1035,68 @@ public class ScreenEnumUtil { return tmp; } } + + /** + * 等待平台枚举抽入数据库或redis + */ + public enum ENUM_SOFT_TYPE { + COMMON(10, "CommonEnumUtil", "通用枚举"), + IMPP(10, "ImppEnumUtil", "平台枚举"), + WMS(10, "WmsEnumUtil", "WMS枚举"), + SWEB(10, "SwebEnumUtil", "Sweb枚举"), + MES(10, "MesEnumUtil", "Mes枚举"), + MES_PCN(10, "MesPcnEnumUtil", "MesPcn枚举"), + ANDON(10, "AndonEnumUtil", "Andon枚举"), + APS(20, "ApsEnumUtil", "Aps枚举"), + BLOCK_FORM(20, "BlockFormEnumUtil", "动态表单枚举"), + BLOCK_REPORT(20, "BlockReportEnumUtil", "动态报表枚举"), + BLOCK_SOFT_SWITCH(20, "BlockSoftSwitchEnumUtil", "软适配枚举"), + LAC(20, "LacEnumUtil", "Lac枚举"), + MDM(20, "MdmEnumUtil", "主数据中心枚举"), + PTL(20, "PtlEnumUtil", "Ptl枚举"), + PTL_PCN(20, "PtlPcnEnumUtil", "PtlPcn枚举"), + SCREEN(20, "ScreenEnumUtil", "通用界面枚举"); + + private Integer value; + private String code; + private String description; + + ENUM_SOFT_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 ENUM_SOFT_TYPE valueOfEnum(Integer value) { + ENUM_SOFT_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i]; + } + } + return tmp; + } + + 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/ScrModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java index 64c0116..2822d43 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 @@ -71,6 +71,10 @@ public class ScrModelField extends BaseBean implements Serializable { @ApiModelProperty("是否支持排序") private Integer isAllowSort; + @Column(name = "IS_ALLOW_MODIFY") + @ApiModelProperty("是否支持修改") + private Integer isAllowModify; + @Column(name = "IS_REQUIRED") @ApiModelProperty("是否必填") private Integer isRequired; @@ -87,13 +91,13 @@ public class ScrModelField extends BaseBean implements Serializable { @ApiModelProperty("是否是虚拟的") private Integer isVirtual; - @Column(name = "MODEL_FIELD_DATASOURCE") + @Column(name = "MODEL_FIELD_SOURCE") @ApiModelProperty("字段数据来源") - private Integer modelFieldDatasource; + private Integer modelFieldSource; - @Column(name = "MODEL_FIELD_DATASOURCE_PROPS") + @Column(name = "MODEL_FIELD_SOURCE_PROPS") @ApiModelProperty("model字段来源属性") - private String modelFieldDatasourceProps; + private String modelFieldSourceProps; @Transient private Object fieldValue; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java index ee78596..55207a2 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java @@ -6,8 +6,8 @@ import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.web.multipart.MultipartFile; +import java.io.File; import java.io.Serializable; import java.util.List; import java.util.Map; @@ -65,11 +65,14 @@ public class ScrRequestModel implements Serializable { private String methodName; @ApiModelProperty("上传文件") - private MultipartFile file; + private transient File file; @ApiModelProperty("模型字段") private List modelFields; + @ApiModelProperty("模型字段代码") + private Map modelFieldMap; + @ApiModelProperty("父代码") private String parentCode; @@ -80,7 +83,7 @@ public class ScrRequestModel implements Serializable { private String whereAppender; @ApiModelProperty("调用接口参数") - private Map param; + private Map param; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrResponseModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrResponseModel.java index a6a6cae..eb30f5a 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrResponseModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrResponseModel.java @@ -1,13 +1,11 @@ package cn.estsh.i3plus.pojo.screen.model; import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; import lombok.Data; -import org.springframework.web.multipart.MultipartFile; import java.io.Serializable; import java.util.List; From aa3ece833627ac2e77329c547eb44ca723e95860 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Mon, 26 Jul 2021 11:35:25 +0800 Subject: [PATCH 08/26] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=94=AF=E6=8C=81=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E4=B8=BAresultBean?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/bean/po/EngineScriptPersistence.java | 75 ++++++ .../i3plus/pojo/bsp/common/GroovyCommonUtil.java | 11 + .../cn/estsh/i3plus/pojo/bsp/common/HttpUtils.java | 296 +++++++++++---------- .../cn/estsh/i3plus/pojo/bsp/common/ReturnT.java | 112 ++++---- .../pojo/bsp/server/bean/model/RouteParam.java | 27 ++ .../bsp/server/repository/ScriptRepository.java | 14 + 6 files changed, 332 insertions(+), 203 deletions(-) create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/EngineScriptPersistence.java create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/GroovyCommonUtil.java create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ScriptRepository.java diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/EngineScriptPersistence.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/EngineScriptPersistence.java new file mode 100644 index 0000000..b0666b5 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/EngineScriptPersistence.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.bsp.client.bean.po; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * 脚本持久化实体类 + * + * @author Rock.Yu + * @since 2019-03-18 14:22 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "SCRIPT_PERSISTENCE", uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SCRIPT_NO"}) +}) +@Api("系统动态脚本") +public class EngineScriptPersistence extends BaseBean { + private static final long serialVersionUID = 7893111140559759490L; + // 脚本调用的唯一编号，例如：WMS_PDA_0001 + @Column(name = "SCRIPT_NO", length = 50) + private String scriptNo; + + // 脚本的中文名称 + @Column(name = "SCRIPT_NAME", length = 50) + private String scriptName; + + // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 + @Column(name = "SCRIPT_TYPE") + private Integer scriptType; + + // 脚本编写的语言 + // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby + @Column(name = "LANGUAGE_TYPE") + private Integer languageType; + + // 脚本的具体内容 + @Lob + @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + private String scriptContent; + + // 脚本的描述，包含脚本的用法，参数说明等 + @Column(name = "SCRIPT_REMARK", length = 2000) + private String scriptRemark; + + // 编译后的脚本内容，通过预编译加快脚本的运行速度 + @Transient + private Object compiledScript; + + // 构造方法，便于批量创建数据 + public EngineScriptPersistence(Long id, String scriptNo, String scriptName, Integer scriptType, Integer languageType, + String scriptContent, String scriptRemark) { + this.id = id; + this.scriptNo = scriptNo; + this.scriptName = scriptName; + this.scriptType = scriptType; + this.languageType = languageType; + this.scriptContent = scriptContent; + this.scriptRemark = scriptRemark; + } +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/GroovyCommonUtil.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/GroovyCommonUtil.java new file mode 100644 index 0000000..ad98d80 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/GroovyCommonUtil.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.bsp.common; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/7/22 15:38 + * @Modify: + **/ +public class GroovyCommonUtil { +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/HttpUtils.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/HttpUtils.java index f1032b0..d5be5c1 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/HttpUtils.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/HttpUtils.java @@ -1,147 +1,149 @@ -package cn.estsh.i3plus.pojo.bsp.common; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.net.ssl.*; -import java.io.BufferedReader; -import java.io.DataOutputStream; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; - -/** - * @Description : - * @Reference : - * @Author : Castle - * @CreateDate : 2021/6/17 13:37 - * @Modify: - **/ -public class HttpUtils { - private static Logger logger = LoggerFactory.getLogger(HttpUtils.class); - - // trust-https start - private static void trustAllHosts(HttpsURLConnection connection) { - try { - SSLContext sc = SSLContext.getInstance("TLS"); - sc.init(null, trustAllCerts, new java.security.SecureRandom()); - SSLSocketFactory newFactory = sc.getSocketFactory(); - - connection.setSSLSocketFactory(newFactory); - } catch (Exception e) { - logger.error(e.getMessage(), e); - } - connection.setHostnameVerifier(new HostnameVerifier() { - @Override - public boolean verify(String hostname, SSLSession session) { - return true; - } - }); - } - - private static final TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() { - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[]{}; - } - - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException { - } - - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException { - } - }}; - // trust-https end - - - /** - * post - * - * @param url - * @param timeout - * @param requestObj - * @return - */ - public static ReturnT postBody(String url, int timeout, Object requestObj) { - HttpURLConnection connection = null; - BufferedReader bufferedReader = null; - try { - // connection - URL realUrl = new URL(url); - connection = (HttpURLConnection) realUrl.openConnection(); - - // trust-https - boolean useHttps = url.startsWith("https"); - if (useHttps) { - HttpsURLConnection https = (HttpsURLConnection) connection; - trustAllHosts(https); - } - - // connection setting - connection.setRequestMethod("POST"); - connection.setDoOutput(true); - connection.setDoInput(true); - connection.setUseCaches(false); - connection.setReadTimeout(timeout * 1000); - connection.setConnectTimeout(3 * 1000); - connection.setRequestProperty("connection", "Keep-Alive"); - connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8"); - connection.setRequestProperty("Accept-Charset", "application/json;charset=UTF-8"); - - // do connection - connection.connect(); - - // write requestBody - if (requestObj != null) { - String requestBody = GsonTool.toJson(requestObj); - - DataOutputStream dataOutputStream = new DataOutputStream(connection.getOutputStream()); - dataOutputStream.write(requestBody.getBytes("UTF-8")); - dataOutputStream.flush(); - dataOutputStream.close(); - } - - // valid StatusCode - int statusCode = connection.getResponseCode(); - if (statusCode != 200) { - - return new ReturnT(ReturnT.FAIL_CODE, "rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url); - } - - // result - bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); - StringBuilder result = new StringBuilder(); - String line; - while ((line = bufferedReader.readLine()) != null) { - result.append(line); - } - String resultJson = result.toString(); - // parse returnT - try { - return GsonTool.fromJson(resultJson, ReturnT.class); - } catch (Exception e) { - logger.error("rpc remoting (url=" + url + ") response content invalid(" + resultJson + ").", e); - return new ReturnT(ReturnT.FAIL_CODE, "rpc remoting (url=" + url + ") response content invalid(" + resultJson + ")."); - } - } catch (Exception e) { - logger.error(e.getMessage(), e); - return new ReturnT(ReturnT.FAIL_CODE, "rpc remoting error(" + e.getMessage() + "), for url : " + url); - } finally { - try { - if (bufferedReader != null) { - bufferedReader.close(); - } - if (connection != null) { - connection.disconnect(); - } - } catch (Exception e2) { - logger.error(e2.getMessage(), e2); - } - } - } - -} \ No newline at end of file +//package cn.estsh.i3plus.pojo.bsp.common; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +// +//import javax.net.ssl.*; +//import java.io.BufferedReader; +//import java.io.DataOutputStream; +//import java.io.InputStreamReader; +//import java.net.HttpURLConnection; +//import java.net.URL; +//import java.security.cert.CertificateException; +//import java.security.cert.X509Certificate; +// +///** +// * @Description : +// * @Reference : +// * @Author : Castle +// * @CreateDate : 2021/6/17 13:37 +// * @Modify: +// **/ +//public class HttpUtils { +// private static Logger logger = LoggerFactory.getLogger(HttpUtils.class); +// +// // trust-https start +// private static void trustAllHosts(HttpsURLConnection connection) { +// try { +// SSLContext sc = SSLContext.getInstance("TLS"); +// sc.init(null, trustAllCerts, new java.security.SecureRandom()); +// SSLSocketFactory newFactory = sc.getSocketFactory(); +// +// connection.setSSLSocketFactory(newFactory); +// } catch (Exception e) { +// logger.error(e.getMessage(), e); +// } +// connection.setHostnameVerifier(new HostnameVerifier() { +// @Override +// public boolean verify(String hostname, SSLSession session) { +// return true; +// } +// }); +// } +// +// private static final TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() { +// @Override +// public X509Certificate[] getAcceptedIssuers() { +// return new X509Certificate[]{}; +// } +// +// @Override +// public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException { +// } +// +// @Override +// public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException { +// } +// }}; +// // trust-https end +// +// +// /** +// * post +// * +// * @param url +// * @param timeout +// * @param requestObj +// * @return +// */ +// public static ResultBean postBody(String url, int timeout, Object requestObj) { +// HttpURLConnection connection = null; +// BufferedReader bufferedReader = null; +// try { +// // connection +// URL realUrl = new URL(url); +// connection = (HttpURLConnection) realUrl.openConnection(); +// +// // trust-https +// boolean useHttps = url.startsWith("https"); +// if (useHttps) { +// HttpsURLConnection https = (HttpsURLConnection) connection; +// trustAllHosts(https); +// } +// +// // connection setting +// connection.setRequestMethod("POST"); +// connection.setDoOutput(true); +// connection.setDoInput(true); +// connection.setUseCaches(false); +// connection.setReadTimeout(timeout * 1000); +// connection.setConnectTimeout(3 * 1000); +// connection.setRequestProperty("connection", "Keep-Alive"); +// connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8"); +// connection.setRequestProperty("Accept-Charset", "application/json;charset=UTF-8"); +// +// // do connection +// connection.connect(); +// +// // write requestBody +// if (requestObj != null) { +// String requestBody = GsonTool.toJson(requestObj); +// +// DataOutputStream dataOutputStream = new DataOutputStream(connection.getOutputStream()); +// dataOutputStream.write(requestBody.getBytes("UTF-8")); +// dataOutputStream.flush(); +// dataOutputStream.close(); +// } +// +// // valid StatusCode +// int statusCode = connection.getResponseCode(); +// if (statusCode != 200) { +// return ResultBean.fail("rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url); +//// return new BaseResultBean().errorMsg("rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url); +//// return new ReturnT(ReturnT.FAIL_CODE, "rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url); +// } +// +// // result +// bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); +// StringBuilder result = new StringBuilder(); +// String line; +// while ((line = bufferedReader.readLine()) != null) { +// result.append(line); +// } +// String resultJson = result.toString(); +// // parse returnT +// try { +// return GsonTool.fromJson(resultJson, BaseResultBean.class); +// } catch (Exception e) { +// logger.error("rpc remoting (url=" + url + ") response content invalid(" + resultJson + ").", e); +// return ResultBean.fail("rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url); +// } +// } catch (Exception e) { +// logger.error(e.getMessage(), e); +// return ResultBean.fail("rpc remoting fail, error message(" + e.getMessage() + ") invalid. for url : " + url); +// } finally { +// try { +// if (bufferedReader != null) { +// bufferedReader.close(); +// } +// if (connection != null) { +// connection.disconnect(); +// } +// } catch (Exception e2) { +// logger.error(e2.getMessage(), e2); +// } +// } +// } +// +//} \ No newline at end of file diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/ReturnT.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/ReturnT.java index 81d6e63..350078d 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/ReturnT.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/ReturnT.java @@ -1,56 +1,56 @@ -package cn.estsh.i3plus.pojo.bsp.common; - -import java.io.Serializable; - -/** - * @author Castle - */ -public class ReturnT implements Serializable { - public static final long serialVersionUID = 42L; - - public static final int SUCCESS_CODE = 200; - public static final int FAIL_CODE = 500; - - public static final ReturnT SUCCESS = new ReturnT(null); - public static final ReturnT FAIL = new ReturnT(FAIL_CODE, null); - - private int code; - private String msg; - private T content; - - public ReturnT(){} - public ReturnT(int code, String msg) { - this.code = code; - this.msg = msg; - } - - public ReturnT(T content) { - this.code = SUCCESS_CODE; - this.content = content; - } - - public int getCode() { - return code; - } - public void setCode(int code) { - this.code = code; - } - public String getMsg() { - return msg; - } - public void setMsg(String msg) { - this.msg = msg; - } - public T getContent() { - return content; - } - public void setContent(T content) { - this.content = content; - } - - @Override - public String toString() { - return "ReturnT [code=" + code + ", msg=" + msg + ", content=" + content + "]"; - } - -} +//package cn.estsh.i3plus.pojo.bsp.common; +// +//import java.io.Serializable; +// +///** +// * @author Castle +// */ +//public class ReturnT implements Serializable { +// public static final long serialVersionUID = 42L; +// +// public static final int SUCCESS_CODE = 200; +// public static final int FAIL_CODE = 500; +// +// public static final ReturnT SUCCESS = new ReturnT(null); +// public static final ReturnT FAIL = new ReturnT(FAIL_CODE, null); +// +// private int code; +// private String msg; +// private T content; +// +// public ReturnT(){} +// public ReturnT(int code, String msg) { +// this.code = code; +// this.msg = msg; +// } +// +// public ReturnT(T content) { +// this.code = SUCCESS_CODE; +// this.content = content; +// } +// +// public int getCode() { +// return code; +// } +// public void setCode(int code) { +// this.code = code; +// } +// public String getMsg() { +// return msg; +// } +// public void setMsg(String msg) { +// this.msg = msg; +// } +// public T getContent() { +// return content; +// } +// public void setContent(T content) { +// this.content = content; +// } +// +// @Override +// public String toString() { +// return "ReturnT [code=" + code + ", msg=" + msg + ", content=" + content + "]"; +// } +// +//} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java new file mode 100644 index 0000000..a9f2148 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description :路由参数 + * @Reference : + * @Author : Castle + * @CreateDate : 2021/7/5 14:02 + * @Modify: + **/ +@Data +@ApiModel("路由参数") +public class RouteParam { + + @ApiModelProperty(value = "执行方法Id") + private Long methodId; + @ApiModelProperty(value = "路由的权重配置") + private HashMap weightConfig; + @ApiModelProperty(value = "执行器地址列表") + private List addressList; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ScriptRepository.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ScriptRepository.java new file mode 100644 index 0000000..52a88d2 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ScriptRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.bsp.server.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.bsp.client.bean.po.EngineScriptPersistence; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/7/22 13:51 + * @Modify: + **/ +public interface ScriptRepository extends BaseRepository { +} From 474e181d8c06202601815418d7dd5715547d8f63 Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 28 Jul 2021 11:20:40 +0800 Subject: [PATCH 09/26] =?UTF-8?q?bsp=E6=B3=A8=E5=86=8C=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E5=86=8C=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java index faf16b6..1b11d0d 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java @@ -22,6 +22,8 @@ public class RegistryParam implements Serializable { private String appname; @ApiParam("执行器的地址") private String address; + @ApiParam(value = "注册类型 1:自动 2:手动", defaultValue = "1") + private Integer registryType; @ApiParam("执行器注册的方法信息") private List methodRegistryParamList; From 756b41e393c40f1c2ba29851d8cff366d9cd767d Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 30 Jul 2021 17:36:58 +0800 Subject: [PATCH 10/26] =?UTF-8?q?bsp=20=E4=BF=AE=E6=94=B9pojo,=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0icloud?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/bean/model/MethodGroupListModel.java | 23 +++++++++++++++++++++ .../bsp/server/bean/model/MethodGroupModel.java | 19 ++++++++++------- .../bsp/server/bean/model/MethodLevelModel.java | 12 +++++------ .../server/bean/model/MethodLevelParamModel.java | 14 ++++++------- .../bsp/server/bean/model/MethodListModel.java | 24 ++++++++++++++++++++++ .../bsp/server/bean/model/RegistryMessageInfo.java | 12 +++++------ .../bsp/server/bean/model/RegistryMethodInfo.java | 11 +++++----- .../server/bean/model/RegistryMethodParamInfo.java | 12 +++++------ .../pojo/bsp/server/bean/model/RouteParam.java | 4 ++-- .../pojo/bsp/server/bean/po/MethodGroupInfo.java | 4 ++++ 10 files changed, 95 insertions(+), 40 deletions(-) create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupListModel.java create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodListModel.java diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupListModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupListModel.java new file mode 100644 index 0000000..01684c1 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupListModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : 查询方法组使用的model + * @Reference : + * @Author : Castle + * @CreateDate : 2021/7/30 9:36 + * @Modify: + **/ +@ApiModel("查询方法组") +@Data +public class MethodGroupListModel { + + @ApiModelProperty("方法组名字") + private String methodGroupName; + + @ApiModelProperty("方法组分类") + private String classify; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java index 0614b68..dab4701 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java @@ -1,12 +1,11 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.model; -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.Data; import java.util.List; -import java.util.Map; /** * @Description : @@ -17,13 +16,19 @@ import java.util.Map; **/ @Data @AllArgsConstructor -@Api("添加方法组") +@ApiModel("添加方法组") public class MethodGroupModel { - @ApiParam("方法组的名称") + @ApiModelProperty("方法组的名称") private String methodGroupName; - @ApiParam("方法组的描述") + + @ApiModelProperty("方法组的描述") private String description; - @ApiParam("方法组层级列表") + + @ApiModelProperty("方法组层级列表") private List methodLevel; + + @ApiModelProperty("方法组分类") + private String classify; + } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java index 13ca0b7..0cce4ee 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.model; -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.Data; @@ -16,13 +16,13 @@ import java.util.List; **/ @Data @AllArgsConstructor -@Api("添加方法组层级") +@ApiModel("添加方法组层级") public class MethodLevelModel { - @ApiParam("方法Id") + @ApiModelProperty("方法Id") private Long methodId; - @ApiParam("方法层级") + @ApiModelProperty("方法层级") private String level; - @ApiParam("参数列表") + @ApiModelProperty("参数列表") List paramModels; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java index 5664d22..b6d1924 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java @@ -1,12 +1,10 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.model; -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.Data; -import java.util.Map; - /** * @Description : * @Reference : @@ -16,12 +14,12 @@ import java.util.Map; **/ @Data @AllArgsConstructor -@Api("添加方法组层级参数") +@ApiModel("添加方法组层级参数") public class MethodLevelParamModel { - @ApiParam("根据出参生成，入参key = 层级 + methodId + 出参Name") + @ApiModelProperty("根据出参生成，入参key = 层级 + methodId + 出参Name") private String paramKey; - @ApiParam("对应本方法的入参名称") + @ApiModelProperty("对应本方法的入参名称") private String paramValue; - @ApiParam("入参类型，用于校验数据类型") + @ApiModelProperty("入参类型，用于校验数据类型") private String type; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodListModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodListModel.java new file mode 100644 index 0000000..bcd60f7 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodListModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/7/29 10:14 + * @Modify: + **/ +@Data +@ApiModel("分页查询方法列表") +public class MethodListModel { + + @ApiModelProperty(name = "执行器名") + private String appName; + @ApiModelProperty(name = "方法的版本号") + private String version; + + +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java index 420f335..95e1f6a 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.model; -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.Data; @@ -16,16 +16,16 @@ import java.util.List; **/ @Data @AllArgsConstructor -@Api("注册/心跳") +@ApiModel("注册/心跳") public class RegistryMessageInfo { - @ApiParam("appName,根据appName分执行器组") + @ApiModelProperty("appName,根据appName分执行器组") private String appName; - @ApiParam("执行器地址") + @ApiModelProperty("执行器地址") private String address; - @ApiParam("方法列表") + @ApiModelProperty("方法列表") private List methodRegistryParamList; diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java index bac52b3..ce2f963 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.model; -import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; @@ -16,16 +17,16 @@ import java.util.List; **/ @Data @AllArgsConstructor -@Api("注册方法信息") +@ApiModel("注册方法信息") public class RegistryMethodInfo { - @ApiParam("方法名") + @ApiModelProperty("方法名") private String methodName; - @ApiParam("调用方法时的key") + @ApiModelProperty("调用方法时的key") private String methodHandlerKey; - @ApiParam("参数列表") + @ApiModelProperty("参数列表") private List methodParamList; /*-----------------------------------文档------------------------------------------------*/ diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java index 06899f1..4ab8832 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.model; -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.Data; @@ -14,16 +14,16 @@ import lombok.Data; **/ @Data @AllArgsConstructor -@Api("方法注册参数") +@ApiModel("方法注册参数") public class RegistryMethodParamInfo { - @ApiParam("参数名") + @ApiModelProperty("参数名") private String name; - @ApiParam("参数类型，入参1，出参0") + @ApiModelProperty("参数类型，入参1，出参0") private Integer type; - @ApiParam("数据类型，基本数据类型") + @ApiModelProperty("数据类型，基本数据类型") private String typeName; diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java index a9f2148..971b152 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java @@ -4,8 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Description :路由参数 @@ -21,7 +21,7 @@ public class RouteParam { @ApiModelProperty(value = "执行方法Id") private Long methodId; @ApiModelProperty(value = "路由的权重配置") - private HashMap weightConfig; + private Map weightConfig; @ApiModelProperty(value = "执行器地址列表") private List addressList; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java index f010070..d5ec62c 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java @@ -38,5 +38,9 @@ public class MethodGroupInfo extends BaseBean implements Serializable { @ApiModelProperty("方法组描述") private String description; + @Column(name = "CLASSIFY") + @ApiModelProperty("方法组分类(唯一)") + private String classify; + } From 563cbab713e21672a16c4f5e7b59a439d99156ff Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 30 Jul 2021 17:38:11 +0800 Subject: [PATCH 11/26] =?UTF-8?q?bsp=20=E4=BF=AE=E6=94=B9pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java | 2 +- .../cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java index 8da6d03..82dbf4c 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java @@ -40,7 +40,7 @@ public class ExecutorGroupRegistryInfo extends BaseBean implements Serializable @Column(name = "TYPE",columnDefinition = "int default 0") @ApiModelProperty("自动注册 0，手动注册 1") - private String type; + private Integer type; @Column @ApiModelProperty("执行器组路由策略,默认随机") diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java index dc7a4f9..680ea4a 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java @@ -40,4 +40,8 @@ public class ExecutorRegistryInfo extends BaseBean implements Serializable { @Column(name = "UPDATE_TIME") @ApiModelProperty("最近一次心跳时间") private Date updateTime; + + @Column(name = "WEIGHT") + @ApiModelProperty("执行器权重") + private Integer weight; } From 0b6ef981235685991e96abeba0b825862ac3bfb7 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Mon, 2 Aug 2021 11:52:45 +0800 Subject: [PATCH 12/26] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/bsp/server/bean/model/MethodLevelModel.java | 2 ++ .../bsp/server/bean/model/MethodLevelParamModel.java | 2 +- .../pojo/bsp/server/bean/po/MethodLevelInfo.java | 4 ++++ .../bsp/server/bean/po/MethodLevelParamInfo.java | 20 +++++++++++++++++--- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java index 0cce4ee..a3febb7 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java @@ -21,6 +21,8 @@ public class MethodLevelModel { @ApiModelProperty("方法Id") private Long methodId; + @ApiModelProperty("方法名称") + private String methodName; @ApiModelProperty("方法层级") private String level; @ApiModelProperty("参数列表") diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java index b6d1924..6137bc2 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java @@ -19,7 +19,7 @@ public class MethodLevelParamModel { @ApiModelProperty("根据出参生成，入参key = 层级 + methodId + 出参Name") private String paramKey; @ApiModelProperty("对应本方法的入参名称") - private String paramValue; + private String methodParamName; @ApiModelProperty("入参类型，用于校验数据类型") private String type; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelInfo.java index c1b4f15..798b564 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelInfo.java @@ -43,6 +43,10 @@ public class MethodLevelInfo extends BaseBean implements Serializable { @ApiModelProperty("当前层级的方法ID") private Long methodId; + @Column(name = "METHOD_NAME") + @ApiModelProperty("方法名称") + private String methodName; + @Transient @ApiModelProperty("方法的参数关系列表") private List paramInfoList; diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelParamInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelParamInfo.java index 23c0d46..d96c81b 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelParamInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelParamInfo.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.po; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; import lombok.*; import javax.persistence.Column; @@ -47,6 +48,12 @@ public class MethodLevelParamInfo extends BaseBean implements Serializable { @Column(name = "METHOD_ID") @ApiModelProperty("对应的当前层级的方法Id") private Long methodId; + /** + * 对应方法的名字,todo 临时字段 2021/8/1 + */ + @Column(name = "METHOD_NAME") + @ApiModelProperty("对应的当前层级的方法的名字") + private String methodName; @Column(name = "METHOD_GROUP_ID") @ApiModelProperty("对应方法组的Id") @@ -54,13 +61,20 @@ public class MethodLevelParamInfo extends BaseBean implements Serializable { /** * 原有方法的入参是否必须，做验证 */ - @Column(name = "require") + @Column(name = "REQUIRE_TYPE",columnDefinition = "int") @ApiModelProperty("原有方法的入参是否必须，做调用前验证") - private Integer require; + private Integer requireType; /** * 参数类型，验证是否正确 */ - @Column(name = "type") + @Column(name = "TYPE") @ApiModelProperty("参数类型验证") private String type; + + /** + * 层级的入参 + */ + @Column(name = "LEVEL") + @ApiModelProperty("层级的入参") + private String level; } From 84f686b54e18f319cff52f4c3631c668440e0dad Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Mon, 2 Aug 2021 16:19:15 +0800 Subject: [PATCH 13/26] =?UTF-8?q?=E5=8D=8E=E5=9F=9F=E9=9B=B6=E6=98=9F?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=96=B0=E5=A2=9E=E5=8C=85=E8=A3=85=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 8e8e88e..7b460fa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -158,6 +158,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("维修名称") private String repairName; + @Column(name = "SPEC_CODE") + @ApiParam("包装代码") + private String specCode; + @Transient @ApiParam(value = "完成状态") public Integer orderStatus; From 5a44baf73aa737b27956ad6b06df0f386a19db0e Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Mon, 2 Aug 2021 20:31:33 +0800 Subject: [PATCH 14/26] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 02668f4..b95e375 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -5,9 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Transient; - /** * @Description: 打印条码工步， 打印信息模板 * @Reference: @@ -159,4 +156,6 @@ public class StepPrintSnModel extends MesProduceSn { private String qcCode; @ApiParam("打印机名称") private String printerName; + @ApiParam("是否DB件") + private String isDb; } From 472504f4a8432f3775f7558085113df4fcf4ef2b Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Tue, 3 Aug 2021 18:18:51 +0800 Subject: [PATCH 15/26] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=8D=8E=E5=9F=9F?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 7b460fa..8e8e88e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -158,10 +158,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("维修名称") private String repairName; - @Column(name = "SPEC_CODE") - @ApiParam("包装代码") - private String specCode; - @Transient @ApiParam(value = "完成状态") public Integer orderStatus; From 91bd3d9021cdab7c064377cd1f1c597095804242 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 3 Aug 2021 20:05:46 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index b95e375..68c3855 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -158,4 +158,6 @@ public class StepPrintSnModel extends MesProduceSn { private String printerName; @ApiParam("是否DB件") private String isDb; + @ApiParam("图片url") + private String imageUrl; } From fc8e25ecdd34727a43fa8a7187aee33638638574 Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 4 Aug 2021 18:44:07 +0800 Subject: [PATCH 17/26] =?UTF-8?q?bsp=20=E6=B3=A8=E5=86=8C=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=A2=9E=E5=8A=A0=E6=96=B9=E6=B3=95=E7=9A=84=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java index 0587f9b..8391c30 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java @@ -30,6 +30,8 @@ public class MethodRegistryParam implements Serializable { private List parameterList; @ApiParam("方法的版本") private String version; + @ApiParam("方法描述") + private String description; // @ApiParam("方法影响了那些表") // private String[] affectTableClassName; From 987ecdc447c579c57b065cec71f6e608bdc7f437 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 4 Aug 2021 19:39:56 +0800 Subject: [PATCH 18/26] =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java index 38e7baa..e8c05c3 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java @@ -50,6 +50,10 @@ public class ExecutorRegistryMethodInfo extends BaseBean implements Serializable @ApiModelProperty("所属执行器的appName") private String appName; + @Column(name = "description") + @ApiModelProperty("方法描述") + private String description; + @Transient @ApiModelProperty("方法参数列表") private List paramInfos; From 4b1228fbbc34b1972d76706a17f58043aca4fd66 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 4 Aug 2021 20:26:34 +0800 Subject: [PATCH 19/26] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 5 ++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java index bef6a1c..8d7733d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.validator.ImportGroup; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -49,5 +50,6 @@ public class DayShift extends BaseAPS { @Column(name="COLOR") @ApiParam(value ="颜色") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.COLOR_PICKER) private String color; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 96546b7..9f9e6b2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -1037,7 +1037,8 @@ public class ApsEnumUtil { OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"), LIST("LIST", "对象集合，不可编辑。"), MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部"), - QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"); + QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"), + COLOR_PICKER("COLOR_PICKER", "颜色选择框"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 02668f4..b95e375 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -5,9 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Transient; - /** * @Description: 打印条码工步， 打印信息模板 * @Reference: @@ -159,4 +156,6 @@ public class StepPrintSnModel extends MesProduceSn { private String qcCode; @ApiParam("打印机名称") private String printerName; + @ApiParam("是否DB件") + private String isDb; } From 0dd2f3b3c3838600aeaa9d68bbce9f9628924a37 Mon Sep 17 00:00:00 2001 From: Wynne Date: Thu, 5 Aug 2021 12:22:54 +0800 Subject: [PATCH 20/26] =?UTF-8?q?=E9=80=9A=E7=94=A8=E7=95=8C=E9=9D=A2=20re?= =?UTF-8?q?questmodel=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95=E7=BB=84id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ScreenEnumUtil.java | 30 +++++++++++----------- .../i3plus/pojo/screen/bean/ScrModelField.java | 1 + .../i3plus/pojo/screen/model/ScrRequestModel.java | 8 +++--- 3 files changed, 20 insertions(+), 19 deletions(-) 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 9b51dbe..4901a17 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 @@ -1041,21 +1041,21 @@ public class ScreenEnumUtil { */ public enum ENUM_SOFT_TYPE { COMMON(10, "CommonEnumUtil", "通用枚举"), - IMPP(10, "ImppEnumUtil", "平台枚举"), - WMS(10, "WmsEnumUtil", "WMS枚举"), - SWEB(10, "SwebEnumUtil", "Sweb枚举"), - MES(10, "MesEnumUtil", "Mes枚举"), - MES_PCN(10, "MesPcnEnumUtil", "MesPcn枚举"), - ANDON(10, "AndonEnumUtil", "Andon枚举"), - APS(20, "ApsEnumUtil", "Aps枚举"), - BLOCK_FORM(20, "BlockFormEnumUtil", "动态表单枚举"), - BLOCK_REPORT(20, "BlockReportEnumUtil", "动态报表枚举"), - BLOCK_SOFT_SWITCH(20, "BlockSoftSwitchEnumUtil", "软适配枚举"), - LAC(20, "LacEnumUtil", "Lac枚举"), - MDM(20, "MdmEnumUtil", "主数据中心枚举"), - PTL(20, "PtlEnumUtil", "Ptl枚举"), - PTL_PCN(20, "PtlPcnEnumUtil", "PtlPcn枚举"), - SCREEN(20, "ScreenEnumUtil", "通用界面枚举"); + IMPP(20, "ImppEnumUtil", "平台枚举"), + WMS(30, "WmsEnumUtil", "WMS枚举"), + SWEB(40, "SwebEnumUtil", "Sweb枚举"), + MES(50, "MesEnumUtil", "Mes枚举"), + MES_PCN(60, "MesPcnEnumUtil", "MesPcn枚举"), + ANDON(70, "AndonEnumUtil", "Andon枚举"), + APS(80, "ApsEnumUtil", "Aps枚举"), + BLOCK_FORM(90, "BlockFormEnumUtil", "动态表单枚举"), + BLOCK_REPORT(100, "BlockReportEnumUtil", "动态报表枚举"), + BLOCK_SOFT_SWITCH(110, "BlockSoftSwitchEnumUtil", "软适配枚举"), + LAC(120, "LacEnumUtil", "Lac枚举"), + MDM(130, "MdmEnumUtil", "主数据中心枚举"), + PTL(140, "PtlEnumUtil", "Ptl枚举"), + PTL_PCN(150, "PtlPcnEnumUtil", "PtlPcn枚举"), + SCREEN(160, "ScreenEnumUtil", "通用界面枚举"); private Integer value; private String code; 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 2822d43..2bcd645 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 @@ -100,6 +100,7 @@ public class ScrModelField extends BaseBean implements Serializable { private String modelFieldSourceProps; @Transient + @ApiModelProperty(value="模型字段值") private Object fieldValue; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java index 55207a2..3d1381d 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java @@ -61,8 +61,8 @@ public class ScrRequestModel implements Serializable { @ApiModelProperty("类名") private String className; - @ApiModelProperty("方法名") - private String methodName; + @ApiModelProperty("方法ID") + private Long methodGroupId; @ApiModelProperty("上传文件") private transient File file; @@ -82,8 +82,8 @@ public class ScrRequestModel implements Serializable { @ApiModelProperty("where条件补充") private String whereAppender; - @ApiModelProperty("调用接口参数") - private Map param; + @ApiModelProperty("字段转换") + private Map fieldConverter; } From 30eb4e2194b860e0d163b8d9269800c697da4eb9 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 6 Aug 2021 02:18:23 +0800 Subject: [PATCH 21/26] =?UTF-8?q?=E5=9B=9E=E6=BB=9APOM=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-bsp/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-screen/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 2ab69b8..7fdc84c 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index b73ac3b..99a4195 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 6a2a6dd..3411cbc 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-bsp/pom.xml b/modules/i3plus-pojo-bsp/pom.xml index 2453f02..254b452 100644 --- a/modules/i3plus-pojo-bsp/pom.xml +++ b/modules/i3plus-pojo-bsp/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index ee93af0..37bf889 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index b6822e2..048d5cd 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 2de88b5..c338f71 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index d1f5529..1ed6d53 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 0c4fd62..93d4237 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 7f94617..d98b7d8 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index eaaf018..0ee0761 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index ab3d9f0..4519749 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 0fb3892..1c581bc 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 2e2e59e..657abba 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 66b4907..504b0e7 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 840238c..26e173f 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 6bef2bc..48930f8 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index c5d4c40..9e00793 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 703ac5f..f73c5b2 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 7095411..1bf205d 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0a11dee..ca147a4 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index b8fd5af..478033a 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base diff --git a/sonar-project.properties b/sonar-project.properties index 8c37b31..37d8ae0 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -7,7 +7,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 69e2f819f2bf94b7b4c931c6e56100d22bd254ec Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 6 Aug 2021 02:55:56 +0800 Subject: [PATCH 22/26] =?UTF-8?q?16891=2019081-EOL=E7=9C=8B=E6=9D=BF-19:00?= =?UTF-8?q?=E8=87=B300:00=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE=E4=B8=BA0-20?= =?UTF-8?q?210730?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java index 01e3cda..fb2dafc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java @@ -56,4 +56,8 @@ public class MesBoardShiftSection extends BaseBean implements Serializable { @Transient @ApiParam("班次名称") private String shiftName; + + @Transient + @ApiParam("是否跨天") + private boolean isNextDay; } From db9dcabf1f3712a12da569b64d74c81a87e27282 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 6 Aug 2021 20:42:31 +0800 Subject: [PATCH 23/26] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E8=A1=A8=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 --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 03cd270..1bce589 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -27,7 +27,11 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "IF_PRODUCT_OFF_LINE", uniqueConstraints = { +@Table(name = "IF_PRODUCT_OFF_LINE", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "VIN_CODE") +}, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "ITEM_PART_NO"}) }) @NoArgsConstructor From 31344a93175dc3bdc5ea2d06e3d5e6cb156df10d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 7 Aug 2021 01:35:28 +0800 Subject: [PATCH 24/26] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index bd936f1..64732dc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1846,7 +1846,8 @@ public class WmsEnumUtil { CANCEL(50, "已取消"), REJECT(60, "全部退货"), SPECIAL(70, "全部特采"), - SECOND_JUDGMENT(80, "二次判定"); + SECOND_JUDGMENT(80, "二次判定"), + XUANBIE_JUDGMENT(90, "全部选别"); private int value; private String description; From cc6ab7dc42c9582440faf04c577193f84c96de31 Mon Sep 17 00:00:00 2001 From: gsz Date: Sat, 7 Aug 2021 14:06:05 +0800 Subject: [PATCH 25/26] =?UTF-8?q?=E2=80=9C=E4=BF=AE=E6=94=B9=E9=A1=B9g?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=98=E7=89=B9=E5=9B=BEpojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/model/GanttCalendarModel.java | 4 +++- .../i3plus/pojo/aps/model/GanttEventRequest.java | 2 +- .../estsh/i3plus/pojo/aps/model/GanttOrderModel.java | 19 ++++++++++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index 13abdc2..7a80b06 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java @@ -10,7 +10,7 @@ import java.util.Date; @Data public class GanttCalendarModel { - private Long resourceId; + private String resourceId; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) private Date startDate; @@ -21,4 +21,6 @@ public class GanttCalendarModel { //private String timeRangeColor; private String eventColor; private String name; + + private Double percentDone;//完成百分比 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java index 69d1e23..706f7bc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java @@ -21,7 +21,7 @@ import java.util.List; @Data @Api("甘特图分页查询参数") public class GanttEventRequest { - private Long[] resourceIds; + private String[] resourceIds; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) private Date begin; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java index 88cd06c..ce36f12 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java @@ -1,14 +1,31 @@ package cn.estsh.i3plus.pojo.aps.model; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.Data; import java.util.ArrayList; +import java.util.Date; import java.util.List; @Data public class GanttOrderModel { - private Long id; + private String id; private String code; private String name; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date startDate; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date endDate; + private String color;//颜色 + private Double percentDone;//完成百分比 + private Boolean expanded;//是否展开树 + private Boolean rollup;//自动把数据相加 在children的上层 当前 + private long duration;//期间 -- + private String unit;//期间单位 -- private List children = new ArrayList<>(); } From cfdcf6aaff4fb32094a0b232cf9c81b72c991f37 Mon Sep 17 00:00:00 2001 From: gsz Date: Sun, 8 Aug 2021 09:25:06 +0800 Subject: [PATCH 26/26] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BEModel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java index ce36f12..21b06ea 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java @@ -15,17 +15,19 @@ public class GanttOrderModel { private String id; private String code; private String name; + private String operationName; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) private Date startDate; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) private Date endDate; - private String color;//颜色 + private String color; private Double percentDone;//完成百分比 private Boolean expanded;//是否展开树 private Boolean rollup;//自动把数据相加 在children的上层 当前 - private long duration;//期间 -- - private String unit;//期间单位 -- +// private long duration; + private String durationUnit; + private Boolean manuallyScheduled; private List children = new ArrayList<>(); }