From 5a6d4547e7c39507926698a02802163553f1236d Mon Sep 17 00:00:00 2001
From: lrj <386002446@qq.com>
Date: 星期五, 25 十月 2024 11:01:02 +0800
Subject: [PATCH] bug
---
src/test/java/org/example/test.groovy | 16 ++++++++--------
src/test/java/org/example/Builder.java | 1 +
src/main/java/com/ycl/scheme/SqlQueryBuilder.java | 7 +++----
src/main/java/com/ycl/scheme/AbstractSchemeRunner.java | 9 +++++++++
4 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ycl/scheme/AbstractSchemeRunner.java b/src/main/java/com/ycl/scheme/AbstractSchemeRunner.java
index a152645..fb5ea51 100644
--- a/src/main/java/com/ycl/scheme/AbstractSchemeRunner.java
+++ b/src/main/java/com/ycl/scheme/AbstractSchemeRunner.java
@@ -14,4 +14,13 @@
parameters.putAll(pars);
}
+
+ protected Map<String,Object> getSqlParameters(){
+ Map<String,Object> m = new HashMap<>();
+ parameters.forEach((k,v)->{
+ m.put(k,v.getScript());
+ });
+ return m;
+ }
+
}
diff --git a/src/main/java/com/ycl/scheme/SqlQueryBuilder.java b/src/main/java/com/ycl/scheme/SqlQueryBuilder.java
index 79e026c..5ea35d1 100644
--- a/src/main/java/com/ycl/scheme/SqlQueryBuilder.java
+++ b/src/main/java/com/ycl/scheme/SqlQueryBuilder.java
@@ -128,7 +128,6 @@
throw new RuntimeException("缁撴灉琛ㄨ揪寮忎笉姝ｇ‘");
}
-
String fields = ss[0];
String compareStr = resultText.substring(fields.length());
fields+=" ";
@@ -181,7 +180,7 @@
StringBuilder csb = new StringBuilder();
String sql = "\"" +this.sql + "\"";
csb.append(" def " + funcName + "(){\n");
- csb.append(" Map<String,Object> pars = new HashMap<>();\n");
+ csb.append(" Map<String,Object> pars = super.getSqlParameters();\n");
csb.append(" def sql= " +sql + ";\n");
this.parameters.forEach((k,v)->{
@@ -384,11 +383,11 @@
//鏈夊嚑涓棶鍙凤紝灏辫鏈夊嚑涓搴旂殑鍙傛暟
Parameter p1 = new Parameter();
- p1.setName("beginTime");
+ p1.setName("endTime");
p1.setScript("LocalDateTime.now()");
p1.setTypeName("LocalDateTime");
Parameter p2 = new Parameter();
- p2.setName("endTime");
+ p2.setName("beginTime");
p2.setScript("LocalDateTime.now().minusDays("+day+ ")");
p2.setTypeName("LocalDateTime");
parameters.put(p1.getName(),p1);
diff --git a/src/test/java/org/example/Builder.java b/src/test/java/org/example/Builder.java
index 6f3d55d..156ccaf 100644
--- a/src/test/java/org/example/Builder.java
+++ b/src/test/java/org/example/Builder.java
@@ -51,6 +51,7 @@
p.setName("rowId");
p.setScript(1);
p.setTypeName("Integer");
+ pars.put("rowId",p);
runner.run(pars,service);
System.out.println(code);
diff --git a/src/test/java/org/example/test.groovy b/src/test/java/org/example/test.groovy
index 5f4f20b..73c0819 100644
--- a/src/test/java/org/example/test.groovy
+++ b/src/test/java/org/example/test.groovy
@@ -19,12 +19,12 @@
}
def func_0(){
- Map<String,Object> pars = new HashMap<>();
+ Map<String,Object> pars = super.getSqlParameters();
def sql= "select count(*) from t_info where create_time between :beginTime and :endTime and content like '%鎶㈠ず%' and address like '%閲戠墰澶ч亾%' ";
- def p_beginTime = LocalDateTime.now();
- pars.put('beginTime',p_beginTime);
- def p_endTime = LocalDateTime.now().minusDays(5);
+ def p_endTime = LocalDateTime.now();
pars.put('endTime',p_endTime);
+ def p_beginTime = LocalDateTime.now().minusDays(5);
+ pars.put('beginTime',p_beginTime);
def rs = service.execQuery(sql,pars);
if(rs > 2){
return true;
@@ -33,12 +33,12 @@
}
}
def func_1(){
- Map<String,Object> pars = new HashMap<>();
+ Map<String,Object> pars = super.getSqlParameters();
def sql= "select sum(amt) from t_case where create_time between :beginTime and :endTime and content like '%璇堥獥%' and address like '%閾剁墰澶ч亾%' ";
- def p_beginTime = LocalDateTime.now();
- pars.put('beginTime',p_beginTime);
- def p_endTime = LocalDateTime.now().minusDays(5);
+ def p_endTime = LocalDateTime.now();
pars.put('endTime',p_endTime);
+ def p_beginTime = LocalDateTime.now().minusDays(5);
+ pars.put('beginTime',p_beginTime);
def rs = service.execQuery(sql,pars);
if(rs >=100000){
return true;
--
Gitblit v1.8.0