JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【添加】jeecg字样去除

Browse Source
This commit is contained in:
zer0Black
2021-03-12 17:58:56 +08:00
parent ed22cee030
commit 823866b7d1
28 changed files with 693 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java
+2 -2
View File
@@ -103,9 +103,9 @@ public class OnlCgformApiController {
private ISysBaseAPI sysBaseAPI;
@Autowired
private IOnlineService onlineService;
@Value("${jeecg.path.upload}")
@Value("${jero.path.upload}")
private String upLoadPath;
@Value("${jeecg.uploadType}")
@Value("${jero.uploadType}")
private String uploadType;
public OnlCgformApiController() {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java
+1 -1
View File
@@ -564,7 +564,7 @@ public class OnlCgformHeadController {
private void b() {
if (b == null) {
Resource var1 = this.resourceLoader.getResource("classpath:jeecg" + File.separator + "jeecg_config.properties");
Resource var1 = this.resourceLoader.getResource("classpath:jero" + File.separator + "jero_config.properties");
InputStream var2 = null;
try {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/service/a/OnlCgreportHeadServiceImpl.java
+6 -6
View File
@@ -107,16 +107,16 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
var23.eq(OnlCgreportItem::getCgrheadId, onlCgreportHeadId);
var23.eq(OnlCgreportItem::getIsSearch, 1);
List var12 = this.onlCgreportItemService.list(var23);
String var13 = "jeecg_rp_temp.";
String var13 = "jero_rp_temp.";
String var14 = CgReportQueryParamUtil.a(var12, params, var13, (String)null);
if (ReUtil.contains(" order\\s+by ", sql.toLowerCase()) && "SQLSERVER".equalsIgnoreCase(var4)) {
throw new JeroBootException("SqlServer不支持SQL内排序!");
} else {
String var15 = "select * from (" + sql + ") jeecg_rp_temp where 1=1 " + var14;
String var15 = "select * from (" + sql + ") jero_rp_temp where 1=1 " + var14;
var15 = SqlUtil.b(var15);
Object var16 = params.get("column");
if (var16 != null) {
var15 = var15 + " order by jeecg_rp_temp." + var16.toString() + " " + params.get("order").toString();
var15 = var15 + " order by jero_rp_temp." + var16.toString() + " " + params.get("order").toString();
}
a.info("报表查询sql=>\r\n" + var15);
@@ -168,15 +168,15 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
if (ReUtil.contains(" order\\s+by ", sql.toLowerCase()) && "3".equalsIgnoreCase(var5.getDbType())) {
throw new JeroBootException("SqlServer不支持SQL内排序!");
} else {
String var26 = "jeecg_rp_temp.";
String var26 = "jero_rp_temp.";
var15 = DataBaseEnum.getDataBaseNameByValue(var5.getDbType());
String var16 = CgReportQueryParamUtil.a(var25, params, var26, var15);
String var17 = "select * from (" + sql + ") jeecg_rp_temp where 1=1 " + var16;
String var17 = "select * from (" + sql + ") jero_rp_temp where 1=1 " + var16;
var17 = SqlUtil.b(var17);
String var18 = SqlUtils.getCountSql(var17);
Object var19 = params.get("column");
if (var19 != null) {
var17 = var17 + " order by jeecg_rp_temp." + var19.toString() + " " + params.get("order").toString();
var17 = var17 + " order by jero_rp_temp." + var19.toString() + " " + params.get("order").toString();
}
String var20 = var17;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/util/SqlUtil.java
-24
View File
@@ -60,30 +60,6 @@ public class SqlUtil {
return var2;
}
public static String a(String var0, Map var1, int var2, int var3) {
String var4 = "jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false";
int var5 = (var2 - 1) * var3;
String[] var6 = new String[]{var0, var5 + "", var3 + ""};
if (var4.indexOf("MYSQL") != -1) {
var0 = MessageFormat.format("select * from ( {0}) sel_tab00 limit {1},{2}", var6);
} else if (var4.indexOf("POSTGRESQL") != -1) {
var0 = MessageFormat.format("select * from ( {0}) sel_tab00 limit {2} offset {1}", var6);
} else {
int var7 = (var2 - 1) * var3;
int var8 = var7 + var3;
var6[2] = Integer.toString(var7);
var6[1] = Integer.toString(var8);
if (var4.indexOf("ORACLE") != -1) {
var0 = MessageFormat.format("select * from (select row_.*,rownum rownum_ from ({0}) row_ where rownum <= {1}) where rownum_>{2}", var6);
} else if (var4.indexOf("SQLSERVER") != -1) {
var6[0] = var0.substring(c(var0));
var0 = MessageFormat.format("select * from ( select row_number() over(order by tempColumn) tempRowNumber, * from (select top {1} tempColumn = 0, {0}) t ) tt where tempRowNumber > {2}", var6);
}
}
return var0;
}
public static String a(String var0, String var1, String var2, Map var3, int var4, int var5) {
var2 = a(var2, var3);
int var6 = (var4 - 1) * var5;