课时补充调整

src/main/java/com/xjrsoft/module/classtime/service/impl/ClassTimeStatisticsServiceImpl.java

@@ -232,12 +232,15 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                 Double courseTimeTypeTime = 0D;
                 for (String courseTimeType : CourseTimeTypeMap.keySet()) {
                     List<WfTeacherCourseTime> courseTimes = courseTimeMap.get(courseTimeType);
+                    if(courseTimes == null){
+                        continue;
+                    }
                     double sum = courseTimes.stream()
                             .filter(x -> x.getTeacherIds().contains(teacher.getId().toString()))
                             .mapToDouble(WfTeacherCourseTime::getCourseTime).sum();
                     allClassTime = allClassTime + sum;
                     courseTimeTypeTime = courseTimeTypeTime + sum;
-                    courseTimeTypeJson.addProperty(courseTimeType, sum);
+                    courseTimeTypeJson.addProperty(CourseTimeTypeMap.get(courseTimeType), sum);
 
                     for (LocalDate localDate : allDateList) {
                         double sum1 = courseTimes.stream()
@@ -251,6 +254,8 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                         allClassTimeDataArray.add(courseJson);
                     }
                 }
+                record.setCourseTimeTypeData(courseTimeTypeJson.toString());
+
                 //早自习、正课、晚辅、顶课、调课
                 Double classTime7 = 0D,classTime8 = 0D,classTime9 = 0D,classTime11 = 0D;
 

src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeStatisticsRecordVo.java

@@ -60,36 +60,6 @@ public class ClassTimeStatisticsRecordVo {
     @ApiModelProperty("每周数据")
     private String weekData;
     /**
-    * 教研会
-    */
-    @ApiModelProperty("教研会")
-    private Double classTime1;
-    /**
-    * 督导听课
-    */
-    @ApiModelProperty("督导听课")
-    private Double classTime2;
-    /**
-    * 临近三年退休政策
-    */
-    @ApiModelProperty("临近三年退休政策")
-    private Double classTime3;
-    /**
-    * 出题
-    */
-    @ApiModelProperty("出题")
-    private Double classTime4;
-    /**
-    * 阅卷
-    */
-    @ApiModelProperty("阅卷")
-    private Double classTime5;
-    /**
-    * 周末培优
-    */
-    @ApiModelProperty("周末培优")
-    private Double classTime6;
-    /**
     * 早自习
     */
     @ApiModelProperty("早自习")
@@ -115,4 +85,7 @@ public class ClassTimeStatisticsRecordVo {
     @ApiModelProperty("调课")
     private Double classTime11;
 
+    @ApiModelProperty("课时补充数据")
+    private String courseTimeTypeData;
+
 }

src/main/java/com/xjrsoft/module/job/HikvisionBaseDataTask.java

@@ -31,6 +31,11 @@ public class HikvisionBaseDataTask {
 
     @Scheduled(cron = "0 */15 * * * ?")
     public void execute() {
+        String active = SpringUtil.getActiveProfile();
+        if(!"prod".equals(active)){
+            log.info("非正式环境，无法执行数据推送");
+            return;
+        }
         RefreshConnectionPool();
     }
     public void RefreshConnectionPool() {