From c75a2c0b464c44602aa31b06202a718577e9ff57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= Date: Tue, 21 Jun 2022 16:33:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArchivesDicSettingController.java | 38 +++++++++++++- .../ArchivesDictrionaryController.java | 2 +- .../ArchivesListSettingController.java | 4 +- .../service/ArchivesDictionaryService.java | 2 +- .../service/ArchivesNoSettingService.java | 23 +++++++- .../service/dto/ArchivesNoSettingDTO.java | 5 +- .../service/impl/ArchivesDictionaryImpl.java | 32 ++++++------ .../service/impl/ArchivesNoSettingImpl.java | 52 +++++++++++++++++-- .../service/impl/ArchivesTypeServiceImpl.java | 3 +- .../service/impl/DynamicTableImpl.java | 3 +- 10 files changed, 134 insertions(+), 30 deletions(-) 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); } From 320d5153275120bea4c9b1a563e8b4cf340714f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= Date: Tue, 21 Jun 2022 17:33:03 +0800 Subject: [PATCH 2/5] fix bug --- .../modules/dictionary/service/dto/ArchivesDictionaryDTO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionaryDTO.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionaryDTO.java index 6ef1e6c..6ad2631 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionaryDTO.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionaryDTO.java @@ -73,6 +73,8 @@ public class ArchivesDictionaryDTO extends BaseDTO implements Serializable { private Integer displayLength; + private Integer queue; + @Override public boolean equals(Object o) { if (this == o) return true; From b2ed9ffe88579202c0dd9d0d8f1ed40a961e1b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= Date: Wed, 22 Jun 2022 11:49:16 +0800 Subject: [PATCH 3/5] fix bug --- .../ArchivesDicSettingController.java | 28 +++++++++++++++++-- .../ArchivesDictrionaryController.java | 6 ++-- .../ArchivesDictionaryRepository.java | 10 +++---- .../service/ArchivesDictionaryService.java | 6 ++++ .../service/ArchivesNoSettingService.java | 13 +++++++++ .../service/dto/ArchivesDicStateDTO.java | 2 +- .../service/dto/ArchivesNoSettingDTO.java | 4 +-- .../service/impl/ArchivesDictionaryImpl.java | 11 ++++++-- .../service/impl/ArchivesNoSettingImpl.java | 15 ++++++++++ 9 files changed, 79 insertions(+), 16 deletions(-) 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 be144de..fa79cd6 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 @@ -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 create(@RequestBody Set archivesNoSettingDTO) { - arcSettingService.create(archivesNoSettingDTO); - return ApiResponse.success(ResponseStatus.SUCCESS); + public ApiResponse create(@RequestBody Set 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 delete(@RequestBody Set 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 getAll() { + return ApiResponse.success(arcSettingService.getAll()); + } } 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 e60610f..fb90047 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 @@ -83,11 +83,11 @@ public class ArchivesDictrionaryController { @ApiOperation("门类字段管理") @AnonymousGetMapping("manage") - public ApiResponse getFieldName(@RequestParam String categoryId, Integer isDataType,Boolean isInput) { - if (!StringUtils.isEmpty(categoryId) && isDataType != null) { + public ApiResponse 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)); } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java index 9e7bee9..d387cad 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java @@ -28,11 +28,11 @@ public interface ArchivesDictionaryRepository extends JpaRepository findByCategoryIdAndIsDataTypeAndIsInput(String categoryId, Integer isDateType,Boolean isInput); + List findByCategoryIdAndIsTypeAndIsInput(String categoryId, Integer isType,Boolean isInput); /** * 通过门类id和字典数据类型查询 @@ -40,7 +40,7 @@ public interface ArchivesDictionaryRepository extends JpaRepository findByCategoryIdAndIsDataType(String categoryId, Integer isDateType); + List findByCategoryIdAndIsType(String categoryId, Integer isDateType); /** * 通过名称查询 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 3e7d612..92b1962 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 @@ -103,4 +103,10 @@ public interface ArchivesDictionaryService { * @param archivesDisplaySmallDTOS */ void updateOrderBy(Set archivesDisplaySmallDTOS); + + /** + * 修改isDisplayformat状态 + * @param id / + */ + void updateIsDisplayFormat(String id,Boolean isDisplayformat); } 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 8e8e744..1dcf55e 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,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); /** * 删除规则字段 + * * @param archivesNoSettingDTOS / */ void delete(Set archivesNoSettingDTOS); /** * 修改规则字段 + * * @param archivesNoSettingDTOS / */ void update(Set archivesNoSettingDTOS); @@ -40,7 +45,15 @@ public interface ArchivesNoSettingService { /** * 修改排序 + * * @param archivesNoSettingDTOS / */ void sequence(Set archivesNoSettingDTOS); + + /** + * 获取所有规则设置列表 + * + * @return / + */ + List getAll(); } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDicStateDTO.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDicStateDTO.java index a72e9ab..3b771bb 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDicStateDTO.java +++ b/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; 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 58f7af0..e595150 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 @@ -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; 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 3af2fb3..1c33f03 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 @@ -41,9 +41,9 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService { public List getAll(ArchivesDicStateDTO archivesDicStateDTO) { List 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 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); + } + } 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 b6d112d..e2b9b93 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 @@ -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 getAll() { + List ar = ansRepostiory.findAll(Sort.by(Sort.Direction.ASC, "sequence")); + List dtoList = new ArrayList<>(); + ar.forEach(item -> { + ArchivesNoSettingDTO dto = archivesNoSettingMapper.toDto(item); + dtoList.add(dto); + }); + return dtoList; + } } From 3d2e6e6b54666951e81ca2918501086256db28ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= Date: Thu, 23 Jun 2022 10:54:45 +0800 Subject: [PATCH 4/5] fix bug --- .../dictionary/domain/ArchivesNoSetting.java | 12 ++++++------ .../repository/ArchivesNoSettingRepository.java | 5 +++++ .../service/dto/ArchivesNoSettingDTO.java | 1 - .../service/impl/ArchivesNoSettingImpl.java | 13 ++++++++++--- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesNoSetting.java b/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesNoSetting.java index f5b5061..451d121 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesNoSetting.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesNoSetting.java @@ -27,12 +27,12 @@ public class ArchivesNoSetting extends BaseEntity implements Serializable { private String id; @ApiModelProperty(value = "列名") - @Column(name = "filed_cn_name") - private String filedCnName; + @Column(name = "field_cn_name") + private String fieldCnName; @ApiModelProperty(value = "字段名") - @Column(name = "filed_name") - private String filedName; + @Column(name = "field_name") + private String fieldName; @ApiModelProperty(value = "连接符") @Column(name = "connector") @@ -55,11 +55,11 @@ public class ArchivesNoSetting extends BaseEntity implements Serializable { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; ArchivesNoSetting that = (ArchivesNoSetting) o; - return Objects.equals(id, that.id) && Objects.equals(filedCnName, that.filedCnName) && Objects.equals(filedName, that.filedName) && Objects.equals(connector, that.connector) && Objects.equals(sequence, that.sequence) && Objects.equals(categoryId, that.categoryId) && Objects.equals(dictionaryId, that.dictionaryId); + return Objects.equals(id, that.id) && Objects.equals(fieldCnName, that.fieldCnName) && Objects.equals(fieldName, that.fieldName) && Objects.equals(connector, that.connector) && Objects.equals(sequence, that.sequence) && Objects.equals(categoryId, that.categoryId) && Objects.equals(dictionaryId, that.dictionaryId); } @Override public int hashCode() { - return Objects.hash(id, filedCnName, filedName, connector, sequence, categoryId, dictionaryId); + return Objects.hash(id, fieldCnName, fieldName, connector, sequence, categoryId, dictionaryId); } } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java index 70c9d29..0caf3c7 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java @@ -3,6 +3,7 @@ package com.storeroom.modules.dictionary.repository; import com.storeroom.modules.dictionary.domain.ArchivesNoSetting; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Query; public interface ArchivesNoSettingRepository extends JpaRepository, JpaSpecificationExecutor { @@ -16,4 +17,8 @@ public interface ArchivesNoSettingRepository extends JpaRepository archivesNoSettingDTO) { archivesNoSettingDTO.forEach(item -> { + + Integer num = ansRepostiory.findByMax(); + if (num == 0) { + item.setSequence(1); + } item.setId(NanoIdUtils.randomNanoId()); + item.setSequence(num + 1); ArchivesNoSetting as = archivesNoSettingMapper.toEntity(item); ansRepostiory.save(as); + }); } @@ -60,12 +66,13 @@ public class ArchivesNoSettingImpl implements ArchivesNoSettingService { 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.setFieldCnName(item.getFieldCnName()); as.setSequence(item.getSequence()); - as.setFiledName(item.getFiledName()); + as.setFieldName(item.getFieldName()); as.setDictionaryId(item.getDictionaryId()); ansRepostiory.save(as); } From f6d12d50ac84d87b611f89d100c31fc2f0ed3357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= Date: Fri, 24 Jun 2022 16:07:57 +0800 Subject: [PATCH 5/5] fix bug --- .../controller/ArchivesDicSettingController.java | 9 +++++++-- .../repository/ArchivesNoSettingRepository.java | 5 +++++ .../dictionary/service/ArchivesNoSettingService.java | 2 +- .../dictionary/service/impl/ArchivesNoSettingImpl.java | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) 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 fa79cd6..71f3ef1 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 @@ -10,12 +10,14 @@ 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; +import com.storeroom.utils.StringUtils; import com.storeroom.utils.enums.ResponseStatus; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.Set; @@ -82,7 +84,10 @@ public class ArchivesDicSettingController { @ApiOperation("获取规则列表") @AnonymousGetMapping("list") - public ApiResponse getAll() { - return ApiResponse.success(arcSettingService.getAll()); + public ApiResponse getAll(@RequestParam String categoryId) { + if (!StringUtils.isEmpty(categoryId)) { + return ApiResponse.success(arcSettingService.findByCategoryId(categoryId)); + } + throw new BaseException("id异常"); } } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java index 0caf3c7..73467b5 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java @@ -5,6 +5,8 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; +import java.util.List; + public interface ArchivesNoSettingRepository extends JpaRepository, JpaSpecificationExecutor { @@ -21,4 +23,7 @@ public interface ArchivesNoSettingRepository extends JpaRepository findByCategoryId(String id); } 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 1dcf55e..4a5075b 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 @@ -55,5 +55,5 @@ public interface ArchivesNoSettingService { * * @return / */ - List getAll(); + List findByCategoryId(String categoryId); } 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 45525e6..a49dcdc 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 @@ -91,8 +91,8 @@ public class ArchivesNoSettingImpl implements ArchivesNoSettingService { } @Override - public List getAll() { - List ar = ansRepostiory.findAll(Sort.by(Sort.Direction.ASC, "sequence")); + public List findByCategoryId(String categoryId) { + List ar = ansRepostiory.findByCategoryId(categoryId); List dtoList = new ArrayList<>(); ar.forEach(item -> { ArchivesNoSettingDTO dto = archivesNoSettingMapper.toDto(item);