KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【添加】utils修复

Browse Source
This commit is contained in:
zer0Black
2021-03-12 16:19:51 +08:00
parent e61dc85909
commit e240930f17
23 changed files with 138 additions and 3739 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/util/k.java
-33
View File
@@ -207,39 +207,6 @@ public class k {
private static String getMaOld() {
if (l.c(c)) {
return c;
}
String str1 = getOSName();
String str2 = getSystemRoot() + "/system32/ipconfig /all";
String str3 = null;
if (str1.startsWith("windows")) {
if (str1.equals("windows xp")) {
str3 = b(str2);
} else if (str1.equals("windows 2003")) {
str3 = b(str2);
} else {
str3 = getWindow7Ma();
}
} else if (str1.startsWith("linux")) {
str3 = getLinuxMa();
} else {
str3 = getUnixMa();
}
c = str3;
return str3;
}
private static String getOSName() {
return System.getProperty("os.name").toLowerCase();
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/controller/OnlCgformApiController.java
+22 -19
View File
@@ -56,7 +56,10 @@ import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService;
import org.jeecg.modules.online.cgform.service.IOnlCgformHeadService;
import org.jeecg.modules.online.cgform.service.IOnlCgformSqlService;
import org.jeecg.modules.online.cgform.service.IOnlineService;
import org.jeecg.modules.online.cgform.util.CgFormExcelHandler;
import org.jeecg.modules.online.cgform.util.CgformUtil;
import org.jeecg.modules.online.cgform.util.EnhanceJsUtil;
import org.jeecg.modules.online.cgform.util.GenerateCodeFileToZip;
import org.jeecg.modules.online.config.b.d;
import org.jeecg.modules.online.config.exception.BusinessException;
import org.jeecg.modules.online.config.exception.DBException;
@@ -169,7 +172,7 @@ public class OnlCgformApiController {
} else {
try {
String var5 = var4.getTableName();
Map var6 = org.jeecg.modules.online.cgform.util.b.a(var2);
Map var6 = CgformUtil.a(var2);
Map var7 = this.onlCgformFieldService.queryAutolistPage(var5, var1, var6, (List)null);
this.a(var4, var7);
var3.setResult(var7);
@@ -242,9 +245,9 @@ public class OnlCgformApiController {
JSONObject var19 = new JSONObject();
List var20 = this.onlAuthPageService.queryFormDisabledCode(var17.getId());
if (1 == var17.getRelationType()) {
var19 = org.jeecg.modules.online.cgform.util.b.a(var18, var20, (TreeSelectColumn)null);
var19 = CgformUtil.a(var18, var20, (TreeSelectColumn)null);
} else {
var19.put("columns", org.jeecg.modules.online.cgform.util.b.a(var18, var20));
var19.put("columns", CgformUtil.a(var18, var20));
List var15 = this.onlAuthPageService.queryListHideButton((String)null, var17.getId());
var19.put("hideButtons", var15);
}
@@ -314,7 +317,7 @@ public class OnlCgformApiController {
public Result<?> b(@PathVariable("code") String var1, @PathVariable("id") String var2) {
try {
Map var3 = this.onlCgformHeadService.queryManyFormData(var1, var2);
return Result.OK(org.jeecg.modules.online.cgform.util.b.b(var3));
return Result.OK(CgformUtil.b(var3));
} catch (Exception var4) {
a.error("Online表单查询异常：" + var4.getMessage(), var4);
return Result.error("查询失败，" + var4.getMessage());
@@ -325,7 +328,7 @@ public class OnlCgformApiController {
public Result<?> c(@PathVariable("table") String var1, @PathVariable("mainId") String var2) {
try {
Map var3 = this.onlCgformHeadService.querySubFormData(var1, var2);
return Result.OK(org.jeecg.modules.online.cgform.util.b.b(var3));
return Result.OK(CgformUtil.b(var3));
} catch (Exception var4) {
a.error("Online表单查询异常：" + var4.getMessage(), var4);
return Result.error("查询失败，" + var4.getMessage());
@@ -377,7 +380,7 @@ public class OnlCgformApiController {
Result var4 = new Result();
try {
String var5 = org.jeecg.modules.online.cgform.util.b.a();
String var5 = CgformUtil.a();
var2.put("id", var5);
String var6 = TokenUtils.getTokenByRequest(var3);
String var7 = this.onlCgformHeadService.saveManyFormData(var1, var2, var6);
@@ -387,7 +390,7 @@ public class OnlCgformApiController {
} catch (Exception var8) {
a.error("OnlCgformApiController.formAdd()发生异常：", var8);
var4.setSuccess(false);
var4.setMessage("保存失败，" + org.jeecg.modules.online.cgform.util.b.a(var8));
var4.setMessage("保存失败，" + CgformUtil.a(var8));
}
return var4;
@@ -408,7 +411,7 @@ public class OnlCgformApiController {
return var4;
} catch (Exception var5) {
a.error("OnlCgformApiController.formEdit()发生异常：" + var5.getMessage(), var5);
return Result.error("修改失败，" + org.jeecg.modules.online.cgform.util.b.a(var5));
return Result.error("修改失败，" + CgformUtil.a(var5));
}
}
@@ -519,7 +522,7 @@ public class OnlCgformApiController {
a.info("==同步数据库消耗时间" + (System.currentTimeMillis() - var3) + "毫秒");
} catch (Exception var5) {
a.error(var5.getMessage(), var5);
return Result.error("同步数据库失败，" + org.jeecg.modules.online.cgform.util.b.a(var5));
return Result.error("同步数据库失败，" + CgformUtil.a(var5));
}
return Result.OK("同步数据库成功!");
@@ -631,7 +634,7 @@ public class OnlCgformApiController {
var9.eq(OnlCgformField::getCgformHeadId, var1);
List var10 = this.onlCgformFieldService.list(var9);
String var11 = var2.getParameter("isSingleTableImport");
List var12 = org.jeecg.modules.online.cgform.util.b.e(var10);
List var12 = CgformUtil.e(var10);
if (oConvertUtils.isEmpty(var11) && var8.getTableType() == 2 && oConvertUtils.isNotEmpty(var8.getSubTableStr())) {
String[] var13 = var8.getSubTableStr().split(",");
int var14 = var13.length;
@@ -641,7 +644,7 @@ public class OnlCgformApiController {
OnlCgformHead var17 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper<OnlCgformHead>()).eq(OnlCgformHead::getTableName, var16));
if (var17 != null) {
List var18 = this.onlCgformFieldService.list((Wrapper)(new LambdaQueryWrapper<OnlCgformField>()).eq(OnlCgformField::getCgformHeadId, var17.getId()));
List var19 = org.jeecg.modules.online.cgform.util.b.b(var18, var17.getTableTxt());
List var19 = CgformUtil.b(var18, var17.getTableTxt());
if (var19.size() > 0) {
var12.addAll(var19);
}
@@ -667,7 +670,7 @@ public class OnlCgformApiController {
MultipartFile var21 = (MultipartFile)var20.getValue();
ImportParams var22 = new ImportParams();
var22.setImageList(var12);
var22.setDataHanlder(new org.jeecg.modules.online.cgform.util.a(var10, this.upLoadPath, this.uploadType));
var22.setDataHanlder(new CgFormExcelHandler(var10, this.upLoadPath, this.uploadType));
List var23 = ExcelImportUtil.importExcel(var21.getInputStream(), Map.class, var22);
if (var23 != null) {
Object var24 = "";
@@ -812,7 +815,7 @@ public class OnlCgformApiController {
String var5 = var1.getIdType();
String var6 = var1.getIdSequence();
if (oConvertUtils.isNotEmpty(var5) && "UUID".equalsIgnoreCase(var5)) {
var4 = org.jeecg.modules.online.cgform.util.b.a();
var4 = CgformUtil.a();
} else {
PostgreSQLSequenceMaxValueIncrementer var7;
OracleSequenceMaxValueIncrementer var13;
@@ -857,7 +860,7 @@ public class OnlCgformApiController {
var4 = null;
}
} else {
var4 = org.jeecg.modules.online.cgform.util.b.a();
var4 = CgformUtil.a();
}
}
@@ -964,11 +967,11 @@ public class OnlCgformApiController {
for(int var15 = 0; var15 < var3.size(); ++var15) {
var2.put(var9, ((Map)var3.get(var15)).get(var8));
String var12 = org.jeecg.modules.online.cgform.util.b.a(var5.getTableName(), var7, var2);
String var12 = CgformUtil.a(var5.getTableName(), var7, var2);
a.info("-----------动态列表查询子表sql》》" + var12);
List var13 = this.onlCgformHeadService.queryListData(var12);
ConvertUtil.a(1, var13, var7);
((Map)var3.get(var15)).put(var1, org.jeecg.modules.online.cgform.util.b.d(var13));
((Map)var3.get(var15)).put(var1, CgformUtil.d(var13));
}
}
@@ -1022,7 +1025,7 @@ public class OnlCgformApiController {
if (var1 != null && (var4 == null || var4.size() <= 0)) {
String var5 = "生成代码_" + System.currentTimeMillis() + ".zip";
final String var6 = "/opt/temp/codegenerate/" + var5;
File var7 = org.jeecg.modules.online.cgform.util.d.a(var1, var6);
File var7 = GenerateCodeFileToZip.a(var1, var6);
if (var7.exists()) {
var3.setContentType("application/force-download");
var3.addHeader("Content-Disposition", "attachment;fileName=" + var5);
@@ -1100,7 +1103,7 @@ public class OnlCgformApiController {
String var6 = var4.getTreeIdField();
String var7 = var4.getTreeParentIdField();
ArrayList var8 = Lists.newArrayList(new String[]{var6, var7});
Map var9 = org.jeecg.modules.online.cgform.util.b.a(var2);
Map var9 = CgformUtil.a(var2);
String var10 = null;
if (var9.get(var6) != null) {
var10 = var9.get(var6).toString();
@@ -1137,7 +1140,7 @@ public class OnlCgformApiController {
Result var3 = new Result();
try {
String var4 = org.jeecg.modules.online.cgform.util.b.a();
String var4 = CgformUtil.a();
var2.put("id", var4);
this.onlCgformHeadService.addCrazyFormData(var1, var2);
var3.setResult(var4);
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/controller/OnlCgformHeadController.java
+5 -4
View File
@@ -33,6 +33,7 @@ import org.jeecg.modules.online.cgform.entity.OnlCgformHead;
import org.jeecg.modules.online.cgform.service.IOnlCgformEnhanceService;
import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService;
import org.jeecg.modules.online.cgform.service.IOnlCgformHeadService;
import org.jeecg.modules.online.cgform.util.CgformUtil;
import org.jeecg.modules.online.config.exception.DBException;
import org.jeecgframework.codegenerate.database.DbReadTableUtil;
import org.slf4j.Logger;
@@ -295,7 +296,7 @@ public class OnlCgformHeadController {
@PostMapping({"/enhanceJava/{formId}"})
public Result<?> b(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceJava var2) {
try {
if (!org.jeecg.modules.online.cgform.util.b.a(var2)) {
if (!CgformUtil.a(var2)) {
return Result.error("类实例化失败，请检查!");
} else {
var2.setCgformHeadId(var1);
@@ -315,7 +316,7 @@ public class OnlCgformHeadController {
@PutMapping({"/enhanceJava/{formId}"})
public Result<?> c(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceJava var2) {
try {
if (!org.jeecg.modules.online.cgform.util.b.a(var2)) {
if (!CgformUtil.a(var2)) {
return Result.error("类实例化失败，请检查!");
} else {
var2.setCgformHeadId(var1);
@@ -371,8 +372,8 @@ public class OnlCgformHeadController {
return Result.error("同步失败，未获取数据库表信息");
}
org.jeecg.modules.online.cgform.util.b.b(var6);
var6 = org.jeecg.modules.online.cgform.util.b.f(var6);
CgformUtil.b(var6);
var6 = CgformUtil.f(var6);
List var7 = this.onlCgformHeadService.queryOnlinetables();
this.b();
var6.removeAll(var7);
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java
+33 -32
View File
@@ -28,6 +28,7 @@ import org.jeecg.modules.online.cgform.mapper.OnlCgformFieldMapper;
import org.jeecg.modules.online.cgform.mapper.OnlCgformHeadMapper;
import org.jeecg.modules.online.cgform.model.TreeModel;
import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService;
import org.jeecg.modules.online.cgform.util.CgformUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +61,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
List var7 = this.list(var6);
List var8 = this.queryAvailableFields(headId, tbname, true, var7, needList);
StringBuffer var9 = new StringBuffer();
org.jeecg.modules.online.cgform.util.b.a(tbname, var8, var9);
CgformUtil.a(tbname, var8, var9);
LoginUser var10 = (LoginUser)SecurityUtils.getSubject().getPrincipal();
String var11 = var10.getId();
List var12 = this.onlAuthDataMapper.queryOwnerAuth(var11, headId);
@@ -68,8 +69,8 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
JeroDataAutorUtils.installUserInfo(this.sysBaseAPI.getCacheUser(var10.getUsername()));
}
String var13 = org.jeecg.modules.online.cgform.util.b.a(var7, params, needList, var12);
String var14 = org.jeecg.modules.online.cgform.util.b.a(params);
String var13 = CgformUtil.a(var7, params, needList, var12);
String var14 = CgformUtil.a(params);
var9.append(" where 1=1 " + var13 + var14);
Object var15 = params.get("column");
if (var15 != null) {
@@ -92,7 +93,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
if (var21 != null && var21.size() != 0) {
var5.put("total", var21.size());
var5.put("fieldList", var8);
var5.put("records", org.jeecg.modules.online.cgform.util.b.d(var21));
var5.put("records", CgformUtil.d(var21));
} else {
var5.put("total", 0);
var5.put("fieldList", var8);
@@ -103,7 +104,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
a.debug("---Online查询sql:>>" + var9.toString());
IPage var19 = this.onlCgformFieldMapper.selectPageBySql(var18, var9.toString());
var5.put("total", var19.getTotal());
var5.put("records", org.jeecg.modules.online.cgform.util.b.d(var19.getRecords()));
var5.put("records", CgformUtil.d(var19.getRecords()));
}
return var5;
@@ -117,7 +118,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
List var8 = this.list(var7);
List var9 = this.queryAvailableFields(headId, tbname, true, var8, needList);
StringBuffer var10 = new StringBuffer();
org.jeecg.modules.online.cgform.util.b.a(tbname, var9, var10);
CgformUtil.a(tbname, var9, var10);
LoginUser var11 = (LoginUser)SecurityUtils.getSubject().getPrincipal();
String var12 = var11.getId();
List var13 = this.onlAuthDataMapper.queryOwnerAuth(var12, headId);
@@ -125,8 +126,8 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
JeroDataAutorUtils.installUserInfo(this.sysBaseAPI.getCacheUser(var11.getUsername()));
}
String var14 = org.jeecg.modules.online.cgform.util.b.a(var8, params, needList, var13);
String var15 = org.jeecg.modules.online.cgform.util.b.a(params);
String var14 = CgformUtil.a(var8, params, needList, var13);
String var15 = CgformUtil.a(params);
var10.append(" where 1=1 " + var14 + var15);
Object var16 = params.get("column");
if (var16 != null) {
@@ -172,7 +173,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
if (var25 != null && ((List)var25).size() != 0) {
var6.put("total", ((List)var25).size());
var6.put("fieldList", var9);
var6.put("records", org.jeecg.modules.online.cgform.util.b.d((List)var25));
var6.put("records", CgformUtil.d((List)var25));
} else {
var6.put("total", 0);
var6.put("fieldList", var9);
@@ -183,7 +184,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
a.debug("---Online查询sql:>>" + var10.toString());
IPage var28 = this.onlCgformFieldMapper.selectPageBySql(var27, var10.toString());
var6.put("total", var28.getTotal());
var6.put("records", org.jeecg.modules.online.cgform.util.b.d(var28.getRecords()));
var6.put("records", CgformUtil.d(var28.getRecords()));
}
return var6;
@@ -198,7 +199,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
List var8 = this.list(var7);
List var9 = this.queryAvailableFields(var3, var2, true, var8, var4);
StringBuffer var10 = new StringBuffer();
org.jeecg.modules.online.cgform.util.b.a(var2, var9, var10);
CgformUtil.a(var2, var9, var10);
LoginUser var11 = (LoginUser)SecurityUtils.getSubject().getPrincipal();
String var12 = var11.getId();
List var13 = this.onlAuthDataMapper.queryOwnerAuth(var12, var3);
@@ -206,7 +207,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
JeroDataAutorUtils.installUserInfo(this.sysBaseAPI.getCacheUser(var11.getUsername()));
}
String var14 = org.jeecg.modules.online.cgform.util.b.a(var8, var6, var4, var13);
String var14 = CgformUtil.a(var8, var6, var4, var13);
var10.append(" where 1=1 " + var14 + "and id='" + var1 + "'");
List var15 = this.onlCgformFieldMapper.queryListBySql(var10.toString());
if (var15 != null && var15.size() > 0) {
@@ -222,9 +223,9 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
var5.eq(OnlCgformField::getCgformHeadId, code);
List var6 = this.list(var5);
if (isCrazy) {
((OnlCgformFieldMapper)this.baseMapper).executeInsertSQL(org.jeecg.modules.online.cgform.util.b.c(tbname, var6, json));
((OnlCgformFieldMapper)this.baseMapper).executeInsertSQL(CgformUtil.c(tbname, var6, json));
} else {
((OnlCgformFieldMapper)this.baseMapper).executeInsertSQL(org.jeecg.modules.online.cgform.util.b.a(tbname, var6, json));
((OnlCgformFieldMapper)this.baseMapper).executeInsertSQL(CgformUtil.a(tbname, var6, json));
}
}
@@ -247,7 +248,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
}
}
Map var10 = org.jeecg.modules.online.cgform.util.b.a(tbname, var7, json);
Map var10 = CgformUtil.a(tbname, var7, json);
((OnlCgformFieldMapper)this.baseMapper).executeInsertSQL(var10);
if (!"0".equals(json.getString(pidField))) {
((OnlCgformFieldMapper)this.baseMapper).editFormData("update " + tbname + " set " + hasChildField + " = '1' where id = '" + json.getString(pidField) + "'");
@@ -258,7 +259,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
}
public void saveFormData(List<OnlCgformField> fieldList, String tbname, JSONObject json) {
Map var4 = org.jeecg.modules.online.cgform.util.b.a(tbname, fieldList, json);
Map var4 = CgformUtil.a(tbname, fieldList, json);
((OnlCgformFieldMapper)this.baseMapper).executeInsertSQL(var4);
}
@@ -267,18 +268,18 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
var5.eq(OnlCgformField::getCgformHeadId, code);
List var6 = this.list(var5);
if (isCrazy) {
((OnlCgformFieldMapper)this.baseMapper).executeUpdatetSQL(org.jeecg.modules.online.cgform.util.b.d(tbname, var6, json));
((OnlCgformFieldMapper)this.baseMapper).executeUpdatetSQL(CgformUtil.d(tbname, var6, json));
} else {
((OnlCgformFieldMapper)this.baseMapper).executeUpdatetSQL(org.jeecg.modules.online.cgform.util.b.b(tbname, var6, json));
((OnlCgformFieldMapper)this.baseMapper).executeUpdatetSQL(CgformUtil.b(tbname, var6, json));
}
}
public void editTreeFormData(String code, String tbname, JSONObject json, String hasChildField, String pidField) {
String var6 = org.jeecg.modules.online.cgform.util.b.f(tbname);
String var6 = CgformUtil.f(tbname);
String var7 = "select * from " + var6 + " where id = '" + json.getString("id") + "'";
Map var8 = ((OnlCgformFieldMapper)this.baseMapper).queryFormData(var7);
Map var9 = org.jeecg.modules.online.cgform.util.b.b(var8);
Map var9 = CgformUtil.b(var8);
String var10 = var9.get(pidField).toString();
LambdaQueryWrapper<OnlCgformField> var11 = new LambdaQueryWrapper();
var11.eq(OnlCgformField::getCgformHeadId, code);
@@ -293,7 +294,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
}
}
Map var16 = org.jeecg.modules.online.cgform.util.b.b(tbname, var12, json);
Map var16 = CgformUtil.b(tbname, var12, json);
((OnlCgformFieldMapper)this.baseMapper).executeUpdatetSQL(var16);
if (!var10.equals(json.getString(pidField))) {
if (!"0".equals(var10)) {
@@ -316,7 +317,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
var4.eq(OnlCgformField::getCgformHeadId, code);
var4.eq(OnlCgformField::getIsShowForm, 1);
List var5 = this.list(var4);
String var6 = org.jeecg.modules.online.cgform.util.b.a(tbname, var5, id);
String var6 = CgformUtil.a(tbname, var5, id);
return this.onlCgformFieldMapper.queryFormData(var6);
}
@@ -380,7 +381,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
}
String var32 = var27[var31];
String var33 = org.jeecg.modules.online.cgform.util.b.a(var4, var25, var32);
String var33 = CgformUtil.a(var4, var25, var32);
Map var34 = this.onlCgformFieldMapper.queryFormData(var33);
new ArrayList();
Iterator var20 = var9.iterator();
@@ -426,7 +427,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
}
String var10 = var5.toString();
String var11 = "DELETE FROM " + org.jeecg.modules.online.cgform.util.b.f(tbname) + " where " + linkField + " in(" + var10.substring(0, var10.length() - 1) + ")";
String var11 = "DELETE FROM " + CgformUtil.f(tbname) + " where " + linkField + " in(" + var10.substring(0, var10.length() - 1) + ")";
a.debug("--删除sql-->" + var11);
this.onlCgformFieldMapper.deleteAutoList(var11);
}
@@ -534,12 +535,12 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
}
public Map<String, Object> queryFormData(List<OnlCgformField> fieldList, String tbname, String id) {
String var4 = org.jeecg.modules.online.cgform.util.b.a(tbname, fieldList, id);
String var4 = CgformUtil.a(tbname, fieldList, id);
return this.onlCgformFieldMapper.queryFormData(var4);
}
public List<Map<String, Object>> querySubFormData(List<OnlCgformField> fieldList, String tbname, String linkField, String value) {
String var5 = org.jeecg.modules.online.cgform.util.b.a(tbname, fieldList, linkField, value);
String var5 = CgformUtil.a(tbname, fieldList, linkField, value);
return this.onlCgformFieldMapper.queryListData(var5);
}
@@ -738,7 +739,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
}
public void updateTreeNodeNoChild(String tableName, String filed, String id) {
Map var4 = org.jeecg.modules.online.cgform.util.b.a(tableName, filed, id);
Map var4 = CgformUtil.a(tableName, filed, id);
((OnlCgformFieldMapper)this.baseMapper).executeUpdatetSQL(var4);
}
@@ -776,12 +777,12 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
for(int var9 = 0; var9 < var8; ++var9) {
String var10 = var7[var9];
if (var10 != null) {
String var11 = org.jeecg.modules.online.cgform.util.b.f(var4);
String var11 = CgformUtil.f(var4);
String var12 = "select * from " + var11 + " where id = '" + var10 + "'";
Map var13 = ((OnlCgformFieldMapper)this.baseMapper).queryFormData(var12);
Map var14 = org.jeecg.modules.online.cgform.util.b.b(var13);
Map var14 = CgformUtil.b(var13);
String var15 = var14.get(var3).toString();
String var16 = "select * from " + org.jeecg.modules.online.cgform.util.b.f(var4) + " where " + var3 + "= '" + var15 + "' and id not in(" + ids + ")";
String var16 = "select * from " + CgformUtil.f(var4) + " where " + var3 + "= '" + var15 + "' and id not in(" + ids + ")";
List var17 = this.onlCgformFieldMapper.queryListBySql(var16);
if ((var17 == null || var17.size() == 0) && !Arrays.asList(var6).contains(var15) && !var5.toString().contains(var15)) {
var5.append(var15).append(",");
@@ -793,13 +794,13 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
}
private StringBuffer a(String var1, String var2, String var3, StringBuffer var4) {
String var5 = "select * from " + org.jeecg.modules.online.cgform.util.b.f(var3) + " where " + var2 + "= '" + var1 + "'";
String var5 = "select * from " + CgformUtil.f(var3) + " where " + var2 + "= '" + var1 + "'";
List var6 = this.onlCgformFieldMapper.queryListBySql(var5);
Map var9;
if (var6 != null && var6.size() > 0) {
for(Iterator var7 = var6.iterator(); var7.hasNext(); this.a(var9.get("id").toString(), var2, var3, var4)) {
Map var8 = (Map)var7.next();
var9 = org.jeecg.modules.online.cgform.util.b.b(var8);
var9 = CgformUtil.b(var8);
if (!var4.toString().contains(var9.get("id").toString())) {
var4.append(",").append(var9.get("id"));
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java
+17 -16
View File
@@ -50,6 +50,7 @@ import org.jeecg.modules.online.cgform.model.TreeSelectColumn;
import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService;
import org.jeecg.modules.online.cgform.service.IOnlCgformHeadService;
import org.jeecg.modules.online.cgform.service.IOnlCgformIndexService;
import org.jeecg.modules.online.cgform.util.CgformUtil;
import org.jeecg.modules.online.config.a.b;
import org.jeecg.modules.online.config.b.c;
import org.jeecg.modules.online.config.b.d;
@@ -149,7 +150,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
return Result.error("未找到对应实体");
} else {
String var4 = var3.getIsDbSynch();
if (org.jeecg.modules.online.cgform.util.b.a(var3, var2)) {
if (CgformUtil.a(var3, var2)) {
var4 = "N";
}
@@ -192,7 +193,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
for(var19 = var9.iterator(); var19.hasNext(); this.fieldService.updateById(var21)) {
var21 = (OnlCgformField)var19.next();
OnlCgformField var23 = (OnlCgformField)this.fieldService.getById(var21.getId());
boolean var14 = org.jeecg.modules.online.cgform.util.b.a(var23, var21);
boolean var14 = CgformUtil.a(var23, var21);
if (var14) {
var4 = "N";
}
@@ -253,7 +254,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
for(var25 = var24.iterator(); var25.hasNext(); this.indexService.updateById(var15)) {
var15 = (OnlCgformIndex)var25.next();
OnlCgformIndex var27 = (OnlCgformIndex)this.indexService.getById(var15.getId());
boolean var17 = org.jeecg.modules.online.cgform.util.b.a(var27, var15);
boolean var17 = CgformUtil.a(var27, var15);
if (var17) {
var4 = "N";
var15.setIsDbSynch("N");
@@ -702,7 +703,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
} else {
String var5 = "add";
this.executeEnhanceJava(var5, "start", var4, json);
String var6 = org.jeecg.modules.online.cgform.util.b.f(var4.getTableName());
String var6 = CgformUtil.f(var4.getTableName());
if (var4.getTableType() == 2) {
String var7 = var4.getSubTableStr();
if (oConvertUtils.isNotEmpty(var7)) {
@@ -851,7 +852,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
while(var14.hasNext()) {
Map var15 = (Map)var14.next();
var13.add(org.jeecg.modules.online.cgform.util.b.b(var15));
var13.add(CgformUtil.b(var15));
}
return var13;
@@ -897,7 +898,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
List var19 = this.fieldService.querySubFormData(var13, var11, var14, var15);
if (var19 != null && var19.size() != 0) {
var5.put(var11, org.jeecg.modules.online.cgform.util.b.d(var19));
var5.put(var11, CgformUtil.d(var19));
} else {
var5.put(var11, new String[0]);
}
@@ -1050,7 +1051,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
var4.eq(OnlCgformEnhanceSql::getCgformHeadId, formId);
OnlCgformEnhanceSql var5 = (OnlCgformEnhanceSql)this.onlCgformEnhanceSqlMapper.selectOne(var4);
if (var5 != null && oConvertUtils.isNotEmpty(var5.getCgbSql())) {
String var6 = org.jeecg.modules.online.cgform.util.b.a(var5.getCgbSql(), json);
String var6 = CgformUtil.a(var5.getCgbSql(), json);
String[] var7 = var6.split(";");
String[] var8 = var7;
int var9 = var7.length;
@@ -1071,7 +1072,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
if (var4 == null) {
throw new BusinessException("未找到表配置信息");
} else {
Map var5 = ((OnlCgformHeadMapper)this.baseMapper).queryOneByTableNameAndId(org.jeecg.modules.online.cgform.util.b.f(var4.getTableName()), dataId);
Map var5 = ((OnlCgformHeadMapper)this.baseMapper).queryOneByTableNameAndId(CgformUtil.f(var4.getTableName()), dataId);
JSONObject var6 = JSONObject.parseObject(JSON.toJSONString(var5));
this.executeEnhanceJava(buttonCode, "start", var4, var6);
this.executeEnhanceSql(buttonCode, formId, var6);
@@ -1102,12 +1103,12 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
if (var3 == null) {
throw new BusinessException("未找到表配置信息");
} else {
String var4 = org.jeecg.modules.online.cgform.util.b.f(var3.getTableName());
String var4 = CgformUtil.f(var3.getTableName());
Map var5 = ((OnlCgformHeadMapper)this.baseMapper).queryOneByTableNameAndId(var4, dataId);
if (var5 == null) {
throw new BusinessException("未找到数据信息");
} else {
Map var6 = org.jeecg.modules.online.cgform.util.b.b(var5);
Map var6 = CgformUtil.b(var5);
String var7 = "delete";
JSONObject var8 = JSONObject.parseObject(JSON.toJSONString(var6));
this.executeEnhanceJava(var7, "start", var3, var8);
@@ -1141,7 +1142,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
}
}
JSONObject var14 = org.jeecg.modules.online.cgform.util.b.a(var2, var3, (TreeSelectColumn)null);
JSONObject var14 = CgformUtil.a(var2, var3, (TreeSelectColumn)null);
if (head.getTableType() == 2) {
String var5 = head.getSubTableStr();
if (oConvertUtils.isNotEmpty(var5)) {
@@ -1163,9 +1164,9 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
JSONObject var13 = new JSONObject();
if (1 == var10.getRelationType()) {
var13 = org.jeecg.modules.online.cgform.util.b.a(var11, var12, (TreeSelectColumn)null);
var13 = CgformUtil.a(var11, var12, (TreeSelectColumn)null);
} else {
var13.put("columns", org.jeecg.modules.online.cgform.util.b.a(var11, var12));
var13.put("columns", CgformUtil.a(var11, var12));
}
var13.put("relationType", var10.getRelationType());
@@ -1396,7 +1397,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
var20.put(var14, var15);
}
this.fieldService.executeInsertSQL(org.jeecg.modules.online.cgform.util.b.c(var9, var13, var20));
this.fieldService.executeInsertSQL(CgformUtil.c(var9, var13, var20));
}
}
}
@@ -1450,7 +1451,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
var17.put(var12, var13);
}
this.fieldService.executeInsertSQL(org.jeecg.modules.online.cgform.util.b.c(var9, var11, var17));
this.fieldService.executeInsertSQL(CgformUtil.c(var9, var11, var17));
}
}
}
@@ -1554,7 +1555,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
public void updateParentNode(OnlCgformHead head, String dataId) {
if ("Y".equals(head.getIsTree())) {
String var3 = org.jeecg.modules.online.cgform.util.b.f(head.getTableName());
String var3 = CgformUtil.f(head.getTableName());
String var4 = head.getTreeParentIdField();
Map var5 = ((OnlCgformHeadMapper)this.baseMapper).queryOneByTableNameAndId(var3, dataId);
String var6 = null;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformSqlServiceImpl.java
+3 -2
View File
@@ -14,6 +14,7 @@ import org.jeecg.modules.online.cgform.entity.OnlCgformHead;
import org.jeecg.modules.online.cgform.mapper.OnlCgformFieldMapper;
import org.jeecg.modules.online.cgform.service.IOnlCgformHeadService;
import org.jeecg.modules.online.cgform.service.IOnlCgformSqlService;
import org.jeecg.modules.online.cgform.util.CgformUtil;
import org.jeecg.modules.online.config.exception.BusinessException;
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.beans.factory.annotation.Autowired;
@@ -75,10 +76,10 @@ public class OnlCgformSqlServiceImpl implements IOnlCgformSqlService {
String var7 = var2.getTableName();
Map var8;
if (1 == var6) {
var8 = org.jeecg.modules.online.cgform.util.b.a(var7, var3, var5);
var8 = CgformUtil.a(var7, var3, var5);
var4.executeInsertSQL(var8);
} else if (2 == var6) {
var8 = org.jeecg.modules.online.cgform.util.b.b(var7, var3, var5);
var8 = CgformUtil.b(var7, var3, var5);
var4.executeUpdatetSQL(var8);
} else if (0 == var6) {
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlineServiceImpl.java
+5 -4
View File
@@ -30,6 +30,7 @@ import org.jeecg.modules.online.cgform.model.TreeSelectColumn;
import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService;
import org.jeecg.modules.online.cgform.service.IOnlCgformHeadService;
import org.jeecg.modules.online.cgform.service.IOnlineService;
import org.jeecg.modules.online.cgform.util.CgformUtil;
import org.jeecg.modules.online.cgform.util.EnhanceJsUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -88,7 +89,7 @@ public class OnlineServiceImpl implements IOnlineService {
List var29;
if ("switch".equals(var17)) {
var29 = org.jeecg.modules.online.cgform.util.b.a(var11);
var29 = CgformUtil.a(var11);
var6.put(var12, var29);
var28.setCustomRender(var12);
}
@@ -116,7 +117,7 @@ public class OnlineServiceImpl implements IOnlineService {
if ("cat_tree".equals(var17)) {
var31 = var11.getDictText();
if (oConvertUtils.isEmpty(var31)) {
String var32 = org.jeecg.modules.online.cgform.util.b.e(var11.getDictField());
String var32 = CgformUtil.e(var11.getDictField());
var20 = this.sysBaseAPI.queryFilterTableDictInfo("SYS_CATEGORY", "NAME", "ID", var32);
var6.put(var12, var20);
var28.setCustomRender(var12);
@@ -255,11 +256,11 @@ public class OnlineServiceImpl implements IOnlineService {
var7.setPidField(head.getTreeParentIdField());
var7.setPidValue("0");
var7.setHsaChildField(head.getTreeIdField());
var7.setTableName(org.jeecg.modules.online.cgform.util.b.f(head.getTableName()));
var7.setTableName(CgformUtil.f(head.getTableName()));
var7.setTextField(head.getTreeFieldname());
}
JSONObject var8 = org.jeecg.modules.online.cgform.util.b.a(var5, var6, var7);
JSONObject var8 = CgformUtil.a(var5, var6, var7);
var8.put("table", head.getTableName());
var8.put("describe", head.getTableTxt());
var3.put("schema", var8);
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/a.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/CgFormExcelHandler.java
+3 -3
View File
@@ -11,14 +11,14 @@ import org.jeecg.modules.online.cgform.entity.OnlCgformField;
import org.jeecgframework.poi.handler.impl.ExcelDataHandlerDefaultImpl;
import org.jeecgframework.poi.util.PoiPublicUtil;
public class a extends ExcelDataHandlerDefaultImpl {
public class CgFormExcelHandler extends ExcelDataHandlerDefaultImpl {
Map<String, OnlCgformField> a;
ISysBaseAPI b;
String c;
String d;
String e;
public a(List<OnlCgformField> var1, String var2, String var3) {
public CgFormExcelHandler(List<OnlCgformField> var1, String var2, String var3) {
this.a = this.a(var1);
this.c = var2;
this.d = "online";
@@ -44,7 +44,7 @@ public class a extends ExcelDataHandlerDefaultImpl {
map.put(var4, PoiPublicUtil.doubleToString((Double)value));
} else if (value instanceof byte[]) {
byte[] var5 = (byte[])((byte[])value);
String var6 = org.jeecg.modules.online.cgform.util.b.a(var5, this.c, this.d, this.e);
String var6 = CgformUtil.a(var5, this.c, this.d, this.e);
if (var6 != null) {
map.put(var4, var6);
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/b.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/CgformUtil.java
+31 -31
View File
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import com.jero.common.exception.JeecgBootException;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.MatchTypeEnum;
import com.jero.common.system.query.QueryGenerator;
@@ -69,8 +69,8 @@ import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class b {
private static final Logger aw = LoggerFactory.getLogger(b.class);
public class CgformUtil {
private static final Logger aw = LoggerFactory.getLogger(CgformUtil.class);
public static final String a = "SELECT ";
public static final String b = " FROM ";
public static final String c = " AND ";
@@ -148,7 +148,7 @@ public class b {
private static final String ax = "beforeAdd,beforeEdit,afterAdd,afterEdit,beforeDelete,afterDelete,mounted,created";
private static String ay;
public b() {
public CgformUtil() {
}
public static void a(String var0, List<OnlCgformField> var1, StringBuffer var2) {
@@ -273,7 +273,7 @@ public class b {
var11 = var1.get(var9 + "_begin");
if (var11 != null) {
var4.append(" AND " + var9 + ">=");
if (org.jeecg.modules.online.cgform.util.i.a(var10)) {
if (OnlineDbHandler.a(var10)) {
var4.append(var11.toString());
} else if ("ORACLE".equals(var5) && var10.toLowerCase().indexOf("date") >= 0) {
var4.append(a(var11.toString()));
@@ -285,7 +285,7 @@ public class b {
Object var12 = var1.get(var9 + "_end");
if (var12 != null) {
var4.append(" AND " + var9 + "<=");
if (org.jeecg.modules.online.cgform.util.i.a(var10)) {
if (OnlineDbHandler.a(var10)) {
var4.append(var12.toString());
} else if ("ORACLE".equals(var5) && var10.toLowerCase().indexOf("date") >= 0) {
var4.append(a(var12.toString()));
@@ -317,7 +317,7 @@ public class b {
} else if ("ORACLE".equals(var5) && var10.toLowerCase().indexOf("date") >= 0) {
var4.append(" AND " + var9 + "=" + a(var11.toString()));
} else {
boolean var19 = !org.jeecg.modules.online.cgform.util.i.a(var10);
boolean var19 = !OnlineDbHandler.a(var10);
var13 = QueryGenerator.getSingleQueryConditionSql(var9, "", var11, var19);
var4.append(" AND " + var13);
}
@@ -590,10 +590,10 @@ public class b {
}
var14 = new StringProperty(var11, var12, var13, var10.getDbLength(), (List)var30);
if (org.jeecg.modules.online.cgform.util.i.a(var10.getDbType())) {
if (OnlineDbHandler.a(var10.getDbType())) {
((CommonProperty)var14).setType("number");
}
} else if (org.jeecg.modules.online.cgform.util.i.a(var10.getDbType())) {
} else if (OnlineDbHandler.a(var10.getDbType())) {
NumberProperty var29 = new NumberProperty(var11, var12, "number");
if (CgformValidPatternEnum.INTEGER.getType().equals(var10.getFieldValidType())) {
var29.setPattern(CgformValidPatternEnum.INTEGER.getPattern());
@@ -716,7 +716,7 @@ public class b {
String var10 = var7.getFieldShowType();
String var11 = var7.getDictField();
Object var12 = null;
if (org.jeecg.modules.online.cgform.util.i.a(var7.getDbType())) {
if (OnlineDbHandler.a(var7.getDbType())) {
var12 = new NumberProperty(var8, var9, "number");
} else if (c(var10)) {
List var13 = var5.queryDictItemsByCode(var11);
@@ -788,7 +788,7 @@ public class b {
String var8 = null;
LoginUser var9 = (LoginUser)SecurityUtils.getSubject().getPrincipal();
if (var9 == null) {
throw new JeecgBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
throw new JeroBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
} else {
Set var10 = a(var1);
Iterator var11 = var1.iterator();
@@ -811,7 +811,7 @@ public class b {
String var14;
if (var10.contains(var13)) {
var3.append("," + var13);
var14 = org.jeecg.modules.online.cgform.util.i.a(var5, var12, var2, var6);
var14 = OnlineDbHandler.a(var5, var12, var2, var6);
var4.append("," + var14);
} else if (var12.getIsShowForm() == 1 || !oConvertUtils.isEmpty(var12.getMainField()) || !oConvertUtils.isEmpty(var12.getDbDefaultVal())) {
if (var2.get(var13) == null) {
@@ -824,13 +824,13 @@ public class b {
if ("".equals(var2.get(var13))) {
var14 = var12.getDbType();
if (org.jeecg.modules.online.cgform.util.i.a(var14) || org.jeecg.modules.online.cgform.util.i.b(var14)) {
if (OnlineDbHandler.a(var14) || OnlineDbHandler.b(var14)) {
continue;
}
}
var3.append("," + var13);
var14 = org.jeecg.modules.online.cgform.util.i.a(var5, var12, var2, var6);
var14 = OnlineDbHandler.a(var5, var12, var2, var6);
var4.append("," + var14);
}
}
@@ -868,7 +868,7 @@ public class b {
LoginUser var6 = (LoginUser)SecurityUtils.getSubject().getPrincipal();
if (var6 == null) {
throw new JeecgBootException("online修改表单数据异常:系统未找到当前登陆用户信息");
throw new JeroBootException("online修改表单数据异常:系统未找到当前登陆用户信息");
} else {
Set var7 = a(var1);
Iterator var8 = var1.iterator();
@@ -883,18 +883,18 @@ public class b {
a(var9, var6, var2, "UPDATE_BY", "UPDATE_TIME");
String var11;
if (var7.contains(var10) && var2.get(var10) != null && !"".equals(var2.getString(var10))) {
var11 = org.jeecg.modules.online.cgform.util.i.a(var5, var9, var2, var4);
var11 = OnlineDbHandler.a(var5, var9, var2, var4);
var3.append(var10 + "=" + var11 + ",");
} else if (var9.getIsShowForm() == 1 && !"id".equals(var10)) {
if ("".equals(var2.get(var10))) {
var11 = var9.getDbType();
if (org.jeecg.modules.online.cgform.util.i.a(var11) || org.jeecg.modules.online.cgform.util.i.b(var11)) {
if (OnlineDbHandler.a(var11) || OnlineDbHandler.b(var11)) {
continue;
}
}
if (!oConvertUtils.isNotEmpty(var9.getMainTable()) || !oConvertUtils.isNotEmpty(var9.getMainField())) {
var11 = org.jeecg.modules.online.cgform.util.i.a(var5, var9, var2, var4);
var11 = OnlineDbHandler.a(var5, var9, var2, var4);
var3.append(var10 + "=" + var11 + ",");
}
}
@@ -1052,7 +1052,7 @@ public class b {
boolean var9;
String var10;
if (oConvertUtils.isNotEmpty(var6.getMainField())) {
var9 = !org.jeecg.modules.online.cgform.util.i.a(var8);
var9 = !OnlineDbHandler.a(var8);
var10 = QueryGenerator.getSingleQueryConditionSql(var7, "", var2.get(var7), var9);
if (!"".equals(var10)) {
var3.append(" AND " + var10);
@@ -1062,7 +1062,7 @@ public class b {
if (var6.getIsQuery() == 1) {
if ("single".equals(var6.getQueryMode())) {
if (var2.get(var7) != null) {
var9 = !org.jeecg.modules.online.cgform.util.i.a(var8);
var9 = !OnlineDbHandler.a(var8);
var10 = QueryGenerator.getSingleQueryConditionSql(var7, "", var2.get(var7), var9);
if (!"".equals(var10)) {
var3.append(" AND " + var10);
@@ -1072,7 +1072,7 @@ public class b {
Object var11 = var2.get(var7 + "_begin");
if (var11 != null) {
var3.append(" AND " + var7 + ">=");
if (org.jeecg.modules.online.cgform.util.i.a(var8)) {
if (OnlineDbHandler.a(var8)) {
var3.append(var11.toString());
} else {
var3.append("'" + var11.toString() + "'");
@@ -1082,7 +1082,7 @@ public class b {
Object var12 = var2.get(var7 + "_end");
if (var12 != null) {
var3.append(" AND " + var7 + "<=");
if (org.jeecg.modules.online.cgform.util.i.a(var8)) {
if (OnlineDbHandler.a(var8)) {
var3.append(var12.toString());
} else {
var3.append("'" + var12.toString() + "'");
@@ -1149,7 +1149,7 @@ public class b {
public static void b(List<String> var0) {
Collections.sort(var0, new Comparator<String>() {
public int a(String var1, String var2) {
public int compare(String var1, String var2) {
if (var1 != null && var2 != null) {
if (var1.compareTo(var2) > 0) {
return 1;
@@ -1167,7 +1167,7 @@ public class b {
public static void c(List<String> var0) {
Collections.sort(var0, new Comparator<String>() {
public int a(String var1, String var2) {
public int compare(String var1, String var2) {
if (var1 != null && var2 != null) {
if (var1.length() > var2.length()) {
return 1;
@@ -1222,7 +1222,7 @@ public class b {
private static void a(String var0, SysPermissionDataRuleModel var1, String var2, String var3, StringBuffer var4) {
QueryRuleEnum var5 = QueryRuleEnum.getByValue(var1.getRuleConditions());
boolean var6 = !org.jeecg.modules.online.cgform.util.i.a(var3);
boolean var6 = !OnlineDbHandler.a(var3);
String var7 = a(var1.getRuleValue(), var6, var5);
if (var7 != null && var5 != null) {
if ("ORACLE".equalsIgnoreCase(var0) && "Date".equals(var3)) {
@@ -1714,7 +1714,7 @@ public class b {
String var8 = null;
LoginUser var9 = (LoginUser)SecurityUtils.getSubject().getPrincipal();
if (var9 == null) {
throw new JeecgBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
throw new JeroBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
} else {
Iterator var10 = var1.iterator();
@@ -1729,7 +1729,7 @@ public class b {
String var13;
if ("".equals(var2.get(var12))) {
var13 = var11.getDbType();
if (org.jeecg.modules.online.cgform.util.i.a(var13) || org.jeecg.modules.online.cgform.util.i.b(var13)) {
if (OnlineDbHandler.a(var13) || OnlineDbHandler.b(var13)) {
continue;
}
}
@@ -1739,7 +1739,7 @@ public class b {
var8 = var2.getString(var12);
} else {
var3.append("," + var12);
var13 = org.jeecg.modules.online.cgform.util.i.a(var5, var11, var2, var6);
var13 = OnlineDbHandler.a(var5, var11, var2, var6);
var4.append("," + var13);
}
}
@@ -1772,7 +1772,7 @@ public class b {
LoginUser var6 = (LoginUser)SecurityUtils.getSubject().getPrincipal();
if (var6 == null) {
throw new JeecgBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
throw new JeroBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
} else {
Iterator var7 = var1.iterator();
@@ -1787,12 +1787,12 @@ public class b {
String var10;
if ("".equals(var2.get(var9))) {
var10 = var8.getDbType();
if (org.jeecg.modules.online.cgform.util.i.a(var10) || org.jeecg.modules.online.cgform.util.i.b(var10)) {
if (OnlineDbHandler.a(var10) || OnlineDbHandler.b(var10)) {
continue;
}
}
var10 = org.jeecg.modules.online.cgform.util.i.a(var5, var8, var2, var4);
var10 = OnlineDbHandler.a(var5, var8, var2, var4);
var3.append(var9 + "=" + var10 + ",");
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/d.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/GenerateCodeFileToZip.java
+2 -2
View File
@@ -12,8 +12,8 @@ import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
public class d {
public d() {
public class GenerateCodeFileToZip {
public GenerateCodeFileToZip() {
}
public static File a(List<String> var0, String var1) throws RuntimeException {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/i.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/OnlineDbHandler.java
+2 -2
View File
@@ -6,7 +6,7 @@ import java.math.BigDecimal;
import java.util.Map;
import org.jeecg.modules.online.cgform.entity.OnlCgformField;
public class i {
public class OnlineDbHandler {
public static final String a = "int";
public static final String b = "Integer";
public static final String c = "double";
@@ -16,7 +16,7 @@ public class i {
public static final String g = "datetime";
public static final String h = "Timestamp";
public i() {
public OnlineDbHandler() {
}
public static boolean a(String var0) {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/c.java
-2447
View File
File diff suppressed because it is too large Load Diff
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/e.java
-106
View File
@@ -1,106 +0,0 @@
package org.jeecg.modules.online.cgform.util;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.Enumeration;
class e {
e() {
}
private static String b() {
String var0 = "";
Object var2 = null;
byte[] var8;
try {
InetAddress var1 = InetAddress.getLocalHost();
var8 = NetworkInterface.getByInetAddress(var1).getHardwareAddress();
} catch (Exception var7) {
return null;
}
StringBuffer var3 = new StringBuffer("");
if (var8 == null) {
return null;
} else {
for(int var4 = 0; var4 < var8.length; ++var4) {
if (var4 != 0) {
var3.append("-");
}
int var5 = var8[var4] & 255;
String var6 = Integer.toHexString(var5);
if (var6.length() == 1) {
var3.append("0" + var6);
} else {
var3.append(var6);
}
}
var0 = var3.toString().toUpperCase();
if ("".equals(var0)) {
return null;
} else {
return var0;
}
}
}
private static String c() {
String var0 = "";
try {
Enumeration var1 = NetworkInterface.getNetworkInterfaces();
while(true) {
byte[] var2;
do {
if (!var1.hasMoreElements()) {
return var0;
}
var2 = ((NetworkInterface)var1.nextElement()).getHardwareAddress();
} while(var2 == null);
StringBuilder var3 = new StringBuilder();
byte[] var4 = var2;
int var5 = var2.length;
for(int var6 = 0; var6 < var5; ++var6) {
byte var7 = var4[var6];
var3.append(a(var7));
var3.append("-");
}
var3.deleteCharAt(var3.length() - 1);
var0 = var3.toString().toUpperCase();
}
} catch (Exception var8) {
var8.printStackTrace();
return var0;
}
}
private static String a(byte var0) {
String var1 = "000000" + Integer.toHexString(var0);
return var1.substring(var1.length() - 2);
}
private static String d() {
return System.getProperty("os.name").toLowerCase();
}
public static String a() {
String var0 = d();
String var1 = null;
if (var0.startsWith("windows")) {
var1 = b();
} else {
var1 = c();
}
return var1;
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/f.java
-21
View File
@@ -1,21 +0,0 @@
package org.jeecg.modules.online.cgform.util;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import javax.net.ssl.X509TrustManager;
class f implements X509TrustManager {
f() {
}
public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
}
public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
}
public X509Certificate[] getAcceptedIssuers() {
return null;
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/g.java
-13
View File
@@ -1,13 +0,0 @@
package org.jeecg.modules.online.cgform.util;
public class g {
public static final String a = "file";
public static final String b = "image";
public static final String c = "editor";
public static final String d = "date";
public static final String e = "pca";
public g() {
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/h.java
-14
View File
@@ -1,14 +0,0 @@
package org.jeecg.modules.online.cgform.util;
public class h {
public static final String a = "fileSlot";
public static final String b = "imgSlot";
public static final String c = "htmlSlot";
public static final String d = "dateSlot";
public static final String e = "fieldHref_";
public static final String f = "pcaSlot";
public h() {
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/j.java
-67
View File
@@ -1,67 +0,0 @@
package org.jeecg.modules.online.cgform.util;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.SecureRandom;
import java.util.Base64;
import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;
import javax.crypto.spec.SecretKeySpec;
import com.jero.common.util.oConvertUtils;
public class j {
public j() {
}
public static String a(byte[] var0, int var1) {
return (new BigInteger(1, var0)).toString(var1);
}
public static String a(byte[] var0) {
return Base64.getEncoder().encodeToString(var0);
}
public static byte[] a(String var0) throws Exception {
return oConvertUtils.isEmpty(var0) ? null : Base64.getDecoder().decode(var0);
}
public static byte[] b(byte[] var0) throws Exception {
MessageDigest var1 = MessageDigest.getInstance("MD5");
var1.update(var0);
return var1.digest();
}
public static byte[] b(String var0) throws Exception {
return oConvertUtils.isEmpty(var0) ? null : b(var0.getBytes());
}
public static String c(String var0) throws Exception {
return oConvertUtils.isEmpty(var0) ? null : a(b(var0));
}
public static byte[] a(String var0, String var1) throws Exception {
KeyGenerator var2 = KeyGenerator.getInstance("AES");
var2.init(128, new SecureRandom(var1.getBytes()));
Cipher var3 = Cipher.getInstance("AES");
var3.init(1, new SecretKeySpec(var2.generateKey().getEncoded(), "AES"));
return var3.doFinal(var0.getBytes("utf-8"));
}
public static String b(String var0, String var1) throws Exception {
return a(a(var0, var1));
}
public static String a(byte[] var0, String var1) throws Exception {
KeyGenerator var2 = KeyGenerator.getInstance("AES");
var2.init(128, new SecureRandom(var1.getBytes()));
Cipher var3 = Cipher.getInstance("AES");
var3.init(2, new SecretKeySpec(var2.generateKey().getEncoded(), "AES"));
byte[] var4 = var3.doFinal(var0);
return new String(var4);
}
public static String c(String var0, String var1) throws Exception {
return oConvertUtils.isEmpty(var0) ? null : a(a(var0), var1);
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/k.java
-433
View File
@@ -1,433 +0,0 @@
package org.jeecg.modules.online.cgform.util;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.URL;
import java.net.UnknownHostException;
import java.security.SecureRandom;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.ResourceBundle;
import java.util.Scanner;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
public class k {
private static String c;
private static String d;
private static String e;
public static String a;
public static boolean b;
public k() {
}
public static String getssss() {
if ("".equals(d) || d == null) {
String var0 = "";
var0 = getMa() + getProcessorId() + getMotherboardSN();
a = m.c(var0);
d = m.c(a.toUpperCase() + getLicTime() + getNetLic() + "P5P5");
}
return d.toUpperCase();
}
public static String getmachine_code() {
if ("".equals(d) || d == null) {
String var0 = "";
var0 = getMa() + getProcessorId() + getMotherboardSN();
a = m.c(var0);
}
return a.toUpperCase();
}
public static String getssssserver() {
if ("".equals(e) || e == null) {
String var0 = "";
var0 = getMa() + getProcessorId() + getMotherboardSN();
a = m.c(var0);
e = m.c(a.toUpperCase() + getNetLic() + "9999");
}
return e.toUpperCase();
}
private static String getProcessorId() {
String var0 = "CPUID000";
try {
Process var1 = Runtime.getRuntime().exec(new String[]{"wmic", "cpu", "get", "ProcessorId"});
var1.getOutputStream().close();
Scanner var2 = new Scanner(var1.getInputStream());
String var3 = var2.next();
var0 = var2.next();
} catch (Exception var4) {
}
return var0;
}
private static String a(String var0) {
String var1 = "";
try {
File var2 = File.createTempFile("damn", ".vbs");
var2.deleteOnExit();
FileWriter var3 = new FileWriter(var2);
String var4 = "Set objFSO = CreateObject(\"Scripting.FileSystemObject\")\nSet colDrives = objFSO.Drives\nSet objDrive = colDrives.item(\"" + var0 + "\")\nWscript.Echo objDrive.SerialNumber";
var3.write(var4);
var3.close();
Process var5 = Runtime.getRuntime().exec("cscript //NoLogo " + var2.getPath());
BufferedReader var6;
String var7;
for(var6 = new BufferedReader(new InputStreamReader(var5.getInputStream())); (var7 = var6.readLine()) != null; var1 = var1 + var7) {
}
var6.close();
} catch (Exception var8) {
var8.printStackTrace();
}
return var1.trim();
}
private static String getMotherboardSN() {
String var0 = "ZBXLH000";
try {
File var1 = File.createTempFile("realhowto", ".vbs");
var1.deleteOnExit();
FileWriter var2 = new FileWriter(var1);
String var3 = "Set objWMIService = GetObject(\"winmgmts:\\\\.\\root\\cimv2\")\nSet colItems = objWMIService.ExecQuery _ \n (\"Select * from Win32_BaseBoard\") \nFor Each objItem in colItems \n Wscript.Echo objItem.SerialNumber \n exit for ' do the first cpu only! \nNext \n";
var2.write(var3);
var2.close();
Process var4 = Runtime.getRuntime().exec("cscript //NoLogo " + var1.getPath());
BufferedReader var5;
String var6;
for(var5 = new BufferedReader(new InputStreamReader(var4.getInputStream())); (var6 = var5.readLine()) != null; var0 = var0 + var6) {
}
var5.close();
} catch (Exception var7) {
}
return var0.trim();
}
private static String getLicTime() {
SimpleDateFormat var0 = new SimpleDateFormat("yyyy");
String var1 = var0.format(new Date());
return var1;
}
public static boolean a() {
Date var0 = new Date();
String var1 = "2015-04-18";
SimpleDateFormat var2 = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
Date var3 = null;
try {
var3 = var2.parse(var1);
} catch (Exception var5) {
var5.printStackTrace();
}
boolean var4 = var3.before(var0);
return var4;
}
private static String getNetLic() {
String var0 = "A0001";
try {
ResourceBundle var1 = org.jeecg.modules.online.cgform.util.c.a();
if (var1 == null) {
var1 = ResourceBundle.getBundle("jeecglic");
}
var0 = var1.getString("licence.key");
} catch (Exception var2) {
}
return var0;
}
private static String getMa() {
return org.jeecg.modules.online.cgform.util.e.a();
}
private static String getMaOld() {
if (l.c(c)) {
return c;
} else {
String var0 = getOSName();
String var1 = getSystemRoot() + "/system32/ipconfig /all";
String var2 = null;
if (var0.startsWith("windows")) {
if (var0.equals("windows xp")) {
var2 = b(var1);
} else if (var0.equals("windows 2003")) {
var2 = b(var1);
} else {
var2 = getWindow7Ma();
}
} else if (var0.startsWith("linux")) {
var2 = getLinuxMa();
} else {
var2 = getUnixMa();
}
c = var2;
return var2;
}
}
private static String getOSName() {
return System.getProperty("os.name").toLowerCase();
}
private static String b(String var0) {
String var1 = null;
BufferedReader var2 = null;
Process var3 = null;
try {
var3 = Runtime.getRuntime().exec(var0);
var2 = new BufferedReader(new InputStreamReader(var3.getInputStream()));
String var4 = null;
boolean var5 = true;
while((var4 = var2.readLine()) != null) {
if (var4.indexOf("本地连接") == -1) {
int var16 = var4.toLowerCase().indexOf("physical address");
if (var16 != -1) {
var16 = var4.indexOf(":");
if (var16 != -1) {
var1 = var4.substring(var16 + 1).trim();
}
break;
}
}
}
} catch (IOException var14) {
var14.printStackTrace();
} finally {
try {
if (var2 != null) {
var2.close();
}
} catch (IOException var13) {
var13.printStackTrace();
}
var2 = null;
var3 = null;
}
return var1;
}
private static String getWindow7Ma() {
InetAddress var0 = null;
try {
var0 = InetAddress.getLocalHost();
} catch (UnknownHostException var6) {
var6.printStackTrace();
}
byte[] var1 = null;
try {
var1 = NetworkInterface.getByInetAddress(var0).getHardwareAddress();
} catch (SocketException var5) {
}
StringBuffer var2 = new StringBuffer();
for(int var3 = 0; var3 < var1.length; ++var3) {
if (var3 != 0) {
var2.append("-");
}
String var4 = Integer.toHexString(var1[var3] & 255);
var2.append(var4.length() == 1 ? 0 + var4 : var4);
}
return var2.toString().toUpperCase();
}
private static String getLinuxMa() {
String var0 = null;
BufferedReader var1 = null;
Process var2 = null;
try {
var2 = Runtime.getRuntime().exec("ifconfig eth0");
var1 = new BufferedReader(new InputStreamReader(var2.getInputStream()));
String var3 = null;
boolean var4 = true;
while((var3 = var1.readLine()) != null) {
int var15 = var3.toLowerCase().indexOf("硬件地址");
if (var15 != -1) {
var0 = var3.substring(var15 + 4).trim();
break;
}
}
} catch (IOException var13) {
var13.printStackTrace();
} finally {
try {
if (var1 != null) {
var1.close();
}
} catch (IOException var12) {
var12.printStackTrace();
}
var1 = null;
var2 = null;
}
return var0;
}
private static String getUnixMa() {
String var0 = null;
BufferedReader var1 = null;
Process var2 = null;
try {
var2 = Runtime.getRuntime().exec("ifconfig eth0");
var1 = new BufferedReader(new InputStreamReader(var2.getInputStream()));
String var3 = null;
boolean var4 = true;
while((var3 = var1.readLine()) != null) {
int var15 = var3.toLowerCase().indexOf("hwaddr");
if (var15 != -1) {
var0 = var3.substring(var15 + "hwaddr".length() + 1).trim();
break;
}
}
} catch (IOException var13) {
var13.printStackTrace();
} finally {
try {
if (var1 != null) {
var1.close();
}
} catch (IOException var12) {
var12.printStackTrace();
}
var1 = null;
var2 = null;
}
return var0;
}
private static String getSystemRoot() {
String var0 = null;
String var1 = null;
String var2 = null;
String var3 = "windir";
var1 = System.getProperty("os.name").toLowerCase();
if (var1.startsWith("windows")) {
var0 = "cmd /c SET";
} else {
var0 = "env";
}
try {
Process var4 = Runtime.getRuntime().exec(var0);
InputStreamReader var5 = new InputStreamReader(var4.getInputStream());
BufferedReader var6 = new BufferedReader(var5);
String var7 = null;
while((var7 = var6.readLine()) != null) {
var7 = var7.toLowerCase();
if (var7.indexOf(var3) > -1) {
var2 = var7.substring(var7.indexOf(var3) + var3.length() + 1);
return var2;
}
}
} catch (Exception var8) {
}
return null;
}
public static String a(String var0, String var1, String var2) {
Object var3 = null;
StringBuffer var4 = new StringBuffer();
try {
TrustManager[] var5 = new TrustManager[]{new f()};
SSLContext var6 = SSLContext.getInstance("SSL", "SunJSSE");
var6.init((KeyManager[])null, var5, new SecureRandom());
SSLSocketFactory var7 = var6.getSocketFactory();
URL var8 = new URL(var0);
HttpURLConnection var9 = (HttpURLConnection)var8.openConnection();
var9.setConnectTimeout(4500);
var9.setReadTimeout(4500);
var9.setDoOutput(true);
var9.setDoInput(true);
var9.setUseCaches(false);
var9.setRequestMethod(var1);
if ("GET".equalsIgnoreCase(var1)) {
var9.connect();
}
OutputStream var10;
if (null != var2) {
var10 = var9.getOutputStream();
var10.write(var2.getBytes("UTF-8"));
var10.close();
}
InputStream var16 = var9.getInputStream();
InputStreamReader var11 = new InputStreamReader(var16, "utf-8");
BufferedReader var12 = new BufferedReader(var11);
String var13 = null;
while((var13 = var12.readLine()) != null) {
var4.append(var13);
}
var12.close();
var11.close();
var16.close();
var10 = null;
var9.disconnect();
} catch (ConnectException var14) {
} catch (Exception var15) {
}
return var4.toString();
}
static {
b = Boolean.TRUE;
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/l.java
-396
View File
@@ -1,396 +0,0 @@
package org.jeecg.modules.online.cgform.util;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.util.Collection;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
class l {
static Map<String, Object> a = new HashMap();
l() {
}
public static Map<String, Object> a() {
return a;
}
public static boolean a(Object var0) {
if (var0 == null) {
return true;
} else if (var0.equals("")) {
return true;
} else {
return var0.equals("null");
}
}
public static boolean b(Object var0) {
if (var0 == null) {
return true;
} else if (var0 instanceof CharSequence) {
return ((CharSequence)var0).length() == 0;
} else if (var0 instanceof Collection) {
return ((Collection)var0).isEmpty();
} else if (var0 instanceof Map) {
return ((Map)var0).isEmpty();
} else if (!(var0 instanceof Object[])) {
return false;
} else {
Object[] var1 = (Object[])((Object[])var0);
if (var1.length == 0) {
return true;
} else {
boolean var2 = true;
for(int var3 = 0; var3 < var1.length; ++var3) {
if (!b(var1[var3])) {
var2 = false;
break;
}
}
return var2;
}
}
}
public static boolean c(Object var0) {
return var0 != null && !var0.equals("") && !var0.equals("null");
}
public static String a(String var0, String var1, String var2) {
String var3 = c(var0, var1, var2);
return var3;
}
public static String b(String var0, String var1, String var2) {
var0 = "";
try {
var0 = new String(var0.getBytes("ISO-8859-1"), "GBK");
} catch (UnsupportedEncodingException var4) {
var4.printStackTrace();
}
return var0;
}
private static String c(String var0, String var1, String var2) {
String var3 = null;
if (var0 != null && !var0.trim().equals("")) {
try {
byte[] var4 = var0.getBytes(var1);
for(int var5 = 0; var5 < var4.length; ++var5) {
System.out.print(var4[var5] + " ");
}
var3 = new String(var4, var2);
return var3;
} catch (Exception var6) {
var6.printStackTrace();
return null;
}
} else {
return var0;
}
}
public static int a(String var0, int var1) {
if (var0 != null && var0 != "") {
try {
return Integer.parseInt(var0);
} catch (NumberFormatException var3) {
return var1;
}
} else {
return var1;
}
}
public static int a(String var0) {
if (var0 != null && var0 != "") {
try {
return Integer.parseInt(var0);
} catch (NumberFormatException var2) {
return 0;
}
} else {
return 0;
}
}
public static int d(Object var0) {
if (var0 != null && var0 != "") {
try {
return Integer.parseInt(var0.toString());
} catch (NumberFormatException var2) {
return 0;
}
} else {
return 0;
}
}
public static int a(String var0, Integer var1) {
if (var0 != null && var0 != "") {
try {
return Integer.parseInt(var0);
} catch (NumberFormatException var3) {
return 0;
}
} else {
return var1;
}
}
public static Integer[] a(String[] var0) {
Integer[] var1 = new Integer[var0.length];
if (var0 == null) {
return null;
} else {
for(int var2 = 0; var2 < var0.length; ++var2) {
var1[var2] = Integer.parseInt(var0[var2]);
}
return var1;
}
}
public static double a(String var0, double var1) {
if (var0 != null && var0 != "") {
try {
return Double.parseDouble(var0);
} catch (NumberFormatException var4) {
return var1;
}
} else {
return var1;
}
}
public static double a(Double var0, double var1) {
return var0 == null ? var1 : var0;
}
public static int a(Object var0, int var1) {
if (a(var0)) {
return var1;
} else {
try {
return Integer.parseInt(var0.toString());
} catch (NumberFormatException var3) {
return var1;
}
}
}
public static int a(BigDecimal var0, int var1) {
return var0 == null ? var1 : var0.intValue();
}
public static Integer[] b(String[] var0) {
int var1 = var0.length;
Integer[] var2 = new Integer[var1];
try {
for(int var3 = 0; var3 < var1; ++var3) {
var2[var3] = new Integer(var0[var3].trim());
}
return var2;
} catch (NumberFormatException var4) {
return null;
}
}
public static String b(String var0) {
return a(var0, "");
}
public static String e(Object var0) {
return a(var0) ? "" : var0.toString().trim();
}
public static String a(int var0) {
return String.valueOf(var0);
}
public static String c(String[] var0) {
if (var0.length == 0) {
return "";
} else {
String var1 = "";
String[] var2 = var0;
int var3 = var0.length;
for(int var4 = 0; var4 < var3; ++var4) {
String var5 = var2[var4];
var1 = var1 + ",'" + var5 + "'";
}
return var1.substring(1);
}
}
public static String a(float var0) {
return String.valueOf(var0);
}
public static String a(String var0, String var1) {
return a((Object)var0) ? var1 : var0.trim();
}
public static String a(Object var0, String var1) {
return a(var0) ? var1 : var0.toString().trim();
}
public static long c(String var0) {
Long var1 = new Long(0L);
try {
var1 = Long.valueOf(var0);
} catch (Exception var3) {
}
return var1;
}
public static String b() {
String var0 = null;
try {
InetAddress var1 = InetAddress.getLocalHost();
var0 = var1.getHostAddress();
} catch (UnknownHostException var2) {
var2.printStackTrace();
}
return var0;
}
private static boolean a(Class var0) throws Exception {
return var0.equals(String.class) || var0.equals(Integer.class) || var0.equals(Byte.class) || var0.equals(Long.class) || var0.equals(Double.class) || var0.equals(Float.class) || var0.equals(Character.class) || var0.equals(Short.class) || var0.equals(BigDecimal.class) || var0.equals(BigInteger.class) || var0.equals(Boolean.class) || var0.equals(Date.class) || var0.isPrimitive();
}
public static String c() throws SocketException {
String var0 = null;
String var1 = null;
Enumeration var2 = NetworkInterface.getNetworkInterfaces();
InetAddress var3 = null;
boolean var4 = false;
while(var2.hasMoreElements() && !var4) {
NetworkInterface var5 = (NetworkInterface)var2.nextElement();
Enumeration var6 = var5.getInetAddresses();
while(var6.hasMoreElements()) {
var3 = (InetAddress)var6.nextElement();
if (!var3.isSiteLocalAddress() && !var3.isLoopbackAddress() && var3.getHostAddress().indexOf(":") == -1) {
var1 = var3.getHostAddress();
var4 = true;
break;
}
if (var3.isSiteLocalAddress() && !var3.isLoopbackAddress() && var3.getHostAddress().indexOf(":") == -1) {
var0 = var3.getHostAddress();
}
}
}
return var1 != null && !"".equals(var1) ? var1 : var0;
}
public static String d(String var0) {
String var1 = "";
if (var0 != null) {
Pattern var2 = Pattern.compile("\\s*|\t|\r|\n");
Matcher var3 = var2.matcher(var0);
var1 = var3.replaceAll("");
}
return var1;
}
public static boolean a(String var0, String[] var1) {
if (var1 != null && var1.length != 0) {
for(int var2 = 0; var2 < var1.length; ++var2) {
String var3 = var1[var2];
if (var3.equals(var0)) {
return true;
}
}
return false;
} else {
return false;
}
}
public static boolean b(String var0, String var1) {
String[] var2 = null;
if (var1 != null) {
var2 = var1.split(",");
}
return a(var0, var2);
}
public static Map<Object, Object> d() {
return new HashMap();
}
public static Map<Object, Object> a(Set<Object> var0) {
Map var1 = d();
Iterator var2 = var0.iterator();
while(var2.hasNext()) {
Entry var3 = (Entry)var2.next();
var1.put(var3.getKey().toString(), var3.getValue() == null ? "" : var3.getValue().toString().trim());
}
return var1;
}
public static boolean e(String var0) {
boolean var1 = false;
long var2 = f(var0);
long var4 = f("10.0.0.0");
long var6 = f("10.255.255.255");
long var8 = f("172.16.0.0");
long var10 = f("172.31.255.255");
long var12 = f("192.168.0.0");
long var14 = f("192.168.255.255");
var1 = a(var2, var4, var6) || a(var2, var8, var10) || a(var2, var12, var14) || var0.equals("127.0.0.1");
return var1;
}
private static long f(String var0) {
String[] var1 = var0.split("\\.");
long var2 = (long)Integer.parseInt(var1[0]);
long var4 = (long)Integer.parseInt(var1[1]);
long var6 = (long)Integer.parseInt(var1[2]);
long var8 = (long)Integer.parseInt(var1[3]);
long var10 = var2 * 256L * 256L * 256L + var4 * 256L * 256L + var6 * 256L + var8;
return var10;
}
private static boolean a(long var0, long var2, long var4) {
return var0 >= var2 && var0 <= var4;
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/m.java
-80
View File
@@ -1,80 +0,0 @@
package org.jeecg.modules.online.cgform.util;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
class m {
private static final String a = "FECO#$N*CX";
private static final Charset b = Charset.forName("UTF-8");
private static byte[] c;
m() {
}
public static String a(String var0) {
byte[] var1 = var0.getBytes(b);
int var2 = 0;
for(int var3 = var1.length; var2 < var3; ++var2) {
byte[] var4 = c;
int var5 = var4.length;
for(int var6 = 0; var6 < var5; ++var6) {
byte var7 = var4[var6];
var1[var2] ^= var7;
}
}
return new String(var1);
}
public static String b(String var0) {
byte[] var1 = var0.getBytes(b);
byte[] var2 = var1;
int var3 = 0;
for(int var4 = var1.length; var3 < var4; ++var3) {
byte[] var5 = c;
int var6 = var5.length;
for(int var7 = 0; var7 < var6; ++var7) {
byte var8 = var5[var7];
var1[var3] = (byte)(var2[var3] ^ var8);
}
}
return new String(var1);
}
public static String c(String var0) {
MessageDigest var1 = null;
try {
var1 = MessageDigest.getInstance("MD5");
var1.reset();
var1.update(var0.getBytes("UTF-8"));
} catch (NoSuchAlgorithmException var5) {
} catch (UnsupportedEncodingException var6) {
}
byte[] var2 = var1.digest();
StringBuffer var3 = new StringBuffer();
for(int var4 = 0; var4 < var2.length; ++var4) {
if (Integer.toHexString(255 & var2[var4]).length() == 1) {
var3.append("0").append(Integer.toHexString(255 & var2[var4]));
} else {
var3.append(Integer.toHexString(255 & var2[var4]));
}
}
return var3.toString();
}
static {
c = "FECO#$N*CX".getBytes(b);
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/a/b.java
+3 -2
View File
@@ -16,6 +16,7 @@ import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.DynamicDataSourceModel;
import com.jero.common.util.SqlInjectionUtil;
import org.jeecg.modules.base.service.BaseCommonService;
import org.jeecg.modules.online.cgform.util.CgformUtil;
import org.jeecg.modules.online.cgreport.entity.OnlCgreportHead;
import org.jeecg.modules.online.cgreport.entity.OnlCgreportItem;
import org.jeecg.modules.online.cgreport.entity.OnlCgreportParam;
@@ -85,7 +86,7 @@ public class b {
var11.setFieldTxt(var14);
var11.setIsShow(1);
var11.setOrderNum(var8);
var11.setId(org.jeecg.modules.online.cgform.util.b.a());
var11.setId(CgformUtil.a());
var11.setFieldType("String");
var4.add(var11);
}
@@ -139,7 +140,7 @@ public class b {
Result var2 = new Result();
try {
String var3 = org.jeecg.modules.online.cgform.util.b.a();
String var3 = CgformUtil.a();
OnlCgreportHead var4 = var1.getHead();
List var5 = var1.getParams();
List var6 = var1.getItems();
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/service/a/b.java
+5 -5
View File
@@ -27,6 +27,7 @@ import com.jero.common.util.dynamic.db.DataSourceCachePool;
import com.jero.common.util.dynamic.db.DynamicDBUtil;
import com.jero.common.util.dynamic.db.SqlUtils;
import org.jeecg.modules.online.cgform.enums.DataBaseEnum;
import org.jeecg.modules.online.cgform.util.CgformUtil;
import org.jeecg.modules.online.cgreport.entity.OnlCgreportHead;
import org.jeecg.modules.online.cgreport.entity.OnlCgreportItem;
import org.jeecg.modules.online.cgreport.entity.OnlCgreportParam;
@@ -36,7 +37,6 @@ import org.jeecg.modules.online.cgreport.service.IOnlCgreportHeadService;
import org.jeecg.modules.online.cgreport.service.IOnlCgreportItemService;
import org.jeecg.modules.online.cgreport.service.IOnlCgreportParamService;
import org.jeecg.modules.online.cgreport.util.SqlUtil;
import org.jeecg.modules.online.cgreport.util.a;
import org.jeecg.modules.online.config.b.d;
import org.jeecg.modules.online.config.exception.DBException;
import org.slf4j.Logger;
@@ -130,7 +130,7 @@ public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> imple
}
var20.put("total", ((IPage)var17).getTotal());
var20.put("records", org.jeecg.modules.online.cgform.util.b.d(((IPage)var17).getRecords()));
var20.put("records", CgformUtil.d(((IPage)var17).getRecords()));
return var20;
}
}
@@ -190,7 +190,7 @@ public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> imple
Map var22 = (Map)DynamicDBUtil.findOne(dbKey, var18, new Object[0]);
var21.put("total", var22.get("total"));
List var23 = DynamicDBUtil.findList(dbKey, var20, new Object[0]);
var21.put("records", org.jeecg.modules.online.cgform.util.b.d(var23));
var21.put("records", CgformUtil.d(var23));
return var21;
}
}
@@ -372,8 +372,8 @@ public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> imple
List var4 = this.mapper.queryCgReportItems(reportId);
List var5 = this.mapper.queryCgReportParams(reportId);
if (d.a()) {
var2.put("main", org.jeecg.modules.online.cgform.util.b.b(var3));
var2.put("items", org.jeecg.modules.online.cgform.util.b.d(var4));
var2.put("main", CgformUtil.b(var3));
var2.put("items", CgformUtil.d(var4));
} else {
var2.put("main", var3);
var2.put("items", var4);
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/util/a.java
+7 -7
View File
@@ -15,7 +15,7 @@ import javax.servlet.http.HttpServletRequest;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.DateUtils;
import com.jero.common.util.oConvertUtils;
import org.jeecg.modules.online.cgform.util.b;
import org.jeecg.modules.online.cgform.util.CgformUtil;
import org.jeecg.modules.online.cgreport.entity.OnlCgreportItem;
import org.jeecg.modules.online.config.b.d;
import org.jeecg.modules.online.config.exception.DBException;
@@ -233,9 +233,9 @@ public class a {
if (!"Long".equals(var10) && !"Integer".equals(var10)) {
if ("ORACLE".equals(var5)) {
if (var10.toLowerCase().equals("datetime")) {
var4.append(b.a(var11.toString()));
var4.append(CgformUtil.a(var11.toString()));
} else if (var10.toLowerCase().equals("date")) {
var4.append(b.b(var11.toString()));
var4.append(CgformUtil.b(var11.toString()));
}
} else {
var4.append("'" + var11.toString() + "'");
@@ -254,10 +254,10 @@ public class a {
boolean var12 = !"Long".equals(var10) && !"Integer".equals(var10);
if ("ORACLE".equals(var5)) {
if (var10.toLowerCase().equals("datetime")) {
var11 = b.a(var11.toString());
var11 = CgformUtil.a(var11.toString());
var12 = false;
} else if (var10.toLowerCase().equals("date")) {
var11 = b.b(var11.toString());
var11 = CgformUtil.b(var11.toString());
var12 = false;
}
}
@@ -273,9 +273,9 @@ public class a {
if (!"Long".equals(var10) && !"Integer".equals(var10)) {
if ("ORACLE".equals(var5)) {
if (var10.toLowerCase().equals("datetime")) {
var4.append(b.a(var18.toString()));
var4.append(CgformUtil.a(var18.toString()));
} else if (var10.toLowerCase().equals("date")) {
var4.append(b.b(var18.toString()));
var4.append(CgformUtil.b(var18.toString()));
}
} else {
var4.append("'" + var18.toString() + "'");