fix:88095

2024-08-06 16:27:39 +08:00
parent 9e7187ed49
commit 8f540531b7
9 changed files with 49 additions and 9 deletions
@@ -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";
 }
@@ -118,8 +118,12 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {

    @Override
    public void sendTodoTaskByFeiShu(List<UnifiedTodoVO> 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) {
@@ -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<LawsTag, ILawsTagService>
 			}
 			return Result.OK(ResultCommon.OK);
 		}
+
 		return result;
 	}

@@ -57,6 +57,14 @@ public interface LawsTagMapper extends BaseMapper<LawsTag> {

    int updateAllById(@Param("updated")LawsTag updated);

+    /**
+     * 查看字段是否已存在
+     * @param tableName 表名
+     * @param dbFieldName 字段名
+     * @return
+     */
+    long selectColumns(@Param("tableName") String tableName,@Param("dbFieldName") String dbFieldName);
+


 }
@@ -133,7 +133,7 @@
        where is_model=#{isModel} and db_field_en_name=#{dbFieldEnName} and db_field_txt=#{dbFieldTxt} and del_flag = 1
    </select>

-<!--auto generated by MybatisCodeHelper on 2023-11-09-->
+    <!--auto generated by MybatisCodeHelper on 2023-11-09-->
    <update id="updateAllById">
        update laws_tag
        <set>
@@ -169,4 +169,10 @@
        </set>
        where id = #{updated.id}
    </update>
-</mapper>
+    <select id="selectColumns" resultType="java.lang.Long">
+        SELECT count(*)
+        FROM INFORMATION_SCHEMA.COLUMNS
+        WHERE TABLE_NAME = #{tableName}
+        AND COLUMN_NAME = #{dbFieldName}
+    </select>
+</mapper>
@@ -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<LawsTagMapper, LawsTag> 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<LawsTagMapper, LawsTag> 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);
+		}
 	}

 	/**
@@ -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
@@ -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
@@ -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