接口增加参数time_period_c

src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -252,8 +252,18 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
             dto.setWeek(dayOfWeek.getValue());
         }
         dto.setTeacherId(Long.parseLong(teacherId));
+        List<CourseListVo> list = courseTableMapper.getAdjustList(dto);
+        for (CourseListVo courseListVo : list) {
+            if(courseListVo.getTimePeriod() == 1){
+                courseListVo.setTimePeriodCn("上午");
+            }else if(courseListVo.getTimePeriod() == 2){
+                courseListVo.setTimePeriodCn("下午");
+            }else if(courseListVo.getTimePeriod() == 3){
+                courseListVo.setTimePeriodCn("晚上");
+            }
+        }
 
-        return courseTableMapper.getAdjustList(dto);
+        return list;
     }
 
     @Override

src/main/java/com/xjrsoft/module/schedule/util/DataUtil.java

@@ -199,7 +199,7 @@ public class DataUtil {
                 continue;
             }
             JsonObject paramJson = new JsonObject();
-            paramJson.addProperty("name", courseSubject.getName() + courseSubject.getCode());
+            paramJson.addProperty("name", courseSubject.getName());
             paramJson.addProperty("code", courseSubject.getCode());
             paramJson.addProperty("extendId", courseSubject.getId().toString());
             if(tagMap.get(courseSubject.getBaseLabelId()) != null){
@@ -263,6 +263,8 @@ public class DataUtil {
 
             if(semester.getStartDate() != null && semester.getEndDate() != null && semester.getEndDate().getTime() > timestamp && semester.getStartDate().getTime() < timestamp){
                 paramJson.addProperty("isCurrent", Boolean.TRUE);
+            }else if(semester.getStartDate() != null && semester.getEndDate() != null && semester.getEndDate().getTime() > timestamp && semester.getStartDate().getTime() > timestamp){
+                paramJson.addProperty("isCurrent", Boolean.TRUE);
             }else{
                 paramJson.addProperty("isCurrent", Boolean.FALSE);
             }

src/main/java/com/xjrsoft/module/schedule/util/ScheduleUtil.java

@@ -63,7 +63,7 @@ public class ScheduleUtil {
             URL url = new URL(httpUrl);
             // 通过远程url连接对象打开连接
             connection = (HttpURLConnection) url.openConnection();
-            connection.setRequestProperty("schoolId","UUXQ8G4W9IU");
+            connection.setRequestProperty("schoolId",secert);
             connection.setRequestProperty("sign",sign);
             connection.setRequestProperty("timestamp",String.format("%d",timestamp));
             // 设置连接请求方式

src/main/java/com/xjrsoft/module/schedule/vo/CourseListVo.java

@@ -20,7 +20,11 @@ public class CourseListVo {
     private String classroomName;
 
     @ApiModelProperty("时段（1=上午 2=下午 3=晚上）")
-    private String timePeriod;
+    private Integer timePeriod;
+
+    @ApiModelProperty("时段（1=上午 2=下午 3=晚上）")
+    private String timePeriodCn;
+
 
     @ApiModelProperty("节次")
     private String timeNumber;

src/test/java/com/xjrsoft/xjrsoftboot/ScheduleFlowTest.java

@@ -33,8 +33,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 // 简约课表测试
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = XjrSoftApplication.class)
+//@RunWith(SpringRunner.class)
+//@SpringBootTest(classes = XjrSoftApplication.class)
 public class ScheduleFlowTest {
 
     public static final String ALGORITHM = "HmacSHA256";
@@ -87,10 +87,10 @@ public class ScheduleFlowTest {
     public void ScheduleFlowTest() throws Exception {
         long timestamp = System.currentTimeMillis();
         System.out.println("timestamp:" + timestamp);
-        String md5Str = SaSecureUtil.md5("Jh&NAbn6Rm#p@6ZZ" + timestamp);
+        String md5Str = SaSecureUtil.md5("@ak8To$xSHFoT6FoqsqYb3" + timestamp);
 
 
-        String sign = calculateHMac("UUFM5TID45X", md5Str);
+        String sign = calculateHMac("UUXQ8G4W9IU", md5Str);
         System.out.println("sign:" + sign);
 
         //查询校区id
@@ -117,13 +117,13 @@ public class ScheduleFlowTest {
 //        List<String> classInfo = getClassInfo(sign, timestamp);
 //
 //        //查询课表信息
-        List<JianyueData> baseClass = jianyueDataMapper.selectList(new QueryWrapper<JianyueData>().lambda().eq(JianyueData::getTableName, "base_class"));
-        List<String> classInfo = new ArrayList<>();
-        for (JianyueData aClass : baseClass) {
-            classInfo.add(aClass.getJianyueId());
-        }
-        JsonArray scheduleInfo = getScheduleInfo(sign, timestamp, classInfo);
-        System.out.println(scheduleInfo);
+//        List<JianyueData> baseClass = jianyueDataMapper.selectList(new QueryWrapper<JianyueData>().lambda().eq(JianyueData::getTableName, "base_class"));
+//        List<String> classInfo = new ArrayList<>();
+//        for (JianyueData aClass : baseClass) {
+//            classInfo.add(aClass.getJianyueId());
+//        }
+//        JsonArray scheduleInfo = getScheduleInfo(sign, timestamp, classInfo);
+//        System.out.println(scheduleInfo);
 
 //
 

src/test/java/com/xjrsoft/xjrsoftboot/ScheduleTest.java

@@ -1,27 +1,41 @@
 package com.xjrsoft.xjrsoftboot;
 
 import cn.dev33.satoken.secure.SaSecureUtil;
+import cn.hutool.db.Db;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.xjrsoft.XjrSoftApplication;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.xjrsoft.common.utils.DatasourceUtil;
 import com.xjrsoft.module.courseTable.service.ICourseTableService;
+import com.xjrsoft.module.schedule.entity.JianyueData;
+import com.xjrsoft.module.schedule.util.DataUtil;
 import com.xjrsoft.module.schedule.util.ScheduleUtil;
 import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
+import javax.sql.DataSource;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 // 简约课表测试
-//@RunWith(SpringRunner.class)
-//@SpringBootTest(classes = XjrSoftApplication.class)
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = XjrSoftApplication.class)
 public class ScheduleTest {
 
     public static final String ALGORITHM = "HmacSHA256";
@@ -80,83 +94,83 @@ public class ScheduleTest {
         String sign = calculateHMac("UUXQ8G4W9IU", md5Str);
         System.out.println("sign:" + sign);
 
-        JsonObject paramJson = new JsonObject();
-        paramJson.addProperty("pageIndex", 1);
-        paramJson.addProperty("pageSize", 200);
+//        JsonObject paramJson = new JsonObject();
+//        paramJson.addProperty("pageIndex", 1);
+//        paramJson.addProperty("pageSize", 200);
 
         //获取时间戳
 //        long timestamp = System.currentTimeMillis();
         //生成签名
 //        String sign = ScheduleUtil.createSign(timestamp);
-        String result = ScheduleUtil.doPost("http://219.153.208.33:20000/api/v1/ScheduleFlowV2/OpenApi/SchoolDistrict/page", paramJson.toString(), sign, timestamp);
-        System.out.println(result);
+//        String result = ScheduleUtil.doPost("http://219.153.208.33:20000/api/v1/ScheduleFlowV2/OpenApi/SchoolDistrict/page", paramJson.toString(), sign, timestamp);
+//        System.out.println(result);
 
-//        DataSource datasource = DatasourceUtil.getDataSource(GlobalConstant.DEFAULT_DATASOURCE_KEY);
-//        try {
-//            Db use = Db.use(datasource);
-//            String sql = "SELECT distinct table_name FROM jianyue_data WHERE 1 = 1";
-//            List<JianyueData> query = use.query(sql, JianyueData.class);
-//            Set<String> tables = new HashSet<>();
-//            for (JianyueData jianyueData : query) {
-//                tables.add(jianyueData.getTableName());
-//            }
-//            sql = "SELECT * FROM jianyue_data WHERE 0 = 0";
-//            List<JianyueData> list = use.query(sql, JianyueData.class);
-//            Map<String, Map<Long, String>> dataMap = new HashMap<>();
-//            for (String table : tables) {
-//                Map<Long, String> tableData = new HashMap<>();
-//                for (JianyueData jianyueData : list) {
-//                    if(!table.equals(jianyueData.getTableName())){
-//                        continue;
-//                    }
-//                    tableData.put(jianyueData.getSourceId(), jianyueData.getJianyueId());
-//                }
-//                dataMap.put(table, tableData);
-//            }
-//            DataUtil dataUtil = new DataUtil();
-//            //查询校区
-//            JsonArray schoolDistrictData = dataUtil.getSchoolDistrictData();
-//            //推送年级
-//            String tableName = "base_grade";
-//            Map<Long, String> grade = dataUtil.insertGrade(use, tableName, schoolDistrictData.get(0).getAsString(), dataMap.get(tableName));
-//            if(grade.isEmpty() && dataMap.get(tableName) != null){
-//                grade = dataMap.get(tableName);
-//            }
-//
-//            //推送学期
-//            tableName = "base_semester";
-//            dataUtil.insertSemester(use, tableName, dataMap.get(tableName));
-//            //推送标签
-//            tableName = "base_label";
-//            Map<Long, String> tagMap = dataUtil.insertCourseTag(use, tableName, dataMap.get(tableName));
-//            if(tagMap.isEmpty() && dataMap.get(tableName) != null){
-//                tagMap = dataMap.get(tableName);
-//            }
-//            //推送课程
-//            tableName = "base_course_subject";
-//            dataUtil.insertCourse(use, tableName, dataMap.get(tableName), tagMap);
-//            //推送教职工
-//            tableName = "base_teacher";
-//            Map<Long, String> teacherMap = dataUtil.insertTeacher(use, tableName, dataMap.get(tableName));
-//            if(teacherMap.isEmpty() && dataMap.get(tableName) != null){
-//                teacherMap = dataMap.get(tableName);
-//            }
-//            //推送学生
-//            tableName = "base_student";
-//            dataUtil.insertStudent(use, tableName, grade, dataMap.get(tableName));
-//            //推送教室
-//            tableName = "base_classroom";
-//            Map<Long, String> classroomMap = dataUtil.insertClassRoom(use, tableName, schoolDistrictData.get(0).getAsString(), dataMap.get(tableName));
-//            if(classroomMap.isEmpty() && dataMap.get(tableName) != null){
-//                classroomMap = dataMap.get(tableName);
-//            }
-//            //推送行政班，先查询当前学期id
-//            String currenSemeter = dataUtil.getCurrenSemeter();
-//            tableName = "base_class";
-//            dataUtil.insertClass(use, tableName, grade, teacherMap, currenSemeter, dataMap.get(tableName), classroomMap);
-//
-//        } catch (Exception e) {
-//        }
+        DataSource datasource = DatasourceUtil.getDataSource(GlobalConstant.DEFAULT_DATASOURCE_KEY);
+        try {
+            Db use = Db.use(datasource);
+            String sql = "SELECT distinct table_name FROM jianyue_data WHERE 1 = 1";
+            List<JianyueData> query = use.query(sql, JianyueData.class);
+            Set<String> tables = new HashSet<>();
+            for (JianyueData jianyueData : query) {
+                tables.add(jianyueData.getTableName());
+            }
+            sql = "SELECT * FROM jianyue_data WHERE 0 = 0";
+            List<JianyueData> list = use.query(sql, JianyueData.class);
+            Map<String, Map<Long, String>> dataMap = new HashMap<>();
+            for (String table : tables) {
+                Map<Long, String> tableData = new HashMap<>();
+                for (JianyueData jianyueData : list) {
+                    if(!table.equals(jianyueData.getTableName())){
+                        continue;
+                    }
+                    tableData.put(jianyueData.getSourceId(), jianyueData.getJianyueId());
+                }
+                dataMap.put(table, tableData);
+            }
+            DataUtil dataUtil = new DataUtil();
+            //查询校区
+            JsonArray schoolDistrictData = dataUtil.getSchoolDistrictData();
+            //推送年级
+            String tableName = "base_grade";
+            Map<Long, String> grade = dataUtil.insertGrade(use, tableName, schoolDistrictData.get(0).getAsString(), dataMap.get(tableName));
+            if(grade.isEmpty() && dataMap.get(tableName) != null){
+                grade = dataMap.get(tableName);
+            }
+
+            //推送学期
+            tableName = "base_semester";
+            dataUtil.insertSemester(use, tableName, dataMap.get(tableName));
+            //推送标签
+            tableName = "base_label";
+            Map<Long, String> tagMap = dataUtil.insertCourseTag(use, tableName, dataMap.get(tableName));
+            if(tagMap.isEmpty() && dataMap.get(tableName) != null){
+                tagMap = dataMap.get(tableName);
+            }
+            //推送课程
+            tableName = "base_course_subject";
+            dataUtil.insertCourse(use, tableName, dataMap.get(tableName), tagMap);
+            //推送教职工
+            tableName = "base_teacher";
+            Map<Long, String> teacherMap = dataUtil.insertTeacher(use, tableName, dataMap.get(tableName));
+            if(teacherMap.isEmpty() && dataMap.get(tableName) != null){
+                teacherMap = dataMap.get(tableName);
+            }
+            //推送学生
+            tableName = "base_student";
+            dataUtil.insertStudent(use, tableName, grade, dataMap.get(tableName));
+            //推送教室
+            tableName = "base_classroom";
+            Map<Long, String> classroomMap = dataUtil.insertClassRoom(use, tableName, schoolDistrictData.get(0).getAsString(), dataMap.get(tableName));
+            if(classroomMap.isEmpty() && dataMap.get(tableName) != null){
+                classroomMap = dataMap.get(tableName);
+            }
+            //推送行政班，先查询当前学期id
+            String currenSemeter = dataUtil.getCurrenSemeter();
+            tableName = "base_class";
+            dataUtil.insertClass(use, tableName, grade, teacherMap, currenSemeter, dataMap.get(tableName), classroomMap);
+
+        } catch (Exception e) {
+        }
     }