UTC时间根据区域返回对应区域时间

user-common/src/main/java/com/poyee/req/SysDictDataQueryReq.java

@@ -1,11 +1,9 @@
 package com.poyee.req;
 
-import com.poyee.req.page.Page;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
@@ -13,12 +11,11 @@ import java.io.Serializable;
 /**
  * 字典数据查询参数
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel("字典数据查询Request")
 @NoArgsConstructor
 @AllArgsConstructor
-public class SysDictDataQueryReq extends Page implements Serializable {
+public class SysDictDataQueryReq implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -28,15 +25,10 @@ public class SysDictDataQueryReq extends Page implements Serializable {
     @ApiModelProperty("字典类型")
     private String dictType;
 
-    /**
-     * 字典标签
-     */
-    @ApiModelProperty("字典标签")
-    private String label;
 
-    /**
-     * 状态（0正常 1停用）
-     */
-    @ApiModelProperty("状态（0正常 1停用）")
-    private Integer status;
+    @ApiModelProperty("关键字搜索")
+    private String keywords;
+
+    @ApiModelProperty("条件类型 label  value")
+    private String condition;
 }

user-web/src/main/java/com/poyee/controller/SysDictDataController.java

@@ -28,8 +28,8 @@ public class SysDictDataController {
     private final ISysDictDataFacade sysDictDataFacade;
 
     @PostMapping("/list")
-    @ApiOperation("分页查询字典数据列表")
-    public Result<PageInfo<SysDictDataRes>> list(@RequestBody SysDictDataQueryReq query) {
+    @ApiOperation("查询字典数据列表")
+    public Result<List<SysDictDataRes>> list(@RequestBody SysDictDataQueryReq query) {
         return Result.success(sysDictDataFacade.list(query));
     }
 

user-web/src/main/java/com/poyee/controller/SysDictTypeController.java

@@ -28,8 +28,8 @@ public class SysDictTypeController {
     private final ISysDictTypeFacade sysDictTypeFacade;
 
     @PostMapping("/list")
-    @ApiOperation("分页查询字典类型列表")
-    public Result<PageInfo<SysDictTypeRes>> list(@RequestBody SysDictTypeQueryReq query) {
+    @ApiOperation("查询字典类型列表(左侧菜单)")
+    public Result<List<SysDictTypeRes>> list(@RequestBody SysDictTypeQueryReq query) {
         return Result.success(sysDictTypeFacade.list(query));
     }
 
@@ -63,6 +63,5 @@ public class SysDictTypeController {
         return Result.success(sysDictTypeFacade.dropdown());
     }
 
-    //TODO 图片上传等ossKey secret
 
 }

user-web/src/main/java/com/poyee/facade/ISysDictDataFacade.java

@@ -19,7 +19,7 @@ public interface ISysDictDataFacade {
      * @param query 查询参数
      * @return 分页结果
      */
-    PageInfo<SysDictDataRes> list(SysDictDataQueryReq query);
+    List<SysDictDataRes> list(SysDictDataQueryReq query);
 
     /**
      * 查询字典数据详情

user-web/src/main/java/com/poyee/facade/ISysDictTypeFacade.java

@@ -19,7 +19,7 @@ public interface ISysDictTypeFacade {
      * @param query 查询参数
      * @return 分页结果
      */
-    PageInfo<SysDictTypeRes> list(SysDictTypeQueryReq query);
+    List<SysDictTypeRes> list(SysDictTypeQueryReq query);
 
     /**
      * 查询字典类型详情

user-web/src/main/java/com/poyee/facade/impl/SysDictDataFacade.java

@@ -36,26 +36,22 @@ public class SysDictDataFacade implements ISysDictDataFacade {
     private final SysDictMapStruct sysDictMapStruct;
 
     @Override
-    public PageInfo<SysDictDataRes> list(SysDictDataQueryReq query) {
-        PageHelper.startPage(query.getPage(), query.getPageSize());
+    public List<SysDictDataRes>  list(SysDictDataQueryReq query) {
         LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
         if (StrUtil.isNotBlank(query.getDictType())) {
             wrapper.eq(SysDictData::getDictType, query.getDictType());
         }
-        if (StrUtil.isNotBlank(query.getLabel())) {
-            wrapper.likeRight(SysDictData::getLabel, query.getLabel());
-        }
-        if (Objects.nonNull(query.getStatus())) {
-            wrapper.eq(SysDictData::getStatus, query.getStatus());
+        if (StrUtil.isNotBlank(query.getCondition()) && StrUtil.isNotBlank(query.getKeywords())) {
+            if (query.getCondition().equals("label")) {
+                wrapper.like(SysDictData::getLabel, query.getKeywords());
+            }else{
+                wrapper.like(SysDictData::getValue, query.getKeywords());
+            }
         }
         wrapper.eq(SysDictData::getDeleteFlag, StatusEnum.FALSE.getCode());
         wrapper.orderByAsc(SysDictData::getSort);
-        wrapper.orderByDesc(SysDictData::getCreateTime);
         List<SysDictData> list = sysDictDataService.list(wrapper);
-        if (CollUtil.isEmpty(list)) {
-            return PageInfo.emptyPageInfo();
-        }
-        return PageInfo.of(sysDictMapStruct.toDataResList(list));
+        return sysDictMapStruct.toDataResList(list);
     }
 
     @Override

user-web/src/main/java/com/poyee/facade/impl/SysDictTypeFacade.java

@@ -36,7 +36,7 @@ public class SysDictTypeFacade implements ISysDictTypeFacade {
     private final SysDictMapStruct sysDictMapStruct;
 
     @Override
-    public PageInfo<SysDictTypeRes> list(SysDictTypeQueryReq query) {
+    public List<SysDictTypeRes> list(SysDictTypeQueryReq query) {
         PageHelper.startPage(query.getPage(), query.getPageSize());
         LambdaQueryWrapper<SysDictType> wrapper = new LambdaQueryWrapper<>();
         if (StrUtil.isNotBlank(query.getDictName())) {
@@ -52,9 +52,9 @@ public class SysDictTypeFacade implements ISysDictTypeFacade {
         wrapper.orderByDesc(SysDictType::getCreateTime);
         List<SysDictType> list = sysDictTypeService.list(wrapper);
         if (CollUtil.isEmpty(list)) {
-            return PageInfo.emptyPageInfo();
+            return CollUtil.newArrayList();
         }
-        return PageInfo.of(sysDictMapStruct.toTypeResList(list));
+        return sysDictMapStruct.toTypeResList(list);
     }
 
     @Override