添加教室管理功能

修改FileController
添加b_rooms sql文件

src/main/java/org/rcisoft/business/brooms/controller/BRoomsController.java

@@ -28,6 +28,7 @@ import org.rcisoft.business.brooms.entity.BRooms;
 import org.rcisoft.business.brooms.service.BRoomsService;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.io.File;
 import java.util.List;
@@ -46,9 +47,17 @@ public class BRoomsController extends FileController<BRooms> {
     private Global global;
 
     @ApiOperation(value="添加", notes="添加")
-    //@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "campus", value = "校区(1)", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "building", value = "教学楼(1-50)", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "category", value = "教室类型(1)", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "classroomNo", value = "教室号(1-50)", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "classroomName", value = "教室名(1-50)", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "classSeat", value = "座位数(1-5)", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "examSeat", value = "考试座位数(1-5)", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "plan", value = "计划(1-50)", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "code", value = "教室编号(1-50)", required = true, dataType = "varchar")})
     @PostMapping(value = "/add")
-    public Result add(@Valid BRooms bRooms, BindingResult bindingResult) {
+    public Result add( @ApiIgnore BRooms bRooms, BindingResult bindingResult) {
         bRooms.setToken(getToken());
         PersistModel data = bRoomsServiceImpl.save(bRooms);
         return Result.builder(data,
@@ -58,7 +67,7 @@ public class BRoomsController extends FileController<BRooms> {
     }
 
     @ApiOperation(value="逻辑删除", notes="逻辑删除")
-    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "id", required = false, dataType = "varchar")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "id", required = true, dataType = "varchar")})
     @DeleteMapping("/delete/{id:\\w+}")
     public Result delete(@PathVariable String id) {
         BRooms bRooms = new BRooms();
@@ -72,9 +81,18 @@ public class BRoomsController extends FileController<BRooms> {
     }
 
     @ApiOperation(value="修改", notes="修改")
-    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
-    @PutMapping("/update/{id:\\w+}")
-    public Result update(@Valid BRooms bRooms, BindingResult bindingResult) {
+    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "campus", value = "校区(1)", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "building", value = "教学楼(1-50)", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "category", value = "教室类型(1)", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "classroomNo", value = "教室号(1-50)", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "classroomName", value = "教室名(1-50)", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "classSeat", value = "座位数(1-5)", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "examSeat", value = "考试座位数(1-5)", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "plan", value = "计划(1-50)", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "code", value = "教室编号(1-50)", required = false, dataType = "varchar")})
+    @PutMapping("/update")
+    public Result update(@ApiIgnore BRooms bRooms, BindingResult bindingResult) {
         bRooms.setToken(getToken());
         PersistModel data = bRoomsServiceImpl.merge(bRooms);
         return Result.builder(data,
@@ -84,6 +102,7 @@ public class BRoomsController extends FileController<BRooms> {
     }
 
     @ApiOperation(value="查看单 ", notes="查看单 ")
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "id", required = true, dataType = "varchar")})
     @GetMapping("/detail/{id:\\w+}")
     public Result detail(@PathVariable String id) {
         return Result.builder(new PersistModel(1),

src/main/java/org/rcisoft/business/brooms/entity/BRooms.java

@@ -2,6 +2,8 @@ package org.rcisoft.business.brooms.entity;
 
 import lombok.*;
 
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.NotBlank;
 import org.rcisoft.core.entity.IdEntity;
 import javax.persistence.*;
 import java.math.BigDecimal;
@@ -19,22 +21,44 @@ import java.util.List;
 @AllArgsConstructor
 @Table(name = "b_rooms")
 public class BRooms  extends IdEntity<BRooms> {
+
+     /*教室类型*/
+     @Length(min= 1 , max = 1, message = "长度为1")
+     @NotBlank
      private String category;
 
+     /*校区*/
+     @Length(min= 1 , max = 1, message = "长度为1")
+     @NotBlank
      private String campus;
 
+     /*教学楼*/
+     @Length(min= 1 , max = 64, message = "长度最短为1，最长为50")
+     @NotBlank
      private String building;
 
+     /*教室号*/
+     @Length(min= 1 , max = 64, message = "长度最短为1，最长为50")
+     @NotBlank
      private String classroomNo;
 
+     /*教室名*/
+     @Length(min= 1 , max = 64, message = "长度最短为1，最长为50")
      private String classroomName;
 
+     /*座位数*/
      private Integer classSeat;
 
+     /*考试座位数*/
      private Integer examSeat;
 
+     /*计划*/
+     @Length(min= 1 , max = 64, message = "长度最短为1，最长为50")
      private String plan;
 
+     /*教室编号*/
+     @Length(min= 1 , max = 64, message = "长度最短为1，最长为50")
+     @NotBlank
      private String code;
 
      @Transient

src/main/java/org/rcisoft/business/brooms/utils/multipartToFile.java

-package org.rcisoft.business.brooms.utils;
-
-import org.apache.commons.fileupload.disk.DiskFileItem;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-
-import java.io.File;
-import java.io.IOException;
-
-public class multipartToFile {
-
-    private static File multipartToFileMethod(MultipartFile multfile) throws IOException {
-        CommonsMultipartFile cf= (CommonsMultipartFile)multfile;
-        DiskFileItem fi = (DiskFileItem)cf.getFileItem();
-        return fi.getStoreLocation();
-    }
-}
\ No newline at end of file