Skip to content

Commit 034dc6e

Browse files
albedobootalbedoboot
committed
完善测试代码
1 parent 9e35cbe commit 034dc6e

File tree

38 files changed

+1296
-106
lines changed

38 files changed

+1296
-106
lines changed

‎albedo-boot-common/albedo-boot-util/src/main/java/com/albedo/java/util/StringUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ public static String toUnderScoreCase(String s) {
343343
*
344344
* @return
345345
*/
346-
public static String getProjectPath(String fileName,String relativeUIPath) {
346+
public static String getProjectPath(String fileName, String relativeUIPath) {
347347
String projectPath = "";
348348
try {
349349
File file = new DefaultResourceLoader().getResource("").getFile();

‎albedo-boot-common/albedo-boot-util/src/main/java/com/albedo/java/util/exception/RuntimeMsgException.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ public RuntimeMsgException(String message, Object data) {
3030
super(message);
3131
this.setData(data);
3232
}
33-
33+
public RuntimeMsgException(HttpStatus code, String message) {
34+
super(message);
35+
this.setCode(code);
36+
}
3437
public RuntimeMsgException(String message) {
3538
super(message);
3639
}

‎albedo-boot-common/albedo-boot-vo/src/main/java/com/albedo/java/vo/base/TreeEntityVo.java

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

33
import com.albedo.java.util.annotation.BeanField;
44
import lombok.Data;
5+
import org.hibernate.validator.constraints.NotBlank;
56

67
/**
78
* 通常的数据基类 copyright 2014 albedo all right reserved author 李杰 created on 2014年12月31日 下午1:57:09
@@ -15,6 +16,7 @@ public class TreeEntityVo extends DataEntityVo {
1516
public static final String F_SORT = "sort";
1617
public static final String F_PARENT = "parent";
1718
/*** 模块名称 */
19+
@NotBlank
1820
protected String name;
1921
/*** 上级模块 */
2022
protected String parentId;

‎albedo-boot-common/albedo-boot-vo/src/main/java/com/albedo/java/vo/sys/OrgVo.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.albedo.java.vo.sys;
22

3+
import com.albedo.java.util.annotation.SearchField;
34
import com.albedo.java.vo.base.TreeEntityVo;
45
import lombok.Data;
56
import lombok.ToString;
7+
import org.hibernate.validator.constraints.NotBlank;
68

79
/**
810
* Created by somewhere on 2017/8/1.
@@ -12,6 +14,8 @@
1214
public class OrgVo extends TreeEntityVo {
1315

1416
private static final long serialVersionUID = 1L;
17+
;
18+
public static final String F_CODE = "code";
1519
private String code;
1620
/*** 拼音简码 */
1721
private String en;

‎albedo-boot-data/albedo-boot-data-hibernate/albedo-boot-data-hibernate-domain/src/main/java/com/albedo/java/common/data/persistence/IdEntity.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import javax.persistence.Id;
88
import javax.persistence.MappedSuperclass;
99
import javax.persistence.PrePersist;
10+
import java.util.Objects;
1011

1112
@MappedSuperclass
1213
public class IdEntity extends DataEntity {
@@ -35,4 +36,23 @@ public String getId() {
3536
public void setId(String id) {
3637
this.id = id;
3738
}
39+
40+
@Override
41+
public boolean equals(Object o) {
42+
if (this == o) {
43+
return true;
44+
}
45+
if (o == null || getClass() != o.getClass()) {
46+
return false;
47+
}
48+
IdEntity idEntity = (IdEntity) o;
49+
if (idEntity.getId() == null || getId() == null) {
50+
return false;
51+
}
52+
return Objects.equals(getId(), idEntity.getId());
53+
}
54+
@Override
55+
public int hashCode() {
56+
return Objects.hashCode(getId());
57+
}
3858
}

‎albedo-boot-data/albedo-boot-data-hibernate/albedo-boot-data-hibernate-domain/src/main/java/com/albedo/java/common/data/persistence/TreeDataEntity.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import com.albedo.java.util.annotation.SearchField;
44
import com.albedo.java.util.domain.QueryCondition.Operator;
5+
import com.sun.org.apache.xerces.internal.jaxp.datatype.XMLGregorianCalendarImpl;
56
import org.hibernate.annotations.NotFound;
67
import org.hibernate.annotations.NotFoundAction;
78
import org.hibernate.validator.constraints.Length;
9+
import org.hibernate.validator.constraints.NotBlank;
810

911
import javax.persistence.*;
1012

@@ -28,6 +30,7 @@ public abstract class TreeDataEntity<T extends DataEntity> extends DataEntity {
2830
@Length(min = 1, max = 100)
2931
@Column(name = "name_")
3032
@SearchField
33+
@NotBlank
3134
protected String name;
3235
/*** 上级组织 */
3336
@Length(min = 0, max = 64)
@@ -80,6 +83,7 @@ public void setName(String name) {
8083
this.name = name;
8184
}
8285

86+
8387
public Integer getSort() {
8488
return sort;
8589
}

‎albedo-boot-data/albedo-boot-data-hibernate/albedo-boot-data-hibernate-domain/src/main/java/com/albedo/java/common/data/persistence/TreeEntity.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package com.albedo.java.common.data.persistence;
22

33
import com.albedo.java.common.data.persistence.pk.IdGen;
4+
import com.albedo.java.modules.sys.domain.Org;
45
import com.albedo.java.util.annotation.SearchField;
56
import com.alibaba.fastjson.annotation.JSONField;
67

78
import javax.persistence.Column;
89
import javax.persistence.Id;
910
import javax.persistence.MappedSuperclass;
1011
import javax.persistence.PrePersist;
12+
import java.util.Objects;
1113

1214
/**
1315
* 数据TreeEntity类
@@ -52,4 +54,23 @@ public void setId(String id) {
5254
public boolean isRoot() {
5355
return isRoot(this.id);
5456
}
57+
58+
@Override
59+
public boolean equals(Object o) {
60+
if (this == o) {
61+
return true;
62+
}
63+
if (o == null || getClass() != o.getClass()) {
64+
return false;
65+
}
66+
TreeEntity treeEntity = (TreeEntity) o;
67+
if (treeEntity.getId() == null || getId() == null) {
68+
return false;
69+
}
70+
return Objects.equals(getId(), treeEntity.getId());
71+
}
72+
@Override
73+
public int hashCode() {
74+
return Objects.hashCode(getId());
75+
}
5576
}

‎albedo-boot-data/albedo-boot-data-hibernate/albedo-boot-data-hibernate-domain/src/main/java/com/albedo/java/modules/sys/domain/Org.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
package com.albedo.java.modules.sys.domain;
22

3+
import com.albedo.java.common.data.persistence.TreeDataEntity;
34
import com.albedo.java.common.data.persistence.TreeEntity;
45
import com.albedo.java.util.annotation.DictType;
56
import com.albedo.java.util.annotation.SearchField;
67
import com.alibaba.fastjson.annotation.JSONField;
8+
import com.sun.org.apache.xerces.internal.jaxp.datatype.XMLGregorianCalendarImpl;
79
import io.swagger.annotations.ApiModelProperty;
810
import lombok.ToString;
911
import org.hibernate.annotations.Cache;
1012
import org.hibernate.annotations.*;
13+
import org.hibernate.validator.constraints.NotBlank;
1114

1215
import javax.persistence.*;
1316
import javax.persistence.Entity;
1417
import javax.persistence.OrderBy;
1518
import javax.persistence.Table;
19+
import java.util.Objects;
1620
import java.util.Set;
1721

1822
/**
@@ -28,10 +32,14 @@
2832
public class Org extends TreeEntity<Org> {
2933

3034
public static final String F_TYPE = "type";
35+
public static final String F_CODE = "code";
36+
public static final String F_EN = "en";
37+
public static final String F_GRADE = "grade";
3138
private static final long serialVersionUID = 1L;
3239
/*** 组织编码 */
3340
@Column(name = "code_")
3441
@SearchField
42+
@NotBlank
3543
private String code;
3644

3745
/*** 拼音简码 */
@@ -77,7 +85,10 @@ public void setCode(String code) {
7785
this.code = code;
7886
}
7987

80-
88+
public Org code(String code) {
89+
setCode(code);
90+
return this;
91+
}
8192
public String getEn() {
8293
return en;
8394
}
@@ -110,4 +121,5 @@ public void setUsers(Set<User> users) {
110121
this.users = users;
111122
}
112123

124+
113125
}

‎albedo-boot-data/albedo-boot-data-hibernate/albedo-boot-data-hibernate-jpa/src/main/java/com/albedo/java/common/data/persistence/SpecificationDetail.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,14 @@ private Predicate toGetPredicate(List<QueryCondition> queryConditions, Root<T> r
108108
}
109109
Operator op = queryCondition.getOperate();
110110
if (Operator.in.equals(op)) {
111-
String tempValue = String.valueOf(queryCondition.getValue());
112-
List<Object> list = Lists.newArrayList();
113-
Lists.newArrayList(tempValue.split(",")).forEach(item -> {
114-
list.add(QueryUtil.getQueryValue(queryCondition, item));
115-
});
116-
predicates.add(expression.in(list));
111+
if(queryCondition.getValue() instanceof List){
112+
predicates.add(expression.in(((List)queryCondition.getValue())));
113+
}else{
114+
String tempValue = (String) queryCondition.getValue();
115+
List<Object> list = Lists.newArrayList();
116+
Lists.newArrayList(tempValue.split(",")).forEach(item -> list.add(QueryUtil.getQueryValue(queryCondition, item)));
117+
predicates.add(expression.in(list));
118+
}
117119
} else {
118120
Object val = QueryUtil.getQueryValue(queryCondition, null);
119121
predicates.add(Operator.eq.equals(op) ?

‎albedo-boot-data/albedo-boot-data-hibernate/albedo-boot-data-hibernate-jpa/src/main/java/com/albedo/java/common/data/persistence/repository/JpaCustomeRepository.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import com.albedo.java.util.domain.ComboData;
66
import com.albedo.java.util.domain.PageModel;
77
import com.albedo.java.util.domain.QueryCondition;
8-
import org.hibernate.Query;
9-
import org.hibernate.SQLQuery;
108
import org.hibernate.Session;
9+
import org.hibernate.query.NativeQuery;
10+
import org.hibernate.query.Query;
1111

1212
import java.util.List;
1313

@@ -38,7 +38,8 @@ public interface JpaCustomeRepository<T extends BaseEntity> {
3838
*/
3939
Query createQuery(String HQL, Object... params);
4040

41-
SQLQuery createSqlQuery(String SQL, Object... params);
41+
NativeQuery createSqlQuery(String SQL, Object... params);
42+
NativeQuery<T> createSqlQuery(String SQL, Class<T> clazz, Object... params);
4243

4344
Object findByHQL(String HQL, boolean isList, List<QueryCondition> conditionList, Object... params);
4445

@@ -82,6 +83,10 @@ public interface JpaCustomeRepository<T extends BaseEntity> {
8283

8384
List findListBySQL(String SQL, Object... params);
8485

86+
List findListBySQL(String SQL, Class<T> clazz, List<QueryCondition> conditionList, Object... params);
87+
88+
List findListBySQL(String SQL, Class<T> clazz, Object... params);
89+
8590
Object findObjectBySQL(String SQL, List<QueryCondition> conditionList, Object... params);
8691

8792
Object findObjectBySQL(String SQL, Object... params);

0 commit comments

Comments
 (0)