字典类型分页修改

.idea/compiler.xml

@@ -7,10 +7,10 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <module name="base-admin" />
+        <module name="hazard-admin" />
         <module name="hazard-sdk" />
         <module name="business-service" />
-        <module name="hazard-admin" />
-        <module name="base-admin" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>

hazard-admin/src/main/java/com/ozs/web/controller/system/SysDictDataController.java

@@ -3,8 +3,15 @@ package com.ozs.web.controller.system;
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.common.core.domain.vo.SysDictDataVo;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,28 +39,67 @@ import com.ozs.system.service.ISysDictTypeService;
  */
 @RestController
 @RequestMapping("/system/dict/data")
-public class SysDictDataController extends BaseController
-{
+public class SysDictDataController extends BaseController {
     @Autowired
     private ISysDictDataService dictDataService;
 
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SysDictData dictData)
-    {
-        startPage();
-        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
-        return getDataTable(list);
+//    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(SysDictData dictData)
+//    {
+//        startPage();
+//        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+//        return getDataTable(list);
+//    }
+
+    /**
+     * 获取字典数据列表
+     *
+     * @param sysDictDataVo
+     * @return
+     */
+    @ApiOperation(value = "获取字典类型列表")
+    @PostMapping("/list")
+    public AjaxResult list(@RequestBody SysDictDataVo sysDictDataVo) {
+        LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<SysDictData>();
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getDictCode())) {
+            wrapper.like(SysDictData::getDictCode, sysDictDataVo.getDictCode());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getDictSort())) {
+            wrapper.like(SysDictData::getDictSort, sysDictDataVo.getDictSort());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getDictLabel())) {
+            wrapper.like(SysDictData::getDictLabel, sysDictDataVo.getDictLabel());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getDictValue())) {
+            wrapper.like(SysDictData::getDictValue, sysDictDataVo.getDictValue());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getDictType())) {
+            wrapper.like(SysDictData::getDictType, sysDictDataVo.getDictType());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getCssClass())) {
+            wrapper.like(SysDictData::getCssClass, sysDictDataVo.getCssClass());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getListClass())) {
+            wrapper.like(SysDictData::getListClass, sysDictDataVo.getListClass());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getIsDefault())) {
+            wrapper.like(SysDictData::getIsDefault, sysDictDataVo.getIsDefault());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getStatus())) {
+            wrapper.like(SysDictData::getStatus, sysDictDataVo.getStatus());
+        }
+        IPage<SysDictData> page = dictDataService.page(new Page<>(sysDictDataVo.getPageNum(), sysDictDataVo.getPageSize()), wrapper);
+        return AjaxResult.success(page);
     }
 
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysDictData dictData)
-    {
+    public void export(HttpServletResponse response, SysDictData dictData) {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
         util.exportExcel(response, list, "字典数据");

hazard-admin/src/main/java/com/ozs/web/controller/system/SysDictTypeController.java

@@ -1,9 +1,21 @@
 package com.ozs.web.controller.system;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.common.core.domain.entity.SysDept;
+import com.ozs.common.core.domain.entity.SysRole;
+import com.ozs.common.core.domain.entity.SysUser;
+import com.ozs.common.core.domain.vo.SysDictTypeVo;
+import com.ozs.common.core.domain.vo.SysUserVo;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,25 +42,52 @@ import com.ozs.system.service.ISysDictTypeService;
  */
 @RestController
 @RequestMapping("/system/dict/type")
-public class SysDictTypeController extends BaseController
-{
+public class SysDictTypeController extends BaseController {
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SysDictType dictType)
-    {
-        startPage();
-        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
-        return getDataTable(list);
+//    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(SysDictType dictType)
+//    {
+//        startPage();
+//        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+//        return getDataTable(list);
+//    }
+
+    /**
+     * 获取字典类型列表
+     *
+     * @param sysDictTypeVo
+     * @return
+     */
+    @ApiOperation(value = "获取字典类型列表")
+    @PostMapping("/list")
+    public AjaxResult list(@RequestBody SysDictTypeVo sysDictTypeVo) {
+        LambdaQueryWrapper<SysDictType> wrapper = new LambdaQueryWrapper<SysDictType>();
+        if (!ObjectUtils.isEmpty(sysDictTypeVo.getDictId())) {
+            wrapper.like(SysDictType::getDictId, sysDictTypeVo.getDictId());
+        }
+        if (!ObjectUtils.isEmpty(sysDictTypeVo.getDataType())) {
+            wrapper.like(SysDictType::getDataType, sysDictTypeVo.getDataType());
+        }
+        if (!ObjectUtils.isEmpty(sysDictTypeVo.getDictName())) {
+            wrapper.like(SysDictType::getDictName, sysDictTypeVo.getDictName());
+        }
+        if (!ObjectUtils.isEmpty(sysDictTypeVo.getDictType())) {
+            wrapper.like(SysDictType::getDictType, sysDictTypeVo.getDictType());
+        }
+        if (!ObjectUtils.isEmpty(sysDictTypeVo.getStatus())) {
+            wrapper.like(SysDictType::getStatus, sysDictTypeVo.getStatus());
+        }
+        IPage<SysDictType> page = dictTypeService.page(new Page<>(sysDictTypeVo.getPageNum(), sysDictTypeVo.getPageSize()), wrapper);
+        return AjaxResult.success(page);
     }
 
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysDictType dictType)
-    {
+    public void export(HttpServletResponse response, SysDictType dictType) {
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
         ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
         util.exportExcel(response, list, "字典类型");