commit code

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

@@ -2,6 +2,7 @@ package com.storeroom.modules.dictionary.controller;
 
 
 import com.storeroom.annotaion.rest.AnonymousPostMapping;
+import com.storeroom.annotaion.rest.AnonymousPutMapping;
 import com.storeroom.exception.BaseException;
 import com.storeroom.modules.dictionary.service.ArchivesDictionaryService;
 import com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO;
@@ -16,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Set;
+
 @Api(tags = "列表界面设置")
 @RestController
 @RequiredArgsConstructor
@@ -27,11 +30,21 @@ public class ArchivesListSettingController {
 
     @ApiOperation("新增列表显示设置")
     @AnonymousPostMapping("create")
-    public ApiResponse<Object> create(@RequestBody ArchivesDisplaySmallDTO archivesDisplaySmallDTO){
-        if (!StringUtils.isEmpty(archivesDisplaySmallDTO.getId())){
+    public ApiResponse<Object> create(@RequestBody ArchivesDisplaySmallDTO archivesDisplaySmallDTO) {
+        if (!StringUtils.isEmpty(archivesDisplaySmallDTO.getId())) {
             archivesDictionaryService.createListDisplay(archivesDisplaySmallDTO);
             return ApiResponse.success(ResponseStatus.SUCCESS);
         }
         throw new BaseException("id异常");
     }
+
+    @ApiOperation("修改排序")
+    @AnonymousPutMapping("display-order")
+    public ApiResponse<Object> updateDisplayOrder(@RequestBody Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTO) {
+        if (archivesDisplaySmallDTO.size() != 0) {
+            archivesDictionaryService.updateDisplaryOrder(archivesDisplaySmallDTO);
+            return ApiResponse.success(ResponseStatus.SUCCESS);
+        }
+        throw new BaseException("id异常");
+    }
 }

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

@@ -0,0 +1,39 @@
+package com.storeroom.modules.dictionary.controller;
+
+
+import com.storeroom.annotaion.rest.AnonymousPutMapping;
+import com.storeroom.exception.BaseException;
+import com.storeroom.modules.dictionary.service.ArchivesDictionaryService;
+import com.storeroom.modules.dictionary.service.dto.ArchivesDisplaySmallDTO;
+import com.storeroom.utils.ApiResponse;
+import com.storeroom.utils.enums.ResponseStatus;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Set;
+
+@RestController
+@Api(tags = "浏览列表排序规则设置")
+@RequiredArgsConstructor
+@RequestMapping("/api/arc-list-sort/")
+public class ArchivesListSortController {
+
+    private final ArchivesDictionaryService archivesDictionaryService;
+
+
+
+    @ApiOperation("修改queue序列排序")
+    @AnonymousPutMapping("update-queue")
+    public ApiResponse<Object> updateArcQueue(@RequestBody Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTOS) {
+        if (archivesDisplaySmallDTOS.size() != 0 && archivesDisplaySmallDTOS.size() > 1) {
+                archivesDictionaryService.updateQueue(archivesDisplaySmallDTOS);
+                return ApiResponse.success(ResponseStatus.SUCCESS);
+        }
+        throw new BaseException("数据异常");
+    }
+
+}

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

@@ -85,7 +85,18 @@ public interface ArchivesDictionaryService {
     void createListDisplay(ArchivesDisplaySmallDTO archivesDisplaySmallDTO);
 
 
+    /**
+     * 修改列表显示排序
+     * @param archivesDisplaySmallDTO /
+     */
+    void updateDisplaryOrder(Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTO);
+
 
+    /**
+     * 修改序列
+     * @param archivesDisplaySmallDTO /
+     */
+    void updateQueue(Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTO);
 
 
 }

archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionarySmallDTO.java

@@ -14,5 +14,5 @@ public class ArchivesDictionarySmallDTO implements Serializable {
     @NotNull
     private String id;
 
-    private Integer sort;
+    private Integer isSequence;
 }

archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDisplaySmallDTO.java

@@ -20,11 +20,17 @@ public class ArchivesDisplaySmallDTO implements Serializable {
     //显示状态
     private Boolean isDisplay;
 
-    //排序
-    private Integer sort;
-
     //升降排序
     private String displayOrderBy;
 
+    //浏览排序
+    private Integer displayOrder;
+
+    //排序
+    private Integer isSequence;
+
+    //序号
+    private Integer queue;
+
 
 }

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

@@ -128,7 +128,7 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
         List<ArchivesDictionary> list = new ArrayList<>();
         for (ArchivesDictionarySmallDTO ar : archivesDictionaryDTO) {
             ArchivesDictionary ad = archivesDictionaryRepository.findById(ar.getId()).orElseGet(ArchivesDictionary::new);
-            ad.setIsSequence(ar.getSort());
+            ad.setIsSequence(ar.getIsSequence());
             list.add(ad);
         }
         archivesDictionaryRepository.saveAll(list);
@@ -143,7 +143,7 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
             ad.setIsDisplay(ar.getIsDisplay());
             ad.setDisplayformatType(ar.getDisplayformatType());
             ad.setDisplayLength(ar.getDisplayLength());
-            ad.setIsSequence(ar.getSort());
+            ad.setIsSequence(ar.getIsSequence());
             ad.setDisplayOrderBy(ar.getDisplayOrderBy());
             list.add(ad);
         }
@@ -179,4 +179,30 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
 
     }
 
+    @Override
+    public void updateDisplaryOrder(Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTO) {
+        archivesDisplaySmallDTO.forEach(item->{
+            ArchivesDictionary archivesDictionary = archivesDictionaryRepository.findById(item.getId()).orElseGet(ArchivesDictionary::new);
+            if (archivesDictionary!=null){
+                archivesDictionary.setDisplayOrder(item.getDisplayOrder());
+                archivesDictionaryRepository.save(archivesDictionary);
+            }else {
+                throw new BaseException("没有找到数据");
+            }
+        });
+    }
+
+    @Override
+    public void updateQueue(Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTO) {
+        archivesDisplaySmallDTO.forEach(item->{
+            ArchivesDictionary archivesDictionary = archivesDictionaryRepository.findById(item.getId()).orElseGet(ArchivesDictionary::new);
+            if (archivesDictionary!=null){
+                archivesDictionary.setQueue(item.getQueue());
+                archivesDictionaryRepository.save(archivesDictionary);
+            }else {
+                throw new BaseException("没有找到数据");
+            }
+        });
+    }
+
 }