新增门类排序等接口

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

@@ -11,6 +11,7 @@ import com.storeroom.modules.common.ArchivesTypeEnum;
 import com.storeroom.modules.dictionary.service.ArchivesDictionaryService;
 import com.storeroom.modules.dictionary.service.ArchivesTypeService;
 import com.storeroom.modules.dictionary.service.DictionaryService;
+import com.storeroom.modules.dictionary.service.dto.ArcDicSmallDTO;
 import com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO;
 import com.storeroom.modules.dictionary.service.dto.ArchivesTypeDTO;
 import com.storeroom.utils.ApiResponse;
@@ -80,7 +81,7 @@ public class ArchivesTypeController {
     }
 
 
-    @ApiOperation("删除门类类型")
+    @ApiOperation("删除门类类型菜单")
     @AnonymousDeleteMapping("delete-type")
     public ApiResponse<Object> deleteType(@RequestParam String id) {
         if (!StringUtils.isEmpty(id)) {
@@ -150,4 +151,21 @@ public class ArchivesTypeController {
         return ApiResponse.success(dictionaryService.findDictrionaryMenu());
 
     }
+
+    @ApiOperation("删除门类字典字段")
+    @AnonymousDeleteMapping("delete-dic")
+    public ApiResponse<Object> delete(@RequestParam String id) {
+        if (!StringUtils.isEmpty(id)) {
+            archivesDictionaryService.delete(id);
+            return ApiResponse.success(ResponseStatus.SUCCESS);
+        }
+        throw new BaseException("id异常");
+    }
+
+    @ApiOperation("修改排序")
+    @AnonymousPutMapping("sort")
+    public ApiResponse<Object> upSort(@Validated @RequestBody Set<ArcDicSmallDTO> arcDicSmallDTO){
+        archivesTypeService.updateSort(arcDicSmallDTO);
+        return ApiResponse.success(ResponseStatus.SUCCESS);
+    }
 }

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

@@ -44,4 +44,11 @@ public interface ArchivesDictionaryService {
      */
     void create(ArchivesDictionaryDTO arcdicDto);
 
+
+    /**
+     * 删除门类字典字段
+     * @param id 字段id
+     */
+    void delete(String id);
+
 }

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

@@ -2,9 +2,11 @@ package com.storeroom.modules.dictionary.service;
 
 
 
+import com.storeroom.modules.dictionary.service.dto.ArcDicSmallDTO;
 import com.storeroom.modules.dictionary.service.dto.ArchivesTypeDTO;
 
 import java.util.List;
+import java.util.Set;
 
 
 public interface ArchivesTypeService {
@@ -37,8 +39,10 @@ public interface ArchivesTypeService {
     void delete(String id);
 
 
-
-
+    /**
+     *
+     */
+    void updateSort(Set<ArcDicSmallDTO> arcDicSmallDTO);
 
 
 }

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

@@ -0,0 +1,24 @@
+package com.storeroom.modules.dictionary.service.dto;
+
+import com.storeroom.base.BaseDTO;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+
+@Getter
+@Setter
+public class ArcDicSmallDTO implements Serializable {
+
+    @NotNull
+    private String id;
+
+    @NotNull
+    private Integer sort;
+
+
+}

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

@@ -61,6 +61,7 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
         dictionary1.setFieldName(dictionary.getFieldName());
         dictionary1.setFieldCnName(dictionary.getFieldCnName());
         dictionary1.setIsDefaultValue(dictionary.getIsDefaultValue());
+        dictionary1.setDictionaryConfigId(dictionary.getDictionaryConfigId());
         dictionary1.setIsInput(dictionary.getIsInput());
         dictionary1.setIsInputClass(dictionary.getIsInputClass());
         dictionary1.setIsDataTypeDetails(dictionary.getIsDataTypeDetails());
@@ -100,5 +101,10 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
         throw new BaseException("字段名称不能重复");
     }
 
+    @Override
+    public void delete(String id) {
+        archivesDictionaryRepository.deleteById(id);
+    }
+
 
 }

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

@@ -1,10 +1,12 @@
 package com.storeroom.modules.dictionary.service.impl;
 
 import com.storeroom.exception.BaseException;
+import com.storeroom.modules.dictionary.domain.ArchivesDictionary;
 import com.storeroom.modules.dictionary.domain.ArchivesType;
 import com.storeroom.modules.dictionary.repository.ArchivesTypeRepository;
 import com.storeroom.modules.dictionary.service.ArchivesTypeService;
 import com.storeroom.modules.dictionary.service.DynamicTableService;
+import com.storeroom.modules.dictionary.service.dto.ArcDicSmallDTO;
 import com.storeroom.modules.dictionary.service.dto.ArchivesTypeDTO;
 import com.storeroom.modules.dictionary.service.mapstruct.ArchivesTypeMapper;
 import com.storeroom.utils.DateUtils;
@@ -103,5 +105,16 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService {
         archivesTypeRepository.deleteById(id);
     }
 
+    @Override
+    public void updateSort(Set<ArcDicSmallDTO> arcDicSmallDTO) {
+        List<ArchivesType> list = new ArrayList<>();
+        for (ArcDicSmallDTO id : arcDicSmallDTO) {
+            ArchivesType ar = archivesTypeRepository.findById(id.getId()).orElseGet(ArchivesType::new);
+            ar.setCategorySeq(id.getSort());
+            list.add(ar);
+        }
+        archivesTypeRepository.saveAll(list);
+    }
+
 
 }

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

@@ -95,6 +95,7 @@ public class DynamicTableImpl implements DynamicTableService {
             archivesDictionaryDTO.setIsSequence(j.getIsSequence());
             archivesDictionaryDTO.setIsType(j.getIsType());
             archivesDictionaryDTO.setIsSystem(j.getIsSystem());
+            archivesDictionaryDTO.setIsColumnType(j.getIsType()==3?2:1);
             newList.add(archivesDictionaryDTO);
         }