From 8f540531b704b07f9cc5df5ee68bd1584c9677fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 6 Aug 2024 16:27:39 +0800 Subject: [PATCH] fix:88095 --- .../com/jero/common/api/vo/ResultCommon.java | 3 ++- .../service/impl/UnifiedTodoServiceImpl.java | 8 ++++++-- .../tag/controller/LawsTagController.java | 3 +++ .../modules/tag/mapper/LawsTagMapper.java | 8 ++++++++ .../modules/tag/mapper/xml/LawsTagMapper.xml | 10 ++++++++-- .../tag/service/impl/ILawsTagServiceImpl.java | 20 +++++++++++++++++-- .../main/resources/application-dev-chery.yml | 4 ++-- .../resources/i18n/messages_en.properties | 1 + .../resources/i18n/messages_zh.properties | 1 + 9 files changed, 49 insertions(+), 9 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 d0faa2ac..ea5c2e5d 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 @@ -205,5 +205,6 @@ public class ResultCommon { public static final String MODEL_IMPORT_DATA_ERROR = "model.import.data.error"; public static final String FILE_EMPTY_IMPORT_ERROR = "file.empty.import.error"; - + // 行大小太大 + public static final String ROW_SIZE_TOO_LARGE = "row.size.too.large"; } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java index 55db0453..8fa42a45 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java @@ -118,8 +118,12 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI { @Override public void sendTodoTaskByFeiShu(List unifiedTodoVOList) { - // 发送飞书 - sendFeiShuService.sendTodoTask(unifiedTodoVOList); + try { + // 发送飞书 + sendFeiShuService.sendTodoTask(unifiedTodoVOList); + }catch (Exception e){ + log.error("飞书发送异常",e.getMessage()); + } } private void push(String url, String jsonString,String reqJsonString, String title) { diff --git a/laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java b/laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java index 9956ca84..09f60113 100644 --- a/laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java +++ b/laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java @@ -30,6 +30,8 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.sql.SQLException; +import java.sql.SQLSyntaxErrorException; import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -134,6 +136,7 @@ public class LawsTagController extends JeroController } return Result.OK(ResultCommon.OK); } + return result; } diff --git a/laws-modules/src/main/java/com/jero/modules/tag/mapper/LawsTagMapper.java b/laws-modules/src/main/java/com/jero/modules/tag/mapper/LawsTagMapper.java index bc9d6206..2d7681d3 100644 --- a/laws-modules/src/main/java/com/jero/modules/tag/mapper/LawsTagMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/tag/mapper/LawsTagMapper.java @@ -57,6 +57,14 @@ public interface LawsTagMapper extends BaseMapper { int updateAllById(@Param("updated")LawsTag updated); + /** + * 查看字段是否已存在 + * @param tableName 表名 + * @param dbFieldName 字段名 + * @return + */ + long selectColumns(@Param("tableName") String tableName,@Param("dbFieldName") String dbFieldName); + } diff --git a/laws-modules/src/main/java/com/jero/modules/tag/mapper/xml/LawsTagMapper.xml b/laws-modules/src/main/java/com/jero/modules/tag/mapper/xml/LawsTagMapper.xml index 94d7d8f1..5e94287e 100644 --- a/laws-modules/src/main/java/com/jero/modules/tag/mapper/xml/LawsTagMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/tag/mapper/xml/LawsTagMapper.xml @@ -133,7 +133,7 @@ where is_model=#{isModel} and db_field_en_name=#{dbFieldEnName} and db_field_txt=#{dbFieldTxt} and del_flag = 1 - + update laws_tag @@ -169,4 +169,10 @@ where id = #{updated.id} - \ No newline at end of file + + 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 6a712ee5..59caec13 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.enums.YesOrNoEnum; @@ -30,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.sql.SQLSyntaxErrorException; import java.util.Date; import java.util.List; @@ -106,7 +108,6 @@ public class ILawsTagServiceImpl extends ServiceImpl imp if (dbFieldName.length() > 64){ throw new JeroBootException(ResultCommon.TAG_ADD_ERROR_1,dbFieldName); } - if (lawsTag1 != null){ executeDDL(lawsTag,"modify"); }else { @@ -211,10 +212,25 @@ public class ILawsTagServiceImpl extends ServiceImpl imp if (StringUtils.isNotBlank(dbFieldNameOld)){ sql = "alter table " + tableName + " change `" + dbFieldNameOld + "` `" + dbFieldName + "` " + type + " null comment '"+dbFieldTxt+"'"; }else { + // 验证字段是否存在 + long l = lawsTagMapper.selectColumns(tableName,dbFieldName); + if(l > 0){ + throw new JeroBootException(ResultCommon.TAG_EDIT_ERROR_2); + } sql = "alter table " + tableName + " " + modifyOrAdd + " `" + dbFieldName + "` " + type + " null comment '"+dbFieldTxt+"'"; } - lawsTagMapper.executeDDL(sql); + try{ + lawsTagMapper.executeDDL(sql); + } catch (Exception e) { + log.error(e.getMessage()); + // 捕获所有的SQLException + if (e.getMessage().contains("java.sql.SQLSyntaxErrorException: Row size too large.")) { + // 判断是否为SQLSyntaxErrorException + throw new JeroBootException(ResultCommon.ROW_SIZE_TOO_LARGE); + } + throw new JeroBootException(ResultCommon.ERROR); + } } /** diff --git a/laws-single-startup/src/main/resources/application-dev-chery.yml b/laws-single-startup/src/main/resources/application-dev-chery.yml index c8a9e58f..67bcbed9 100644 --- a/laws-single-startup/src/main/resources/application-dev-chery.yml +++ b/laws-single-startup/src/main/resources/application-dev-chery.yml @@ -398,8 +398,8 @@ hiwork: isWorkflow: true # 前端调用地址 url: https://iamuat.mychery.com:5443/idp/oauth2/authorize?state=123&client_id=CGRSM&redirect_uri= - fontUrl: ?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} - fontAppUrl: /mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} + fontUrl: http://10.2.16.8:3344{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} + fontAppUrl: http://10.2.16.8:3344/mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} #hiwork单点登录 appkey: dingshfclphtivrd0r7k appsecret: dqhom_17n6BC8pmLeaf5wNp4aV_4XSt_aYn-dNBo8z__-79NjVvZhDJ_M2REdxRc 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 9a44c1c9..acbd0250 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_en.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties @@ -100,3 +100,4 @@ split.import.template.error=Split import template error model.import.template.error=Model import template error model.import.data.error=Model import data error.{0} file.empty.import.error=The file is empty, please upload again +row.size.too.large=Row size too large 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 0015c295..fd89485e 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -99,3 +99,4 @@ split.import.template.error=\u5206\u89E3\u5355\u4E0A\u4F20\u6A21\u677F\u9519\u8B model.import.template.error=\u8F66\u578B\u9879\u76EE\u6587\u4EF6\u4E0A\u4F20\u6A21\u677F\u9519\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5 model.import.data.error=\u8F66\u578B\u9879\u76EE\u6587\u4EF6\u4E0A\u4F20\u6570\u636E\u9519\u8BEF\u3002{0} file.empty.import.error=\u6587\u4EF6\u4E3A\u7A7A\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5 +row.size.too.large=\u884C\u5927\u5C0F\u592A\u5927