diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/CaseController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/CaseController.java index 33c0c3b..120efa7 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/CaseController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/CaseController.java @@ -1,7 +1,6 @@ package com.storeroom.modules.archives.controller; -import com.storeroom.exception.constant.ResponseStatus; -import com.storeroom.modules.archives.domain.ArchivesCaseCartoning; +import com.storeroom.utils.enums.ResponseStatus; import com.storeroom.modules.archives.service.ArchivesCaseService; import com.storeroom.modules.archives.service.dto.ArchivesCaseCartoningDTO; import com.storeroom.modules.archives.service.dto.CaseDTO; 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 new file mode 100644 index 0000000..be09f60 --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDicSettingController.java @@ -0,0 +1,33 @@ +package com.storeroom.modules.dictionary.controller; + + +import com.storeroom.annotaion.rest.AnonymousPostMapping; +import com.storeroom.modules.dictionary.service.ArchivesNoSettingService; +import com.storeroom.modules.dictionary.service.dto.ArchivesNoSettingDTO; +import com.storeroom.utils.ApiResponse; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags = "档号规则设置") +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/dic-setting/") +public class ArchivesDicSettingController { + + private final ArchivesNoSettingService arcSettingService; + + + + @ApiOperation("新增规则字段") + @AnonymousPostMapping("create") + public ApiResponse create(@RequestBody ArchivesNoSettingDTO archivesNoSettingDTO){ + arcSettingService.create(archivesNoSettingDTO); + return ApiResponse.success(ResponseStatus.SUCCESS); + } +} 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 new file mode 100644 index 0000000..cbaa278 --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDictrionaryController.java @@ -0,0 +1,83 @@ +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.domain.ArchivesDictionary; +import com.storeroom.modules.dictionary.service.ArchivesDictionaryService; +import com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO; +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; + +@Api(tags = "字典管理") +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/arc-dic/") +public class ArchivesDictrionaryController { + + private final ArchivesDictionaryService arcdicService; + + + @ApiOperation("获取隐藏状态字典") + @AnonymousGetMapping("isdispaly") + public ApiResponse getIsDisPlayState(@RequestParam Boolean isDisPlayState) { + if (isDisPlayState != null) { + return ApiResponse.success(arcdicService.getIsDisPlayState(isDisPlayState)); + } + throw new BaseException("状态异常"); + } + + @ApiOperation("创建门类字典") + @AnonymousPostMapping("create") + public ApiResponse createDic(@RequestBody ArchivesDictionaryDTO arcdicDto) { + if (!StringUtils.isEmpty(arcdicDto.getId())) { + throw new BaseException("id添加异常"); + } + if (StringUtils.isEmpty(arcdicDto.getFieldCnName()) || StringUtils.isEmpty(arcdicDto.getFieldName())) { + throw new BaseException("字段名字不能为空"); + } + if (StringUtils.isEmpty(arcdicDto.getIsDataTypeDetails())) { + throw new BaseException("数据类型不能为空"); + } + if (StringUtils.isEmpty(arcdicDto.getDictionaryConfigId().getId()) || arcdicDto.getDictionaryConfigId().getId().equals("null")) { + arcdicDto.setDictionaryConfigId(null); + } + arcdicService.create(arcdicDto); + return ApiResponse.success(ResponseStatus.SUCCESS); + } + + @ApiOperation("删除门类类型菜单") + @AnonymousDeleteMapping("delete") + public ApiResponse deleteType(@RequestParam String id) { + if (!StringUtils.isEmpty(id)) { + arcdicService.delete(id); + return ApiResponse.success(ResponseStatus.SUCCESS); + } + throw new BaseException("id不能为空"); + } + + + @ApiOperation("修改门类字段") + @AnonymousPutMapping("update") + public ApiResponse updateDic(@RequestBody ArchivesDictionaryDTO arcdicDto) { + if (!StringUtils.isEmpty(arcdicDto.getId())) { + if (StringUtils.isEmpty(arcdicDto.getDictionaryConfigId().getId()) || arcdicDto.getDictionaryConfigId().getId().equals("null")) { + arcdicDto.setDictionaryConfigId(null); + } + arcdicService.update(arcdicDto); + return ApiResponse.success(ResponseStatus.SUCCESS); + } + throw new BaseException("id异常"); + } +} diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDisplayController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDisplayController.java index 52fe8f0..a01d38d 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDisplayController.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDisplayController.java @@ -2,13 +2,11 @@ package com.storeroom.modules.dictionary.controller; 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.exception.constant.ResponseStatus; +import com.storeroom.utils.enums.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; @@ -44,7 +42,7 @@ public class ArchivesDisplayController { throw new BaseException("数据异常"); } - @ApiOperation("修改界面浏览设置状态") + @ApiOperation("修改界面浏览设置排序状态") @AnonymousPutMapping("state") public ApiResponse ChangeDisplayState(@Validated @RequestBody Set archivesDisplaySmallDTO) { archivesDictionaryService.ChangeDisplayState(archivesDisplaySmallDTO); diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java index 2ace9a1..cefe6c7 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java @@ -6,7 +6,7 @@ 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.exception.constant.ResponseStatus; +import com.storeroom.utils.enums.ResponseStatus; import com.storeroom.modules.common.ArchivesTypeEnum; import com.storeroom.modules.dictionary.service.ArchivesDictionaryService; import com.storeroom.modules.dictionary.service.ArchivesTypeService; @@ -68,7 +68,7 @@ public class ArchivesTypeController { } @ApiOperation("修改门类") - @AnonymousPutMapping("updata-type") + @AnonymousPutMapping("update") public ApiResponse updataAchivesType(@RequestBody ArchivesTypeDTO archivesTypeDTO) { if (!StringUtils.isEmpty(archivesTypeDTO.getId())) { archivesTypeService.update(archivesTypeDTO); @@ -78,16 +78,6 @@ public class ArchivesTypeController { } - @ApiOperation("删除门类类型菜单") - @AnonymousDeleteMapping("delete-type") - public ApiResponse deleteType(@RequestParam String id) { - if (!StringUtils.isEmpty(id)) { - archivesTypeService.delete(id); - return ApiResponse.success(ResponseStatus.SUCCESS); - } - throw new BaseException("id不能为空"); - } - @ApiOperation("获取门类树状菜单") @AnonymousGetMapping("menu") //TODO:权限未添加 @@ -98,11 +88,12 @@ public class ArchivesTypeController { @ApiOperation("门类字段管理") @AnonymousGetMapping("manage") - public ApiResponse getFieldName(@RequestParam String categoryId, Integer isDateType) { - if (!StringUtils.isEmpty(categoryId) && isDateType != null) { + public ApiResponse getFieldName(@RequestParam String categoryId, Integer isDataType,Boolean isInput) { + if (!StringUtils.isEmpty(categoryId) && isDataType != null) { ArchivesDicStateDTO dto = new ArchivesDicStateDTO(); dto.setCategoryId(categoryId); - dto.setIsDataType(isDateType); + dto.setIsDataType(isDataType); + dto.setIsInput(isInput); return ApiResponse.success(archivesDictionaryService.getAll(dto)); } throw new BaseException("id异常"); @@ -117,37 +108,9 @@ public class ArchivesTypeController { throw new BaseException("id异常"); } - @ApiOperation("修改门类字段") - @AnonymousPutMapping("update") - public ApiResponse updateDic(@RequestBody ArchivesDictionaryDTO arcdicDto) { - if (!StringUtils.isEmpty(arcdicDto.getId())) { - if (StringUtils.isEmpty(arcdicDto.getDictionaryConfigId().getId()) || arcdicDto.getDictionaryConfigId().getId().equals("null")) { - arcdicDto.setDictionaryConfigId(null); - } - archivesDictionaryService.update(arcdicDto); - return ApiResponse.success(ResponseStatus.SUCCESS); - } - throw new BaseException("id异常"); - } - @ApiOperation("创建门类字典") - @AnonymousPostMapping("create-dic") - public ApiResponse createDic(@RequestBody ArchivesDictionaryDTO arcdicDto) { - if (!StringUtils.isEmpty(arcdicDto.getId())) { - throw new BaseException("id添加异常"); - } - if (StringUtils.isEmpty(arcdicDto.getFieldCnName()) || StringUtils.isEmpty(arcdicDto.getFieldName())) { - throw new BaseException("字段名字不能为空"); - } - if (StringUtils.isEmpty(arcdicDto.getIsDataTypeDetails())) { - throw new BaseException("数据类型不能为空"); - } - if (StringUtils.isEmpty(arcdicDto.getDictionaryConfigId().getId()) || arcdicDto.getDictionaryConfigId().getId().equals("null")) { - arcdicDto.setDictionaryConfigId(null); - } - archivesDictionaryService.create(arcdicDto); - return ApiResponse.success(ResponseStatus.SUCCESS); - } + + @ApiOperation("获取档案配置下拉列表") @AnonymousGetMapping("arc-config") @@ -155,11 +118,11 @@ public class ArchivesTypeController { return ApiResponse.success(dictionaryService.findDictrionaryMenu()); } - @ApiOperation("删除门类字典字段") - @AnonymousDeleteMapping("delete-dic") + @ApiOperation("删除门类") + @AnonymousDeleteMapping("delete") public ApiResponse delete(@RequestParam String id) { if (!StringUtils.isEmpty(id)) { - archivesDictionaryService.delete(id); + archivesTypeService.delete(id); return ApiResponse.success(ResponseStatus.SUCCESS); } throw new BaseException("id异常"); diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/DictrionaryController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/DictrionaryController.java index 3a7e3dd..78b45ac 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/DictrionaryController.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/DictrionaryController.java @@ -1,15 +1,11 @@ package com.storeroom.modules.dictionary.controller; -import com.storeroom.annotaion.rest.AnonymousGetMapping; -import com.storeroom.annotaion.rest.AnonymousPostMapping; -import com.storeroom.exception.constant.ResponseStatus; -import com.storeroom.modules.dictionary.domain.vo.DictionaryVO; +import com.storeroom.utils.enums.ResponseStatus; import com.storeroom.modules.dictionary.service.DictionaryService; import com.storeroom.modules.dictionary.service.dto.DictionaryDTO; import com.storeroom.modules.dictionary.service.dto.DictionaryQueryCriteria; import com.storeroom.modules.dictionary.service.dto.PrimaryDTO; import com.storeroom.utils.ApiResponse; -import com.storeroom.utils.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -18,8 +14,6 @@ import org.springframework.http.HttpStatus; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; - @RestController @RequiredArgsConstructor @Api(tags = "字典表管理") diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/FieldController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/FieldController.java index 18433aa..13f028a 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/FieldController.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/FieldController.java @@ -1,25 +1,18 @@ package com.storeroom.modules.dictionary.controller; -import com.storeroom.annotaion.rest.AnonymousGetMapping; -import com.storeroom.annotaion.rest.AnonymousPostMapping; import com.storeroom.config.RsaProperties; -import com.storeroom.exception.constant.ResponseStatus; +import com.storeroom.utils.enums.ResponseStatus; import com.storeroom.modules.dictionary.service.FieldService; import com.storeroom.modules.dictionary.service.dto.FieldDTO; -import com.storeroom.modules.dictionary.service.dto.PrimaryDTO; import com.storeroom.utils.ApiResponse; import com.storeroom.utils.RsaUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.List; - @RestController @RequiredArgsConstructor @Api(tags = "字段表管理") diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesDictionary.java b/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesDictionary.java index 2521029..e1d0a53 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesDictionary.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesDictionary.java @@ -2,14 +2,12 @@ package com.storeroom.modules.dictionary.domain; import com.storeroom.base.BaseEntity; import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; import lombok.Getter; import lombok.Setter; import javax.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.util.List; import java.util.Objects; @Entity @@ -148,17 +146,21 @@ public class ArchivesDictionary extends BaseEntity implements Serializable { @ApiModelProperty(value = "显示长度") private Integer displayLength; + @Column(name = "queue") + @ApiModelProperty(value = "序号") + private Integer queue; + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; ArchivesDictionary that = (ArchivesDictionary) o; - return Objects.equals(id, that.id) && Objects.equals(categoryId, that.categoryId) && Objects.equals(dictionaryConfigId, that.dictionaryConfigId) && Objects.equals(fieldName, that.fieldName) && Objects.equals(fieldCnName, that.fieldCnName) && Objects.equals(isDefaultValue, that.isDefaultValue) && Objects.equals(isInputClass, that.isInputClass) && Objects.equals(isDataType, that.isDataType) && Objects.equals(isDataTypeDetails, that.isDataTypeDetails) && Objects.equals(isColumnLength, that.isColumnLength) && Objects.equals(isColumnType, that.isColumnType) && Objects.equals(isSequence, that.isSequence) && Objects.equals(isType, that.isType) && Objects.equals(isSystem, that.isSystem) && Objects.equals(isLine, that.isLine) && Objects.equals(isInput, that.isInput) && Objects.equals(isRequired, that.isRequired) && Objects.equals(isAutomatic, that.isAutomatic) && Objects.equals(isAdd, that.isAdd) && Objects.equals(isSearch, that.isSearch) && Objects.equals(isInherit, that.isInherit) && Objects.equals(isFilling, that.isFilling) && Objects.equals(fillingDigit, that.fillingDigit) && Objects.equals(isRepeat, that.isRepeat) && Objects.equals(isDisplay, that.isDisplay) && Objects.equals(displayOrder, that.displayOrder) && Objects.equals(isDisplayformat, that.isDisplayformat) && Objects.equals(displayformatType, that.displayformatType) && Objects.equals(editLength, that.editLength) && Objects.equals(displayLength, that.displayLength); + return Objects.equals(id, that.id) && Objects.equals(categoryId, that.categoryId) && Objects.equals(dictionaryConfigId, that.dictionaryConfigId) && Objects.equals(fieldName, that.fieldName) && Objects.equals(fieldCnName, that.fieldCnName) && Objects.equals(isDefaultValue, that.isDefaultValue) && Objects.equals(isInputClass, that.isInputClass) && Objects.equals(isDataType, that.isDataType) && Objects.equals(isDataTypeDetails, that.isDataTypeDetails) && Objects.equals(isColumnLength, that.isColumnLength) && Objects.equals(isColumnType, that.isColumnType) && Objects.equals(isSequence, that.isSequence) && Objects.equals(isType, that.isType) && Objects.equals(isSystem, that.isSystem) && Objects.equals(isLine, that.isLine) && Objects.equals(isInput, that.isInput) && Objects.equals(isRequired, that.isRequired) && Objects.equals(isAutomatic, that.isAutomatic) && Objects.equals(isAdd, that.isAdd) && Objects.equals(isSearch, that.isSearch) && Objects.equals(isInherit, that.isInherit) && Objects.equals(isFilling, that.isFilling) && Objects.equals(fillingDigit, that.fillingDigit) && Objects.equals(isRepeat, that.isRepeat) && Objects.equals(isDisplay, that.isDisplay) && Objects.equals(displayOrder, that.displayOrder) && Objects.equals(displayOrderBy, that.displayOrderBy) && Objects.equals(isDisplayformat, that.isDisplayformat) && Objects.equals(displayformatType, that.displayformatType) && Objects.equals(editLength, that.editLength) && Objects.equals(displayLength, that.displayLength) && Objects.equals(queue, that.queue); } @Override public int hashCode() { - return Objects.hash(id, categoryId, dictionaryConfigId, fieldName, fieldCnName, isDefaultValue, isInputClass, isDataType, isDataTypeDetails, isColumnLength, isColumnType, isSequence, isType, isSystem, isLine, isInput, isRequired, isAutomatic, isAdd, isSearch, isInherit, isFilling, fillingDigit, isRepeat, isDisplay, displayOrder, isDisplayformat, displayformatType, editLength, displayLength); + return Objects.hash(id, categoryId, dictionaryConfigId, fieldName, fieldCnName, isDefaultValue, isInputClass, isDataType, isDataTypeDetails, isColumnLength, isColumnType, isSequence, isType, isSystem, isLine, isInput, isRequired, isAutomatic, isAdd, isSearch, isInherit, isFilling, fillingDigit, isRepeat, isDisplay, displayOrder, displayOrderBy, isDisplayformat, displayformatType, editLength, displayLength, queue); } } 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 2ec3e44..e752548 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 @@ -23,17 +23,18 @@ public interface ArchivesDictionaryRepository extends JpaRepository findDisPlay(String categoryId); + /** - * 通过门类id查询 + * 通过门类id、字典数据类型、输入状态查询 * * @param categoryId + * @param isDateType * @return */ - List findByCategoryId(String categoryId); + List findByCategoryIdAndIsDataTypeAndIsInput(String categoryId, Integer isDateType,Boolean isInput); /** - * 通过门类id 和字典数据类型查询 - * + * 通过门类id和字典数据类型查询 * @param categoryId * @param isDateType * @return @@ -52,15 +53,15 @@ public interface ArchivesDictionaryRepository extends JpaRepository querybyName(String fName, String fcName); + + ArchivesDictionary findFirstByCategoryIdAndFieldName(String categoryId,String fieldName); + /** - * 通过数据类型查询 - * - * @param type + * 查询字段隐藏状态 + * @param state * @return */ - List findByIsDataType(Integer type); - - ArchivesDictionary findFirstByCategoryIdAndFieldName(String categoryId,String fieldName); + List findByIsDisplay(Boolean state); } 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 178e106..fa20d82 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 @@ -70,6 +70,14 @@ public interface ArchivesDictionaryService { void ChangeDisplayState(Set archivesDictionarySmallDTOS); + /** + * 查询隐藏状态字典 + * @param isDisPlayState + * @return + */ + List getIsDisPlayState(Boolean isDisPlayState); + + 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 82e705b..61362b2 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 @@ -1,6 +1,8 @@ package com.storeroom.modules.dictionary.service; +import com.storeroom.modules.dictionary.service.dto.ArchivesNoSettingDTO; + /** * 档案配置规则服务 */ @@ -13,4 +15,11 @@ public interface ArchivesNoSettingService { * @return */ Boolean IsDataState(String dicId); + + + /** + * 创建规则字段 + * @param archivesNoSettingDTO / + */ + void create(ArchivesNoSettingDTO archivesNoSettingDTO); } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesTypeService.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesTypeService.java index d595bd0..07e37d9 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesTypeService.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesTypeService.java @@ -41,9 +41,16 @@ public interface ArchivesTypeService { /** - * + * 排序 */ void updateSort(Set arcDicSmallDTO); + /** + * 通过id 查询门类 + * @param id 门类id + * @return + */ + ArchivesTypeDTO findById(String id); + } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/DynamicTableService.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/DynamicTableService.java index a751da5..d8c8817 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/DynamicTableService.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/DynamicTableService.java @@ -14,5 +14,12 @@ public interface DynamicTableService { void DynamicCreate(Integer type,String archiveTypeId,String tableName); + /** + * 删除动态生成的表 + * @param name + */ + void DeleteTable(String name); + + } 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 9afc2cc..a72e9ab 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 @@ -15,4 +15,7 @@ public class ArchivesDicStateDTO implements Serializable { @NotNull private Integer isDataType; + + @NotNull + private Boolean isInput; } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionarySmallDTO.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionarySmallDTO.java index 905df04..de3be23 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionarySmallDTO.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionarySmallDTO.java @@ -14,6 +14,5 @@ public class ArchivesDictionarySmallDTO implements Serializable { @NotNull private String id; - private Integer sort; } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDisplaySmallDTO.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDisplaySmallDTO.java index 385c02f..06a3781 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDisplaySmallDTO.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDisplaySmallDTO.java @@ -11,15 +11,19 @@ public class ArchivesDisplaySmallDTO implements Serializable { @NotNull private String id; - + //显示格式 private String displayformatType; + //字段长度 private Integer displayLength; + //显示状态 private Boolean isDisplay; + //排序 private Integer sort; + //升降排序 private String displayOrderBy; 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 new file mode 100644 index 0000000..94129e3 --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesNoSettingDTO.java @@ -0,0 +1,25 @@ +package com.storeroom.modules.dictionary.service.dto; + + +import com.storeroom.base.BaseDTO; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ArchivesNoSettingDTO extends BaseDTO implements Serializable { + + private String id; + + private String filedCnName; + + private String filedName; + + private String connector; + + private Integer sequence; + + private String categoryId; + + private String dictionaryId; +} 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 6806ce2..ecee124 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,13 +3,12 @@ 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.repository.ArchivesNoSettingRepository; import com.storeroom.modules.dictionary.service.ArchivesDictionaryService; -import com.storeroom.modules.dictionary.service.dto.ArchivesDicStateDTO; -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.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; import com.storeroom.utils.ValidationUtil; @@ -28,7 +27,6 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService { private final ArchivesDictionaryRepository archivesDictionaryRepository; private final ArchivesDictionaryMapper archivesDictionaryMapper; - @Override @Transactional(rollbackFor = Exception.class) public void saveAll(List list) { @@ -44,10 +42,15 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService { @Override public List getAll(ArchivesDicStateDTO archivesDicStateDTO) { - List list= archivesDictionaryRepository.findByCategoryIdAndIsDataType(archivesDicStateDTO.getCategoryId(),archivesDicStateDTO.getIsDataType()); - List dtoList=new ArrayList<>(); - list.forEach(item-> { - ArchivesDictionaryDTO dto=archivesDictionaryMapper.toDto(item); + List list; + if (archivesDicStateDTO.getIsInput() != null) { + list = archivesDictionaryRepository.findByCategoryIdAndIsDataTypeAndIsInput(archivesDicStateDTO.getCategoryId(), archivesDicStateDTO.getIsDataType(), archivesDicStateDTO.getIsInput()); + } else { + list = archivesDictionaryRepository.findByCategoryIdAndIsDataType(archivesDicStateDTO.getCategoryId(), archivesDicStateDTO.getIsDataType()); + } + List dtoList = new ArrayList<>(); + list.forEach(item -> { + ArchivesDictionaryDTO dto = archivesDictionaryMapper.toDto(item); dtoList.add(dto); }); return dtoList; @@ -147,4 +150,15 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService { archivesDictionaryRepository.saveAll(list); } + @Override + public List getIsDisPlayState(Boolean isDisPlayState) { + List list = archivesDictionaryRepository.findByIsDisplay(isDisPlayState); + List list1 = new ArrayList<>(); + list.forEach(item -> { + ArchivesDictionaryDTO ar = archivesDictionaryMapper.toDto(item); + list1.add(ar); + }); + return list1; + } + } 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 9113a04..070d007 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,6 +4,9 @@ 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.ArchivesNoSettingDTO; +import com.storeroom.modules.dictionary.service.mapstruct.ArchivesNoSettingMapper; +import com.storeroom.utils.NanoIdUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -12,6 +15,7 @@ import org.springframework.stereotype.Service; public class ArchivesNoSettingImpl implements ArchivesNoSettingService { private final ArchivesNoSettingRepository ansRepostiory; + private final ArchivesNoSettingMapper archivesNoSettingMapper; @Override @@ -23,4 +27,11 @@ public class ArchivesNoSettingImpl implements ArchivesNoSettingService { } return state; } + + @Override + public void create(ArchivesNoSettingDTO archivesNoSettingDTO) { + archivesNoSettingDTO.setId(NanoIdUtils.randomNanoId()); + ArchivesNoSetting as = archivesNoSettingMapper.toEntity(archivesNoSettingDTO); + 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 8b9b633..773b744 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,6 +1,7 @@ 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; @@ -10,6 +11,7 @@ import com.storeroom.modules.dictionary.service.dto.ArchivesTypeDTO; import com.storeroom.modules.dictionary.service.mapstruct.ArchivesTypeMapper; import com.storeroom.utils.DateUtils; import com.storeroom.utils.NanoIdUtils; +import com.storeroom.utils.StringUtils; import com.storeroom.utils.ValidationUtil; import lombok.RequiredArgsConstructor; @@ -96,6 +98,9 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService { @Override public void delete(String id) { + ArchivesType archivesType=archivesTypeRepository.findById(id).orElseGet(ArchivesType::new); + String tableName = archivesType.getEnName(); + dynamicTableService.DeleteTable(tableName); archivesTypeRepository.deleteById(id); } @@ -110,5 +115,14 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService { archivesTypeRepository.saveAll(list); } + @Override + public ArchivesTypeDTO findById(String id) { + if (!StringUtils.isEmpty(id)) { + ArchivesType archivesType = archivesTypeRepository.findById(id).orElseGet(ArchivesType::new); + return archivesTypeMapper.toDto(archivesType); + } + return null; + } + } 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 d4caa9c..d4f5575 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 @@ -1,21 +1,30 @@ package com.storeroom.modules.dictionary.service.impl; -import com.storeroom.exception.BaseException; import com.storeroom.modules.common.ArchivesListToMap; import com.storeroom.modules.dictionary.domain.vo.FieldVO; import com.storeroom.modules.dictionary.service.ArchivesDictionaryService; import com.storeroom.modules.dictionary.service.DynamicTableService; import com.storeroom.modules.dictionary.service.FieldService; import com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO; -import com.storeroom.modules.dictionary.service.dto.FieldDTO; import com.storeroom.utils.DateUtils; -import com.storeroom.utils.NanoIdUtils; +import com.storeroom.utils.StringUtils; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.DataSourceUtils; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.sql.DataSource; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -28,8 +37,7 @@ public class DynamicTableImpl implements DynamicTableService { private final FieldService fieldService; private final ArchivesDictionaryService archivesDictionaryService; private final JdbcTemplate jdbcTemplate; - - + private final DataSource dataSource; @Override @@ -38,7 +46,7 @@ public class DynamicTableImpl implements DynamicTableService { List integerList = new ArrayList<>(); if (type == 4 || type == 5) { //#生成文件表名称 - String fileTableName="file_tb_"; + String fileTableName = "file_tb_"; integerList.add(1); integerList.add(2); @@ -63,6 +71,7 @@ public class DynamicTableImpl implements DynamicTableService { } + /** * 查询字典字段 * @@ -74,6 +83,41 @@ public class DynamicTableImpl implements DynamicTableService { return list; } + @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); + } + } + + + /** + * 验证表是否存在 + * + * @param tableName 表名 + * @return 返回状态 + */ + private Boolean checkTableNameExitst(String tableName) { + Boolean result; + Connection connection = DataSourceUtils.getConnection(dataSource); + try { + ResultSet rs = connection.getMetaData().getTables(null, null, tableName, null); + if (rs.next()) { + //表存在 + result = true; + } else { + //表不存在 + result = false; + } + } catch (Exception e) { + return false; + } + return result; + + } + /** * 插入档案字典表数据 diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/mapstruct/ArchivesNoSettingMapper.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/mapstruct/ArchivesNoSettingMapper.java new file mode 100644 index 0000000..ffde7ed --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/mapstruct/ArchivesNoSettingMapper.java @@ -0,0 +1,11 @@ +package com.storeroom.modules.dictionary.service.mapstruct; + +import com.storeroom.base.BaseMapper; +import com.storeroom.modules.dictionary.domain.ArchivesNoSetting; +import com.storeroom.modules.dictionary.service.dto.ArchivesNoSettingDTO; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +@Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface ArchivesNoSettingMapper extends BaseMapper { +} diff --git a/common/src/main/java/com/storeroom/exception/BaseException.java b/common/src/main/java/com/storeroom/exception/BaseException.java index d106d98..aeee538 100644 --- a/common/src/main/java/com/storeroom/exception/BaseException.java +++ b/common/src/main/java/com/storeroom/exception/BaseException.java @@ -1,6 +1,5 @@ package com.storeroom.exception; -import com.storeroom.exception.constant.ResponseStatus; import com.storeroom.utils.MessageUtils; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/common/src/main/java/com/storeroom/exception/handler/GlobalExceptionHandler.java b/common/src/main/java/com/storeroom/exception/handler/GlobalExceptionHandler.java index c22560e..34c219d 100644 --- a/common/src/main/java/com/storeroom/exception/handler/GlobalExceptionHandler.java +++ b/common/src/main/java/com/storeroom/exception/handler/GlobalExceptionHandler.java @@ -1,7 +1,7 @@ package com.storeroom.exception.handler; import com.storeroom.exception.BaseException; -import com.storeroom.exception.constant.ResponseStatus; +import com.storeroom.utils.enums.ResponseStatus; import com.storeroom.utils.ApiResponse; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; diff --git a/common/src/main/java/com/storeroom/utils/ApiResponse.java b/common/src/main/java/com/storeroom/utils/ApiResponse.java index 1e51008..d50406d 100644 --- a/common/src/main/java/com/storeroom/utils/ApiResponse.java +++ b/common/src/main/java/com/storeroom/utils/ApiResponse.java @@ -1,11 +1,9 @@ package com.storeroom.utils; -import com.storeroom.exception.constant.ResponseStatus; +import com.storeroom.utils.enums.ResponseStatus; import lombok.Data; -import java.time.LocalDateTime; - /** * 通用的 API 接口封装 */ diff --git a/common/src/main/java/com/storeroom/utils/SecurityUtils.java b/common/src/main/java/com/storeroom/utils/SecurityUtils.java index 7a6c599..a04f0c0 100644 --- a/common/src/main/java/com/storeroom/utils/SecurityUtils.java +++ b/common/src/main/java/com/storeroom/utils/SecurityUtils.java @@ -5,7 +5,7 @@ import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.storeroom.exception.BaseException; -import com.storeroom.exception.constant.ResponseStatus; +import com.storeroom.utils.enums.ResponseStatus; import com.storeroom.utils.enums.DataScopeEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.Authentication; diff --git a/common/src/main/java/com/storeroom/exception/constant/ResponseStatus.java b/common/src/main/java/com/storeroom/utils/enums/ResponseStatus.java similarity index 94% rename from common/src/main/java/com/storeroom/exception/constant/ResponseStatus.java rename to common/src/main/java/com/storeroom/utils/enums/ResponseStatus.java index 63dce74..bae754d 100644 --- a/common/src/main/java/com/storeroom/exception/constant/ResponseStatus.java +++ b/common/src/main/java/com/storeroom/utils/enums/ResponseStatus.java @@ -1,4 +1,4 @@ -package com.storeroom.exception.constant; +package com.storeroom.utils.enums; import lombok.Getter; diff --git a/system/src/main/java/com/storeroom/modules/security/controller/AuthorizationController.java b/system/src/main/java/com/storeroom/modules/security/controller/AuthorizationController.java index 64f8d57..f4cef7b 100644 --- a/system/src/main/java/com/storeroom/modules/security/controller/AuthorizationController.java +++ b/system/src/main/java/com/storeroom/modules/security/controller/AuthorizationController.java @@ -7,7 +7,7 @@ import com.storeroom.annotaion.rest.AnonymousGetMapping; import com.storeroom.annotaion.rest.AnonymousPostMapping; import com.storeroom.config.RsaProperties; import com.storeroom.exception.BaseException; -import com.storeroom.exception.constant.ResponseStatus; +import com.storeroom.utils.enums.ResponseStatus; import com.storeroom.modules.security.config.bean.LoginCodeEnum; import com.storeroom.modules.security.config.bean.LoginProperties; import com.storeroom.modules.security.config.bean.SecurityProperties; @@ -21,7 +21,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.core.Authentication; diff --git a/system/src/main/java/com/storeroom/modules/system/controller/DeptController.java b/system/src/main/java/com/storeroom/modules/system/controller/DeptController.java index 26925c3..07244fc 100644 --- a/system/src/main/java/com/storeroom/modules/system/controller/DeptController.java +++ b/system/src/main/java/com/storeroom/modules/system/controller/DeptController.java @@ -4,7 +4,7 @@ package com.storeroom.modules.system.controller; import cn.hutool.core.collection.CollectionUtil; import com.storeroom.annotation.Log; import com.storeroom.exception.BaseException; -import com.storeroom.exception.constant.ResponseStatus; +import com.storeroom.utils.enums.ResponseStatus; import com.storeroom.modules.system.domain.Dept; import com.storeroom.modules.system.service.DeptService; import com.storeroom.modules.system.service.dto.DeptDto; diff --git a/system/src/main/java/com/storeroom/modules/system/controller/DictController.java b/system/src/main/java/com/storeroom/modules/system/controller/DictController.java index abcd7a7..4db03fe 100644 --- a/system/src/main/java/com/storeroom/modules/system/controller/DictController.java +++ b/system/src/main/java/com/storeroom/modules/system/controller/DictController.java @@ -3,7 +3,7 @@ package com.storeroom.modules.system.controller; import com.storeroom.annotation.Log; import com.storeroom.exception.BaseException; -import com.storeroom.exception.constant.ResponseStatus; +import com.storeroom.utils.enums.ResponseStatus; import com.storeroom.modules.system.domain.Dict; import com.storeroom.modules.system.service.DictService; import com.storeroom.modules.system.service.dto.DictQueryCriteria; diff --git a/system/src/main/java/com/storeroom/modules/system/controller/DictDetailController.java b/system/src/main/java/com/storeroom/modules/system/controller/DictDetailController.java index a9a7ef3..0c56a76 100644 --- a/system/src/main/java/com/storeroom/modules/system/controller/DictDetailController.java +++ b/system/src/main/java/com/storeroom/modules/system/controller/DictDetailController.java @@ -3,7 +3,7 @@ package com.storeroom.modules.system.controller; import com.storeroom.annotation.Log; import com.storeroom.exception.BaseException; -import com.storeroom.exception.constant.ResponseStatus; +import com.storeroom.utils.enums.ResponseStatus; import com.storeroom.modules.system.domain.DictDetail; import com.storeroom.modules.system.service.DictDetailService; import com.storeroom.modules.system.service.dto.DictDetailDto; diff --git a/system/src/main/java/com/storeroom/modules/system/controller/MenuController.java b/system/src/main/java/com/storeroom/modules/system/controller/MenuController.java index ca53911..e15b5d6 100644 --- a/system/src/main/java/com/storeroom/modules/system/controller/MenuController.java +++ b/system/src/main/java/com/storeroom/modules/system/controller/MenuController.java @@ -4,7 +4,7 @@ package com.storeroom.modules.system.controller; import cn.hutool.core.collection.CollectionUtil; import com.storeroom.annotation.Log; import com.storeroom.exception.BaseException; -import com.storeroom.exception.constant.ResponseStatus; +import com.storeroom.utils.enums.ResponseStatus; import com.storeroom.modules.system.domain.Menu; import com.storeroom.modules.system.service.MenuService; import com.storeroom.modules.system.service.dto.MenuDto; diff --git a/system/src/main/java/com/storeroom/modules/system/controller/TestController.java b/system/src/main/java/com/storeroom/modules/system/controller/TestController.java index fb8dde2..4c1b055 100644 --- a/system/src/main/java/com/storeroom/modules/system/controller/TestController.java +++ b/system/src/main/java/com/storeroom/modules/system/controller/TestController.java @@ -1,21 +1,15 @@ package com.storeroom.modules.system.controller; -import com.storeroom.annotaion.rest.AnonymousGetMapping; import com.storeroom.annotaion.rest.AnonymousPostMapping; -import com.storeroom.exception.BaseException; -import com.storeroom.exception.constant.ResponseStatus; import com.storeroom.modules.system.domain.vo.CreateTableVo; import com.storeroom.utils.ApiResponse; -import com.storeroom.utils.NanoIdUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import java.lang.reflect.Field; diff --git a/system/src/main/java/com/storeroom/modules/system/controller/UserController.java b/system/src/main/java/com/storeroom/modules/system/controller/UserController.java index 855123f..ab416d0 100644 --- a/system/src/main/java/com/storeroom/modules/system/controller/UserController.java +++ b/system/src/main/java/com/storeroom/modules/system/controller/UserController.java @@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.storeroom.annotation.Log; import com.storeroom.config.RsaProperties; import com.storeroom.exception.BaseException; -import com.storeroom.exception.constant.ResponseStatus; +import com.storeroom.utils.enums.ResponseStatus; import com.storeroom.modules.system.domain.Dept; import com.storeroom.modules.system.domain.User; import com.storeroom.modules.system.domain.vo.UserPassVo;