Merge branch 'Regulation' of http://git.izouma.com/licailing/wenlvju into Regulation

src/main/java/com/izouma/wenlvju/domain/performance/ArrangeJudge.java

@@ -2,6 +2,7 @@ package com.izouma.wenlvju.domain.performance;
 
 import com.izouma.wenlvju.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -27,4 +28,7 @@ public class ArrangeJudge extends BaseEntity {
     private boolean morning;
 
     private Long expertId;
+
+    @ApiModelProperty(value = "审核状态")
+    private int status;
 }

src/main/java/com/izouma/wenlvju/domain/performance/Programme.java

@@ -8,6 +8,7 @@ import com.izouma.wenlvju.domain.BaseEntity;
 import com.izouma.wenlvju.domain.VideoObject;
 import com.izouma.wenlvju.dto.ProgUploadDTO;
 import com.izouma.wenlvju.dto.ProgrammeDTO;
+import com.izouma.wenlvju.enums.ProgrammeStatus;
 import com.izouma.wenlvju.enums.SignedIn;
 import com.izouma.wenlvju.enums.CompetitionGroup;
 import io.swagger.annotations.ApiModel;
@@ -90,6 +91,10 @@ public class Programme extends BaseEntity {
     */
     private int status;
 
+    @ApiModelProperty(value = "状态")
+    @Enumerated(EnumType.STRING)
+    private ProgrammeStatus programmeStatus;
+
     @ApiModelProperty(value = "签到管理")
     @Enumerated(EnumType.STRING)
     private SignedIn signedIn;

src/main/java/com/izouma/wenlvju/enums/ProgrammeProcess.java

@@ -0,0 +1,24 @@
+package com.izouma.wenlvju.enums;
+/**
+ * 审核流程
+ */
+public enum ProgrammeProcess {
+
+    /*
+    待分组
+     */
+    ARRANGE,
+    /*
+    待分配评委
+     */
+    ARRANGE_JUDGE,
+    /*
+    待签到
+     */
+    SIGN_IN,
+    /*
+    待评分
+     */
+    RATE
+
+}

src/main/java/com/izouma/wenlvju/enums/ProgrammeStatus.java

@@ -1,5 +1,8 @@
 package com.izouma.wenlvju.enums;
 
+/**
+ * 节目状态
+ */
 public enum ProgrammeStatus {
     /*
     初始状态
@@ -16,5 +19,21 @@ public enum ProgrammeStatus {
     /*
     审核中
      */
-    UNDER_REVIEW
+    UNDER_REVIEW,
+    /*
+    审核未通过
+     */
+    REVIEW_FAILED,
+    /*
+    复审中
+     */
+    UNDER_SECOND_REVIEW,
+    /*
+    评奖中
+     */
+    AWARD,
+    /*
+    完成
+     */
+    COMPLETE
 }

src/main/vue/src/components/VideoGrid.vue

@@ -38,10 +38,8 @@ export default {
         return {
             player: null,
             list: [
-                'https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/video/2021-03-19-14-47-24CxnKwMnv.mp4',
-                'https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/video/2021-03-19-15-30-43nvcwuumz.mp4',
-                'https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/video/2021-03-19-14-33-40dhjGRCso.mp4',
-                'https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/video/2021-03-19-14-47-40sDbsFufH.mp4'
+                'https://wenlvju.oss-cn-hangzhou.aliyuncs.com/video/video_20211017_085836.mp4',
+                'https://wenlvju.oss-cn-hangzhou.aliyuncs.com/video/video_20211017_090538.mp4'
             ],
             videoUrl: ''
         };

src/main/vue/src/components/VideoGridOrganization.vue

@@ -34,10 +34,8 @@ export default {
         return {
             player: null,
             list: [
-                'https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/video/2021-03-19-14-47-24CxnKwMnv.mp4',
-                'https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/video/2021-03-19-15-30-43nvcwuumz.mp4',
-                'https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/video/2021-03-19-14-33-40dhjGRCso.mp4',
-                'https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/video/2021-03-19-14-47-40sDbsFufH.mp4'
+                'https://wenlvju.oss-cn-hangzhou.aliyuncs.com/video/video_20211017_085836.mp4',
+                'https://wenlvju.oss-cn-hangzhou.aliyuncs.com/video/video_20211017_090538.mp4'
             ],
             videoUrl: ''
         };

src/main/vue/src/views/record/VideoList.vue

@@ -194,7 +194,7 @@ export default {
                     this.$nextTick(() => {
                         if (res.length > 0) {
                             res.forEach((item, index) => {
-                                if (index <= 1) {
+                                if (index <= -1) {
                                     this.$refs.video[index].init();
                                 } else {
                                     let _index = this.randomNum(0, 4);

src/main/vue/src/views/record/VideoOrganizationList.vue

@@ -88,7 +88,7 @@ export default {
                     this.$nextTick(() => {
                         if (res.content.length > 0) {
                             res.content.forEach((item, index) => {
-                                if (index == 0) {
+                                if (index <= -1) {
                                     this.$refs.video[index].init();
                                 } else {
                                     let _index = this.randomNum(0, 4);

src/test/java/com/izouma/wenlvju/web/ExamRoomControllerTest.java

@@ -0,0 +1,44 @@
+package com.izouma.wenlvju.web;
+
+import com.izouma.wenlvju.ApplicationTests;
+import com.izouma.wenlvju.domain.ExamRoom;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class ExamRoomControllerTest extends ApplicationTests {
+
+    @Autowired
+    private ExamRoomController examRoomController;
+
+    @Test
+    public void save() {
+//        ExamRoom build = ExamRoom.builder()
+//                .name("萌艺佳")
+//                .deviceSerial("F75663984")
+//                .recordId(1206L)
+//                .validateCode("PKDYXQ")
+//                .address("秦淮区卡子门大街复地活力广场")
+//                .build();
+//        examRoomController.save(build);
+
+//        ExamRoom build1 = ExamRoom.builder()
+//                .name("百世琴行")
+//                .deviceSerial("G05342208")
+//                .recordId(1205L)
+//                .validateCode("YEIACL")
+//                .address("秦淮区七家湾88号")
+//                .build();
+//        examRoomController.save(build1);
+
+        ExamRoom build1 = ExamRoom.builder()
+                .name("灵羽舞蹈艺术")
+                .deviceSerial("G05342208")
+                .recordId(1209L)
+                .validateCode("YEIACL")
+                .address("建邺区莲池路油坊城三楼06—09炫梦艺术")
+                .build();
+        examRoomController.save(build1);
+
+
+    }
+}