fix bug

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

@@ -2,9 +2,11 @@ package com.storeroom.modules.dictionary.controller;
 
 
 import com.storeroom.annotaion.rest.AnonymousDeleteMapping;
+import com.storeroom.annotaion.rest.AnonymousGetMapping;
 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.ArchivesNoSettingService;
 import com.storeroom.modules.dictionary.service.dto.ArchivesNoSettingDTO;
 import com.storeroom.utils.ApiResponse;
@@ -25,19 +27,33 @@ import java.util.Set;
 public class ArchivesDicSettingController {
 
     private final ArchivesNoSettingService arcSettingService;
+    private final ArchivesDictionaryService archivesDictionaryService;
 
 
     @ApiOperation("新增规则字段")
     @AnonymousPostMapping("create")
-    public ApiResponse<Object> create(@RequestBody Set<ArchivesNoSettingDTO> archivesNoSettingDTO) {
-        arcSettingService.create(archivesNoSettingDTO);
+    public ApiResponse<Object> create(@RequestBody Set<ArchivesNoSettingDTO> archivesNoSettingDTOS) {
+        if (archivesNoSettingDTOS.size() != 0 ) {
+
+            archivesNoSettingDTOS.forEach(item -> {
+                archivesDictionaryService.updateIsDisplayFormat(item.getDictionaryId(), true);
+            });
+            arcSettingService.create(archivesNoSettingDTOS);
             return ApiResponse.success(ResponseStatus.SUCCESS);
         }
+        throw new BaseException("数据异常");
+    }
+
+
+
 
     @ApiOperation("移除规则字段")
     @AnonymousDeleteMapping("delete")
     public ApiResponse<Object> delete(@RequestBody Set<ArchivesNoSettingDTO> archivesNoSettingDTOS) {
         if (archivesNoSettingDTOS.size() != 0) {
+            archivesNoSettingDTOS.forEach(item -> {
+                archivesDictionaryService.updateIsDisplayFormat(item.getDictionaryId(), false);
+            });
             arcSettingService.delete(archivesNoSettingDTOS);
             return ApiResponse.success(ResponseStatus.SUCCESS);
         }
@@ -63,4 +79,10 @@ public class ArchivesDicSettingController {
         }
         throw new BaseException("数据异常");
     }
+
+    @ApiOperation("获取规则列表")
+    @AnonymousGetMapping("list")
+    public ApiResponse<Object> getAll() {
+        return ApiResponse.success(arcSettingService.getAll());
+    }
 }

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

@@ -83,11 +83,11 @@ public class ArchivesDictrionaryController {
 
     @ApiOperation("门类字段管理")
     @AnonymousGetMapping("manage")
-    public ApiResponse<Object> getFieldName(@RequestParam String categoryId, Integer isDataType,Boolean isInput) {
-        if (!StringUtils.isEmpty(categoryId) && isDataType != null) {
+    public ApiResponse<Object> getFieldName(@RequestParam String categoryId, Integer isType,Boolean isInput) {
+        if (!StringUtils.isEmpty(categoryId) && isType != null) {
             ArchivesDicStateDTO dto = new ArchivesDicStateDTO();
             dto.setCategoryId(categoryId);
-            dto.setIsDataType(isDataType);
+            dto.setIsType(isType);
             dto.setIsInput(isInput);
             return ApiResponse.success(arcdicService.getAll(dto));
         }

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

@@ -28,11 +28,11 @@ public interface ArchivesDictionaryRepository extends JpaRepository<ArchivesDict
     /**
      * 通过门类id、字典数据类型、输入状态查询
      *
-     * @param categoryId
-     * @param isDateType
-     * @return
+     * @param
+     * @param
+     * @return /
      */
-    List<ArchivesDictionary> findByCategoryIdAndIsDataTypeAndIsInput(String categoryId, Integer isDateType,Boolean isInput);
+    List<ArchivesDictionary> findByCategoryIdAndIsTypeAndIsInput(String categoryId, Integer isType,Boolean isInput);
 
     /**
      * 通过门类id和字典数据类型查询
@@ -40,7 +40,7 @@ public interface ArchivesDictionaryRepository extends JpaRepository<ArchivesDict
      * @param isDateType
      * @return
      */
-    List<ArchivesDictionary> findByCategoryIdAndIsDataType(String categoryId, Integer isDateType);
+    List<ArchivesDictionary> findByCategoryIdAndIsType(String categoryId, Integer isDateType);
 
     /**
      * 通过名称查询

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

@@ -103,4 +103,10 @@ public interface ArchivesDictionaryService {
      * @param archivesDisplaySmallDTOS
      */
     void updateOrderBy(Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTOS);
+
+    /**
+     * 修改isDisplayformat状态
+     * @param id /
+     */
+    void updateIsDisplayFormat(String id,Boolean isDisplayformat);
 }

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

@@ -3,6 +3,7 @@ package com.storeroom.modules.dictionary.service;
 
 import com.storeroom.modules.dictionary.service.dto.ArchivesNoSettingDTO;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -13,6 +14,7 @@ public interface ArchivesNoSettingService {
 
     /**
      * 判断自动生成数据状态
+     *
      * @param dicId
      * @return
      */
@@ -21,18 +23,21 @@ public interface ArchivesNoSettingService {
 
     /**
      * 创建规则字段
+     *
      * @param archivesNoSettingDTO /
      */
     void create(Set<ArchivesNoSettingDTO> archivesNoSettingDTO);
 
     /**
      * 删除规则字段
+     *
      * @param archivesNoSettingDTOS /
      */
     void delete(Set<ArchivesNoSettingDTO> archivesNoSettingDTOS);
 
     /**
      * 修改规则字段
+     *
      * @param archivesNoSettingDTOS /
      */
     void update(Set<ArchivesNoSettingDTO> archivesNoSettingDTOS);
@@ -40,7 +45,15 @@ public interface ArchivesNoSettingService {
 
     /**
      * 修改排序
+     *
      * @param archivesNoSettingDTOS /
      */
     void sequence(Set<ArchivesNoSettingDTO> archivesNoSettingDTOS);
+
+    /**
+     * 获取所有规则设置列表
+     *
+     * @return /
+     */
+    List<ArchivesNoSettingDTO> getAll();
 }

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

@@ -14,7 +14,7 @@ public class ArchivesDicStateDTO implements Serializable {
     private String categoryId;
 
     @NotNull
-    private Integer isDataType;
+    private Integer isType;
 
     @NotNull
     private Boolean isInput;

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

@@ -14,9 +14,9 @@ public class ArchivesNoSettingDTO extends BaseDTO implements Serializable {
 
     private String id;
 
-    private String filedCnName;
+    private String fieldCnName;
 
-    private String filedName;
+    private String fieldName;
 
     private String connector;
 

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

@@ -41,9 +41,9 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
     public List<ArchivesDictionaryDTO> getAll(ArchivesDicStateDTO archivesDicStateDTO) {
         List<ArchivesDictionary> list;
         if (archivesDicStateDTO.getIsInput() != null) {
-            list = archivesDictionaryRepository.findByCategoryIdAndIsDataTypeAndIsInput(archivesDicStateDTO.getCategoryId(), archivesDicStateDTO.getIsDataType(), archivesDicStateDTO.getIsInput());
+            list = archivesDictionaryRepository.findByCategoryIdAndIsTypeAndIsInput(archivesDicStateDTO.getCategoryId(), archivesDicStateDTO.getIsType(), archivesDicStateDTO.getIsInput());
         } else {
-            list = archivesDictionaryRepository.findByCategoryIdAndIsDataType(archivesDicStateDTO.getCategoryId(), archivesDicStateDTO.getIsDataType());
+            list = archivesDictionaryRepository.findByCategoryIdAndIsType(archivesDicStateDTO.getCategoryId(), archivesDicStateDTO.getIsType());
         }
         List<ArchivesDictionaryDTO> dtoList = new ArrayList<>();
         list.forEach(item -> {
@@ -219,4 +219,11 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
         });
     }
 
+    @Override
+    public void updateIsDisplayFormat(String id,Boolean isDisplayformat) {
+        ArchivesDictionary ad=archivesDictionaryRepository.findById(id).orElseGet(ArchivesDictionary::new);
+        ad.setIsDisplayformat(isDisplayformat);
+        archivesDictionaryRepository.save(ad);
+    }
+
 }

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

@@ -4,13 +4,17 @@ 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 com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO;
 import com.storeroom.modules.dictionary.service.dto.ArchivesNoSettingDTO;
 import com.storeroom.modules.dictionary.service.mapstruct.ArchivesNoSettingMapper;
 import com.storeroom.utils.NanoIdUtils;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 @Service
@@ -78,4 +82,15 @@ public class ArchivesNoSettingImpl implements ArchivesNoSettingService {
             }
         });
     }
+
+    @Override
+    public List<ArchivesNoSettingDTO> getAll() {
+        List<ArchivesNoSetting> ar = ansRepostiory.findAll(Sort.by(Sort.Direction.ASC, "sequence"));
+        List<ArchivesNoSettingDTO> dtoList = new ArrayList<>();
+        ar.forEach(item -> {
+            ArchivesNoSettingDTO dto = archivesNoSettingMapper.toDto(item);
+            dtoList.add(dto);
+        });
+        return dtoList;
+    }
 }