Skip to content

Commit 4d2785a

Browse files
MatrixSevenMatrixSeven
committed
处理命名
1 parent 517fa76 commit 4d2785a

12 files changed

Lines changed: 66 additions & 65 deletions

File tree

‎src/main/java/seven/ExcelFactory.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import seven.callBack.PackageDataInterface;
44
import seven.savewapper.SaveExcel;
5-
import seven.savewapper.wapperRef.sysWppers.ResExprotDBMap;
6-
import seven.savewapper.wapperRef.sysWppers.ResExprotDBObj;
7-
import seven.savewapper.wapperRef.sysWppers.ResExprotMap;
8-
import seven.savewapper.wapperRef.sysWppers.ResExprotObj;
5+
import seven.savewapper.wapperRef.sysWppers.ResExportDBMap;
6+
import seven.savewapper.wapperRef.sysWppers.ResExportDBObj;
7+
import seven.savewapper.wapperRef.sysWppers.ResExportMap;
8+
import seven.savewapper.wapperRef.sysWppers.ResExportObj;
99
import seven.wapperInt.Wrapper;
1010
import seven.wapperInt.wapperRef.WrapperObj;
1111

@@ -62,9 +62,9 @@ public static SaveExcel saveExcel(List<? extends Object> bean, String FilePath)
6262
throw new Exception("请传入数据");
6363
}
6464
if (bean.get(0) instanceof Map) {
65-
return new ResExprotMap((List<Map>) bean,FilePath);
65+
return new ResExportMap((List<Map>) bean,FilePath);
6666
}
67-
return new ResExprotObj((List)bean, FilePath);
67+
return new ResExportObj((List)bean, FilePath);
6868
}
6969

7070
/**
@@ -75,7 +75,7 @@ public static SaveExcel saveExcel(List<? extends Object> bean, String FilePath)
7575
* @throws Exception
7676
*/
7777
public static SaveExcel saveExcel(ResultSet resultSet, String FilePath) throws Exception {
78-
return new ResExprotDBMap(resultSet,FilePath);
78+
return new ResExportDBMap(resultSet,FilePath);
7979
}
8080

8181
/**
@@ -87,7 +87,7 @@ public static SaveExcel saveExcel(ResultSet resultSet, String FilePath) throws E
8787
* @throws Exception
8888
*/
8989
public static SaveExcel saveExcel(ResultSet resultSet, String FilePath, PackageDataInterface packageDataInterface) throws Exception {
90-
return new ResExprotDBObj(resultSet,FilePath,packageDataInterface);
90+
return new ResExportDBObj(resultSet,FilePath,packageDataInterface);
9191
}
9292

9393
/**
@@ -98,7 +98,7 @@ public static SaveExcel saveExcel(ResultSet resultSet, String FilePath, PackageD
9898
* @throws Exception
9999
*/
100100
public static SaveExcel saveExcel(ResultSet resultSet,Class type) throws Exception {
101-
return new ResExprotDBObj(resultSet,type);
101+
return new ResExportDBObj(resultSet,type);
102102
}
103103

104104

@@ -109,6 +109,6 @@ public static SaveExcel saveExcel(ResultSet resultSet,Class type) throws Excepti
109109
* @throws Exception
110110
*/
111111
public static SaveExcel saveExcel(ResultSet resultSet) throws Exception {
112-
return new ResExprotDBMap(resultSet);
112+
return new ResExportDBMap(resultSet);
113113
}
114114
}

‎src/main/java/seven/callBack/imp/DefaultDataFilter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* [Bolg]https://matrixseven.github.io/
88
* Created by seven on 2016/10/18.
99
*/
10-
public class DefaultDataFilter<T> implements DataFilterInterface<T>{
10+
public class DefaultDataFilter implements DataFilterInterface<Object>{
1111
@Override
12-
public Boolean filter(T o) {
12+
public Boolean filter(Object o) {
1313
return true;
1414
}
1515
}

‎src/main/java/seven/callBack/imp/DefaultDataProFilter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
* Created by seven on 2016/10/18.
99
*/
1010
@SuppressWarnings("unchecked")
11-
public class DefaultDataProFilter<T> implements DataFilterProcessInterface<T> {
11+
public class DefaultDataProFilter implements DataFilterProcessInterface<Object> {
1212
@Override
13-
public void process(T o) {
13+
public void process(Object o) {
1414

1515
}
1616
}

‎src/main/java/seven/savewapper/wapperRef/SaveExcelObject.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public abstract class SaveExcelObject<T> implements SaveExcel {
4444
protected String path;
4545
protected List<String> filterColBy_key = new ArrayList<>();
4646
protected List<String> anyColBy_key = new ArrayList<>();
47-
protected DataFilterInterface filter = new DefaultDataFilter<Object>();
48-
protected DataFilterProcessInterface process = new DefaultDataProFilter<Object>();
47+
protected DataFilterInterface filter = new DefaultDataFilter();
48+
protected DataFilterProcessInterface process = new DefaultDataProFilter();
4949
protected Comparator<? super Object> c = null;
5050
protected ResultSet resultSet = null;
5151
protected OutputStream stream = null;

src/main/java/seven/savewapper/wapperRef/sysWppers/ResExprotDBMap.java renamed to src/main/java/seven/savewapper/wapperRef/sysWppers/ResExportDBMap.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
* [Github]https://github.com/MatrixSeven
2626
* Created by seven on 2017/1/1.
2727
*/
28-
public class ResExprotDBMap extends ResExprotMap {
28+
public class ResExportDBMap extends ResExportMap {
2929

30-
public ResExprotDBMap(ResultSet resultSet, String path) {
30+
public ResExportDBMap(ResultSet resultSet, String path) {
3131
super(resultSet, path);
3232
}
33-
public ResExprotDBMap(ResultSet resultSet) {
33+
public ResExportDBMap(ResultSet resultSet) {
3434
super(resultSet);
3535
}
3636

37-
public ResExprotMap CreateList() throws Exception {
37+
public ResExportMap CreateList() throws Exception {
3838
this.list = new ArrayList<>();
3939
HashMap<String, String> stringStringHashMap;
4040
if (resultSet != null) {

src/main/java/seven/savewapper/wapperRef/sysWppers/ResExprotDBObj.java renamed to src/main/java/seven/savewapper/wapperRef/sysWppers/ResExportDBObj.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,26 @@
2828
* [Github]https://github.com/MatrixSeven
2929
* Created by seven on 2017/1/1.
3030
*/
31-
public class ResExprotDBObj extends ResExprotObj {
31+
public class ResExportDBObj extends ResExportObj {
3232
protected PackageDataInterface dataInterface;
3333
protected Class clazz = null;
3434

35-
public ResExprotDBObj(ResultSet resultSet, String path, PackageDataInterface dataInterface) {
35+
public ResExportDBObj(ResultSet resultSet, String path, PackageDataInterface dataInterface) {
3636
super(resultSet, path);
3737
this.dataInterface = dataInterface;
3838
}
3939

40-
public ResExprotDBObj(ResultSet resultSet, String path, Class type) {
40+
public ResExportDBObj(ResultSet resultSet, String path, Class type) {
4141
super(resultSet, path);
4242
this.clazz = type;
4343
}
4444

45-
public ResExprotDBObj(ResultSet resultSet, Class type) {
45+
public ResExportDBObj(ResultSet resultSet, Class type) {
4646
super(resultSet);
4747
this.clazz = type;
4848
}
4949

50-
public ResExprotDBObj CreateList() throws Exception {
50+
public ResExportDBObj CreateList() throws Exception {
5151
this.list = new ArrayList<>();
5252
if (clazz != null) {
5353
Field[] fields = ExcelTool.GetFilesDeep(clazz);

src/main/java/seven/savewapper/wapperRef/sysWppers/ResExprotMap.java renamed to src/main/java/seven/savewapper/wapperRef/sysWppers/ResExportMap.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
* [Github]https://github.com/MatrixSeven
2929
* Created by seven on 2016/11/30.
3030
*/
31-
public class ResExprotMap extends SaveExcelObject<Map> {
32-
public ResExprotMap(List<Map> list, String path) {
31+
public class ResExportMap extends SaveExcelObject<Map> {
32+
public ResExportMap(List<Map> list, String path) {
3333
super(list, path);
3434
}
3535

36-
public ResExprotMap(ResultSet resultSet, String path) {
36+
public ResExportMap(ResultSet resultSet, String path) {
3737
super(resultSet, path);
3838
}
3939

40-
public ResExprotMap(ResultSet resultSet) {
40+
public ResExportMap(ResultSet resultSet) {
4141
super(resultSet);
4242
}
4343

@@ -58,7 +58,6 @@ public void Save() throws Exception {
5858
CellStyle style = wk.createCellStyle();
5959
// 设置这些样式
6060

61-
6261
style.setAlignment(HorizontalAlignment.CENTER);
6362
Map m = list.get(0);
6463
Set<String> set_title = m.keySet();

src/main/java/seven/savewapper/wapperRef/sysWppers/ResExprotObj.java renamed to src/main/java/seven/savewapper/wapperRef/sysWppers/ResExportObj.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@
3030
* [Github]https://github.com/MatrixSeven
3131
* Created by seven on 2016/11/30.
3232
*/
33-
public class ResExprotObj extends SaveExcelObject<Object> {
33+
public class ResExportObj extends SaveExcelObject<Object> {
3434

35-
public ResExprotObj(List<Object> list, String path) {
35+
public ResExportObj(List<Object> list, String path) {
3636
super(list, path);
3737
}
38-
public ResExprotObj(ResultSet resultSet, String path) {
38+
public ResExportObj(ResultSet resultSet, String path) {
3939
super(resultSet, path);
4040
}
41-
public ResExprotObj(List<Object> list){
41+
public ResExportObj(List<Object> list){
4242
super(list);
4343
};
44-
public ResExprotObj(ResultSet resultSet) {
44+
public ResExportObj(ResultSet resultSet) {
4545
super(resultSet);
4646
}
4747

‎src/main/java/seven/util/RegHelper.java‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,37 @@
1818
// ___`. | .'___
1919
// (______|______)
2020
//=======================================================
21+
2122
/**
2223
* @author Seven<p>
23-
* @date 2016年6月4日-下午4:07:25
24+
* @date 2016年6月4日-下午4:07:25
2425
*/
26+
@Deprecated
2527
public class RegHelper {
2628

27-
public static final String _REG_INT = "^\\d+$";
28-
public static final String _REG_STRING = "Null";
29-
public static final String _REG_FLOAT = "\\d+\\.\\d+";
30-
public static final String _REG_DATE = "^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))";
31-
public static final String _REG_EMAIL = "\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*";
32-
public static final String _REG_PHONE = "^[1]([3][0-9]{1}|59|58|88|89)[0-9]{8}$";
33-
private static HashMap<String, Pattern> Require_Cache;
29+
public static final String _REG_INT = "^\\d+$";
30+
public static final String _REG_STRING = "Null";
31+
public static final String _REG_FLOAT = "\\d+\\.\\d+";
32+
public static final String _REG_DATE = "^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))";
33+
public static final String _REG_EMAIL = "\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*";
34+
public static final String _REG_PHONE = "^[1]([3][0-9]{1}|59|58|88|89)[0-9]{8}$";
35+
private static HashMap<String, Pattern> Require_Cache;
3436

35-
static {
36-
Require_Cache = new HashMap<String, Pattern>();
37-
Require_Cache.put("_REG_INT", Pattern.compile(_REG_INT));
38-
Require_Cache.put("_REG_STRING", Pattern.compile(_REG_STRING));
39-
Require_Cache.put("_REG_FLOAT", Pattern.compile(_REG_FLOAT));
40-
Require_Cache.put("_REG_DATE", Pattern.compile(_REG_DATE));
41-
Require_Cache.put("_REG_EMAIL", Pattern.compile(_REG_EMAIL));
42-
Require_Cache.put("_REG_PHONE", Pattern.compile(_REG_PHONE));
43-
}
37+
static {
38+
Require_Cache = new HashMap<String, Pattern>();
39+
Require_Cache.put("_REG_INT", Pattern.compile(_REG_INT));
40+
Require_Cache.put("_REG_STRING", Pattern.compile(_REG_STRING));
41+
Require_Cache.put("_REG_FLOAT", Pattern.compile(_REG_FLOAT));
42+
Require_Cache.put("_REG_DATE", Pattern.compile(_REG_DATE));
43+
Require_Cache.put("_REG_EMAIL", Pattern.compile(_REG_EMAIL));
44+
Require_Cache.put("_REG_PHONE", Pattern.compile(_REG_PHONE));
45+
}
4446

45-
public static boolean require(String require, String value) {
46-
if (Require_Cache.containsKey(require))
47-
return Require_Cache.get(require).matcher(value).matches();
48-
Require_Cache.put(require, Pattern.compile(require));
49-
return Require_Cache.get(require).matcher(value).matches();
50-
}
47+
public static boolean require(String require, String value) {
48+
if (Require_Cache.containsKey(require))
49+
return Require_Cache.get(require).matcher(value).matches();
50+
Require_Cache.put(require, Pattern.compile(require));
51+
return Require_Cache.get(require).matcher(value).matches();
52+
}
5153

5254
}

‎src/main/java/seven/wapperInt/wapperRef/WrapperObj.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
* @date 2016年4月12日-下午4:07:57
3636
*/
3737
public abstract class WrapperObj<T> extends Wrapper {
38-
protected DataFilterInterface filter=new DefaultDataFilter<Object>();
39-
protected DataFilterProcessInterface process=new DefaultDataProFilter<Object>();
38+
protected DataFilterInterface filter=new DefaultDataFilter();
39+
protected DataFilterProcessInterface process=new DefaultDataProFilter();
4040
protected List<String> filterColBy_key=new ArrayList<>();
4141
protected List<String> filterColBy_value=new ArrayList<>();
4242
protected Comparator<? super Object> c=null;
4343
protected String fs;
4444
protected static final boolean isMap=false;
4545

46-
protected abstract <T> T RefResWapper(String fs,boolean isMap,String key) throws Exception;
46+
protected abstract <T> T RefResWrapper(String fs, boolean isMap, String key) throws Exception;
4747

4848

4949
protected boolean isNull(Map<String, String> map) {
@@ -71,12 +71,12 @@ public Wrapper Sort(Comparator c) {
7171
this.c = c;return this;
7272
}
7373
public List<T> Create() throws Exception{
74-
return RefResWapper(fs,isMap,null);
74+
return RefResWrapper(fs,isMap,null);
7575
}
7676

7777
@Override
7878
public <T> T CreateMap(String key)throws Exception {
79-
return RefResWapper(fs,!isMap,key);
79+
return RefResWrapper(fs,!isMap,key);
8080
}
8181

8282
public Wrapper Filter(DataFilterInterface<?> filter) {

0 commit comments

Comments
 (0)