新增接口

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

@@ -7,10 +7,12 @@ import com.storeroom.annotaion.rest.AnonymousPutMapping;
 import com.storeroom.exception.BaseException;
 import com.storeroom.exception.constant.ResponseStatus;
 import com.storeroom.modules.dictionary.service.ArchivesDictionaryService;
+import com.storeroom.modules.dictionary.service.ArchivesNoSettingService;
 import com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO;
 import com.storeroom.modules.dictionary.service.dto.ArchivesDictionarySmallDTO;
 import com.storeroom.modules.dictionary.service.dto.ArchivesDisplaySmallDTO;
 import com.storeroom.utils.ApiResponse;
+import com.storeroom.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -30,6 +32,7 @@ import java.util.Set;
 public class ArchivesDisplayController {
 
     private final ArchivesDictionaryService archivesDictionaryService;
+    private final ArchivesNoSettingService archivesNoSettingService;
 
     @ApiOperation("修改门类字典排序")
     @AnonymousPutMapping("sort")
@@ -48,10 +51,15 @@ public class ArchivesDisplayController {
         return ApiResponse.success(ResponseStatus.SUCCESS);
     }
 
-//    @ApiOperation("著录界面预览")
-//    @AnonymousGetMapping("field-name")
-//    public ApiResponse<Object> displayFieldName(@RequestParam Integer isDataType) {
-//        return ApiResponse.success(archivesDictionaryService.getDisplayFieldName(isDataType));
-//    }
+    @ApiOperation("自动生成")
+    @AnonymousGetMapping("auto-state")
+    public ApiResponse<Object> getAuto(@RequestParam String dicId) {
+        if (!StringUtils.isEmpty(dicId)) {
+            boolean state = archivesNoSettingService.IsDataState(dicId);
+            return ApiResponse.success(state);
+        }
+        throw new BaseException("id异常");
+    }
+
 
 }

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

@@ -17,7 +17,6 @@ import com.storeroom.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -98,9 +97,15 @@ public class ArchivesTypeController {
 
 
     @ApiOperation("门类字段管理")
-    @AnonymousPostMapping("manage")
-    public ApiResponse<Object> getFieldName(@RequestBody ArchivesDicStateDTO dto) {
+    @AnonymousGetMapping("manage")
+    public ApiResponse<Object> getFieldName(@RequestParam String categoryId, Integer isDateType) {
+        if (!StringUtils.isEmpty(categoryId) && isDateType != null) {
+            ArchivesDicStateDTO dto = new ArchivesDicStateDTO();
+            dto.setCategoryId(categoryId);
+            dto.setIsDataType(isDateType);
             return ApiResponse.success(archivesDictionaryService.getAll(dto));
+        }
+        throw new BaseException("id异常");
     }
 
     @ApiOperation("通过id查询门类字典")

archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java

@@ -7,11 +7,13 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 public interface ArchivesNoSettingRepository extends JpaRepository<ArchivesNoSetting, String>, JpaSpecificationExecutor<ArchivesNoSetting> {
 
 
+
+
     /**
      * 根据字典id查询
      *
-     * @param id 字典id
-     * @return
+     * @param id 字典id \
+     * @return \
      */
     ArchivesNoSetting findByDictionaryId(String id);
 }

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

@@ -69,18 +69,8 @@ public interface ArchivesDictionaryService {
      */
     void ChangeDisplayState(Set<ArchivesDisplaySmallDTO> archivesDictionarySmallDTOS);
 
-//    /**
-//     * 著录界面预览字段显示
-//     * @return
-//     */
-//    List<ArchivesDictionaryDTO> getDisplayFieldName(Integer isDataType);
 
 
-    /**
-     * 判断自动生成
-     * @return
-     */
-    Boolean isAutomatic(String id);
 
 
 

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

@@ -147,22 +147,4 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
         archivesDictionaryRepository.saveAll(list);
     }
 
-//    @Override
-//    public List<ArchivesDictionaryDTO> getDisplayFieldName(Integer isDataType) {
-//        List<ArchivesDictionaryDTO> listDto = new ArrayList<>();
-//        List<ArchivesDictionary> list = archivesDictionaryRepository.findByIsDataType(isDataType);
-//        list.forEach(item -> {
-//            ArchivesDictionaryDTO ad = archivesDictionaryMapper.toDto(item);
-//            listDto.add(ad);
-//        });
-//        return listDto;
-//    }
-
-    @Override
-    public Boolean isAutomatic(String id) {
-
-        return null;
-    }
-
-
 }

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

@@ -1,6 +1,7 @@
 package com.storeroom.modules.dictionary.service.impl;
 
 
+import com.storeroom.modules.dictionary.domain.ArchivesNoSetting;
 import com.storeroom.modules.dictionary.repository.ArchivesNoSettingRepository;
 import com.storeroom.modules.dictionary.service.ArchivesNoSettingService;
 import lombok.RequiredArgsConstructor;
@@ -15,8 +16,11 @@ public class ArchivesNoSettingImpl implements ArchivesNoSettingService {
 
     @Override
     public Boolean IsDataState(String dicId) {
-
-        ansRepostiory.findByDictionaryId(dicId);
-        return null;
+        boolean state = false;
+        ArchivesNoSetting ans = ansRepostiory.findByDictionaryId(dicId);
+        if (ans == null) {
+            state = true;
+        }
+        return state;
     }
 }