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

【update】添加注释与重命名变量

Browse Source
This commit is contained in:
mzc5649
2021-04-06 13:40:17 +08:00
parent 2b7f8e26e3
commit 561bd3c6ca
3 changed files with 110 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/CodeStringUtils.java
+20 -5
View File
@@ -6,7 +6,13 @@ import org.apache.commons.lang.StringUtils;
public class CodeStringUtils { public class CodeStringUtils {
public CodeStringUtils() { public CodeStringUtils() {
} }
// Comma：逗号
/**
* Comma：逗号 将字符串数组转换为逗号间隔字符串
* @date 2021/4/6 13:37
* @param stringArray 字符串数组
* @return java.lang.String
*/
public static String joinComma(String[] stringArray) { public static String joinComma(String[] stringArray) {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
String[] array = stringArray; String[] array = stringArray;
@@ -24,7 +30,11 @@ public class CodeStringUtils {
return sb.toString().substring(1); return sb.toString().substring(1);
} }
/**
* 首字母大写字符串
* @param word 字符串
* @return java.lang.String
*/
public static String convertFirstWordToLower(String word) { public static String convertFirstWordToLower(String word) {
if (StringUtils.isNotBlank(word)) { if (StringUtils.isNotBlank(word)) {
word = word.substring(0, 1).toLowerCase() + word.substring(1); word = word.substring(0, 1).toLowerCase() + word.substring(1);
@@ -32,9 +42,14 @@ public class CodeStringUtils {
return word; return word;
} }
/**
public static Integer checkIntegerAndGet(Integer var0) { * 判断并获取整型
return var0 == null ? 0 : var0; * @date 2021/4/6 13:39
* @param integer 整型数
* @return java.lang.Integer
*/
public static Integer checkIntegerAndGet(Integer integer) {
return integer == null ? 0 : integer;
} }
/** /**
* 是否查询字段数组包含数据库名 * 是否查询字段数组包含数据库名
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java
+8 -3
View File
@@ -997,10 +997,15 @@ public class OnlCgformApiController {
return Result.OK(1); return Result.OK(1);
} }
/**
* 生成代码
* @date 2021/4/6 11:41
* @param jsonObject 参数
* @return com.jero.common.api.vo.Result<?>
*/
@PostMapping({"/codeGenerate"}) @PostMapping({"/codeGenerate"})
public Result<?> b(@RequestBody JSONObject var1) { public Result<?> codeGenerate(@RequestBody JSONObject jsonObject) {
OnlGenerateModel var2 = (OnlGenerateModel)JSONObject.parseObject(var1.toJSONString(), OnlGenerateModel.class); OnlGenerateModel var2 = (OnlGenerateModel)JSONObject.parseObject(jsonObject.toJSONString(), OnlGenerateModel.class);
List var3 = null; List var3 = null;
try { try {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java
+82 -75
View File
@@ -422,113 +422,120 @@ public class OnlCgformHeadController {
return Result.OK("同步完成!"); return Result.OK("同步完成!");
} }
} }
/**
* 获取磁盘根目录
* @date 2021/4/6 11:20
* @param
* @return com.jero.common.api.vo.Result<?>
*/
@GetMapping({"/rootFile"}) @GetMapping({"/rootFile"})
public Result<?> a() { public Result<?> rootFile() {
JSONArray var1 = new JSONArray(); JSONArray jsonArray = new JSONArray();
File[] var2 = File.listRoots(); File[] files = File.listRoots();
File[] var3 = var2; int var4 = files.length;
int var4 = var2.length;
for(int var5 = 0; var5 < var4; ++var5) { for(int i = 0; i < var4; ++i) {
File var6 = var3[var5]; File file = files[i];
JSONObject var7 = new JSONObject(); JSONObject jsonObject = new JSONObject();
if (var6.isDirectory()) { if (file.isDirectory()) {
var7.put("key", var6.getAbsolutePath()); jsonObject.put("key", file.getAbsolutePath());
var7.put("title", var6.getPath()); jsonObject.put("title", file.getPath());
var7.put("opened", false); jsonObject.put("opened", false);
JSONObject var8 = new JSONObject(); JSONObject jsonObject1 = new JSONObject();
var8.put("icon", "custom"); jsonObject1.put("icon", "custom");
var7.put("scopedSlots", var8); jsonObject.put("scopedSlots", jsonObject1);
var7.put("isLeaf", var6.listFiles() == null || var6.listFiles().length == 0); jsonObject.put("isLeaf", file.listFiles() == null || file.listFiles().length == 0);
} }
var1.add(var7); jsonArray.add(jsonObject);
} }
return Result.OK(var1); return Result.OK(jsonArray);
} }
/**
* 获取磁盘文件树
* @date 2021/4/6 11:20
* @param parentPath
* @return com.jero.common.api.vo.Result<?>
*/
@GetMapping({"/fileTree"}) @GetMapping({"/fileTree"})
public Result<?> i(@RequestParam(name = "parentPath",required = true) String var1) { public Result<?> fileTree(@RequestParam(name = "parentPath",required = true) String parentPath) {
JSONArray var2 = new JSONArray(); JSONArray jsonArray = new JSONArray();
File var3 = new File(var1); File file = new File(parentPath);
File[] var4 = var3.listFiles(); File[] files = file.listFiles();
File[] var5 = var4; int length = files.length;
int var6 = var4.length;
for(int var7 = 0; var7 < var6; ++var7) { for(int i = 0; i < length; ++i) {
File var8 = var5[var7]; File file1 = files[i];
if (var8.isDirectory() && oConvertUtils.isNotEmpty(var8.getPath())) { if (file1.isDirectory() && oConvertUtils.isNotEmpty(file1.getPath())) {
JSONObject var9 = new JSONObject(); JSONObject jsonObject = new JSONObject();
System.out.println(var8.getPath()); System.out.println(file1.getPath());
var9.put("key", var8.getAbsolutePath()); jsonObject.put("key", file1.getAbsolutePath());
var9.put("title", var8.getPath().substring(var8.getPath().lastIndexOf(File.separator) + 1)); jsonObject.put("title", file1.getPath().substring(file1.getPath().lastIndexOf(File.separator) + 1));
var9.put("isLeaf", var8.listFiles() == null || var8.listFiles().length == 0); jsonObject.put("isLeaf", file1.listFiles() == null || file1.listFiles().length == 0);
var9.put("opened", false); jsonObject.put("opened", false);
JSONObject var10 = new JSONObject(); JSONObject jsonObject1 = new JSONObject();
var10.put("icon", "custom"); jsonObject1.put("icon", "custom");
var9.put("scopedSlots", var10); jsonObject.put("scopedSlots", jsonObject1);
var2.add(var9); jsonArray.add(jsonObject);
} }
} }
return Result.OK(var2); return Result.OK(jsonArray);
} }
@GetMapping({"/tableInfo"}) @GetMapping({"/tableInfo"})
public Result<?> j(@RequestParam(name = "code",required = true) String var1) { public Result<?> tableInfo(@RequestParam(name = "code",required = true) String code) {
OnlCgformHead var2 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); OnlCgformHead onlCgformHead = (OnlCgformHead)this.onlCgformHeadService.getById(code);
if (var2 == null) { if (onlCgformHead == null) {
return Result.error("未找到对应实体"); return Result.error("未找到对应实体");
} else { } else {
HashMap var3 = new HashMap(); HashMap map = new HashMap();
var3.put("main", var2); map.put("main", onlCgformHead);
if (var2.getTableType() == 2) { if (onlCgformHead.getTableType() == 2) {
String var4 = var2.getSubTableStr(); String subTableStr = onlCgformHead.getSubTableStr();
if (oConvertUtils.isNotEmpty(var4)) { if (oConvertUtils.isNotEmpty(subTableStr)) {
ArrayList var5 = new ArrayList(); ArrayList list = new ArrayList();
String[] var6 = var4.split(","); String[] subTableArray = subTableStr.split(",");
String[] var7 = var6; int length = subTableArray.length;
int var8 = var6.length;
for(int var9 = 0; var9 < var8; ++var9) { for(int i = 0; i < length; ++i) {
String var10 = var7[var9]; String subTable = subTableArray[i];
LambdaQueryWrapper<OnlCgformHead> var11 = new LambdaQueryWrapper(); LambdaQueryWrapper<OnlCgformHead> lambdaQueryWrapper = new LambdaQueryWrapper();
var11.eq(OnlCgformHead::getTableName, var10); lambdaQueryWrapper.eq(OnlCgformHead::getTableName, subTable);
OnlCgformHead var12 = (OnlCgformHead)this.onlCgformHeadService.getOne(var11); OnlCgformHead onlCgformHead1 = (OnlCgformHead)this.onlCgformHeadService.getOne(lambdaQueryWrapper);
var5.add(var12); list.add(onlCgformHead1);
} }
Collections.sort(var5, new Comparator<OnlCgformHead>() { Collections.sort(list, new Comparator<OnlCgformHead>() {
@Override @Override
public int compare(OnlCgformHead var1, OnlCgformHead var2) { public int compare(OnlCgformHead onlCgformHead1, OnlCgformHead onlCgformHead2) {
Integer var3 = var1.getTabOrderNum(); Integer tabOrderNum = onlCgformHead1.getTabOrderNum();
if (var3 == null) { if (tabOrderNum == null) {
var3 = 0; tabOrderNum = 0;
} }
Integer var4 = var2.getTabOrderNum(); Integer tabOrderNum1 = onlCgformHead2.getTabOrderNum();
if (var4 == null) { if (tabOrderNum1 == null) {
var4 = 0; tabOrderNum1 = 0;
} }
return var3.compareTo(var4); return tabOrderNum.compareTo(tabOrderNum1);
} }
}); });
var3.put("sub", var5); map.put("sub", list);
} }
} }
Integer var13 = var2.getTableType(); Integer tableType = onlCgformHead.getTableType();
if ("Y".equals(var2.getIsTree())) { if ("Y".equals(onlCgformHead.getIsTree())) {
var13 = 3; tableType = 3;
} }
List var14 = CgformEnum.getJspModelList(var13); List jspModelList = CgformEnum.getJspModelList(tableType);
var3.put("jspModeList", var14); map.put("jspModeList", jspModelList);
var3.put("projectPath", com.jero.codegenerate.properties.CodeConfigProperties.getProjectPath()); map.put("projectPath", com.jero.codegenerate.properties.CodeConfigProperties.getProjectPath());
return Result.OK(var3); return Result.OK(map);
} }
} }