优化接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/CommonController.java

@@ -80,7 +80,8 @@ public class CommonController extends BaseController {
      */
     @GetMapping("/getTableList")
     public TableDataInfo queryTableList(CommonEntity commonEntity) {
-        TableSql tableSql = iTableSqlService.selectTableSqlByTSqlKey(commonEntity.getQueryMap().get("SQLKEY").toString());
+        System.out.println(commonEntity.getQueryMap());
+        TableSql tableSql = iTableSqlService.selectTableSqlByTSqlKey(commonEntity.getQueryMap().get("sqlkey").toString());
         startPage();  // 校验是否sqlserver 否执行 是执行另一种方式的分页
         return getDataTable(commonService.queryTableList(commonEntity, tableSql));
     }
@@ -112,12 +113,13 @@ public class CommonController extends BaseController {
 
     /**
      * 通用动态表单详情
+     *
      * @param sqlKey
      * @return
      */
     @GetMapping("/dragTableInfo")
-    public AjaxResult dragTableInfo(@RequestParam String sqlKey){
-        return AjaxResult.success(dragTableService.dragTableInfo(sqlKey));
+    public AjaxResult dragTableInfo(CommonEntity commonEntity) {
+        return AjaxResult.success(dragTableService.dragTableInfo(commonEntity.getQueryMap().get("sqlkey").toString()));
     }
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CommonServiceImpl.java

@@ -85,21 +85,19 @@ public class CommonServiceImpl implements ICommonService {
         List<String> test = Arrays.asList(whereTerm);
         // 拼接条件
         if (conditions != null) conditions.forEach((key, val) -> {
-            // 把前端回传的查询参数值名称驼峰转下划线命名，进行筛选是否存在匹配项
-            String sqlWhere = test.stream().filter(item -> item.contains(toUnderScoreCase(key))).findAny().get();
+            String sqlWhere = "";
+            try {
+                // 把前端回传的查询参数值名称驼峰转下划线命名，进行筛选是否存在匹配项
+                sqlWhere = test.stream().filter(item -> item.contains(toUnderScoreCase(key))).findAny().get();
+            } catch (NoSuchElementException e) {
+                return;
+            }
             if (sqlWhere.indexOf("#{timeframe}") != -1) {  // 时间范围查询拼接
                 endSQL.append(" AND " + sqlWhere.replace("#{timeframe}", "'" + val.toString().split(",")[0] + "'" + " and " + "'" + val.toString().split(",")[1] + "'"));
             } else if (sqlWhere.indexOf("#{val}") != -1) { // 寻常条件拼接
                 endSQL.append(" AND " + sqlWhere.replace("#{val}", val.toString()));
             }
         });
-        //for (String w : whereTerm) {
-        //extractSubstring(w, tableSql.getTableAlias()); // 得到当前筛选条件的字段名称
-        //w.replace("#{val}", extractSubstring(w, tableSql.getTableAlias()));
-        //}
-        //conditions.forEach((key, val) -> {
-        //endSQL.append(" and " + tableSql.getTableAlias() + " " + key + " = " + val);
-        //});
         return commonMapper.queryTableList(endSQL.toString());
     }