voList = Binder.convertAndBindRelations(userList, EntityBinderVO.class);
+ for(EntityBinderVO vo : voList){
+ // 验证直接关联和通过中间表间接关联的绑定
+ Assert.assertEquals(vo.getDepartmentId(), vo.getDepartment2().getId());
+ Assert.assertNotNull(vo.getDepartment2().getOrgId());
+ if(vo.getId().equals(1004L)){
+ Assert.assertNotNull(vo.getDepartment2().getExtjsonarr());
+ }
+ }
+ }
+
}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/TestEntityListBinder.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/TestEntityListBinder.java
index aa60c715d4fbcae50770fca1ecb05669e6e18be6..72ea7e7069000ac8058c4a9ae07b3cf415f1ede5 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/TestEntityListBinder.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/TestEntityListBinder.java
@@ -20,6 +20,7 @@ import com.diboot.core.binding.Binder;
import com.diboot.core.entity.Dictionary;
import com.diboot.core.service.DictionaryService;
import com.diboot.core.util.JSON;
+import com.diboot.core.util.S;
import com.diboot.core.util.V;
import com.diboot.core.vo.DictionaryVO;
import diboot.core.test.StartupApplication;
@@ -141,14 +142,16 @@ public class TestEntityListBinder {
for(SimpleSplitVO vo : voList){
// 验证通过中间表间接关联的绑定
Assert.assertTrue(V.notEmpty(vo.getManagers()));
- System.out.println(JSON.stringify(vo));
+ //System.out.println(JSON.stringify(vo));
if(vo.getCharacter().contains(",")){
- String[] valueArr = vo.getCharacter().split(",");
+ String[] valueArr = S.clearNonConst(vo.getCharacter()).split(",");
if(valueArr[0].equals(valueArr[1])){
Assert.assertTrue(vo.getManagers().size() == 1);
+ Assert.assertTrue(vo.getManagersByJson().size() == 1);
}
else{
Assert.assertTrue(vo.getManagers().size() > 1);
+ Assert.assertTrue(vo.getManagersByJson().size() > 1);
}
}
else{
@@ -172,10 +175,11 @@ public class TestEntityListBinder {
// 验证通过中间表间接关联的绑定
if(vo.getManagerId().equals(1001L)){
Assert.assertTrue(vo.getManagerPhotos().size() == 1);
- Assert.assertEquals(1, vo.getManagerPhotoList().size());
+ Assert.assertEquals(2, vo.getManagerPhotoList().size());
}
else{
Assert.assertTrue(vo.getManagerPhotos().size() == 2);
+ Assert.assertTrue(V.isEmpty(vo.getManagerPhotoList()));
}
System.out.println(JSON.stringify(vo));
}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/TestFieldListBinder.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/TestFieldListBinder.java
index 107f938c4b3c9c88910868e85b49de70b8aa7fab..bfe0b08fd1cb1fe3e1ac962672a2315370f9f2d0 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/TestFieldListBinder.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/TestFieldListBinder.java
@@ -18,6 +18,7 @@ package diboot.core.test.binder;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.diboot.core.binding.Binder;
import com.diboot.core.util.JSON;
+import com.diboot.core.util.S;
import com.diboot.core.util.V;
import diboot.core.test.StartupApplication;
import diboot.core.test.binder.entity.DemoTest;
@@ -142,12 +143,14 @@ public class TestFieldListBinder {
Assert.assertTrue(V.notEmpty(vo.getManagerNames()));
System.out.println(JSON.stringify(vo));
if(vo.getCharacter().contains(",")){
- String[] valueArr = vo.getCharacter().split(",");
+ String[] valueArr = S.clearNonConst(vo.getCharacter()).split(",");
if(valueArr[0].equals(valueArr[1])){
Assert.assertTrue(vo.getManagerNames().size() == 1);
+ Assert.assertTrue(vo.getManagerNamesByJson().size() == 1);
}
else{
Assert.assertTrue(vo.getManagerNames().size() > 1);
+ Assert.assertTrue(vo.getManagerNamesByJson().size() > 1);
}
}
else{
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/TestJsonArrayBinder.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/TestJsonArrayBinder.java
new file mode 100644
index 0000000000000000000000000000000000000000..46c71236c95120000e4c2c17038fa919f3da85f3
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/TestJsonArrayBinder.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.diboot.core.binding.Binder;
+import com.diboot.core.util.JSON;
+import com.diboot.core.util.V;
+import diboot.core.test.StartupApplication;
+import diboot.core.test.binder.entity.User;
+import diboot.core.test.binder.service.UserService;
+import diboot.core.test.binder.vo.UserJsonVO;
+import diboot.core.test.config.SpringMvcConfig;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+/**
+ * 测试JsonArray绑定
+ * @author mazc@dibo.ltd
+ * @version v2.7.0
+ * @date 2022/09/09
+ */
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = {SpringMvcConfig.class})
+@SpringBootTest(classes = {StartupApplication.class})
+public class TestJsonArrayBinder {
+
+ @Autowired
+ UserService userService;
+
+ /**
+ * 验证jsonarray字段的条件绑定
+ */
+ @Test
+ public void testJsonArrayBinder(){
+ // 需要先确保queryWrapper.in()支持jsonarray
+ // 加载测试数据
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(User::getId, 1001L, 1002L);
+ List entityList = userService.getEntityList(queryWrapper);
+ // 自动绑定
+ List voList = Binder.convertAndBindRelations(entityList, UserJsonVO.class);
+ // 验证绑定结果
+ Assert.assertTrue(V.notEmpty(voList));
+ for(UserJsonVO vo : voList){
+ // 验证直接关联的绑定
+ System.out.println(JSON.stringify(vo));
+ }
+ }
+
+}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/TestLeadExtConditionBinder.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/TestLeadExtConditionBinder.java
index 8ba5a02f0db6331dd7128a7fd0bc5cfd14fb7951..3d70cf1486696ea74ae2cd8dbdfdee57d02c3607 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/TestLeadExtConditionBinder.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/TestLeadExtConditionBinder.java
@@ -22,7 +22,6 @@ import com.diboot.core.util.V;
import diboot.core.test.StartupApplication;
import diboot.core.test.binder.entity.User;
import diboot.core.test.binder.service.UserService;
-import diboot.core.test.binder.vo.FieldBinderVO;
import diboot.core.test.binder.vo.UserExtVO;
import diboot.core.test.config.SpringMvcConfig;
import org.junit.Assert;
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/DepartmentDTO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/DepartmentDTO.java
index 7679ff3445fd472a509b3928ebdb4322a0b3b463..882f63f2b2d5717764cbd063bea4b5e405635234 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/DepartmentDTO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/DepartmentDTO.java
@@ -18,6 +18,7 @@ package diboot.core.test.binder.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.diboot.core.binding.query.BindQuery;
import com.diboot.core.binding.query.Comparison;
+import com.diboot.core.binding.query.Strategy;
import com.diboot.core.util.D;
import diboot.core.test.binder.entity.Department;
import diboot.core.test.binder.entity.Organization;
@@ -43,11 +44,11 @@ public class DepartmentDTO implements Serializable {
private Long parentId;
- @BindQuery(comparison = Comparison.CONTAINS)
+ @BindQuery(comparison = Comparison.LIKE, strategy = Strategy.IGNORE_EMPTY)
private String name;
// 绑定join查询
- @BindQuery(comparison = Comparison.STARTSWITH, entity = Organization.class, field = "name", condition = "this.org_id=id")
+ @BindQuery(comparison = Comparison.STARTSWITH, strategy = Strategy.INCLUDE_NULL, entity = Organization.class, field = "name", condition = "this.org_id=id")
private String orgName;
// 绑定join查询
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Customer.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Customer.java
new file mode 100644
index 0000000000000000000000000000000000000000..2845e7526cb7818ee118b37e67af3630db189cdb
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Customer.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.diboot.core.entity.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @author mazc@dibo.ltd
+ * @version v2.0
+ * @date 2019/1/30
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName(autoResultMap = true)
+public class Customer extends BaseEntity {
+ private static final long serialVersionUID = 5650761344045195972L;
+
+ @TableField
+ private String realname;
+
+ @TableField
+ private String cellphone;
+
+ /**
+ * JSON数组
+ */
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List extjsonarr;
+
+}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Department.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Department.java
index 03abb0876f098985eee7278cb4cfa1aa50099bc5..d8da8cac63d60db4323100c503264af94009c576 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Department.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Department.java
@@ -16,6 +16,8 @@
package diboot.core.test.binder.entity;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.diboot.core.binding.query.BindQuery;
import com.diboot.core.binding.query.Comparison;
import com.diboot.core.binding.query.Strategy;
@@ -25,6 +27,9 @@ import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
+import java.util.LinkedHashMap;
+import java.util.List;
+
/**
* Department
* @author mazc@dibo.ltd
@@ -34,6 +39,7 @@ import lombok.experimental.Accessors;
@Getter
@Setter
@Accessors(chain = true)
+@TableName(autoResultMap = true)
public class Department extends BaseEntity {
private static final long serialVersionUID = -4849732665419794547L;
@@ -51,4 +57,17 @@ public class Department extends BaseEntity {
@TableField("`character`")
private String character;
+
+ /**
+ * JSON数组
+ */
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List extjsonarr;
+
+ /**
+ * JSON对象
+ */
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private LinkedHashMap extjsonobj;
+
}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/MyStrIdBaseEntity.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/MyStrIdBaseEntity.java
new file mode 100644
index 0000000000000000000000000000000000000000..0dc30a89b6acc5eb81052a220fe185d9efab0e1a
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/MyStrIdBaseEntity.java
@@ -0,0 +1,19 @@
+package diboot.core.test.binder.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.diboot.core.entity.AbstractEntity;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+* 自定义String类型id的BaseEntity
+*/
+@Getter @Setter @Accessors(chain = true)
+public abstract class MyStrIdBaseEntity extends AbstractEntity {
+
+ @TableId(value = "ID_", type = IdType.ASSIGN_UUID)
+ private String id;
+
+}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Organization.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Organization.java
index dcea77b9c409f24381d3e0f42e548f892bc5b8cd..c67224b1ae7d38c583d2f2b52ac902a2739a932e 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Organization.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Organization.java
@@ -36,7 +36,7 @@ public class Organization extends BaseEntity {
@TableField
private Long parentId;
- @TableField
+ //@TableField
private String name;
@TableField
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/StrIdTest.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/StrIdTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..0b8f893c5109620eb6216f853b86319330a23f28
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/StrIdTest.java
@@ -0,0 +1,29 @@
+package diboot.core.test.binder.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+/**
+* String类型id的Entity定义
+*/
+@Getter @Setter @Accessors(chain = true)
+public class StrIdTest extends MyStrIdBaseEntity {
+
+ /**
+ * 类型
+ */
+ @Length(max=255, message="类型长度应小于255")
+ @TableField(value = "TYPE_")
+ private String type;
+
+ /**
+ * 用户ID
+ */
+ @Length(max=255, message="用户ID长度应小于255")
+ @TableField(value = "USER_ID_")
+ private String userId;
+
+}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/TestRegion.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/TestRegion.java
index 6a09f189ffddaa30d7c8aa22b50ecd9f2e0145cc..4a813e7f3c173fbb670e4f02e6a0e9ae05b2d906 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/TestRegion.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/TestRegion.java
@@ -19,14 +19,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.diboot.core.entity.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
-import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
import java.util.List;
/**
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
index 43c7712b954f162dc35695e242232a7cacced234..f18957329667c0168b902011549a1972d0bc7267 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
@@ -16,7 +16,6 @@
package diboot.core.test.binder.entity;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.diboot.core.data.copy.Accept;
import com.diboot.core.entity.BaseEntity;
import com.diboot.core.util.D;
@@ -50,10 +49,10 @@ public class User extends BaseEntity {
@TableField
private String gender;
- //@JsonFormat(pattern = D.FORMAT_DATE_Y4MD)
+ @JsonFormat(pattern = D.FORMAT_DATE_Y4MD)
private Date birthdate;
- @JsonFormat(pattern = D.FORMAT_DATE_Y4MD)
+ @JsonFormat(pattern = D.FORMAT_DATETIME_Y4MDHMS)
private LocalDateTime localDatetime;
@TableField("`character`")
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/mapper/CustomerMapper.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/mapper/CustomerMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..fad9b2622cd3451ed901eeb1198d1cd2dda1140f
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/mapper/CustomerMapper.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.mapper;
+
+import com.diboot.core.mapper.BaseCrudMapper;
+import diboot.core.test.binder.entity.Customer;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客户Mapper
+ * @author mazc@dibo.ltd
+ * @version 2018/12/22
+ */
+@Mapper
+public interface CustomerMapper extends BaseCrudMapper {
+
+}
+
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/mapper/StrIdTestMapper.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/mapper/StrIdTestMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..2dadf47e45f7cf9737bc0e6c237aa22ea1b35474
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/mapper/StrIdTestMapper.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.mapper;
+
+import com.diboot.core.mapper.BaseCrudMapper;
+import diboot.core.test.binder.entity.StrIdTest;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * StrIdTest Mapper
+ * @author mazc@dibo.ltd
+ * @version 2018/12/22
+ */
+@Mapper
+public interface StrIdTestMapper extends BaseCrudMapper {
+
+}
+
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/BaseJwtAuthToken.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/CustomerService.java
similarity index 65%
rename from diboot-iam-starter/src/main/java/com/diboot/iam/jwt/BaseJwtAuthToken.java
rename to diboot-core-starter/src/test/java/diboot/core/test/binder/service/CustomerService.java
index 15e72d8f2b5aaf9c95151cd78409d0e5667f87f7..4c801172715c051af4e41df80fb779e985c46898 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/BaseJwtAuthToken.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/CustomerService.java
@@ -13,21 +13,17 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.diboot.iam.jwt;
+package diboot.core.test.binder.service;
-import com.diboot.iam.shiro.IamAuthToken;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import com.diboot.core.service.BaseService;
+import diboot.core.test.binder.entity.Customer;
/**
- * @author Yangzhao
+ * 客户相关Service
+ * @author mazc@dibo.ltd
* @version v2.0
- * @date 2019/6/6
+ * @date 2019/1/5
*/
-@Deprecated
-@Getter @Setter
-@Slf4j
-public class BaseJwtAuthToken extends IamAuthToken {
- private static final long serialVersionUID = -3455501467921544790L;
+public interface CustomerService extends BaseService {
+
}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/service/DepartmentService.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/DepartmentService.java
index ff27917c88056d98012dc2aa21d3f04b92911078..19aae88b6245173771bf1ac6a80f715362f51f3a 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/service/DepartmentService.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/DepartmentService.java
@@ -15,8 +15,9 @@
*/
package diboot.core.test.binder.service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.diboot.core.service.BaseService;
import com.diboot.core.vo.Pagination;
import diboot.core.test.binder.dto.DepartmentDTO;
import diboot.core.test.binder.entity.Department;
@@ -29,7 +30,15 @@ import java.util.List;
* @version v2.0
* @date 2019/1/30
*/
-public interface DepartmentService extends IService {
+public interface DepartmentService extends BaseService {
+
+ /**
+ * 获取指定条件的Entity集合
+ * @param queryWrapper
+ * @return
+ * @throws Exception
+ */
+ List list(Wrapper queryWrapper);
List getDepartmentSqlList(QueryWrapper queryWrapper, Pagination pagination);
}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/service/StrIdTestService.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/StrIdTestService.java
new file mode 100644
index 0000000000000000000000000000000000000000..e56cc662d37ce3082b8f06baf9aa60911b891dd7
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/StrIdTestService.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.service;
+
+import com.diboot.core.service.BaseService;
+import diboot.core.test.binder.entity.StrIdTest;
+
+/**
+ * StrIdTest相关Service
+ * @author mazc@dibo.ltd
+ * @version 2022/9/19
+ */
+public interface StrIdTestService extends BaseService {
+
+}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/service/impl/CustomerServiceImpl.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/impl/CustomerServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..a2c3dc4c6156e9e9b6ee8a19ba19f5ec4a1978e0
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/impl/CustomerServiceImpl.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.service.impl;
+
+import com.diboot.core.service.impl.BaseServiceImpl;
+import diboot.core.test.binder.entity.Customer;
+import diboot.core.test.binder.mapper.CustomerMapper;
+import diboot.core.test.binder.service.CustomerService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 员工相关Service
+ * @author mazc@dibo.ltd
+ * @version 2018/12/23
+ */
+@Service
+public class CustomerServiceImpl extends BaseServiceImpl implements CustomerService {
+
+}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/service/impl/DepartmentServiceImpl.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/impl/DepartmentServiceImpl.java
index a30f64b3a0b092aca312cca4d035c98a71a1a291..8f19a291635007802928994fc838d3d73d397462 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/service/impl/DepartmentServiceImpl.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/impl/DepartmentServiceImpl.java
@@ -15,8 +15,9 @@
*/
package diboot.core.test.binder.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diboot.core.service.impl.BaseServiceImpl;
import com.diboot.core.vo.Pagination;
import diboot.core.test.binder.dto.DepartmentDTO;
import diboot.core.test.binder.entity.Department;
@@ -35,7 +36,12 @@ import java.util.List;
*/
@Slf4j
@Service
-public class DepartmentServiceImpl extends ServiceImpl implements DepartmentService {
+public class DepartmentServiceImpl extends BaseServiceImpl implements DepartmentService {
+
+ @Override
+ public List list(Wrapper queryWrapper) {
+ return getEntityList(queryWrapper);
+ }
@Override
public List getDepartmentSqlList(QueryWrapper queryWrapper, Pagination pagination) {
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/service/impl/StrIdTestServiceImpl.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/impl/StrIdTestServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..eede0c2810761561d7442078ebee4aa4c34438d4
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/impl/StrIdTestServiceImpl.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.service.impl;
+
+import com.diboot.core.service.impl.BaseServiceImpl;
+import diboot.core.test.binder.entity.StrIdTest;
+import diboot.core.test.binder.mapper.StrIdTestMapper;
+import diboot.core.test.binder.service.StrIdTestService;
+import org.springframework.stereotype.Service;
+
+/**
+ * StrIdTest关Service
+ * @author mazc@dibo.ltd
+ * @version 2022/9/19
+ */
+@Service
+public class StrIdTestServiceImpl extends BaseServiceImpl implements StrIdTestService {
+
+}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/CustomerVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/CustomerVO.java
new file mode 100644
index 0000000000000000000000000000000000000000..12918546d1f1c7b7bded89ddb613ae143ece4f56
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/CustomerVO.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.vo;
+
+import com.diboot.core.binding.annotation.BindDict;
+import diboot.core.test.binder.entity.Customer;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ *
+ *
+ * @author mazc@dibo.ltd
+ * @version v2.0
+ * @date 2019/06/22
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+public class CustomerVO extends Customer {
+
+ @BindDict(type = "MESSAGE_CHANNEL", field = "extjsonarr")
+ private List channelLabels;
+
+}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/DepartmentVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/DepartmentVO.java
index e98de17be12b3d5ab6adc611f773aa3af4079d0e..c2520664707e03e5c9db52c059d3fecd3724d1e0 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/DepartmentVO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/DepartmentVO.java
@@ -54,7 +54,7 @@ public class DepartmentVO {
private Department department;
// 关联Entity，赋值给VO
- @BindEntity(entity = Organization.class, condition = "this.org_id=id") // AND ...
+ @BindEntity(entity = Organization.class, condition = "this.org_id=id", deepBind = true) // AND ...
private OrganizationVO organizationVO;
@BindEntityList(entity = Department.class, condition = "this.id=parent_id AND this.name IS NOT NULL") // AND ...
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/EntityBinderVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/EntityBinderVO.java
index ff1944b14251eed4fe40fe308081638034365e78..cac1c9f4a1fac49061a674f662b1e7ef63c20f67 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/EntityBinderVO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/EntityBinderVO.java
@@ -34,7 +34,7 @@ import lombok.experimental.Accessors;
public class EntityBinderVO extends User {
private static final long serialVersionUID = 3526115343377985725L;
- // 字段关联，相同条件的entity+condition将合并为一条SQL查询
+ // 实体关联，支持附加条件
@BindEntity(entity= Department.class, condition="this.department_id=id AND name like '发'") // AND is_deleted=1
private Department department;
@@ -42,4 +42,8 @@ public class EntityBinderVO extends User {
@BindEntity(entity = Organization.class, condition = "this.department_id=department.id AND department.org_id=id AND parent_id=0") // AND ...
private OrganizationVO organizationVO;
+ // 实体关联
+ @BindEntity(entity= Department.class, condition="this.department_id=id") // AND is_deleted=1
+ private Department department2;
+
}
\ No newline at end of file
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/SimpleSplitVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/SimpleSplitVO.java
index 299817abab769dcbdc5782b16418c02a735cc8d5..fe1ca2c3463c5a42d2753e89ef2491e769ef2177 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/SimpleSplitVO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/SimpleSplitVO.java
@@ -43,10 +43,17 @@ public class SimpleSplitVO extends Department {
//@BindEntityList(entity = User.class, condition="this.character=id", splitBy= Cons.SEPARATOR_COMMA)
private List managers;
-
// ，拆分的id值绑定
@BindFieldList(entity = User.class, field = "username", condition="this.`character`=id", splitBy= Cons.SEPARATOR_COMMA)
//@BindFieldList(entity = User.class, field = "username", condition="this.character=id", splitBy= Cons.SEPARATOR_COMMA)
private List managerNames;
+ // JsonArray的id值绑定
+ @BindEntityList(entity = User.class, condition="this.extjsonarr=id")
+ private List managersByJson;
+
+ // JSONArray的id值绑定
+ @BindFieldList(entity = User.class, field = "username", condition="this.extjsonarr=id")
+ private List managerNamesByJson;
+
}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserExtVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserExtVO.java
index be86b4e4cfad65617e93d68a1ac3646d38b32b3b..a8b44aabe45839ecd475e5e489b2489ce054e069 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserExtVO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserExtVO.java
@@ -17,11 +17,7 @@ package diboot.core.test.binder.vo;
import com.diboot.core.binding.annotation.BindField;
import com.diboot.core.binding.annotation.BindFieldList;
-import com.diboot.core.binding.query.BindQuery;
-import com.diboot.core.binding.query.Comparison;
-import com.diboot.core.binding.query.Strategy;
import diboot.core.test.binder.entity.Department;
-import diboot.core.test.binder.entity.Organization;
import diboot.core.test.binder.entity.Role;
import diboot.core.test.binder.entity.User;
import lombok.Getter;
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserJsonVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserJsonVO.java
new file mode 100644
index 0000000000000000000000000000000000000000..ef07d63fd25a319d22e491949efc653ff16abb18
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserJsonVO.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.vo;
+
+import com.diboot.core.binding.annotation.BindEntityList;
+import com.diboot.core.binding.annotation.BindFieldList;
+import diboot.core.test.binder.entity.Department;
+import diboot.core.test.binder.entity.User;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ *
+ *
+ * @author mazc@dibo.ltd
+ * @version v2.7.0
+ * @date 2022/09/09
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+public class UserJsonVO extends User {
+ private static final long serialVersionUID = 3526115343377985709L;
+
+ // 字段关联，附加更多条件
+ @BindFieldList(entity= Department.class, field="name", condition="this.id=extjsonarr")
+ private List deptNames;
+
+ // 字段关联，附加更多条件
+ @BindEntityList(entity= Department.class, condition="this.id=extjsonarr")
+ private List departments;
+
+}
\ No newline at end of file
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/config/SpringMvcConfig.java b/diboot-core-starter/src/test/java/diboot/core/test/config/SpringMvcConfig.java
index a6f5fc89ceff9fc16149ef205378a0db86c21fdd..36be126991585c1ec9ad18ddbb31622a2d69abbf 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/config/SpringMvcConfig.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/config/SpringMvcConfig.java
@@ -22,9 +22,7 @@ import com.diboot.core.handler.DataAccessControlInterceptor;
import com.diboot.core.util.ContextHelper;
import com.diboot.core.util.D;
import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
@@ -43,7 +41,6 @@ import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.format.FormatterRegistry;
-import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -54,7 +51,6 @@ import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
-import java.util.List;
import java.util.TimeZone;
/***
@@ -145,6 +141,8 @@ public class SpringMvcConfig implements WebMvcConfigurer {
registry.addConverter(new Date2LocalDateConverter());
registry.addConverter(new Date2LocalDateTimeConverter());
registry.addConverter(new String2DateConverter());
+ registry.addConverter(new String2LocalDateConverter());
+ registry.addConverter(new String2LocalDateTimeConverter());
registry.addConverter(new String2BooleanConverter());
registry.addConverter(new Timestamp2LocalDateTimeConverter());
}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java b/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java
index 4f1ffde54f5094f62e1a7d8262a5187d26a487a5..e60bb362d8cefda33b1d5d943f2359b49b5fdba5 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java
@@ -19,14 +19,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.diboot.core.binding.Binder;
import com.diboot.core.binding.JoinsBinder;
import com.diboot.core.binding.QueryBuilder;
+import com.diboot.core.binding.query.dynamic.ExtQueryWrapper;
import com.diboot.core.config.Cons;
import com.diboot.core.vo.Pagination;
import diboot.core.test.StartupApplication;
import diboot.core.test.binder.dto.DepartmentDTO;
import diboot.core.test.binder.dto.UserDTO;
import diboot.core.test.binder.entity.Department;
+import diboot.core.test.binder.entity.StrIdTest;
import diboot.core.test.binder.entity.User;
import diboot.core.test.binder.service.DepartmentService;
+import diboot.core.test.binder.service.StrIdTestService;
import diboot.core.test.binder.service.UserService;
import diboot.core.test.binder.vo.DepartmentVO;
import diboot.core.test.config.SpringMvcConfig;
@@ -60,6 +63,9 @@ public class TestJoinQuery {
@Autowired
UserService userService;
+ @Autowired
+ StrIdTestService strIdTestService;
+
@Test
public void testDateCompaire(){
Department example = departmentService.list(null).get(0);
@@ -85,6 +91,7 @@ public class TestJoinQuery {
queryWrapper = QueryBuilder.toQueryWrapper(departmentDTO);
list = Binder.joinQueryList(queryWrapper, Department.class);
Assert.assertTrue(list.size() > 0);
+
}
@Test
@@ -118,6 +125,11 @@ public class TestJoinQuery {
public void testDynamicSqlQuery(){
// 初始化DTO，测试不涉及关联的情况
DepartmentDTO dto = new DepartmentDTO();
+ //dto.setOrgName("");
+ ExtQueryWrapper query = QueryBuilder.toDynamicJoinQueryWrapper(dto);
+ List departmentList = query.queryList(Department.class);
+ Assert.assertTrue(departmentList.size() > 3);
+
dto.setParentId(10001L);
// 验证 转换后的wrapper可以直接查询
@@ -132,12 +144,9 @@ public class TestJoinQuery {
List builderResultList = QueryBuilder.toDynamicJoinQueryWrapper(dto).queryList(Department.class);
Assert.assertTrue(builderResultList.size() == 3);
- // 初始化DTO
- dto = new DepartmentDTO();
dto.setParentId(10001L);
- dto.setParentName("产品部");
- //boolean类型
dto.setOrgName("苏州帝博");
+ dto.setParentName("产品部");
// 验证直接查询指定字段
List fields = Arrays.asList("parentId", "parentName", "orgName");
@@ -156,6 +165,9 @@ public class TestJoinQuery {
// 不分页 3条结果
List list = JoinsBinder.queryList(queryWrapper, Department.class);
Assert.assertTrue(list.size() == 3);
+ Department departmentFirst = departmentService.getSingleEntity(queryWrapper);
+ Assert.assertTrue(departmentFirst.getId().equals(list.get(0).getId()));
+
// 不分页，直接用wrapper查
list = QueryBuilder.toDynamicJoinQueryWrapper(dto).queryList(Department.class);
Assert.assertTrue(list.size() == 3);
@@ -181,6 +193,8 @@ public class TestJoinQuery {
// 第二页 1条结果
list = Binder.joinQueryList(queryWrapper, Department.class, pagination);
Assert.assertTrue(list.size() == 1);
+
+
}
/**
@@ -229,6 +243,44 @@ public class TestJoinQuery {
Assert.assertTrue(userList.size() > 0);
}
+ @Test
+ public void testDynamicSqlQueryWithOrders(){
+ // 初始化DTO，测试不涉及关联的情况
+ DepartmentDTO dto = new DepartmentDTO();
+ dto.setParentId(10001L);
+ dto.setOrgName("苏州");
+
+ // 分页
+ Pagination pagination = new Pagination();
+ pagination.setPageSize(2);
+ pagination.setPageIndex(1);
+ // 测试排序
+ pagination.setOrderBy("orgName:DESC,parentName");
+
+ // 验证 转换后的wrapper可以直接查询
+ QueryWrapper queryWrapper = QueryBuilder.toDynamicJoinQueryWrapper(dto, pagination);
+ // 第二页 1条结果
+ List departments = departmentService.getEntityList(queryWrapper, pagination);
+ Assert.assertTrue(departments.size() == pagination.getPageSize());
+ }
+
+ @Test
+ public void testIgnoreEmptyDynamicSqlQuery(){
+ // 初始化DTO，测试不涉及关联的情况
+ DepartmentDTO dto = new DepartmentDTO();
+ // builder直接查询，不分页 3条结果
+ List builderResultList = departmentService.getEntityList(QueryBuilder.toQueryWrapper(dto));
+ Assert.assertTrue(builderResultList.size() == 6);
+
+ dto.setName("");
+ builderResultList = departmentService.getEntityList(QueryBuilder.toQueryWrapper(dto));
+ Assert.assertTrue(builderResultList.size() == 6);
+
+ dto.setOrgName("");
+ builderResultList = departmentService.getEntityList(QueryBuilder.toQueryWrapper(dto));
+ Assert.assertTrue(builderResultList.size() == 6);
+ }
+
@Test
public void testBindQueryGroup(){
DepartmentDTO departmentDTO = new DepartmentDTO();
@@ -272,6 +324,17 @@ public class TestJoinQuery {
Assert.assertTrue(sql.contains("LIMIT 1"));
}
+ @Test
+ public void testStringIdBuildQuery(){
+ StrIdTest strIdTest = new StrIdTest();
+ strIdTest.setId("123");
+ strIdTest.setType("A");
+ QueryWrapper queryWrapper = QueryBuilder.toDynamicJoinQueryWrapper(strIdTest);
+ String sql = queryWrapper.getExpression().getSqlSegment();
+ System.out.println(sql);
+ Assert.assertTrue(sql.contains("ID_ ="));
+ }
+
/**
* 构建检测是否有删除字段的sql
* @param middleTable
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java b/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
index d44bccc7d40b6ec3459b3a707b06302fafa9185e..e94bb7e7de5af8385982eea7ec9ac9ddab1f2e0a 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
@@ -25,19 +25,20 @@ import com.diboot.core.binding.QueryBuilder;
import com.diboot.core.binding.RelationsBinder;
import com.diboot.core.binding.cache.BindingCacheManager;
import com.diboot.core.binding.parser.EntityInfoCache;
+import com.diboot.core.binding.query.dynamic.ExtQueryWrapper;
import com.diboot.core.config.BaseConfig;
import com.diboot.core.data.access.DataAccessInterface;
import com.diboot.core.entity.Dictionary;
import com.diboot.core.service.impl.DictionaryServiceExtImpl;
import com.diboot.core.util.*;
import com.diboot.core.vo.*;
+import com.fasterxml.jackson.core.type.TypeReference;
import diboot.core.test.StartupApplication;
-import diboot.core.test.binder.entity.CcCityInfo;
-import diboot.core.test.binder.entity.Department;
-import diboot.core.test.binder.entity.User;
-import diboot.core.test.binder.entity.UserRole;
+import diboot.core.test.binder.dto.UserDTO;
+import diboot.core.test.binder.entity.*;
import diboot.core.test.binder.service.CcCityInfoService;
import diboot.core.test.binder.service.DepartmentService;
+import diboot.core.test.binder.service.OrganizationService;
import diboot.core.test.binder.service.UserService;
import diboot.core.test.binder.vo.SimpleDictionaryVO;
import diboot.core.test.config.SpringMvcConfig;
@@ -46,6 +47,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
@@ -72,6 +74,12 @@ public class BaseServiceTest {
@Autowired
DepartmentService departmentService;
+ @Autowired
+ JdbcTemplate jdbcTemplate;
+
+ @Autowired
+ OrganizationService organizationService;
+
@Test
public void testGet(){
// 查询总数
@@ -193,9 +201,20 @@ public class BaseServiceTest {
IPage dictionaryPage = dictionaryService.page(dp, queryWrapper);
- PagingJsonResult pagingJsonResult = new PagingJsonResult(dictionaryPage);
+ PagingJsonResult pagingJsonResult = new JsonResult().data(dictionaryPage.getRecords()).bindPagination(new Pagination());
Assert.assertTrue(V.notEmpty(pagingJsonResult));
Assert.assertTrue(pagingJsonResult.getPage().getOrderBy().equals("id:DESC"));
+
+ PagingJsonResult> pagingJsonResult2 = new PagingJsonResult(dictionaryPage);
+ String jsonStr = JSON.stringify(pagingJsonResult2);
+ System.out.println(jsonStr);
+ Assert.assertTrue(pagingJsonResult2.getPage().getOrderBy().equals("id:DESC"));
+
+ PagingJsonResult> pagingJsonResult3 = JSON.parseObject(jsonStr,
+ new TypeReference>>() {}
+ );
+ Assert.assertTrue(pagingJsonResult3.getPage() != null);
+ Assert.assertTrue(pagingJsonResult3.getData() != null);
}
/**
@@ -319,6 +338,22 @@ public class BaseServiceTest {
String val = dictionaryService.getValueOfField(Dictionary::getId, 2L, Dictionary::getItemValue);
Assert.assertTrue("M".equals(val));
System.out.println(val);
+
+ // 初始化DTO，测试不涉及关联的情况
+ UserDTO dto = new UserDTO();
+ dto.setUsername("张三");
+ // builder直接查询，不分页 3条结果
+ ExtQueryWrapper queryWrapper = QueryBuilder.toDynamicJoinQueryWrapper(dto);
+ List values = userService.getValuesOfField(queryWrapper, User::getUsername);
+ Assert.assertTrue(values.size() == 1);
+ dto.setUsername(null);
+
+ dto.setDeptId(10002L);
+ dto.setDeptName("研发组");
+ dto.setOrgName("苏州帝博");
+ queryWrapper = QueryBuilder.toDynamicJoinQueryWrapper(dto);
+ List values2 = userService.getValuesOfField(queryWrapper, User::getUsername);
+ Assert.assertTrue(values2.size() == 2);
}
@Test
@@ -353,6 +388,12 @@ public class BaseServiceTest {
pagination.setPageIndex(2);
voList = dictionaryService.getViewObjectList(queryWrapper, pagination, DictionaryVO.class);
Assert.assertTrue(voList.size() == 1);
+
+ // 测试 ORDER BY name
+ pagination = new Pagination();
+ pagination.setOrderBy("name:DESC");
+ List organizations = organizationService.getEntityList(null, pagination);
+ Assert.assertTrue(organizations != null && organizations.get(0).getName().contains("苏州帝博"));
}
@Test
@@ -508,4 +549,29 @@ public class BaseServiceTest {
//ContextHelper.getBean(CcCityInfoService.class).removeById(cityInfo.getId());
}
+ @Test
+ public void testJdbcTemplate(){
+ List> mapList = jdbcTemplate.queryForList("SELECT * FROM department");
+ Assert.assertTrue(mapList != null);
+ System.out.println(mapList);
+
+ List objList = jdbcTemplate.queryForList("SELECT id FROM department", Long.class);
+ Assert.assertTrue(objList != null);
+ Assert.assertTrue(objList.get(0) != null);
+
+ jdbcTemplate.execute("UPDATE department SET name='A' WHERE id=0");
+ }
+
+ @Test
+ public void testJson() {
+ List departments = departmentService.getEntityList(null);
+ Assert.assertTrue(departments != null);
+ for(Department dept : departments) {
+ if(V.notEmpty(dept.getCharacter()) && dept.getCharacter().contains(",")){
+ Assert.assertTrue(dept.getExtjsonarr().size() == S.split(dept.getCharacter()).length);
+ Assert.assertTrue(dept.getExtjsonobj() != null);
+ }
+ }
+ }
+
}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/service/EnhancedConversionService2.java b/diboot-core-starter/src/test/java/diboot/core/test/service/EnhancedConversionService2.java
index d07f718d796e84ad72a00cb416d574415ce96950..61c3071cab7e48fb18b8211edfab439e726af307 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/service/EnhancedConversionService2.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/service/EnhancedConversionService2.java
@@ -15,9 +15,8 @@
*/
package diboot.core.test.service;
-import com.diboot.core.converter.*;
+import com.diboot.core.converter.EnhancedConversionService;
import org.springframework.context.annotation.Primary;
-import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.stereotype.Component;
/**
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java
index 1c1226dc78488ecebc751843fe121ed546d85f58..9d96bb8cc38cc01a7e8a16b1fc7304b87d5dd379 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java
@@ -20,7 +20,6 @@ import com.diboot.core.util.BeanUtils;
import com.diboot.core.util.ContextHelper;
import diboot.core.test.StartupApplication;
import diboot.core.test.binder.entity.DemoTest;
-import diboot.core.test.binder.service.DemoTestService;
import diboot.core.test.binder.service.impl.DemoTestServiceImpl;
import diboot.core.test.config.SpringMvcConfig;
import org.junit.Assert;
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/JsonTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/JsonTest.java
index 50cea70c490be67db449996e367e3242bbfd3ced..b00545e5c5ec0bf6f4ecb7fc26730c6a3f44fd46 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/util/JsonTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/JsonTest.java
@@ -48,7 +48,13 @@ public class JsonTest {
@Test
public void testJsonDateConvert(){
- User user = new User();
+ String json = "{\"id\":123,\"birthdate\":\"1988-09-12\", \"localDatetime\":\"1998-09-12 12:12:20\"}";
+ User user = JSON.toJavaObject(json, User.class);
+ Assert.assertTrue(user.getId() != null);
+ Assert.assertTrue(user.getBirthdate() != null);
+ Assert.assertTrue(user.getLocalDatetime() != null);
+
+ user = new User();
user.setId(123L);
user.setUsername("zhangs").setCreateTime(new Date());
user.setBirthdate(D.convert2Date("1988-09-12 12:34"));
diff --git a/diboot-core-starter/src/test/resources/unittest-dm.sql b/diboot-core-starter/src/test/resources/unittest-dm.sql
index ab06b46253255abc9e1371c6472c7185a84395b9..8324129c7d0c7b9b3eda6019a62bbd904a9ce1a2 100644
--- a/diboot-core-starter/src/test/resources/unittest-dm.sql
+++ b/diboot-core-starter/src/test/resources/unittest-dm.sql
@@ -154,7 +154,7 @@ CREATE TABLE demo_test_join (
);
-- 初始化样例数据
-INSERT INTO department (id, parent_id, org_id, name, character) VALUES (10001, 0, 100001, '产品部', 'WW'), (10002, 10001, 100001, '研发组', '1001'), (10003, 10001, 100001, '测试组', '1001,1002'),
+INSERT INTO department (id, parent_id, org_id, name, character) VALUES (10001, 0, 100001, '产品部', 'WW'), (10002, 10001, 100001, '研发组', '1001'), (10003, 10001, 100001, '测试组', '[1001,1002]'),
(10004, 10001, 100001, '市场部', '1001,1002'), (10005, 10003, 100001, '自动化测试', null), (10006, 10003, 100001, '功能测试', null);
INSERT INTO dictionary (id, parent_id, app_module, type, item_name, item_value) VALUES (1, 0, '', 'GENDER', '性别', null), (2, 1, '', 'GENDER', '男', 'M'), (3, 1, '', 'GENDER', '女', 'F');
SET IDENTITY_INSERT organization ON;
diff --git a/diboot-core-starter/src/test/resources/unittest-mysql.sql b/diboot-core-starter/src/test/resources/unittest-mysql.sql
index 80cece06068c9f68fa6ff65cedd82e0dc5e9bbd4..fefb62f770313ffed6cf16b5763b4d4415015727 100644
--- a/diboot-core-starter/src/test/resources/unittest-mysql.sql
+++ b/diboot-core-starter/src/test/resources/unittest-mysql.sql
@@ -26,6 +26,8 @@ create table department
org_id bigint not null comment '单位ID',
name varchar(50) not null comment '名称',
extdata varchar(100) null comment '扩展字段',
+ extjsonarr JSON null comment '扩展Json数组',
+ extjsonobj JSON null comment '扩展json对象',
`character` varchar(100) null comment '关键字',
is_deleted tinyint(1) default 0 not null comment '已删除',
create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间'
@@ -154,10 +156,32 @@ CREATE TABLE `demo_test_join` (
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间'
) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='关联测试';
+create table customer
+(
+ id bigint unsigned not null comment 'ID' primary key,
+ realname varchar(50) not null comment '名称',
+ cellphone varchar(50) not null comment '电话',
+ extjsonarr JSON null comment '扩展json对象',
+ is_deleted tinyint(1) default 0 not null comment '已删除',
+ create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间'
+)
+ comment '客户' charset=utf8mb4;
+
+INSERT INTO customer (id, realname, cellphone, extjsonarr)
+VALUES (10001, '张三', '13800001111', '["WEBSOCKET","EMAIL"]'), (10002, '李四', '13800002222', '["TEXT_MESSAGE"]');
+
-- 初始化样例数据
-INSERT INTO department (id, parent_id, org_id, name, `character`) VALUES (10001, 0, 100001, '产品部', 'WW'), (10002, 10001, 100001, '研发组', '1001'), (10003, 10001, 100001, '测试组', '1001,1002'),
- (10004, 10001, 100001, '市场部', '1001,1002'), (10005, 10003, 100001, '自动化测试', null), (10006, 10003, 100001, '功能测试', null);
+INSERT INTO department (id, parent_id, org_id, name, `character`, extjsonobj, extjsonarr)
+VALUES (10001, 0, 100001, '产品部', 'WW', null, null), (10002, 10001, 100001, '研发组', '1001', null, null),
+ (10003, 10001, 100001, '测试组', '[1001,1002]', '{"id": 1001, "name": "TEST"}', '[1001,1002]'), (10004, 10001, 100001, '市场部', '1001,1002', '{"id": 1001, "name": "TEST"}', '[1001,1002]'),
+ (10005, 10003, 100001, '自动化测试', null, null, null), (10006, 10003, 100001, '功能测试', null, null, null);
INSERT INTO dictionary (id, parent_id, app_module, type, item_name, item_value) VALUES (1, 0, '', 'GENDER', '性别', null), (2, 1, '', 'GENDER', '男', 'M'), (3, 1, '', 'GENDER', '女', 'F');
+INSERT INTO dictionary
+(id, parent_id, tenant_id, app_module, `type`, item_name, item_value, description, extdata, sort_id, is_editable, is_deletable)
+VALUES(10050, 0, 0, NULL, 'MESSAGE_CHANNEL', '发送通道', NULL, 'message发送通道', NULL, 99, 1, 1),
+ (10051, 10050, 0, NULL, 'MESSAGE_CHANNEL', '站内信', 'WEBSOCKET', NULL, NULL, 0, 1, 1),
+ (10052, 10050, 0, NULL, 'MESSAGE_CHANNEL', '短信', 'TEXT_MESSAGE', NULL, NULL, 1, 1, 1),
+ (10053, 10050, 0, NULL, 'MESSAGE_CHANNEL', '邮件', 'EMAIL', NULL, NULL, 2, 1, 1);
INSERT INTO organization (id, parent_id, name, telphone, manager_id) VALUES (100001, 0, '苏州帝博', '0512-62988949', 1001), (100002, 0, '成都帝博', '028-62988949', 1002);
INSERT INTO role (id, name, code) VALUES (101, '管理员', 'ADMIN'), (102, '操作员', 'OPERATOR');
INSERT INTO user (id, department_id, username, gender, `character`) VALUES (1001, 10002, '张三', 'M', 'test123456'), (1002, 10002, '李四', 'F', 'test123456,test234567'), (1003, 10001, '王五', 'M', 'WW');
diff --git a/diboot-core/pom.xml b/diboot-core/pom.xml
index 22d0b45d4dbf40079be0f5fd8e6636ea48b9558d..660937a2150293eb061fdb0b79fbbdc605b2bd5d 100644
--- a/diboot-core/pom.xml
+++ b/diboot-core/pom.xml
@@ -7,11 +7,11 @@
com.diboot
diboot-root
- 2.6.0
+ 2.7.0
diboot-core
- 2.6.0
+ 2.7.0
jar
diboot core project
@@ -60,7 +60,7 @@
org.springframework.cloud
spring-cloud-openfeign-core
- 3.1.2
+ 3.1.3
provided
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/Binder.java b/diboot-core/src/main/java/com/diboot/core/binding/Binder.java
index bb5644026b4b29f59d69b0f8e94c3e9c83065738..11a33facbd72716659f9e3ef23e2cbd138822bed 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/Binder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/Binder.java
@@ -35,7 +35,7 @@ public class Binder {
* @return
* @throws Exception
*/
- public static E joinQueryOne(QueryWrapper queryWrapper, Class entityClazz){
+ public static T joinQueryOne(QueryWrapper queryWrapper, Class entityClazz){
return JoinsBinder.queryOne(queryWrapper, entityClazz);
}
@@ -46,7 +46,7 @@ public class Binder {
* @return
* @throws Exception
*/
- public static List joinQueryList(QueryWrapper queryWrapper, Class entityClazz){
+ public static List joinQueryList(QueryWrapper queryWrapper, Class entityClazz){
return JoinsBinder.queryList(queryWrapper, entityClazz);
}
@@ -58,7 +58,7 @@ public class Binder {
* @return
* @throws Exception
*/
- public static List joinQueryList(QueryWrapper queryWrapper, Class entityClazz, Pagination pagination){
+ public static List joinQueryList(QueryWrapper queryWrapper, Class entityClazz, Pagination pagination){
return JoinsBinder.queryList(queryWrapper, entityClazz, pagination);
}
@@ -69,7 +69,7 @@ public class Binder {
* @param
* @return
*/
- public static VO convertAndBindRelations(E entity, Class voClass){
+ public static VO convertAndBindRelations(T entity, Class voClass){
return RelationsBinder.convertAndBind(entity, voClass);
}
@@ -81,7 +81,7 @@ public class Binder {
* @param
* @return
*/
- public static List convertAndBindRelations(List entityList, Class voClass){
+ public static List convertAndBindRelations(List entityList, Class voClass){
return RelationsBinder.convertAndBind(entityList, voClass);
}
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/JoinsBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/JoinsBinder.java
index 43c00eaf75bffa9b86bd288b589c5215b96a0aff..3a5da0d0f82abd3faa333ca1f0218917802845a5 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/JoinsBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/JoinsBinder.java
@@ -23,6 +23,7 @@ import com.diboot.core.binding.helper.ServiceAdaptor;
import com.diboot.core.binding.parser.ParserCache;
import com.diboot.core.binding.query.dynamic.AnnoJoiner;
import com.diboot.core.binding.query.dynamic.DynamicJoinQueryWrapper;
+import com.diboot.core.binding.query.dynamic.DynamicSqlProvider;
import com.diboot.core.config.BaseConfig;
import com.diboot.core.config.Cons;
import com.diboot.core.data.ProtectFieldHandler;
@@ -55,8 +56,8 @@ public class JoinsBinder {
* @return
* @throws Exception
*/
- public static E queryOne(QueryWrapper queryWrapper, Class entityClazz){
- List list = executeJoinQuery(queryWrapper, entityClazz, null, true);
+ public static T queryOne(QueryWrapper queryWrapper, Class entityClazz){
+ List list = executeJoinQuery(queryWrapper, entityClazz, null, true);
if(V.notEmpty(list)){
return list.get(0);
}
@@ -70,7 +71,7 @@ public class JoinsBinder {
* @return
* @throws Exception
*/
- public static List queryList(QueryWrapper queryWrapper, Class entityClazz){
+ public static List queryList(QueryWrapper queryWrapper, Class entityClazz){
return queryList(queryWrapper, entityClazz, null);
}
@@ -82,7 +83,7 @@ public class JoinsBinder {
* @return
* @throws Exception
*/
- public static List queryList(QueryWrapper queryWrapper, Class entityClazz, Pagination pagination){
+ public static List queryList(QueryWrapper queryWrapper, Class entityClazz, Pagination pagination){
return executeJoinQuery(queryWrapper, entityClazz, pagination, false);
}
@@ -94,7 +95,7 @@ public class JoinsBinder {
* @return
* @throws Exception
*/
- private static List executeJoinQuery(QueryWrapper queryWrapper, Class entityClazz, Pagination pagination, boolean limit1){
+ private static List executeJoinQuery(QueryWrapper queryWrapper, Class entityClazz, Pagination pagination, boolean limit1){
// 非动态查询，走BaseService
if(queryWrapper instanceof DynamicJoinQueryWrapper == false){
IService iService = ContextHelper.getIServiceByEntity(entityClazz);
@@ -140,11 +141,15 @@ public class JoinsBinder {
}
ProtectFieldHandler protectFieldHandler = ContextHelper.getBean(ProtectFieldHandler.class);
// 转换查询结果
- List entityList = new ArrayList<>();
+ List entityList = new ArrayList<>();
for(Map colValueMap : mapList){
Map fieldValueMap = new HashMap<>();
// 格式化map
for(Map.Entry entry : colValueMap.entrySet()){
+ if(entry.getKey().startsWith(DynamicSqlProvider.PLACEHOLDER_COLUMN_FLAG)) {
+ log.debug("忽略查询占位字段 {}", entry.getKey());
+ continue;
+ }
String fieldName = S.toLowerCaseCamel(entry.getKey());
// 如果是布尔类型，检查entity中的定义是Boolean/boolean
if(entry.getValue() instanceof Boolean && S.startsWithIgnoreCase(entry.getKey(),"is_")){
@@ -163,7 +168,7 @@ public class JoinsBinder {
}
// 绑定map到entity
try{
- E entityInst = entityClazz.newInstance();
+ T entityInst = entityClazz.newInstance();
BeanUtils.bindProperties(entityInst, fieldValueMap);
if (protectFieldHandler != null) {
BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(entityInst);
@@ -188,7 +193,7 @@ public class JoinsBinder {
* @param queryWrapper
* @param pagination
*/
- private static void formatOrderBy(DynamicJoinQueryWrapper queryWrapper, Class entityClazz, Pagination pagination){
+ private static void formatOrderBy(DynamicJoinQueryWrapper queryWrapper, Class entityClazz, Pagination pagination){
// 如果是默认id排序，检查是否有id字段
if(pagination.isDefaultOrderBy()){
// 优化排序
@@ -237,4 +242,4 @@ public class JoinsBinder {
return ContextHelper.getBean(DynamicQueryMapper.class);
}
-}
+}
\ No newline at end of file
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java b/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java
index de940ce417e8b5377bfdb9c64b70705cc9f93185..bb0b1d36efaf108cee957a4d2f0dc8fa5283b38b 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java
@@ -18,7 +18,6 @@ package com.diboot.core.binding;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.core.conditions.ISqlSegment;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.segments.NormalSegmentList;
import com.diboot.core.binding.parser.ParserCache;
@@ -34,6 +33,7 @@ import com.diboot.core.util.BeanUtils;
import com.diboot.core.util.ContextHelper;
import com.diboot.core.util.S;
import com.diboot.core.util.V;
+import com.diboot.core.vo.Pagination;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,7 +65,18 @@ public class QueryBuilder {
* @return
*/
public static QueryWrapper toQueryWrapper(DTO dto){
- return dtoToWrapper(dto, null);
+ return dtoToWrapper(dto, null, null);
+ }
+
+ /**
+ * Entity或者DTO对象转换为QueryWrapper
+ * @param dto
+ * @param pagination 分页
+ * @param
+ * @return
+ */
+ public static QueryWrapper toQueryWrapper(DTO dto, Pagination pagination){
+ return dtoToWrapper(dto, null, pagination);
}
/**
@@ -76,7 +87,19 @@ public class QueryBuilder {
* @return
*/
public static QueryWrapper toQueryWrapper(DTO dto, Collection fields){
- return dtoToWrapper(dto, fields);
+ return dtoToWrapper(dto, fields, null);
+ }
+
+ /**
+ * Entity或者DTO对象转换为QueryWrapper
+ * @param dto
+ * @param fields 指定参与转换的属性值
+ * @param pagination 分页
+ * @param
+ * @return
+ */
+ public static QueryWrapper toQueryWrapper(DTO dto, Collection fields, Pagination pagination){
+ return dtoToWrapper(dto, fields, pagination);
}
/**
@@ -86,41 +109,43 @@ public class QueryBuilder {
* @return
*/
public static ExtQueryWrapper toDynamicJoinQueryWrapper(DTO dto){
- return toDynamicJoinQueryWrapper(dto, null);
+ return toDynamicJoinQueryWrapper(dto, null, null);
}
/**
* Entity或者DTO对象转换为QueryWrapper
* @param dto
- * @param fields 指定参与转换的属性值
+ * @param pagination 分页
* @param
* @return
*/
- public static ExtQueryWrapper toDynamicJoinQueryWrapper(DTO dto, Collection fields){
- QueryWrapper queryWrapper = dtoToWrapper(dto, fields);
- if(!(queryWrapper instanceof DynamicJoinQueryWrapper)){
- return (ExtQueryWrapper)queryWrapper;
- }
- return (DynamicJoinQueryWrapper)queryWrapper;
+ public static ExtQueryWrapper toDynamicJoinQueryWrapper(DTO dto, Pagination pagination){
+ return toDynamicJoinQueryWrapper(dto, null, pagination);
}
/**
- * Entity或者DTO对象转换为LambdaQueryWrapper
+ * Entity或者DTO对象转换为QueryWrapper
* @param dto
+ * @param
* @return
*/
- public static LambdaQueryWrapper toLambdaQueryWrapper(DTO dto){
- return (LambdaQueryWrapper) toQueryWrapper(dto).lambda();
+ public static ExtQueryWrapper toDynamicJoinQueryWrapper(DTO dto, Collection fields){
+ return toDynamicJoinQueryWrapper(dto, fields, null);
}
/**
- * Entity或者DTO对象转换为LambdaQueryWrapper
+ * Entity或者DTO对象转换为QueryWrapper
* @param dto
* @param fields 指定参与转换的属性值
+ * @param
* @return
*/
- public static LambdaQueryWrapper toLambdaQueryWrapper(DTO dto, Collection fields){
- return (LambdaQueryWrapper) toQueryWrapper(dto, fields).lambda();
+ public static ExtQueryWrapper toDynamicJoinQueryWrapper(DTO dto, Collection fields, Pagination pagination){
+ QueryWrapper queryWrapper = dtoToWrapper(dto, fields, pagination);
+ if(!(queryWrapper instanceof DynamicJoinQueryWrapper)){
+ return (ExtQueryWrapper)queryWrapper;
+ }
+ return (DynamicJoinQueryWrapper)queryWrapper;
}
/**
@@ -129,10 +154,10 @@ public class QueryBuilder {
* @param dto
* @return
*/
- private static QueryWrapper dtoToWrapper(DTO dto, Collection fields) {
+ private static QueryWrapper dtoToWrapper(DTO dto, Collection fields, Pagination pagination) {
QueryWrapper wrapper;
// 转换
- LinkedHashMap fieldValuesMap = extractNotNullValues(dto, fields);
+ LinkedHashMap fieldValuesMap = extractNotNullValues(dto, fields, pagination);
if (V.isEmpty(fieldValuesMap)) {
return new QueryWrapper<>();
}
@@ -238,14 +263,15 @@ public class QueryBuilder {
*/
private static void buildQuery(QueryWrapper wrapper, BindQuery bindQuery, String columnName, Object value) {
Comparison comparison = bindQuery != null ? bindQuery.comparison() : Comparison.EQ;
+ if(value == null) {
+ if(bindQuery != null && bindQuery.strategy().equals(Strategy.INCLUDE_NULL) && comparison.equals(Comparison.EQ)) {
+ wrapper.isNull(columnName);
+ }
+ return;
+ }
switch (comparison) {
case EQ:
- if(value == null && bindQuery != null && bindQuery.strategy().equals(Strategy.INCLUDE_NULL)) {
- wrapper.isNull(columnName);
- }
- else{
- wrapper.eq(columnName, value);
- }
+ wrapper.eq(columnName, value);
break;
case IN:
if (value.getClass().isArray()) {
@@ -339,10 +365,11 @@ public class QueryBuilder {
* @param
* @return
*/
- private static LinkedHashMap extractNotNullValues(DTO dto, Collection fields){
+ private static LinkedHashMap extractNotNullValues(DTO dto, Collection fields, Pagination pagination){
Class dtoClass = dto.getClass();
// 转换
List declaredFields = BeanUtils.extractAllFields(dtoClass);
+ List extractOrderFieldNames = extractOrderFieldNames(pagination);
// 结果map：<字段名,字段对象和值>
LinkedHashMap resultMap = new LinkedHashMap<>(declaredFields.size());
for (Field field : declaredFields) {
@@ -384,7 +411,22 @@ public class QueryBuilder {
continue;
}
BindQuery bindQuery = field.getAnnotation(BindQuery.class);
- if (value != null || (bindQuery != null && bindQuery.strategy().equals(Strategy.INCLUDE_NULL))) {
+ Strategy strategy = bindQuery != null? bindQuery.strategy() : Strategy.IGNORE_EMPTY;
+ boolean collectThisField = false;
+ // INCLUDE_NULL策略，包含null也收集
+ if(strategy.equals(Strategy.INCLUDE_NULL)) {
+ collectThisField = true;
+ }
+ else if(strategy.equals(Strategy.IGNORE_EMPTY) && V.notEmpty(value)) {
+ collectThisField = true;
+ }
+ else if(strategy.equals(Strategy.INCLUDE_EMPTY) && value != null) {
+ collectThisField = true;
+ }
+ else if(extractOrderFieldNames.contains(fieldName)) {
+ collectThisField = true;
+ }
+ if (collectThisField) {
resultMap.put(fieldName, new FieldAndValue(field, value));
}
}
@@ -428,4 +470,27 @@ public class QueryBuilder {
}
return false;
}
+
+ /**
+ * 是否为排序字段
+ * @param pagination
+ * @return
+ */
+ private static List extractOrderFieldNames(Pagination pagination) {
+ if (pagination == null || V.isEmpty(pagination.getOrderBy())) {
+ return Collections.emptyList();
+ }
+ // 解析排序
+ // orderBy=shortName:DESC,age:ASC,birthdate
+ String[] orderByFields = S.split(pagination.getOrderBy());
+ List orderFields = new ArrayList<>(orderByFields.length);
+ for (String field : orderByFields) {
+ if (field.contains(":")) {
+ field = S.substringBefore(field, ":");
+ }
+ orderFields.add(field);
+ }
+ return orderFields;
+ }
+
}
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/RelationsBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/RelationsBinder.java
index f753c62b275e5d87186a9fe20ad0b193eac53612..f74bef982310a439e99946412dc758a6423c6059 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/RelationsBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/RelationsBinder.java
@@ -179,6 +179,16 @@ public class RelationsBinder {
List deepBindEntityAnnoList = bindAnnotationGroup.getDeepBindEntityAnnotations();
List deepBindEntitiesAnnoList = bindAnnotationGroup.getDeepBindEntityListAnnotations();
if(deepBindEntityAnnoList != null || deepBindEntitiesAnnoList != null){
+ if(V.notEmpty(deepBindEntityAnnoList)){
+ FieldAnnotation firstAnnotation = deepBindEntityAnnoList.get(0);
+ log.debug("执行深度绑定: {}({}) for field {}", firstAnnotation.getAnnotation().annotationType().getSimpleName(),
+ firstAnnotation.getFieldClass().getSimpleName(), firstAnnotation.getFieldName());
+ }
+ if(deepBindEntitiesAnnoList != null) {
+ FieldAnnotation firstAnnotation = deepBindEntitiesAnnoList.get(0);
+ log.debug("执行深度绑定: {}({}) for field {}", firstAnnotation.getAnnotation().annotationType().getSimpleName(),
+ firstAnnotation.getFieldClass().getSimpleName(), firstAnnotation.getFieldName());
+ }
DeepRelationsBinder.deepBind(voList, deepBindEntityAnnoList, deepBindEntitiesAnnoList);
}
}
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
index 66015409e0967e94614f6c8a91bb626c0813a866..68539b5f7878804d73d606c802e08907dd782a9b 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
@@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory;
import java.lang.reflect.Field;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 关系绑定Binder父类
@@ -316,8 +317,7 @@ public abstract class BaseBinder {
// 构建查询条件
if (V.notEmpty(annoObjectJoinOnList)) {
String refObjJoinOnCol = refObjJoinCols.get(i);
- List unpackAnnoObjectJoinOnList = V.notEmpty(this.splitBy) ? ResultAssembler.unpackValueList(annoObjectJoinOnList, this.splitBy)
- : annoObjectJoinOnList;
+ List unpackAnnoObjectJoinOnList = ResultAssembler.unpackValueList(annoObjectJoinOnList, this.splitBy);
queryWrapper.in(refObjJoinOnCol, unpackAnnoObjectJoinOnList);
if (remoteBindDTO != null) {
remoteBindDTO.setRefJoinCol(refObjJoinOnCol).setInConditionValues(unpackAnnoObjectJoinOnList);
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java
index 9df5025bb6a3cabbbc6c3274502f5bcec485aac6..0057f25b5a840d82ef435b5d54cf5075f3e1f792 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java
@@ -21,14 +21,12 @@ import com.diboot.core.binding.helper.ResultAssembler;
import com.diboot.core.config.Cons;
import com.diboot.core.exception.InvalidUsageException;
import com.diboot.core.util.BeanUtils;
+import com.diboot.core.util.S;
import com.diboot.core.util.V;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Entity集合绑定实现
@@ -145,16 +143,10 @@ public class EntityListBinder extends EntityBinder {
if(obj == null){
continue;
}
- String valStr = String.valueOf(obj);
- List ent = entityMap.get(valStr);
- if(ent != null){
- for (T item : ent) {
- valueList.add(cloneOrConvertBean(item));
- }
- }
- else if(V.notEmpty(splitBy) && valStr.contains(splitBy)){
- for(String key : valStr.split(splitBy)){
- ent = entityMap.get(key);
+ // 兼容JsonArray
+ if(obj instanceof Collection) {
+ for(Object key : (Collection)obj){
+ List ent = entityMap.get(S.valueOf(key));
if(ent != null){
for (T item : ent) {
valueList.add(cloneOrConvertBean(item));
@@ -162,6 +154,25 @@ public class EntityListBinder extends EntityBinder {
}
}
}
+ else {
+ String valStr = S.clearNonConst(String.valueOf(obj));
+ List ent = entityMap.get(valStr);
+ if(ent != null){
+ for (T item : ent) {
+ valueList.add(cloneOrConvertBean(item));
+ }
+ }
+ else if(V.notEmpty(splitBy) && valStr.contains(splitBy)){
+ for(String key : valStr.split(splitBy)){
+ ent = entityMap.get(key);
+ if(ent != null){
+ for (T item : ent) {
+ valueList.add(cloneOrConvertBean(item));
+ }
+ }
+ }
+ }
+ }
}
valueEntityListMap.put(entry.getKey(), valueList);
}
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindingManager.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindingManager.java
index b767bc8ec5183695df81387cc477ffeb81d2e53b..29d69feaf9dddde466fc660636d58e50b91f5545 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindingManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindingManager.java
@@ -73,7 +73,7 @@ public class RemoteBindingManager {
* 获取实例
* @return
*/
- private static RemoteBindingProvider getRemoteBindingProvider(String module){
+ private synchronized static RemoteBindingProvider getRemoteBindingProvider(String module){
if(MODULE_PROVIDER_MAP == null){
MODULE_PROVIDER_MAP = new ConcurrentHashMap<>();
}
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
index c05c5d4a3b465dc4d293462f062d1933c89cca53..1030d7185a08d7637ebdb63addd56438c313124e 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
@@ -26,6 +26,8 @@ import com.diboot.core.util.BeanUtils;
import com.diboot.core.util.ContextHelper;
import com.diboot.core.util.S;
import com.diboot.core.util.V;
+import com.diboot.core.util.init.BeanInitUtils;
+import com.diboot.core.util.init.BeanInitializer;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.context.annotation.Primary;
@@ -45,10 +47,6 @@ import java.util.*;
@SuppressWarnings({"JavaDoc","rawtypes", "unchecked"})
@Slf4j
public class BindingCacheManager {
- /**
- * 实体相关定义缓存管理器
- */
- private static StaticMemoryCacheManager cacheManager;
/**
* 类-EntityInfo缓存key
*/
@@ -74,17 +72,21 @@ public class BindingCacheManager {
*/
private static final String CACHE_NAME_CLASS_NAME2FLDMAP = "CLASS_NAME2FLDMAP";
- private static synchronized StaticMemoryCacheManager getCacheManager(){
- if(cacheManager == null){
- cacheManager = new StaticMemoryCacheManager(
+ /**
+ * CacheManager 初始化器
+ */
+ private static final BeanInitializer CACHE_MANAGER_INITIALIZER = BeanInitUtils.lazyInit(() ->
+ new StaticMemoryCacheManager(
CACHE_NAME_CLASS_ENTITY,
CACHE_NAME_TABLE_ENTITY,
CACHE_NAME_CLASS_PROP,
CACHE_NAME_ENTITYNAME_CLASS,
CACHE_NAME_CLASS_FIELDS,
- CACHE_NAME_CLASS_NAME2FLDMAP);
- }
- return cacheManager;
+ CACHE_NAME_CLASS_NAME2FLDMAP)
+ );
+
+ private static StaticMemoryCacheManager getCacheManager() {
+ return CACHE_MANAGER_INITIALIZER.get();
}
/**
@@ -92,7 +94,7 @@ public class BindingCacheManager {
* @param tableName
* @return
*/
- public static synchronized EntityInfoCache getEntityInfoByTable(String tableName){
+ public static EntityInfoCache getEntityInfoByTable(String tableName) {
initEntityInfoCache();
return getCacheManager().getCacheObj(CACHE_NAME_TABLE_ENTITY, tableName, EntityInfoCache.class);
}
@@ -102,7 +104,7 @@ public class BindingCacheManager {
* @param entityClazz
* @return
*/
- public static synchronized EntityInfoCache getEntityInfoByClass(Class entityClazz){
+ public static EntityInfoCache getEntityInfoByClass(Class entityClazz) {
initEntityInfoCache();
return getCacheManager().getCacheObj(CACHE_NAME_CLASS_ENTITY, entityClazz.getName(), EntityInfoCache.class);
}
@@ -112,12 +114,8 @@ public class BindingCacheManager {
* @param beanClazz
* @return
*/
- public static synchronized PropInfo getPropInfoByClass(Class beanClazz){
- PropInfo propInfo = getCacheManager().getCacheObj(CACHE_NAME_CLASS_PROP, beanClazz.getName(), PropInfo.class);
- if(propInfo == null){
- propInfo = initPropInfoCache(beanClazz);
- }
- return propInfo;
+ public static PropInfo getPropInfoByClass(Class beanClazz) {
+ return getCacheManager().getCacheObj(CACHE_NAME_CLASS_PROP, beanClazz.getName(), () -> new PropInfo(beanClazz));
}
/**
@@ -125,7 +123,7 @@ public class BindingCacheManager {
* @param tableName
* @return
*/
- public static synchronized PropInfo getPropInfoByTable(String tableName){
+ public static PropInfo getPropInfoByTable(String tableName) {
Class entityClass = getEntityClassByTable(tableName);
if(entityClass != null){
return getPropInfoByClass(entityClass);
@@ -138,7 +136,7 @@ public class BindingCacheManager {
* @param tableName
* @return
*/
- public static synchronized Class getEntityClassByTable(String tableName){
+ public static Class getEntityClassByTable(String tableName) {
EntityInfoCache entityInfoCache = getEntityInfoByTable(tableName);
return entityInfoCache != null? entityInfoCache.getEntityClass() : null;
}
@@ -149,7 +147,7 @@ public class BindingCacheManager {
* @param classSimpleName
* @return
*/
- public static synchronized Class getEntityClassBySimpleName(String classSimpleName){
+ public static Class getEntityClassBySimpleName(String classSimpleName) {
initEntityInfoCache();
return getCacheManager().getCacheObj(CACHE_NAME_ENTITYNAME_CLASS, classSimpleName, Class.class);
}
@@ -159,7 +157,7 @@ public class BindingCacheManager {
* @param table
* @return
*/
- public static synchronized BaseMapper getMapperByTable(String table){
+ public static BaseMapper getMapperByTable(String table) {
EntityInfoCache entityInfoCache = getEntityInfoByTable(table);
if(entityInfoCache != null){
return entityInfoCache.getBaseMapper();
@@ -172,7 +170,7 @@ public class BindingCacheManager {
* @param entityClazz
* @return
*/
- public static synchronized BaseMapper getMapperByClass(Class entityClazz){
+ public static BaseMapper getMapperByClass(Class entityClazz) {
EntityInfoCache entityInfoCache = getEntityInfoByClass(entityClazz);
if(entityInfoCache != null){
return entityInfoCache.getBaseMapper();
@@ -185,13 +183,8 @@ public class BindingCacheManager {
* @param beanClazz
* @return
*/
- public static synchronized List getFields(Class beanClazz){
- List fields = getCacheManager().getCacheObj(CACHE_NAME_CLASS_FIELDS, beanClazz.getName(), List.class);
- if(fields == null){
- fields = BeanUtils.extractAllFields(beanClazz);
- getCacheManager().putCacheObj(CACHE_NAME_CLASS_FIELDS, beanClazz.getName(), fields);
- }
- return fields;
+ public static List getFields(Class beanClazz) {
+ return getCacheManager().getCacheObj(CACHE_NAME_CLASS_FIELDS, beanClazz.getName(), () -> BeanUtils.extractAllFields(beanClazz));
}
/**
@@ -199,14 +192,9 @@ public class BindingCacheManager {
* @param beanClazz
* @return
*/
- public static synchronized List getFields(Class beanClazz, Class annotation){
+ public static List getFields(Class beanClazz, Class annotation) {
String key = S.joinWith(Cons.SEPARATOR_COMMA, beanClazz.getName(), annotation.getName());
- List fields = getCacheManager().getCacheObj(CACHE_NAME_CLASS_FIELDS, key, List.class);
- if(fields == null){
- fields = BeanUtils.extractFields(beanClazz, annotation);
- getCacheManager().putCacheObj(CACHE_NAME_CLASS_FIELDS, key, fields);
- }
- return fields;
+ return getCacheManager().getCacheObj(CACHE_NAME_CLASS_FIELDS, key, () -> BeanUtils.extractFields(beanClazz, annotation));
}
/**
@@ -214,24 +202,17 @@ public class BindingCacheManager {
* @param beanClazz
* @return
*/
- public static Map getFieldsMap(Class beanClazz){
- Map fieldsMap = getCacheManager().getCacheObj(CACHE_NAME_CLASS_NAME2FLDMAP, beanClazz.getName(), Map.class);
- if(fieldsMap == null){
- List fields = getFields(beanClazz);
- fieldsMap = BeanUtils.convertToStringKeyObjectMap(fields, "name");
- getCacheManager().putCacheObj(CACHE_NAME_CLASS_NAME2FLDMAP, beanClazz.getName(), fieldsMap);
- }
- return fieldsMap;
+ public static Map getFieldsMap(Class beanClazz) {
+ return getCacheManager().getCacheObj(CACHE_NAME_CLASS_NAME2FLDMAP, beanClazz.getName(),
+ () -> BeanUtils.convertToStringKeyObjectMap(getFields(beanClazz), "name")
+ );
}
/**
- * 初始化
+ * entity相关信息初始化器, 不返回有意义的值, 仅仅为了线程安全地初始化缓存
*/
- private static void initEntityInfoCache() {
+ private static final BeanInitializer ENTITY_INFO_CACHE_INITIALIZER = BeanInitUtils.lazyInit(() -> {
StaticMemoryCacheManager cacheManager = getCacheManager();
- if (cacheManager.isUninitializedCache(CACHE_NAME_CLASS_ENTITY) == false) {
- return;
- }
// 初始化有service的entity缓存
Map serviceMap = ContextHelper.getApplicationContext().getBeansOfType(IService.class);
Set uniqueEntitySet = new HashSet<>();
@@ -291,18 +272,15 @@ public class BindingCacheManager {
}
}
}
- uniqueEntitySet = null;
- }
+ return null;
+ });
/**
- * 初始化bean的属性缓存
- * @param beanClazz
- * @return
+ * 初始化
*/
- private static PropInfo initPropInfoCache(Class beanClazz) {
- PropInfo propInfoCache = new PropInfo(beanClazz);
- getCacheManager().putCacheObj(CACHE_NAME_CLASS_PROP, beanClazz.getName(), propInfoCache);
- return propInfoCache;
+ private static void initEntityInfoCache() {
+ // 初始化entity相关的缓存
+ ENTITY_INFO_CACHE_INITIALIZER.get();
}
}
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/helper/DeepRelationsBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/helper/DeepRelationsBinder.java
index 550dc4961f25c5a7ef3a8449c9a3c0524e6c4ac6..af07eb8a17fe0d2d8ca72997a5217952d5669cd2 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/helper/DeepRelationsBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/helper/DeepRelationsBinder.java
@@ -47,7 +47,7 @@ public class DeepRelationsBinder {
for(FieldAnnotation anno : deepBindEntityAnnoList){
String entityFieldName = anno.getFieldName();
List entityList = BeanUtils.collectToList(voList, entityFieldName);
- RelationsBinder.bind(entityList, false);
+ RelationsBinder.bind(entityList, true);
}
}
if(V.notEmpty(deepBindEntitiesAnnoList)){
@@ -60,7 +60,7 @@ public class DeepRelationsBinder {
allEntityList.addAll(entityList);
}
}
- RelationsBinder.bind(allEntityList, false);
+ RelationsBinder.bind(allEntityList, true);
}
}
}
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/helper/ResultAssembler.java b/diboot-core/src/main/java/com/diboot/core/binding/helper/ResultAssembler.java
index 2ad7a3daa6fb908ab9fc0ae48a848f8264c79b6e..3b127981b16a70fb888e1da82128d53705cf60f5 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/helper/ResultAssembler.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/helper/ResultAssembler.java
@@ -45,29 +45,44 @@ public class ResultAssembler {
if(V.isEmpty(fromList) || V.isEmpty(valueMatchMap)){
return;
}
- StringBuilder sb = new StringBuilder();
try{
for(E object : fromList){
+ List matchKeys = null;
BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(object);
- sb.setLength(0);
for(int i=0; i 0){
- sb.append(Cons.SEPARATOR_COMMA);
+ Object fieldValueObj = BeanUtils.getProperty(object, getterFields[i]);
+ if(fieldValueObj == null) {
+ continue;
+ }
+ if(fieldValueObj instanceof Collection) {
+ if(matchKeys == null) {
+ matchKeys = new ArrayList();
+ }
+ matchKeys.addAll((Collection) fieldValueObj);
+ }
+ else {
+ if(matchKeys == null) {
+ matchKeys = new ArrayList(getterFields.length);
+ }
+ matchKeys.add(S.clearNonConst(S.valueOf(fieldValueObj)));
}
- sb.append(fieldValue);
+ }
+ if(matchKeys == null) {
+ continue;
}
// 查找匹配Key
- String matchKey = sb.toString();
+ String matchKey = S.join(matchKeys);
if(valueMatchMap.containsKey(matchKey)){
// 赋值
beanWrapper.setPropertyValue(setterFieldName, valueMatchMap.get(matchKey));
}
- else if(V.notEmpty(splitBy) && getterFields.length == 1 && matchKey.contains(splitBy)){
- String[] keys = matchKey.split(splitBy);
- List matchedValues = new ArrayList(keys.length);
- for(String key : keys){
- Object value = valueMatchMap.get(key);
+ else {
+ if(matchKeys.size() == 1 && V.notEmpty(splitBy) && getterFields.length == 1 && matchKey.contains(splitBy)) {
+ matchKeys = S.splitToList(matchKey, splitBy);
+ }
+ List matchedValues = new ArrayList(matchKeys.size());
+ for(Object key : matchKeys){
+ Object value = valueMatchMap.get(S.valueOf(key));
if(value != null){
if(value instanceof Collection){
Collection valueList = (Collection)value;
@@ -88,7 +103,6 @@ public class ResultAssembler {
beanWrapper.setPropertyValue(setterFieldName, matchedValues);
}
}
- sb.setLength(0);
}
catch (Exception e){
log.warn("设置属性值异常, setterFieldName="+setterFieldName, e);
@@ -154,25 +168,41 @@ public class ResultAssembler {
if(V.isEmpty(fromList) || V.isEmpty(valueMatchMap)){
return;
}
- StringBuilder sb = new StringBuilder();
try{
for(E object : fromList){
- sb.setLength(0);
+ List matchKeys = null;
for(int i=0; i0){
- sb.append(Cons.SEPARATOR_COMMA);
+ Object fieldValueObj = BeanUtils.getProperty(object, getterFields[i]);
+ if(fieldValueObj == null) {
+ continue;
+ }
+ if(fieldValueObj instanceof Collection) {
+ if(matchKeys == null) {
+ matchKeys = new ArrayList();
+ }
+ matchKeys.addAll((Collection) fieldValueObj);
+ }
+ else {
+ if(matchKeys == null) {
+ matchKeys = new ArrayList(getterFields.length);
+ }
+ matchKeys.add(S.clearNonConst(S.valueOf(fieldValueObj)));
}
- sb.append(val);
+ }
+ // 无有效值，跳过
+ if(matchKeys == null) {
+ continue;
}
// 查找匹配Key
- String matchKey = sb.toString();
+ String matchKey = S.join(matchKeys);
List entityList = valueMatchMap.get(matchKey);
- if(entityList == null && V.notEmpty(splitBy) && matchKey.contains(splitBy)){
- String[] keys = matchKey.split(splitBy);
- List matchedValues = new ArrayList(keys.length);
- for(String key : keys){
- Object value = valueMatchMap.get(key);
+ if(entityList == null){
+ if (matchKeys.size() == 1 && V.notEmpty(splitBy) && matchKey.contains(splitBy)) {
+ matchKeys = S.splitToList(matchKey, splitBy);
+ }
+ List matchedValues = new ArrayList(matchKeys.size());
+ for(Object key : matchKeys){
+ Object value = valueMatchMap.get(S.valueOf(key));
if(value != null){
if(value instanceof Collection){
Collection valueList = (Collection)value;
@@ -193,16 +223,13 @@ public class ResultAssembler {
entityList = matchedValues;
}
}
- if(entityList != null){
- // 赋值
- BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(object);
- for(int i = 0; i< annoObjSetterPropNameList.size(); i++){
- List valObjList = BeanUtils.collectToList(entityList, refGetterFieldNameList.get(i));
- beanWrapper.setPropertyValue(annoObjSetterPropNameList.get(i), valObjList);
- }
+ // 赋值
+ BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(object);
+ for(int i = 0; i< annoObjSetterPropNameList.size(); i++){
+ List valObjList = BeanUtils.collectToList(entityList, refGetterFieldNameList.get(i));
+ beanWrapper.setPropertyValue(annoObjSetterPropNameList.get(i), valObjList);
}
}
- sb.setLength(0);
}
catch (Exception e){
log.warn("设置属性值异常", e);
@@ -323,16 +350,26 @@ public class ResultAssembler {
List newValueList = new ArrayList();
valueList.forEach( value -> {
if(value != null){
- String valueStr = S.valueOf(value);
- if(valueStr.contains(splitBy)){
- for(String oneVal :valueStr.split(splitBy)){
+ if(value instanceof Collection) {
+ for(Object key : (Collection)value){
+ String oneVal = S.valueOf(key);
if(!newValueList.contains(oneVal)){
newValueList.add(oneVal);
}
}
}
- else if(!newValueList.contains(valueStr)){
- newValueList.add(valueStr);
+ else {
+ String valueStr = S.clearNonConst(S.valueOf(value));
+ if(V.notEmpty(splitBy) && valueStr.contains(splitBy)){
+ for(String oneVal : valueStr.split(splitBy)){
+ if(!newValueList.contains(oneVal)){
+ newValueList.add(oneVal);
+ }
+ }
+ }
+ else if(!newValueList.contains(valueStr)){
+ newValueList.add(valueStr);
+ }
}
}
});
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/helper/ServiceAdaptor.java b/diboot-core/src/main/java/com/diboot/core/binding/helper/ServiceAdaptor.java
index f8a0809c6f8b7e89d7e86414567d6ae5486bbed1..c3379c2eea3e3e80655af0d374f4b9122dde8a20 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/helper/ServiceAdaptor.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/helper/ServiceAdaptor.java
@@ -84,6 +84,9 @@ public class ServiceAdaptor {
return (List)baseService.getEntityList(queryWrapper, pagination);
}
else{
+ if(queryWrapper.getEntityClass() == null) {
+ queryWrapper.setEntityClass(entityClass);
+ }
if(pagination != null){
IPage page = convertToIPage(pagination, entityClass);
page = iService.page(page, queryWrapper);
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/parser/EntityInfoCache.java b/diboot-core/src/main/java/com/diboot/core/binding/parser/EntityInfoCache.java
index 3b11f0a1676154b8ddd27cd8fd86a300deeea180..05fe093662806c2a62736ca0687b09374b46ad59 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/parser/EntityInfoCache.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/parser/EntityInfoCache.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.diboot.core.binding.cache.BindingCacheManager;
import com.diboot.core.util.ContextHelper;
import com.diboot.core.util.S;
+import com.diboot.core.util.V;
import lombok.Getter;
import lombok.Setter;
import org.springframework.core.annotation.AnnotationUtils;
@@ -53,7 +54,7 @@ public class EntityInfoCache implements Serializable {
this.propInfo = BindingCacheManager.getPropInfoByClass(entityClass);
// 初始化tableName
TableName tableNameAnno = AnnotationUtils.findAnnotation(entityClass, TableName.class);
- if(tableNameAnno != null){
+ if(tableNameAnno != null && V.notEmpty(tableNameAnno.value())){
this.tableName = tableNameAnno.value();
}
else{
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/parser/ParserCache.java b/diboot-core/src/main/java/com/diboot/core/binding/parser/ParserCache.java
index f5575ac2250f9b8e14f2844cffcd0b3f9fd9a2fe..11d8ab23959f34c6278bedc9ae615d2da57d40f0 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/parser/ParserCache.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/parser/ParserCache.java
@@ -74,10 +74,9 @@ public class ParserCache {
* @return
*/
public static BindAnnotationGroup getBindAnnotationGroup(Class voClass){
- BindAnnotationGroup group = allVoBindAnnotationCacheMap.get(voClass);
- if(group == null){
+ return allVoBindAnnotationCacheMap.computeIfAbsent(voClass, k -> {
// 获取注解并缓存
- group = new BindAnnotationGroup();
+ BindAnnotationGroup group = new BindAnnotationGroup();
// 获取当前VO的所有字段
List fields = BeanUtils.extractAllFields(voClass);
if(V.notEmpty(fields)){
@@ -108,10 +107,9 @@ public class ParserCache {
}
}
}
- allVoBindAnnotationCacheMap.put(voClass, group);
- }
- // 返回归类后的注解对象
- return group;
+ // 返回归类后的注解对象
+ return group;
+ });
}
/**
@@ -139,7 +137,7 @@ public class ParserCache {
}
else{
TableName tableNameAnno = AnnotationUtils.findAnnotation(entityClass, TableName.class);
- if(tableNameAnno != null){
+ if(tableNameAnno != null && V.notEmpty(tableNameAnno.value())){
return tableNameAnno.value();
}
else{
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/parser/PropInfo.java b/diboot-core/src/main/java/com/diboot/core/binding/parser/PropInfo.java
index 85db8efcbe35398dcfd9533d7b8f462aa393b8af..4044e125c3ba9656d82e6c8f75a8f08ee24646b9 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/parser/PropInfo.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/parser/PropInfo.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.diboot.core.config.BaseConfig;
import com.diboot.core.util.BeanUtils;
import com.diboot.core.util.S;
import com.diboot.core.util.V;
@@ -64,6 +65,15 @@ public class PropInfo implements Serializable {
* @param beanClass
*/
public PropInfo(Class beanClass) {
+ this(beanClass, true);
+ }
+
+ /**
+ * 初始化
+ * @param beanClass
+ * @param isEntityClass 是否为entity实体类（数据库表对应实体）
+ */
+ public PropInfo(Class beanClass, boolean isEntityClass) {
List fields = BeanUtils.extractAllFields(beanClass);
if(V.notEmpty(fields)){
for(Field fld : fields){
@@ -102,15 +112,19 @@ public class PropInfo implements Serializable {
else{
TableLogic tableLogic = fld.getAnnotation(TableLogic.class);
if(tableLogic != null){
- if (V.notEmpty(tableLogic.value())){
- columnName = tableLogic.value();
- }
- else if(columnName == null){
+ if(columnName == null){
columnName = S.toSnakeCase(fldName);
}
this.deletedColumn = columnName;
+ if (V.notEmpty(tableLogic.value())){
+ BaseConfig.setActiveFlagValue(tableLogic.value());
+ }
}
}
+ // 实体类基于默认规则提取列名
+ if(columnName == null && isEntityClass) {
+ columnName = S.toSnakeCase(fldName);
+ }
this.fieldToColumnMap.put(fldName, columnName);
if(V.notEmpty(columnName)){
this.columnToFieldMap.put(columnName, fldName);
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicJoinQueryWrapper.java b/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicJoinQueryWrapper.java
index 7dcfe1bccd34ead5617b657f60e7af2aebc7d788..aa36adf3d1a8bfce7007c2684e9895aa37f94ae4 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicJoinQueryWrapper.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicJoinQueryWrapper.java
@@ -29,7 +29,7 @@ import java.util.List;
* @version v2.0
* @date 2020/04/16
*/
-public class DynamicJoinQueryWrapper extends ExtQueryWrapper {
+public class DynamicJoinQueryWrapper extends ExtQueryWrapper {
public DynamicJoinQueryWrapper(Class dtoClass, Collection fields){
this.dtoClass = dtoClass;
this.fields = fields;
@@ -58,7 +58,7 @@ public class DynamicJoinQueryWrapper extends ExtQueryWrapper {
* @return
*/
@Override
- public E queryOne(Class entityClazz){
+ public T queryOne(Class entityClazz){
return JoinsBinder.queryOne(this, entityClazz);
}
@@ -68,7 +68,7 @@ public class DynamicJoinQueryWrapper extends ExtQueryWrapper {
* @return
*/
@Override
- public List queryList(Class entityClazz){
+ public List queryList(Class entityClazz){
return JoinsBinder.queryList(this, entityClazz);
}
@@ -78,7 +78,7 @@ public class DynamicJoinQueryWrapper extends ExtQueryWrapper {
* @return
*/
@Override
- public List queryList(Class entityClazz, Pagination pagination){
+ public List queryList(Class entityClazz, Pagination pagination){
return JoinsBinder.queryList(this, entityClazz, pagination);
}
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicSqlProvider.java b/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicSqlProvider.java
index b3f396ada55410b0793d506d88d4c0ac2bad9417..1f84d0aabf1a2c8e56b78ade6ecdd525aed715dd 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicSqlProvider.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicSqlProvider.java
@@ -41,6 +41,11 @@ import java.util.Set;
@Slf4j
public class DynamicSqlProvider {
+ /**
+ * select中的占位列前缀标识
+ */
+ public static final String PLACEHOLDER_COLUMN_FLAG = "__";
+
/**
* 构建动态SQL
* @param ew
@@ -69,12 +74,7 @@ public class DynamicSqlProvider {
private String buildDynamicSql(Page page, QueryWrapper ew){
DynamicJoinQueryWrapper wrapper = (DynamicJoinQueryWrapper)ew;
return new SQL() {{
- if(V.isEmpty(ew.getSqlSelect())){
- SELECT_DISTINCT("self.*");
- }
- else{
- SELECT_DISTINCT(formatSqlSelect(ew.getSqlSelect(), page));
- }
+ SELECT_DISTINCT(formatSqlSelect(ew.getSqlSelect(), page));
FROM(wrapper.getEntityTable()+" self");
//提取字段，根据查询条件中涉及的表，动态join
List annoJoinerList = wrapper.getAnnoJoiners();
@@ -131,6 +131,15 @@ public class DynamicSqlProvider {
}
}
}
+ // 存在联表且无where条件，
+ else if(V.notEmpty(annoJoinerList)){
+ // 动态为主表添加is_deleted=0
+ String isDeletedCol = ParserCache.getDeletedColumn(wrapper.getEntityTable());
+ String isDeletedSection = "self."+ isDeletedCol;
+ if(isDeletedCol != null && QueryBuilder.checkHasColumn(segments.getNormal(), isDeletedSection) == false){
+ WHERE(isDeletedSection+ " = " +BaseConfig.getActiveFlagValue());
+ }
+ }
}
}}.toString();
}
@@ -141,21 +150,28 @@ public class DynamicSqlProvider {
* @return
*/
private String formatSqlSelect(String sqlSelect, Page page){
- String[] columns = S.split(sqlSelect);
Set columnSets = new HashSet<>();
StringBuilder sb = new StringBuilder();
- for(int i=0; i0){
- sb.append(Cons.SEPARATOR_COMMA);
+ if(V.isEmpty(sqlSelect)){
+ sb.append("self.*");
+ }
+ else {
+ String[] columns = S.split(sqlSelect);
+ for(int i=0; i0){
+ sb.append(Cons.SEPARATOR_COMMA);
+ }
+ sb.append("self.").append(column);
+ columnSets.add("self."+column);
}
- sb.append("self.").append(column);
- columnSets.add("self."+column);
}
- if(page != null && page.getOrders() != null) {
- for(OrderItem orderItem : page.getOrders()){
- if(!columnSets.contains(orderItem.getColumn())){
- sb.append(Cons.SEPARATOR_COMMA).append(orderItem.getColumn()).append(" AS _").append(S.replace(orderItem.getColumn(), ".", "_"));
+ if(page != null && page.orders() != null) {
+ for(OrderItem orderItem : page.orders()){
+ if((V.isEmpty(sqlSelect) && !S.startsWith(orderItem.getColumn(), "self."))
+ || !columnSets.contains(orderItem.getColumn())
+ ){
+ sb.append(Cons.SEPARATOR_COMMA).append(orderItem.getColumn()).append(" AS ").append(PLACEHOLDER_COLUMN_FLAG).append(S.replace(orderItem.getColumn(), ".", "_"));
}
}
}
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/ExtQueryWrapper.java b/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/ExtQueryWrapper.java
index 3b9c64d6ce1e019adc2d3c96d606c68ba6b308b7..1b159632a6dec58f17bb188876cc68f7557fd158 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/ExtQueryWrapper.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/ExtQueryWrapper.java
@@ -33,19 +33,22 @@ import java.util.List;
* @version v2.0
* @date 2020/04/16
*/
-public class ExtQueryWrapper extends QueryWrapper