diff --git a/archives/src/main/java/com/storeroom/modules/common/ArchivesTypeEnum.java b/archives/src/main/java/com/storeroom/modules/common/ArchivesTypeEnum.java new file mode 100644 index 0000000..84a703f --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/common/ArchivesTypeEnum.java @@ -0,0 +1,33 @@ +package com.storeroom.modules.common; + +import lombok.Getter; + +@Getter +public enum ArchivesTypeEnum { + + + folder(1, "文件夹"), + project(2, "项目"), + archives(3, "案卷"), + inChive(4, "卷内"), + files(5, "文件"), + Template(6, "模板"); + + private Integer code; + + private String type; + + ArchivesTypeEnum(Integer code) { + this.code = code; + } + + ArchivesTypeEnum(String type) { + this.type = type; + } + + ArchivesTypeEnum(Integer code, String type) { + this.code = code; + this.type = type; + } + +} 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 new file mode 100644 index 0000000..6474977 --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java @@ -0,0 +1,35 @@ +package com.storeroom.modules.dictionary.controller; + + +import com.storeroom.annotaion.rest.AnonymousGetMapping; +import com.storeroom.modules.common.ArchivesTypeEnum; +import com.storeroom.utils.ApiResponse; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.*; + + +@Api(tags = "门类管理") +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/archives-type/") +public class ArchivesTypeController { + + + @ApiOperation("门类类型") + @AnonymousGetMapping("dropdown-list") + public ApiResponse getType(){ + Map list=new LinkedHashMap<>(); + list.put(ArchivesTypeEnum.folder.getCode(),ArchivesTypeEnum.folder.getType()); + list.put(ArchivesTypeEnum.project.getCode(),ArchivesTypeEnum.project.getType()); + list.put(ArchivesTypeEnum.archives.getCode(),ArchivesTypeEnum.archives.getType()); + list.put(ArchivesTypeEnum.inChive.getCode(),ArchivesTypeEnum.inChive.getType()); + list.put(ArchivesTypeEnum.files.getCode(),ArchivesTypeEnum.folder.getType()); + list.put(ArchivesTypeEnum.Template.getCode(),ArchivesTypeEnum.Template.getType()); + return ApiResponse.success(list); + } +} diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesType.java b/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesType.java index b300d37..eec2dd8 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesType.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesType.java @@ -20,7 +20,6 @@ public class ArchivesType extends BaseEntity implements Serializable { @Id @Column(name = "id") @NotNull(groups = Update.class) - @GeneratedValue(strategy = GenerationType.IDENTITY) @ApiModelProperty(value = "id", hidden = true) private String id; diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesTypeRepository.java b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesTypeRepository.java new file mode 100644 index 0000000..523516b --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesTypeRepository.java @@ -0,0 +1,8 @@ +package com.storeroom.modules.dictionary.repository; + +import com.storeroom.modules.dictionary.domain.ArchivesType; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +public interface ArchivesTypeRepository extends JpaRepository, JpaSpecificationExecutor { +} 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 new file mode 100644 index 0000000..21bedcc --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesTypeService.java @@ -0,0 +1,8 @@ +package com.storeroom.modules.dictionary.service; + +public interface ArchivesTypeService { + + + void create(); + +} diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesTypeDTO.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesTypeDTO.java new file mode 100644 index 0000000..48561a6 --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesTypeDTO.java @@ -0,0 +1,16 @@ +package com.storeroom.modules.dictionary.service.dto; + + +import com.storeroom.base.BaseDTO; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ArchivesTypeDTO extends BaseDTO implements Serializable { + + + + + +} 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 new file mode 100644 index 0000000..998c32e --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java @@ -0,0 +1,9 @@ +package com.storeroom.modules.dictionary.service.impl; + +import com.storeroom.modules.dictionary.service.ArchivesTypeService; +import org.springframework.stereotype.Service; + + +@Service +public class ArchivesTypeServiceImpl implements ArchivesTypeService { +} 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 5446f18..855123f 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 @@ -64,7 +64,7 @@ public class UserController { @ApiOperation("查询用户") @GetMapping - @PreAuthorize("@ys.check('user:list')") + @PreAuthorize("@ys.check('user:list')") public ApiResponse queryUser(UserQueryCriteria criteria, Pageable pageable){ if (!ObjectUtils.isEmpty(criteria.getDeptId())) { criteria.getDeptIds().add(criteria.getDeptId());