commit code

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;
+    }
+
+}

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<Object> getType(){
+            Map<Integer,String> 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);
+        }
+}

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;
 

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<ArchivesType,String>, JpaSpecificationExecutor<ArchivesType> {
+}

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();
+
+}

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 {
+
+
+
+
+
+}

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 {
+}

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<Object> queryUser(UserQueryCriteria criteria, Pageable pageable){
         if (!ObjectUtils.isEmpty(criteria.getDeptId())) {
             criteria.getDeptIds().add(criteria.getDeptId());