Skip to content
GitLab
Commit 18144407 authored by trumansdo's avatar trumansdo
Browse files

应用codestyle 


千万千万要用vscode打开前端项目，或者关闭eslint，移除它
Signed-off-by: default avatartrumansdo <1012243881@qq.com>
parent 9b3d96a6
Expand all Show whitespace changes
Inline Side-by-side
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/file/FileItem.java
View file @ 18144407
......@@ -12,18 +12,20 @@ public abstract class FileItem {
public abstract void copy(OutputStream os);
public abstract boolean delete();
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getPath() {
return path;
}
public void setPath(String path) {
this.path = path;
}
......@@ -43,6 +45,4 @@ public abstract class FileItem {
public void setId(Long id) {
this.id = id;
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/file/FileService.java
View file @ 18144407
......@@ -4,12 +4,13 @@ import java.io.OutputStream;
import java.util.List;
/**
* 文件持久化，默认为文件系统，可以扩展到fastfds等
* @author xiandafu
*
* @author xiandafu
*/
public interface FileService {
/**
* 得到一个临时文件操作
*
* @param name
* @return
*/
......@@ -17,6 +18,7 @@ public interface FileService {
/**
* 创建一个持久的文档
*
* @param name
* @param bizType
* @param bizId
......@@ -25,33 +27,40 @@ public interface FileService {
* @param tags
* @return
*/
public FileItem createFileItem(String name,String bizType,String bizId,Long userId,Long orgId,String fileBatchId,List<FileTag> tags);
public FileItem createFileItem(
String name,
String bizType,
String bizId,
Long userId,
Long orgId,
String fileBatchId,
List<FileTag> tags);
public FileItem loadFileItemByPath(String path);
public FileItem getFileItemById(Long id);
public FileItem getFileItemById(Long id,String batchFileId);
public List<FileItem> queryByUserId(Long userId,List<FileTag> tags);
public List<FileItem> queryByBiz(String bizType,String bizId);
public FileItem getFileItemById(Long id, String batchFileId);
public List<FileItem> queryByUserId(Long userId, List<FileTag> tags);
public List<FileItem> queryByBiz(String bizType, String bizId);
public List<FileItem> queryByBatchId(String fileBatchId);
/**
* 删除某个文件
*
* @param id
* @param fileBatchId，用于验证
*/
public void removeFile(Long id,String fileBatchId);
public void removeFile(Long id, String fileBatchId);
/**
* 完善附件信息
*
* @param fileBatchId
* @param bizType
* @param bizId
*/
public void updateFile(String fileBatchId,String bizType,String bizId);
public void updateFile(String fileBatchId, String bizType, String bizId);
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/file/FileTag.java
View file @ 18144407
......@@ -4,23 +4,28 @@ public class FileTag {
String name;
String value;
Long fileId;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public Long getFileId() {
return fileId;
}
public void setFileId(Long fileId) {
this.fileId = fileId;
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/file/LocalFileItem.java
View file @ 18144407
......@@ -9,26 +9,27 @@ import java.io.OutputStream;
import com.ibeetl.admin.core.util.PlatformException;
/**
* 本地文件系统
* @author xiandafu
*
* @author xiandafu
*/
class LocalFileItem extends PersistFileItem{
class LocalFileItem extends PersistFileItem {
String root = null;
public LocalFileItem(String root) {
this.root = root;
}
public OutputStream openOutpuStream() {
File file = new File(root + File.separator + path);
try {
if(!file.exists()) {
if (!file.exists()) {
file.createNewFile();
}
FileOutputStream fos = new FileOutputStream(file);
return fos;
} catch (IOException e) {
throw new PlatformException("Open stream error "+path);
throw new PlatformException("Open stream error " + path);
}
}
@Override
......@@ -43,10 +44,9 @@ class LocalFileItem extends PersistFileItem{
os.write(buf, 0, bytesRead);
}
}catch(Exception ex) {
throw new PlatformException("下载文件失败"+ex);
}
finally {
} catch (Exception ex) {
throw new PlatformException("下载文件失败" + ex);
} finally {
try {
input.close();
os.close();
......@@ -54,22 +54,16 @@ class LocalFileItem extends PersistFileItem{
// TODO Auto-generated catch block
e.printStackTrace();
}
}
if(path.startsWith("temp")) {
if (path.startsWith("temp")) {
this.delete();
}
}
@Override
public boolean delete() {
File file = new File(root + File.separator + path);
return file.delete();
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/file/LocalFileService.java
View file @ 18144407
......@@ -16,24 +16,24 @@ import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.admin.core.util.UUIDUtil;
/**
* 一个本地文件系统，管理临时文件和用户文件
* @author xiandafu
*
* @author xiandafu
*/
public class LocalFileService implements FileService {
Log log = LogFactory.getLog(this.getClass());
DBIndexHelper dbHelper = null;
String root = null;
public LocalFileService(ApplicationContext ctx,String root) {
public LocalFileService(ApplicationContext ctx, String root) {
this.root = root;
new File(root,"temp").mkdir();
new File(root, "temp").mkdir();
dbHelper = new DBIndexHelper(ctx.getBean(CoreFileDao.class));
}
@Override
public FileItem loadFileItemByPath(String path) {
CoreFile coreFile = dbHelper.getFileItemByPath(path);
if(coreFile!=null) {
if (coreFile != null) {
return getFileItem(coreFile);
}
LocalFileItem item = new LocalFileItem(root);
......@@ -46,7 +46,7 @@ public class LocalFileService implements FileService {
@Override
public FileItem createFileTemp(String name) {
FileItem item = new LocalFileItem(root);
String fileName = "temp"+File.separator+name + "." + this.suffix();
String fileName = "temp" + File.separator + name + "." + this.suffix();
item.setPath(fileName);
item.setName(name);
item.setTemp(true);
......@@ -54,7 +54,14 @@ public class LocalFileService implements FileService {
}
@Override
public FileItem createFileItem(String name, String bizType, String bizId, Long userId, Long orgId, String fileBatchId,List<FileTag> tags) {
public FileItem createFileItem(
String name,
String bizType,
String bizId,
Long userId,
Long orgId,
String fileBatchId,
List<FileTag> tags) {
CoreFile coreFile = new CoreFile();
coreFile.setBizId(bizId);
coreFile.setBizType(bizType);
......@@ -65,29 +72,26 @@ public class LocalFileService implements FileService {
coreFile.setFileBatchId(fileBatchId);
String dir = DateUtil.now("yyyyMMdd");
File dirFile = new File(root + File.separator + dir);
if(!dirFile.exists()) {
if (!dirFile.exists()) {
dirFile.mkdirs();
}
String fileName = name+"."+UUIDUtil.uuid();
String path = dir+File.separator+fileName;
String fileName = name + "." + UUIDUtil.uuid();
String path = dir + File.separator + fileName;
coreFile.setPath(path);
//目前忽略tags
dbHelper.createFileItem(coreFile,tags);
// 目前忽略tags
dbHelper.createFileItem(coreFile, tags);
return this.getFileItem(coreFile);
}
private String suffix() {
// TODO,改成唯一算法
return DateUtil.now("yyyyMMddhhmm")+ "-" + UUIDUtil.uuid();
return DateUtil.now("yyyyMMddhhmm") + "-" + UUIDUtil.uuid();
}
private String parseTempFileName(String path) {
File file = new File(path);
String name = file.getName();
//去掉最后的临时标记
// 去掉最后的临时标记
int index = name.lastIndexOf(".");
return name.substring(0, index);
}
......@@ -106,15 +110,12 @@ public class LocalFileService implements FileService {
protected List<FileItem> getFileItem(List<CoreFile> files) {
List<FileItem> items = new ArrayList<>(files.size());
for(CoreFile file:files) {
for (CoreFile file : files) {
items.add(this.getFileItem(file));
}
return items;
}
@Override
public FileItem getFileItemById(Long id) {
return this.getFileItem(dbHelper.getFileItemById(id));
......@@ -138,20 +139,18 @@ public class LocalFileService implements FileService {
@Override
public void removeFile(Long id, String fileBatchId) {
CoreFile file = dbHelper.getFileItemById(id);
if(!file.getFileBatchId().equals(fileBatchId)){
return ;
if (!file.getFileBatchId().equals(fileBatchId)) {
return;
}
FileItem item = this.getFileItem(file);
boolean success = item.delete();
if(!success) {
log.warn("删除文件失败 "+file.getName()+ ",id="+file.getId()+" path="+file.getPath());
throw new PlatformException("删除文件失败 "+file.getName());
if (!success) {
log.warn("删除文件失败 " + file.getName() + ",id=" + file.getId() + " path=" + file.getPath());
throw new PlatformException("删除文件失败 " + file.getName());
}
dbHelper.fileDao.deleteById(id);
return ;
return;
}
@Override
......@@ -162,14 +161,9 @@ public class LocalFileService implements FileService {
@Override
public FileItem getFileItemById(Long id, String fileBatchId) {
CoreFile file = dbHelper.getFileItemById(id);
if(!file.getFileBatchId().equals(fileBatchId)){
if (!file.getFileBatchId().equals(fileBatchId)) {
return null;
}
return this.getFileItem(file);
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/file/PersistFileItem.java
View file @ 18144407
......@@ -9,46 +9,56 @@ public abstract class PersistFileItem extends FileItem {
protected String bizType;
protected String bizId;
FileTag[] tags;
public PersistFileItem() {
this.isTemp = false;
}
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public Long getOrgId() {
return orgId;
}
public void setOrgId(Long orgId) {
this.orgId = orgId;
}
public FileTag[] getTags() {
return tags;
}
public void setTags(FileTag[] tags) {
this.tags = tags;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getBizType() {
return bizType;
}
public void setBizType(String bizType) {
this.bizType = bizType;
}
public String getBizId() {
return bizId;
}
public void setBizId(String bizId) {
this.bizId = bizId;
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/gen/AutoGen.java
View file @ 18144407
......@@ -5,6 +5,7 @@ import java.io.Writer;
import com.ibeetl.admin.core.gen.model.Entity;
public interface AutoGen {
public void make(Target target,Entity entity);
public void make(Target target, Entity entity);
public String getName();
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/gen/BaseTarget.java
View file @ 18144407
......@@ -15,7 +15,6 @@ public abstract class BaseTarget implements Target {
protected GroupTemplate gt = null;
protected String urlBase = null;
@Override
public void flush(AutoGen gen, String content) {
// TODO Auto-generated method stub
......@@ -24,13 +23,12 @@ public abstract class BaseTarget implements Target {
@Override
public GroupTemplate getGroupTemplate() {
if(gt!=null) {
if (gt != null) {
return gt;
}
ClassLoader loader = Thread.currentThread().getContextClassLoader();
ClasspathResourceLoader rs = new ClasspathResourceLoader(loader,"codeTemplate");
ClasspathResourceLoader rs = new ClasspathResourceLoader(loader, "codeTemplate");
try {
Configuration cfg = Configuration.defaultConfiguration();
......@@ -39,17 +37,17 @@ public abstract class BaseTarget implements Target {
cfg.setHtmlTagSupport(false);
cfg.build();
gt = new GroupTemplate(rs,cfg);
gt = new GroupTemplate(rs, cfg);
gt.registerFunction("verifyFormat", new VerifyForamtFunction());
gt.registerFunction("upperFirst", new Function() {
gt.registerFunction(
"upperFirst",
new Function() {
@Override
public Object call(Object[] paras, Context ctx) {
String s = (String)paras[0];
String s = (String) paras[0];
return upperFirst(s);
}
});
} catch (IOException e) {
throw new RuntimeException(e);
......@@ -58,12 +56,12 @@ public abstract class BaseTarget implements Target {
}
public static String upperFirst(String s) {
if (Character.isUpperCase(s.charAt(0)))
return s;
if (Character.isUpperCase(s.charAt(0))) return s;
else
return (new StringBuilder())
.append(Character.toUpperCase(s.charAt(0)))
.append(s.substring(1)).toString();
.append(s.substring(1))
.toString();
}
public GroupTemplate getGt() {
......@@ -81,6 +79,4 @@ public abstract class BaseTarget implements Target {
public void setUrlBase(String urlBase) {
this.urlBase = urlBase;
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/gen/ConsoleTarget.java
View file @ 18144407
package com.ibeetl.admin.core.gen;
/**
* 用于代码生成
* @author xiandafu
*
* @author xiandafu
*/
public class ConsoleTarget extends BaseTarget {
public ConsoleTarget() {
public ConsoleTarget() {}
}
@Override
public void flush(AutoGen gen, String content) {
System.out.println("=========="+gen.getClass().getSimpleName()+"=============");
System.out.println("==========" + gen.getClass().getSimpleName() + "=============");
System.out.println(content);
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/gen/HtmlGen.java
View file @ 18144407
......@@ -5,7 +5,7 @@ import org.beetl.core.Template;
import com.ibeetl.admin.core.gen.model.Entity;
public class HtmlGen implements AutoGen{
public class HtmlGen implements AutoGen {
@Override
public void make(Target target, Entity entity) {
......@@ -24,11 +24,9 @@ public class HtmlGen implements AutoGen{
public String getName() {
return "";
}
}
class HtmlIndexGen implements AutoGen{
class HtmlIndexGen implements AutoGen {
@Override
public void make(Target target, Entity entity) {
......@@ -44,10 +42,9 @@ class HtmlIndexGen implements AutoGen{
public String getName() {
return "index.html";
}
}
class HtmlEditGen implements AutoGen{
class HtmlEditGen implements AutoGen {
@Override
public void make(Target target, Entity entity) {
......@@ -58,14 +55,14 @@ class HtmlEditGen implements AutoGen{
String content = template.render();
target.flush(this, content);
}
@Override
public String getName() {
return "edit.html";
}
}
class HtmlAddGen implements AutoGen{
class HtmlAddGen implements AutoGen {
@Override
public void make(Target target, Entity entity) {
......@@ -76,13 +73,9 @@ class HtmlAddGen implements AutoGen{
String content = template.render();
target.flush(this, content);
}
@Override
public String getName() {
return "add.html";
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/gen/JSGen.java
View file @ 18144407
......@@ -5,7 +5,7 @@ import org.beetl.core.Template;
import com.ibeetl.admin.core.gen.model.Entity;
public class JSGen implements AutoGen{
public class JSGen implements AutoGen {
@Override
public void make(Target target, Entity entity) {
......@@ -20,14 +20,14 @@ public class JSGen implements AutoGen{
JSIndexGen indexGen = new JSIndexGen();
indexGen.make(target, entity);
}
@Override
public String getName() {
return "";
}
}
class JSDelGen implements AutoGen{
class JSDelGen implements AutoGen {
@Override
public void make(Target target, Entity entity) {
......@@ -37,15 +37,15 @@ class JSDelGen implements AutoGen{
template.binding("target", target);
String content = template.render();
target.flush(this, content);
}
@Override
public String getName() {
return "del.js";
}
}
class JSAddGen implements AutoGen{
class JSAddGen implements AutoGen {
@Override
public void make(Target target, Entity entity) {
......@@ -55,38 +55,36 @@ class JSAddGen implements AutoGen{
template.binding("target", target);
String content = template.render();
target.flush(this, content);
}
@Override
public String getName() {
return "add.js";
}
}
class JSApiGen implements AutoGen{
class JSApiGen implements AutoGen {
Entity entity;
@Override
public void make(Target target, Entity entity) {
this.entity =entity;
this.entity = entity;
GroupTemplate gt = target.getGroupTemplate();
Template template = gt.getTemplate("/js/entityApi.js");
template.binding("entity", entity);
template.binding("target", target);
String content = template.render();
target.flush(this, content);
}
@Override
public String getName() {
return entity.getCode()+"Api.js";
return entity.getCode() + "Api.js";
}
}
class JSEditGen implements AutoGen{
class JSEditGen implements AutoGen {
@Override
public void make(Target target, Entity entity) {
......@@ -96,16 +94,15 @@ class JSEditGen implements AutoGen{
template.binding("target", target);
String content = template.render();
target.flush(this, content);
}
@Override
public String getName() {
return "edit.js";
}
}
class JSIndexGen implements AutoGen{
class JSIndexGen implements AutoGen {
@Override
public void make(Target target, Entity entity) {
......@@ -116,13 +113,9 @@ class JSIndexGen implements AutoGen{
String content = template.render();
target.flush(this, content);
}
@Override
public String getName() {
return "index.js";
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/gen/Target.java
View file @ 18144407
......@@ -4,10 +4,11 @@ import org.beetl.core.GroupTemplate;
/**
* 描述如何输出代码，有打印后台，页面输出，或者直接生成到项目里
* @author lijiazhi
*
* @author lijiazhi
*/
public interface Target {
public void flush(AutoGen gen,String content);
public void flush(AutoGen gen, String content);
public GroupTemplate getGroupTemplate();
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment