更新分页问题

archives/src/main/java/com/storeroom/modules/dictionary/controller/DictrionaryController.java

@@ -16,10 +16,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -32,15 +29,15 @@ public class DictrionaryController {
     private final DictionaryService dictionaryService;
 
     @ApiOperation("字典目录")
-//    @GetMapping("/menu")
-    @AnonymousGetMapping(value = "/menu")
+    @GetMapping("/menu")
+//    @AnonymousGetMapping(value = "/menu")
     public ApiResponse<Object> menu(){
         return ApiResponse.success(dictionaryService.findDictrionaryMenu());
     }
 
     @ApiOperation("编辑字典")
-//    @GetMapping("/edit")
-    @AnonymousPostMapping(value = "/edit")
+    @PostMapping("/edit")
+//    @AnonymousPostMapping(value = "/edit")
     public ApiResponse<Object> edit(
         @Validated @RequestBody DictionaryDTO dto
     ){
@@ -50,8 +47,8 @@ public class DictrionaryController {
     }
 
     @ApiOperation("删除字典")
-//    @GetMapping("/delete")
-    @AnonymousPostMapping(value = "/delete")
+    @PostMapping("/delete")
+//    @AnonymousPostMapping(value = "/delete")
     public ApiResponse<Object> delete(
         @Validated @RequestBody PrimaryDTO dto
     ){
@@ -60,8 +57,8 @@ public class DictrionaryController {
     }
 
     @ApiOperation("根据字典id分页查询子集")
-//    @GetMapping("/findSubsetById")
-    @AnonymousGetMapping(value = "/findSubsetById")
+    @GetMapping("/findSubsetById")
+//    @AnonymousGetMapping(value = "/findSubsetById")
     public ApiResponse<Object> findSubsetById(
         DictionaryQueryCriteria criteria,Pageable page
     ){

archives/src/main/java/com/storeroom/modules/dictionary/controller/FieldController.java

@@ -13,9 +13,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequiredArgsConstructor
@@ -26,8 +24,8 @@ public class FieldController {
     private final FieldService fieldService;
 
     @ApiOperation("编辑字段表")
-//    @GetMapping("/edit")
-    @AnonymousPostMapping(value = "/edit")
+    @PostMapping("/edit")
+//    @AnonymousPostMapping(value = "/edit")
     public ApiResponse<Object> edit(
         @Validated @RequestBody FieldDTO dto
     ){
@@ -37,8 +35,8 @@ public class FieldController {
     }
 
     @ApiOperation("分类查询字段表")
-//    @GetMapping("/findGroupType")
-    @AnonymousGetMapping(value = "/findGroupType")
+    @GetMapping("/findGroupType")
+//    @AnonymousGetMapping(value = "/findGroupType")
     public ApiResponse<Object> findGroupType(
         Integer is_type
     ){

archives/src/main/java/com/storeroom/modules/dictionary/service/DictionaryService.java

@@ -16,5 +16,5 @@ public interface DictionaryService {
     //删除字典信息
     void delete(String dictionaryId);
     //根据字典id查询子集
-    ResultUtils<List<DictionaryVO>> findSubsetById(String id, Pageable pageable);
+    Object findSubsetById(String id, Pageable pageable);
 }

archives/src/main/java/com/storeroom/modules/dictionary/service/impl/DictionaryServiceImpl.java

@@ -8,6 +8,7 @@ import com.storeroom.modules.dictionary.service.DictionaryService;
 import com.storeroom.modules.dictionary.service.dto.DictionaryDTO;
 import com.storeroom.utils.MapUtil;
 import com.storeroom.utils.PageSort;
+import com.storeroom.utils.PageUtil;
 import com.storeroom.utils.ResultUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CacheConfig;
@@ -76,13 +77,13 @@ public class DictionaryServiceImpl implements DictionaryService {
     }
 
     @Override
-    public ResultUtils<List<DictionaryVO>> findSubsetById(String id, Pageable pageable) {
+    public Object findSubsetById(String id, Pageable pageable) {
         PageRequest page= PageSort.pageRequest(pageable.getPageNumber(), pageable.getPageSize(), "dic_sequence", Sort.Direction.ASC);
         //分页查询
         Page<Map<String,Object>> pageMap = dictionaryRepository.findSubsetById(id,page);
         //初始化分页返回数据
-        List<DictionaryVO> deviceVOList = MapUtil.setList(pageMap.getContent(),DictionaryVO.class);
-        return ResultUtils.getResult(deviceVOList,pageMap);
+//        List<DictionaryVO> deviceVOList = MapUtil.setList(pageMap.getContent(),DictionaryVO.class);
+        return PageUtil.toPage(pageMap);
     }
 
     private List<String> getChildId(String id,List<String> deleteIds){

archives/src/main/java/com/storeroom/modules/dictionary/service/impl/FieldServiceImpl.java

@@ -27,7 +27,7 @@ public class FieldServiceImpl implements FieldService {
             field.setCreateBy(userName);
         }
         String origId = fieldRepository.findIdFirstByFieldName(dto.getFieldName());
-        if(null != origId && origId.equals(dto.getId())){
+        if(null != origId && !origId.equals(dto.getId())){
             return "已存在该字段";
         }
         field.setFieldName(dto.getFieldName());