Merge branch 'master' of https://gitea.qinmian.online/2112A-ONE/muyu-source

# Conflicts:
#	muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataValueServiceImpl.java

muyu-source-server/src/main/java/com/muyu/source/controller/DataValueController.java

@@ -41,6 +41,19 @@ public class DataValueController {
         return Result.success(dataValueList);
     }
 
+    /**
+     * 根据基础表ID和SQL语句查询条数
+     *
+     * @param dataValueModel 基础表ID和sql语句
+     * @return DataValue{kltv}
+     */
+    @PostMapping("/getTableValueTotal")
+    @Operation(summary = "根据基础表ID和SQL语句新增数据", description = "根据基础表ID和SQL语句新增数据")
+    public Result getTableValueTotal(@RequestBody DataValueModel dataValueModel) {
+        Integer i = dataValueService.getTableValueTotal(dataValueModel);
+        return Result.success(i);
+    }
+
     /**
      * 根据基础表ID和SQL语句查询数据
      *

muyu-source-server/src/main/java/com/muyu/source/service/DataValueService.java

@@ -21,4 +21,6 @@ public interface DataValueService extends IService<DataValue> {
     List<DataValue> findTableValueByTableName(Long basicId, String tableName);
 
     Integer addTableValue(DataValueModel dataValueModel);
+
+    Integer getTableValueTotal(DataValueModel dataValueModel);
 }