From 1e5a0182815218862c2acad8c0709ebf4fa96354 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Jan 2024 15:06:41 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E9=99=90=E5=88=B6=E6=AF=8F=E5=BC=A0=E8=A1=A8=E6=9C=80?= =?UTF-8?q?=E5=A4=9A=E6=9C=8950=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=BB=98=E8=AE=A4=E9=95=BF=E5=BA=A6=E4=B8=BA?= =?UTF-8?q?500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/common/api/vo/ResultCommon.java | 2 ++ .../modules/tag/service/impl/ILawsTagServiceImpl.java | 10 ++++++++-- .../src/main/resources/i18n/messages.properties | 3 ++- .../src/main/resources/i18n/messages_en.properties | 1 + .../src/main/resources/i18n/messages_zh.properties | 1 + 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java index 3766b11e..6a5b976d 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java @@ -88,6 +88,8 @@ public class ResultCommon { /**字段名称太长*/ public static final String TAG_ADD_ERROR_1 = "tag.add.error.1"; + /**每张表最多有50个字段*/ + public static final String TAG_ADD_ERROR_2 = "tag.add.error.2"; /**同一所属模块下,展示区域名称不能重复！*/ public static final String TAG_ERROR_1 = "tag.error.1"; /**该展示区域有关联数据，无法删除！*/ diff --git a/laws-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java index a2fd0849..bebde388 100644 --- a/laws-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java @@ -68,9 +68,9 @@ public class ILawsTagServiceImpl extends ServiceImpl imp lawsTag.setDbFieldNameOld(lawsTag1.getDbFieldName()); } - //处理DBLength为null的情况，默认为100 + //处理DBLength为null的情况，默认为500 if (lawsTag.getDbLength() == null){ - lawsTag.setDbLength(100); + lawsTag.setDbLength(500); } //设置标签存入数据库的字段类型 if(lawsTag.getFieldShowType().equals(LawsFieldTypeEnum.DATE_SINGLE.getValue())){ @@ -118,6 +118,12 @@ public class ILawsTagServiceImpl extends ServiceImpl imp if (lawsTag1 != null){ lawsTagMapper.updateAllById(lawsTag); }else { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(LawsTag::getTableName,tableName); + Integer integer = lawsTagMapper.selectCount(wrapper); + if (integer >= 50) { + throw new JeroBootException(ResultCommon.TAG_ADD_ERROR_2); + } saveOrUpdate(lawsTag); } diff --git a/laws-single-startup/src/main/resources/i18n/messages.properties b/laws-single-startup/src/main/resources/i18n/messages.properties index 58fcd659..ccca5631 100644 --- a/laws-single-startup/src/main/resources/i18n/messages.properties +++ b/laws-single-startup/src/main/resources/i18n/messages.properties @@ -63,4 +63,5 @@ tag.edit.error.1=\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u4FEE\u6539 please.search.to.import=\u8BF7\u8F93\u5165\u68C0\u7D22\u5185\u5BB9 task.not.exists=\u4EFB\u52A1\u4E0D\u5B58\u5728 draft.not.exists=\u8349\u7A3F\u4E0D\u5B58\u5728 -en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u51B2\u7A81\uFF0C\u8BF7\u91CD\u65B0\u751F\u6210 \ No newline at end of file +en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u51B2\u7A81\uFF0C\u8BF7\u91CD\u65B0\u751F\u6210 +tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002 \ No newline at end of file diff --git a/laws-single-startup/src/main/resources/i18n/messages_en.properties b/laws-single-startup/src/main/resources/i18n/messages_en.properties index 8c4a3341..28f7db6f 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_en.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties @@ -69,3 +69,4 @@ please.search.to.import=please search to import task.not.exists=Task not exists draft.not.exists=Draft not exists en.standard.number.conflict=English standard number conflict +tag.add.error.2=each table can have a maximum of 50 fields. diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties index 1d77fdbb..ab336117 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -69,3 +69,4 @@ please.search.to.import=\u8BF7\u8F93\u5165\u68C0\u7D22\u5185\u5BB9 task.not.exists=\u4EFB\u52A1\u4E0D\u5B58\u5728 draft.not.exists=\u8349\u7A3F\u4E0D\u5B58\u5728 en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u51B2\u7A81\uFF0C\u8BF7\u91CD\u65B0\u751F\u6210 +tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002