新增规则接口

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

@@ -1,7 +1,10 @@
 package com.storeroom.modules.dictionary.controller;
 
 
+import com.storeroom.annotaion.rest.AnonymousDeleteMapping;
 import com.storeroom.annotaion.rest.AnonymousPostMapping;
+import com.storeroom.annotaion.rest.AnonymousPutMapping;
+import com.storeroom.exception.BaseException;
 import com.storeroom.modules.dictionary.service.ArchivesNoSettingService;
 import com.storeroom.modules.dictionary.service.dto.ArchivesNoSettingDTO;
 import com.storeroom.utils.ApiResponse;
@@ -13,6 +16,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
@@ -22,11 +27,40 @@ public class ArchivesDicSettingController {
     private final ArchivesNoSettingService arcSettingService;
 
 
-
     @ApiOperation("新增规则字段")
     @AnonymousPostMapping("create")
-    public ApiResponse<Object> create(@RequestBody ArchivesNoSettingDTO archivesNoSettingDTO){
+    public ApiResponse<Object> create(@RequestBody Set<ArchivesNoSettingDTO> archivesNoSettingDTO) {
         arcSettingService.create(archivesNoSettingDTO);
         return ApiResponse.success(ResponseStatus.SUCCESS);
     }
+
+    @ApiOperation("移除规则字段")
+    @AnonymousDeleteMapping("delete")
+    public ApiResponse<Object> delete(@RequestBody Set<ArchivesNoSettingDTO> archivesNoSettingDTOS) {
+        if (archivesNoSettingDTOS.size() != 0) {
+            arcSettingService.delete(archivesNoSettingDTOS);
+            return ApiResponse.success(ResponseStatus.SUCCESS);
+        }
+        throw new BaseException("数据异常");
+    }
+
+    @ApiOperation("修改规则字段")
+    @AnonymousPutMapping("update")
+    public ApiResponse<Object> update(@RequestBody Set<ArchivesNoSettingDTO> archivesNoSettingDTOS) {
+        if (archivesNoSettingDTOS.size() != 0) {
+            arcSettingService.update(archivesNoSettingDTOS);
+            return ApiResponse.success(ResponseStatus.SUCCESS);
+        }
+        throw new BaseException("数据异常");
+    }
+
+    @ApiOperation("修改规则排序")
+    @AnonymousPutMapping("squence")
+    public ApiResponse<Object> squence(@RequestBody Set<ArchivesNoSettingDTO> archivesNoSettingDTOS) {
+        if (archivesNoSettingDTOS.size() != 0) {
+            arcSettingService.sequence(archivesNoSettingDTOS);
+            return ApiResponse.success(ResponseStatus.SUCCESS);
+        }
+        throw new BaseException("数据异常");
+    }
 }

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

@@ -30,7 +30,7 @@ public class ArchivesDictrionaryController {
 
 
     @ApiOperation("获取隐藏状态字典")
-    @AnonymousGetMapping("is-dispaly")
+    @AnonymousGetMapping("is-display")
     public ApiResponse<Object> getIsDisPlayState(@RequestParam Boolean isDisPlayState,@RequestParam String categoryId) {
         if (isDisPlayState != null) {
             return ApiResponse.success(arcdicService.getIsDisPlayState(isDisPlayState,categoryId));

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

@@ -30,8 +30,8 @@ public class ArchivesListSettingController {
 
     @ApiOperation("新增列表显示设置")
     @AnonymousPostMapping("create")
-    public ApiResponse<Object> create(@RequestBody ArchivesDisplaySmallDTO archivesDisplaySmallDTO) {
-        if (!StringUtils.isEmpty(archivesDisplaySmallDTO.getId())) {
+    public ApiResponse<Object> create(@RequestBody Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTO) {
+        if (archivesDisplaySmallDTO.size() != 0) {
             archivesDictionaryService.createListDisplay(archivesDisplaySmallDTO);
             return ApiResponse.success(ResponseStatus.SUCCESS);
         }

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

@@ -82,7 +82,7 @@ public interface ArchivesDictionaryService {
      * 修改列表显示设置
      * @param archivesDisplaySmallDTO /
      */
-    void createListDisplay(ArchivesDisplaySmallDTO archivesDisplaySmallDTO);
+    void createListDisplay(Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTO);
 
 
     /**

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

@@ -3,6 +3,8 @@ package com.storeroom.modules.dictionary.service;
 
 import com.storeroom.modules.dictionary.service.dto.ArchivesNoSettingDTO;
 
+import java.util.Set;
+
 /**
  * 档案配置规则服务
  */
@@ -21,5 +23,24 @@ public interface ArchivesNoSettingService {
      * 创建规则字段
      * @param archivesNoSettingDTO /
      */
-    void create(ArchivesNoSettingDTO archivesNoSettingDTO);
+    void create(Set<ArchivesNoSettingDTO> archivesNoSettingDTO);
+
+    /**
+     * 删除规则字段
+     * @param archivesNoSettingDTOS /
+     */
+    void delete(Set<ArchivesNoSettingDTO> archivesNoSettingDTOS);
+
+    /**
+     * 修改规则字段
+     * @param archivesNoSettingDTOS /
+     */
+    void update(Set<ArchivesNoSettingDTO> archivesNoSettingDTOS);
+
+
+    /**
+     * 修改排序
+     * @param archivesNoSettingDTOS /
+     */
+    void sequence(Set<ArchivesNoSettingDTO> archivesNoSettingDTOS);
 }

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

@@ -3,10 +3,13 @@ package com.storeroom.modules.dictionary.service.dto;
 
 import com.storeroom.base.BaseDTO;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.io.Serializable;
 
-@Data
+@Getter
+@Setter
 public class ArchivesNoSettingDTO extends BaseDTO implements Serializable {
 
     private String id;

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

@@ -3,11 +3,8 @@ 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.ArchivesDictionaryRepository;
 import com.storeroom.modules.dictionary.service.ArchivesDictionaryService;
-import com.storeroom.modules.dictionary.service.ArchivesTypeService;
-import com.storeroom.modules.dictionary.service.DynamicTableService;
 import com.storeroom.modules.dictionary.service.dto.*;
 import com.storeroom.modules.dictionary.service.mapstruct.ArchivesDictionaryMapper;
 import com.storeroom.utils.NanoIdUtils;
@@ -163,20 +160,23 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
     }
 
     @Override
-    public void createListDisplay(ArchivesDisplaySmallDTO archivesDisplaySmallDTO) {
-        ArchivesDictionary archivesDictionary = archivesDictionaryRepository.findById(archivesDisplaySmallDTO.getId()).orElseGet(ArchivesDictionary::new);
-        if (archivesDictionary != null) {
-            if (archivesDictionary.getDisplayOrder() == null) {
-                archivesDictionary.setDisplayOrder(1);
-            } else {
-                Integer num = archivesDictionary.getDisplayOrder() + 1;
-                archivesDictionary.setDisplayOrder(num);
+    public void createListDisplay(Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTO) {
+        archivesDisplaySmallDTO.forEach(item->{
+            ArchivesDictionary archivesDictionary = archivesDictionaryRepository.findById(item.getId()).orElseGet(ArchivesDictionary::new);
+            if (archivesDictionary != null) {
+                if (archivesDictionary.getDisplayOrder() == null) {
+                    archivesDictionary.setDisplayOrder(1);
+                } else {
+                    Integer num = archivesDictionary.getDisplayOrder() + 1;
+                    archivesDictionary.setDisplayOrder(num);
+                }
+                archivesDictionary.setDisplayLength(item.getDisplayLength());
+                archivesDictionary.setDisplayformatType(item.getDisplayformatType());
+                archivesDictionary.setIsDisplay(item.getIsDisplay());
+                archivesDictionaryRepository.save(archivesDictionary);
             }
-            archivesDictionary.setDisplayLength(archivesDisplaySmallDTO.getDisplayLength());
-            archivesDictionary.setDisplayformatType(archivesDisplaySmallDTO.getDisplayformatType());
-            archivesDictionary.setIsDisplay(archivesDisplaySmallDTO.getIsDisplay());
-            archivesDictionaryRepository.save(archivesDictionary);
-        }
+        });
+
 
     }
 

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

@@ -9,6 +9,9 @@ import com.storeroom.modules.dictionary.service.mapstruct.ArchivesNoSettingMappe
 import com.storeroom.utils.NanoIdUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Set;
 
 @Service
 @RequiredArgsConstructor
@@ -29,9 +32,50 @@ public class ArchivesNoSettingImpl implements ArchivesNoSettingService {
     }
 
     @Override
-    public void create(ArchivesNoSettingDTO archivesNoSettingDTO) {
-        archivesNoSettingDTO.setId(NanoIdUtils.randomNanoId());
-        ArchivesNoSetting as = archivesNoSettingMapper.toEntity(archivesNoSettingDTO);
-        ansRepostiory.save(as);
+    public void create(Set<ArchivesNoSettingDTO> archivesNoSettingDTO) {
+        archivesNoSettingDTO.forEach(item -> {
+            item.setId(NanoIdUtils.randomNanoId());
+            ArchivesNoSetting as = archivesNoSettingMapper.toEntity(item);
+            ansRepostiory.save(as);
+        });
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Set<ArchivesNoSettingDTO> archivesNoSettingDTOS) {
+        archivesNoSettingDTOS.forEach(item -> {
+            ArchivesNoSetting as = archivesNoSettingMapper.toEntity(item);
+            ansRepostiory.delete(as);
+        });
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(Set<ArchivesNoSettingDTO> archivesNoSettingDTOS) {
+        archivesNoSettingDTOS.forEach(item -> {
+            ArchivesNoSetting as = ansRepostiory.findById(item.getId()).orElseGet(ArchivesNoSetting::new);
+            if (as != null) {
+                as.setId(item.getId());
+                as.setCategoryId(item.getCategoryId());
+                as.setConnector(item.getConnector());
+                as.setFiledCnName(item.getFiledCnName());
+                as.setSequence(item.getSequence());
+                as.setFiledName(item.getFiledName());
+                as.setDictionaryId(item.getDictionaryId());
+                ansRepostiory.save(as);
+            }
+        });
+    }
+
+    @Override
+    public void sequence(Set<ArchivesNoSettingDTO> archivesNoSettingDTOS) {
+        archivesNoSettingDTOS.forEach(item -> {
+            ArchivesNoSetting as = ansRepostiory.findById(item.getId()).orElseGet(ArchivesNoSetting::new);
+            if (as != null) {
+                as.setSequence(item.getSequence());
+                ansRepostiory.save(as);
+            }
+        });
     }
 }

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

@@ -1,7 +1,6 @@
 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;
@@ -96,6 +95,7 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void delete(String id) {
         ArchivesType archivesType=archivesTypeRepository.findById(id).orElseGet(ArchivesType::new);
         String tableName = archivesType.getEnName();
@@ -104,6 +104,7 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService {
     }
 
     @Override
+    @Transactional
     public void updateSort(Set<ArcTypeSmallDTO> arcDicSmallDTO) {
         List<ArchivesType> list = new ArrayList<>();
         for (ArcTypeSmallDTO id : arcDicSmallDTO) {

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

@@ -85,7 +85,7 @@ public class DynamicTableImpl implements DynamicTableService {
     @Override
     public void DeleteTable(String tableName) {
         if (!StringUtils.isEmpty(tableName) && checkTableNameExitst(tableName)) {
-            //StringBuilder stringBuilder = new StringBuilder("DROP TABLE " + tableName + "");
+
             String sql = "DROP TABLE " + tableName + "";
             jdbcTemplate.execute(sql);
         }
@@ -141,6 +141,7 @@ public class DynamicTableImpl implements DynamicTableService {
             archivesDictionaryDTO.setIsType(j.getIsType());
             archivesDictionaryDTO.setIsSystem(j.getIsSystem());
             archivesDictionaryDTO.setIsColumnType(j.getIsType());
+            archivesDictionaryDTO.setIsInput(true);
             newList.add(archivesDictionaryDTO);
         }