diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDicSettingController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDicSettingController.java index 6a34d0a..be144de 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDicSettingController.java +++ b/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 create(@RequestBody ArchivesNoSettingDTO archivesNoSettingDTO){ + public ApiResponse create(@RequestBody Set archivesNoSettingDTO) { arcSettingService.create(archivesNoSettingDTO); return ApiResponse.success(ResponseStatus.SUCCESS); } + + @ApiOperation("移除规则字段") + @AnonymousDeleteMapping("delete") + public ApiResponse delete(@RequestBody Set archivesNoSettingDTOS) { + if (archivesNoSettingDTOS.size() != 0) { + arcSettingService.delete(archivesNoSettingDTOS); + return ApiResponse.success(ResponseStatus.SUCCESS); + } + throw new BaseException("数据异常"); + } + + @ApiOperation("修改规则字段") + @AnonymousPutMapping("update") + public ApiResponse update(@RequestBody Set archivesNoSettingDTOS) { + if (archivesNoSettingDTOS.size() != 0) { + arcSettingService.update(archivesNoSettingDTOS); + return ApiResponse.success(ResponseStatus.SUCCESS); + } + throw new BaseException("数据异常"); + } + + @ApiOperation("修改规则排序") + @AnonymousPutMapping("squence") + public ApiResponse squence(@RequestBody Set archivesNoSettingDTOS) { + if (archivesNoSettingDTOS.size() != 0) { + arcSettingService.sequence(archivesNoSettingDTOS); + return ApiResponse.success(ResponseStatus.SUCCESS); + } + throw new BaseException("数据异常"); + } } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDictrionaryController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDictrionaryController.java index 1ec6a19..e60610f 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDictrionaryController.java +++ b/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 getIsDisPlayState(@RequestParam Boolean isDisPlayState,@RequestParam String categoryId) { if (isDisPlayState != null) { return ApiResponse.success(arcdicService.getIsDisPlayState(isDisPlayState,categoryId)); diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesListSettingController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesListSettingController.java index 731da57..413fb8f 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesListSettingController.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesListSettingController.java @@ -30,8 +30,8 @@ public class ArchivesListSettingController { @ApiOperation("新增列表显示设置") @AnonymousPostMapping("create") - public ApiResponse create(@RequestBody ArchivesDisplaySmallDTO archivesDisplaySmallDTO) { - if (!StringUtils.isEmpty(archivesDisplaySmallDTO.getId())) { + public ApiResponse create(@RequestBody Set archivesDisplaySmallDTO) { + if (archivesDisplaySmallDTO.size() != 0) { archivesDictionaryService.createListDisplay(archivesDisplaySmallDTO); return ApiResponse.success(ResponseStatus.SUCCESS); } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesDictionaryService.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesDictionaryService.java index 55203eb..3e7d612 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesDictionaryService.java +++ b/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); /** diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesNoSettingService.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesNoSettingService.java index 61362b2..8e8e744 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesNoSettingService.java +++ b/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); + + /** + * 删除规则字段 + * @param archivesNoSettingDTOS / + */ + void delete(Set archivesNoSettingDTOS); + + /** + * 修改规则字段 + * @param archivesNoSettingDTOS / + */ + void update(Set archivesNoSettingDTOS); + + + /** + * 修改排序 + * @param archivesNoSettingDTOS / + */ + void sequence(Set archivesNoSettingDTOS); } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesNoSettingDTO.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesNoSettingDTO.java index 94129e3..58f7af0 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesNoSettingDTO.java +++ b/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; diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java index 7259a9f..3af2fb3 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java +++ b/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.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); - } + }); + } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesNoSettingImpl.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesNoSettingImpl.java index 070d007..b6d112d 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesNoSettingImpl.java +++ b/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.forEach(item -> { + item.setId(NanoIdUtils.randomNanoId()); + ArchivesNoSetting as = archivesNoSettingMapper.toEntity(item); + ansRepostiory.save(as); + }); + + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(Set archivesNoSettingDTOS) { + archivesNoSettingDTOS.forEach(item -> { + ArchivesNoSetting as = archivesNoSettingMapper.toEntity(item); + ansRepostiory.delete(as); + }); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(Set 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 archivesNoSettingDTOS) { + archivesNoSettingDTOS.forEach(item -> { + ArchivesNoSetting as = ansRepostiory.findById(item.getId()).orElseGet(ArchivesNoSetting::new); + if (as != null) { + as.setSequence(item.getSequence()); + ansRepostiory.save(as); + } + }); } } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java index 80ebd43..cc0421b 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java +++ b/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 arcDicSmallDTO) { List list = new ArrayList<>(); for (ArcTypeSmallDTO id : arcDicSmallDTO) { diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/DynamicTableImpl.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/DynamicTableImpl.java index 89d74ba..3f9be15 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/DynamicTableImpl.java +++ b/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); }