文档说明

src/main/java/com/neotel/smfcore/common/bean/BetweenData.java

+package com.neotel.smfcore.common.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by sunke on 2021/7/22.
+ */
+@Data
+@ApiModel
+public class BetweenData<T> {
+    @ApiModelProperty(value = "起始值")
+    private T from;
+
+    @ApiModelProperty(value = "结束值")
+    private T to;
+}

src/main/java/com/neotel/smfcore/common/utils/QueryHelp.java

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.annotation.QueryCondition;
+import com.neotel.smfcore.common.bean.BetweenData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -44,7 +45,7 @@ public class QueryHelp {
                         if (ObjectUtil.isNotEmpty(blurry)) {
 
                             List<Criteria> orCriterialList = Lists.newArrayList();
-                            Criteria orCriterial = new Criteria();
+//                            Criteria orCriterial = new Criteria();
                             for (String s : blurrys) {
                                 Pattern pattern = Pattern.compile(escapeExprSpecialWord(val.toString()), Pattern.CASE_INSENSITIVE);
                                 //criteria = criteria.and(s).regex(pattern);
@@ -107,12 +108,17 @@ public class QueryHelp {
                                 allCriteria.add(Criteria.where(attributeName).exists(true));
                                 break;
                             case BETWEEN:
-                                List<Object> between = new ArrayList<>((List<Object>)val);
+                                BetweenData<Object> between = (BetweenData<Object>)val;
                                 //criteria = criteria.and(attributeName).gte(between.get(0)).lte(between.get(1));
-                                Object start = between.get(0);
-                                Object end = between.get(1);
-                                allCriteria.add(Criteria.where(attributeName).gte(start));
-                                allCriteria.add(Criteria.where(attributeName).lte(between.get(1)));
+                                Object from = between.getFrom();
+                                Object to = between.getTo();
+                                if(ObjectUtil.isNotEmpty(from)){
+                                    allCriteria.add(Criteria.where(attributeName).gte(from));
+                                }
+
+                                if(ObjectUtil.isNotEmpty(to)){
+                                    allCriteria.add(Criteria.where(attributeName).lte(to));
+                                }
                                 break;
                             default: break;
                         }
@@ -123,7 +129,7 @@ public class QueryHelp {
                 log.error(e.getMessage(), e);
             }
         }
-        if(allCriteria.size()<=0){
+        if(allCriteria.isEmpty()){
             return new Query();
         }
         return new Query(new Criteria().andOperator(allCriteria));

src/main/java/com/neotel/smfcore/core/order/rest/bean/query/OrderQueryCondition.java

@@ -2,6 +2,7 @@
 package com.neotel.smfcore.core.order.rest.bean.query;
 
 import com.neotel.smfcore.common.annotation.QueryCondition;
+import com.neotel.smfcore.common.bean.BetweenData;
 import lombok.Data;
 
 import java.util.Date;
@@ -14,7 +15,7 @@ public class OrderQueryCondition {
     private String blurry;
 
     @QueryCondition(type = QueryCondition.Type.BETWEEN)
-    private List<Date> createTime;
+    private BetweenData<Date> createDate;
 
     @QueryCondition(type = QueryCondition.Type.IN, propName = "source")
     private List<String> sourceList;

src/main/java/com/neotel/smfcore/core/system/rest/bean/query/TaskQueryCondition.java

@@ -2,6 +2,9 @@
 package com.neotel.smfcore.core.system.rest.bean.query;
 
 import com.neotel.smfcore.common.annotation.QueryCondition;
+import com.neotel.smfcore.common.bean.BetweenData;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -9,21 +12,26 @@ import java.util.Date;
 import java.util.List;
 
 @Data
+@ApiModel("查询条件")
 public class TaskQueryCondition {
 
     @QueryCondition(blurry = "barcode,partNumber,posName,sourceName,subSourceInfo,memo")
+    @ApiModelProperty("模糊搜索")
     private String blurry;
 
     @QueryCondition
+    @ApiModelProperty("条码编号")
     private String barcode;
 
-    @QueryCondition(type = QueryCondition.Type.BETWEEN)
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private List<Date> updateDate;
+    @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "updateDate")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private BetweenData<Date> updateDate;
 
     @QueryCondition(type = QueryCondition.Type.IN, propName = "status")
+    @ApiModelProperty("任务状态")
     private List<String> statusList;
 
     @QueryCondition
+    @ApiModelProperty("料仓Id")
     private String storageId;
 }

src/main/java/com/neotel/smfcore/security/rest/RoleController.java

@@ -14,6 +14,8 @@ import com.neotel.smfcore.security.service.manager.IUserManager;
 import com.neotel.smfcore.security.service.po.Role;
 import com.neotel.smfcore.security.service.po.User;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -46,7 +48,10 @@ public class RoleController {
     @Autowired
     private RoleMapper roleMapper;
 
-    @ApiOperation("获取单个role")
+    @ApiOperation(value="获取单个role ",notes = "权限:roles:list")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "角色的ID",required=true)
+    })
     @GetMapping(value = "/{id}")
     @PreAuthorize("@el.check('roles:list')")
     public RoleDto query(@PathVariable String id){

src/main/java/com/neotel/smfcore/security/rest/bean/query/GroupQueryCriteria.java

 package com.neotel.smfcore.security.rest.bean.query;
 
 import com.neotel.smfcore.common.annotation.QueryCondition;
+import com.neotel.smfcore.common.bean.BetweenData;
 
 import java.util.Date;
 import java.util.List;
@@ -10,7 +11,7 @@ public class GroupQueryCriteria {
     private String blurry;
 
     @QueryCondition(type = QueryCondition.Type.BETWEEN)
-    private List<Date> createTime;
+    private BetweenData<Date> createDate;
 
     @QueryCondition
     private String id;

src/main/java/com/neotel/smfcore/security/rest/bean/query/MenuQueryCondition.java

@@ -2,6 +2,7 @@
 package com.neotel.smfcore.security.rest.bean.query;
 
 import com.neotel.smfcore.common.annotation.QueryCondition;
+import com.neotel.smfcore.common.bean.BetweenData;
 import lombok.Data;
 
 import java.util.Date;
@@ -14,7 +15,7 @@ public class MenuQueryCondition {
     private String blurry;
 
     @QueryCondition(type = QueryCondition.Type.BETWEEN)
-    private List<Date> createTime;
+    private BetweenData<Date> createDate;
 
     @QueryCondition(type = QueryCondition.Type.IS_NULL, propName = "pid")
     private Boolean pidIsNull;

src/main/java/com/neotel/smfcore/security/rest/bean/query/RoleQueryCriteria.java

 package com.neotel.smfcore.security.rest.bean.query;
 
 import com.neotel.smfcore.common.annotation.QueryCondition;
+import com.neotel.smfcore.common.bean.BetweenData;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy;
 
 import java.io.Serializable;
 import java.sql.Timestamp;
+import java.util.Date;
 import java.util.List;
 
+@ApiModel
 public class RoleQueryCriteria implements Serializable {
+    @ApiModelProperty("模糊查询")
     @QueryCondition(blurry = "name,description")
     private String blurry;
 
     @QueryCondition(type = QueryCondition.Type.BETWEEN)
-    private List<Timestamp> createTime;
+    private BetweenData<Date> createDate;
     @QueryCondition
     private String id;
 }

src/main/java/com/neotel/smfcore/security/rest/bean/query/UserQueryCriteria.java

 package com.neotel.smfcore.security.rest.bean.query;
 
+import com.google.common.collect.Range;
 import com.neotel.smfcore.common.annotation.QueryCondition;
+import com.neotel.smfcore.common.bean.BetweenData;
 import lombok.Data;
 import org.springframework.data.mongodb.repository.Query;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.sql.Timestamp;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.Date;
 @Data
 public class UserQueryCriteria implements Serializable {
     @QueryCondition
@@ -24,5 +24,7 @@ public class UserQueryCriteria implements Serializable {
     private String roleId;
 
     @QueryCondition(type = QueryCondition.Type.BETWEEN)
-    private List<Timestamp> createTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private BetweenData<Date> createDate;
+
 }