公式相关

blade-service/blade-manager/src/main/java/com/mixsmart/utils/FormulaUtils.java

@@ -238,10 +238,10 @@ public class FormulaUtils {
         }
 
         String str = eName.replaceAll("\\s", "");
-        Pattern pattern = compile("[(（_]");
+        Pattern pattern = compile("[(（][^\\u4e00-\\u9fa5]+[）)]|_+");
         String[] candidate = pattern.split(str);
-
-        String regex = "[^\\u4e00-\\u9fa5]+";
+       /*非中文非罗马数字1到10*/
+        String regex = "[^\\u4e00-\\u9fa5\\u2160-\\u2169）)(（]+";
         Pattern p = compile(regex);
 
         return Arrays.stream(candidate)
@@ -274,7 +274,7 @@ public class FormulaUtils {
 
 
     private static boolean isContainKeywords(String s) {
-        List<String> keywords = Arrays.asList( "：", "个","附录","抽查","测","求","小于","大于","检查","仪","按","不","各","记录","且","规定","值或实","≤","≥");
+        List<String> keywords = Arrays.asList( "：", "个","附录","抽查","测","求","小于","大于","检查","仪","按","不","各","记录","且","规定","值或实","≤","≥","平均");
         return keywords.stream().anyMatch(s::contains);
     }
     private static boolean isContainKeywords2(String s) {
@@ -325,12 +325,13 @@ public class FormulaUtils {
             ,"1△梁（板）长度 (mm)_±5_实测值或实测偏差值"
             ,"墙面平整度(mm)_施工缝、变形缝处≤20_实测值或实测偏差值"
             ,"基底承载力(KPa)_不小于设计_实测值或实测偏差值"
+            ,"1△_拱部超挖(mm)_Ⅱ、Ⅲ、Ⅳ级围岩（中硬岩 、软岩）_平均150，最大250_实测值或实测偏差值"
     );
 
-/*    public static void main(String[] args) {
-       // itemNames.stream().map(FormulaUtils::parseItemName).forEach(System.out::println);
-       itemNames.stream().map(FormulaUtils::checkItemName).forEach(System.out::println);
-    }*/
+    public static void main(String[] args) {
+        itemNames.stream().map(FormulaUtils::parseItemName).forEach(System.out::println);
+      // itemNames.stream().map(FormulaUtils::checkItemName).forEach(System.out::println);
+    }
 
 
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IFormulaService.java

@@ -63,10 +63,8 @@ public interface IFormulaService extends BaseService<Formula> {
     /**根据wbs_tree_private的pkeyId获取公共树*/
     WbsTreePrivate getOriginWtp(Long pkeyId);
 
-    <T> T getSqlOne(@NotNull  String sql, Object[] args,@NotNull Class<T> clazz);
-    <T> T getSqlOne(@NotNull String sql, @NotNull Class<T> clazz);
-    <T> List<T> getSqlList(@NotNull String sql,Object[] args, @NotNull Class<T> clazz);
-    <T> List<T> getSqlList(@NotNull String sql,@NotNull Class<T> clazz);
+    <T> T getSqlOne(@NotNull  String sql,@NotNull Class<T> clazz , Object ...args);
+    <T> List<T> getSqlList(@NotNull String sql, @NotNull Class<T> clazz,Object... args);
 
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -402,10 +402,10 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                Long nodeId=tableInfo.getLong("nodeId");
                List<TableInfo> tableInfoList = this.getTableInfoList(dataArray);
                List<NodeTable> tableAll = createNodeTables(nodeId, tableInfoList.get(0).getContractId(), tableInfoList.get(0).getProjectId(), type);
-                                   this.formulaService.getSqlList(
-                                           "select d.id,c.tab_ch_name tableChName,d.e_type eType,d.e_name eName,d.e_length eLength,d.e_allow_deviation eAllowDeviation,CONCAT(c.tab_en_name,':',d.e_key) code from m_table_info c join m_wbs_form_element d  on  c.id=d.f_id where d.is_deleted=0 and c.tab_en_name in(?)"
-                                           ,new Object[]{tableAll.stream().map(NodeTable::getInitTableName).distinct().collect(Collectors.joining(","))}
-                                           , FormData.class
+               String tableNames=tableAll.stream().map(NodeTable::getInitTableName).distinct().collect(Collectors.joining("','","'","'"));
+               List<FormData>  processFds =this.formulaService.getSqlList(
+                                           "select d.id,c.tab_ch_name tableChName,d.e_type eType,d.e_name eName,d.e_length eLength,d.e_allow_deviation eAllowDeviation,CONCAT(c.tab_en_name,':',d.e_key) code from m_table_info c join m_wbs_form_element d  on  c.id=d.f_id where d.is_deleted=0 and c.tab_en_name in("+tableNames+")"
+                                           ,FormData.class
                                    );
                List<KeyMapper> keyMappers = this.formulaService.getKeyMapperList(tableInfoList.stream().map(TableInfo::getPkeyId).filter(Func::isNotEmpty).map(Long::parseLong).collect(Collectors.toList()), tableInfoList.get(0).getProjectId(), String.valueOf(nodeId), type);
                if (Func.isNotEmpty(keyMappers) && Func.isNotEmpty(tableAll)) {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -1385,7 +1385,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     }
 
     @Override
-    public <T> T getSqlOne(String sql, Object[] args, Class<T> clazz) {
+    public <T> T getSqlOne(String sql, Class<T> clazz, Object... args) {
         List<Map<String,Object>> listMaps=this.jdbcTemplate.queryForList(sql,args);
         if(listMaps.size()>0){
             Map<String,Object> target = listMaps.get(0);
@@ -1398,14 +1398,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     }
 
 
-
-    @Override
-    public <T> T getSqlOne(String sql, Class<T> clazz) {
-        return getSqlOne(sql,null,clazz);
-    }
-
     @Override
-    public <T> List<T> getSqlList(String sql, Object[] args, Class<T> clazz) {
+    public <T> List<T> getSqlList(String sql, Class<T> clazz,Object... args) {
         List<Map<String,Object>> listMaps=this.jdbcTemplate.queryForList(sql,args);
         if(listMaps.size()>0){
             if (Map.class.equals(clazz)) {
@@ -1416,10 +1410,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         return null;
     }
 
-    @Override
-    public <T> List<T> getSqlList(String sql, Class<T> clazz) {
-        return getSqlList(sql,null,clazz);
-    }
+
 
     @Override
     public WbsTreePrivate wtpId(Long pkeyId){