导出

src/main/java/com/izouma/wenlvju/domain/RecordSpecialty.java

@@ -20,9 +20,6 @@ import javax.persistence.Entity;
 public class RecordSpecialty extends BaseEntity {
     private Long recordId;
 
-//    @ApiModelProperty(value = "专业id/艺术分类id")
-//    private Long artTypeId;
-
     private String name;
 
     private String code;

src/main/java/com/izouma/wenlvju/dto/RecordDTO.java

@@ -15,28 +15,71 @@ import java.time.LocalDate;
 @NoArgsConstructor
 @ApiModel("监管管理")
 public class RecordDTO {
-    private Long id;
-
     @ApiModelProperty(value = "考级活动名称")
     private String examinationName;
 
+    @ApiModelProperty(value = "考级活动时间")
+    private LocalDate examinationStartTime;
+
+    @ApiModelProperty(value = "考级活动时间")
+    private LocalDate examinationEndTime;
+
     @ApiModelProperty(value = "考级机构名称")
     private String examinationAgency;
 
+    @ApiModelProperty(value = "单位类别")
+    private String category;
+
     @ApiModelProperty(value = "承办单位名称")
     private String organizer;
 
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String uscc;
+
+    private String district;
+
+    @ApiModelProperty(value = "考级详细地址")
+    private String examinationAddress;
+
+    @ApiModelProperty(value = "考场数量")
+    private int examCenterQuantity;
+
+    @ApiModelProperty(value = "报考人数")
+    private int examQuantity;
+
+    @ApiModelProperty(value = "考官人数")
+    private int examinerQuantity;
+
+    @ApiModelProperty(value = "考点负责人名称")
+    private String examOwner;
+
+    @ApiModelProperty(value = "考点负责人手机号")
+    private String examOwnerPhone;
+
+    @ApiModelProperty(value = "安全负责人名称")
+    private String securityOwner;
+
+    @ApiModelProperty(value = "安全负责人手机号")
+    private String securityOwnerPhone;
+
     @ApiModelProperty(value = "备案时间")
     private LocalDate recordTime;
 
-    private String district;
+    @ApiModelProperty(value = "考试简章")
+    private String examinationGuide;
+
+    @ApiModelProperty(value = "专业名称")
+    private String name;
+
+    @ApiModelProperty(value = "专业代码")
+    private String code;
 
-    @ApiModelProperty(value = "法人姓名")
-    private String privacyPolicy;
+    @ApiModelProperty(value = "总级数")
+    private String level;
 
-    @ApiModelProperty(value = "证件号码")
-    private String IDNo;
+    @ApiModelProperty(value = "考场数量")
+    private int numOfExam;
 
-    @ApiModelProperty(value = "监管人")
-    private String supervisorNickname;
+    @ApiModelProperty(value = "考官人数")
+    private int speExaQuantity;
 }

src/main/java/com/izouma/wenlvju/service/ExamRoomService.java

@@ -13,9 +13,7 @@ import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.ExamRoomRepo;
 import com.izouma.wenlvju.repo.OrganizationRepo;
 import com.izouma.wenlvju.repo.RecordExamRoomRepo;
-import com.izouma.wenlvju.repo.RecordRepo;
 import com.izouma.wenlvju.utils.JpaUtils;
-import jodd.util.StringUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -23,11 +21,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.Predicate;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -48,10 +42,10 @@ public class ExamRoomService {
     /*
     查看设备列表
      */
-    public List<String> showDevice() {
+    public Map<String, Integer> showDevice() {
         String uri = "https://open.ys7.com/api/lapp/device/list";
         String accessToken = ezvizTokenService.getToken();
-        String send = "accessToken=" + accessToken + "&pageStart=0&pageSize=10";
+        String send = "accessToken=" + accessToken + "&pageStart=0&pageSize=50";
         log.info("萤石查看设备--->" + send);
 
         String body = HttpRequest.post(uri).send(send).body();
@@ -63,11 +57,12 @@ public class ExamRoomService {
         }
 
         JSONArray data = JSONObject.parseArray(json.getString("data"));
-        List<String> devices = new ArrayList<>();
+        Map<String, Integer> devices = new HashMap<>();
         for (int i = 0; i < data.size(); i++) {
             JSONObject jsonObject = data.getJSONObject(i);
             String name = jsonObject.getString("deviceSerial");
-            devices.add(name);
+            int status = jsonObject.getInteger("status");
+            devices.put(name, status);
         }
         return devices;
     }
@@ -76,7 +71,7 @@ public class ExamRoomService {
     添加设备
      */
     public void addDevice(String deviceSerial, String validateCode) {
-        List<String> devices = this.showDevice();
+        Set<String> devices = this.showDevice().keySet();
         if (devices.contains(deviceSerial)) {
             return;
         }

src/main/java/com/izouma/wenlvju/service/PerformanceApplyService.java

@@ -83,22 +83,22 @@ public class PerformanceApplyService {
                 performanceApplyRepo.findAllByStatusAndPerformanceId(ApplyStatus.PASS, performanceId);
         LocalDate startDate = performance.getEventStartDate();
 //        LocalDate endDate = performance.getEndDate();
-        LocalTime dayStart = performance.getMorningStartTime();
-        LocalTime dayEnd = performance.getMorningEndTime();
+//        LocalTime dayStart = performance.getMorningStartTime();
+//        LocalTime dayEnd = performance.getMorningEndTime();
 //        Long length = performance.getProgrammeLength();
 
-        LocalTime dayChange = dayStart;
-        for (PerformanceApply apply : applyList) {
+//        LocalTime dayChange = dayStart;
+//        for (PerformanceApply apply : applyList) {
 //            if (start.isAfter(endDate)) {
 //                throw new BusinessException("展示时间过短，请编辑展演结束时间。");
 //            }
-            if (dayChange.isAfter(dayEnd)) {
-                dayChange = performance.getAfternoonStartTime();
-            }
-            apply.setShowStartTime(LocalDateTime.of(startDate, dayChange));
-            dayChange = dayChange.plusMinutes(30);
-            apply.setShowEndTime(LocalDateTime.of(startDate, dayChange));
-        }
+//            if (dayChange.isAfter(dayEnd)) {
+//                dayChange = performance.getAfternoonStartTime();
+//            }
+//            apply.setShowStartTime(LocalDateTime.of(startDate, dayChange));
+//            dayChange = dayChange.plusMinutes(30);
+//            apply.setShowEndTime(LocalDateTime.of(startDate, dayChange));
+//        }
 
 
         Set<Long> artTypeId = new HashSet<>();

src/main/vue/src/plugins/http.js

@@ -5,8 +5,9 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        baseUrl = 'http://localhost:8090';
+        baseUrl = 'http://localhost:8080';
         // baseUrl = 'http://wlj.izouma.com';
+        // baseUrl = 'http://192.168.31.202:8080';
         break;
     case 'test':
         baseUrl = 'http://localhost:8080';

src/test/java/com/izouma/wenlvju/service/ExamRoomServiceTest.java

@@ -25,7 +25,7 @@ public class ExamRoomServiceTest extends ApplicationTests {
 
     @Test
     public void show() {
-        examRoomService.showDevice();
+        System.out.println(examRoomService.showDevice());
     }
 
     @Test