Browse Source

调课顶课接口查询调整

dzx 5 months ago
parent
commit
65923f31dd

+ 18 - 1
src/main/java/com/xjrsoft/module/job/HikvisionLeaveTask.java

@@ -109,7 +109,24 @@ public class HikvisionLeaveTask {
         header.put("tagId", "studentleave");
         //调用接口获取到返回内容,并将其存到数据库中
         String result = apiUtil.doPost(apiPath, paramJson.toString(), null, header);
-        System.out.println(result);
+
+        //删除成功后,重新下载
+        //1、创建任务
+        apiPath = "/api/acps/v1/download/configuration/task/add";
+        String doPost = apiUtil.doPost(apiPath, null, null, null);
+
+        JsonParser jsonParser = new JsonParser();
+        JsonObject resultJson = jsonParser.parse(doPost).getAsJsonObject();
+
+        if("0".equals(resultJson.get("code").getAsString()) && "success".equals(resultJson.get("msg").getAsString())){
+            String taskId = resultJson.get("data").getAsJsonObject().get("taskId").getAsString();
+            //2、下载
+            apiPath = "/api/acps/v1/download/configuration/task/add";
+            paramJson = new JsonObject();
+            paramJson.add("resourceInfos", resourceInfos);
+            paramJson.addProperty("taskId", taskId);
+            apiUtil.doPost(apiPath, paramJson.toString(), null, null);
+        }
     }
 
     JsonArray selectResource(ApiUtil apiUtil){

+ 2 - 2
src/main/resources/mapper/courseTable/CourseTable.xml

@@ -49,7 +49,7 @@
         SELECT t1.time_period,t1.time_number,t1.course_name,t2.name AS class_name,t3.name AS classroom_name,t1.id,t2.id as class_id FROM course_table t1
         LEFT JOIN base_class t2 ON t1.class_id = t2.id
         LEFT JOIN base_classroom t3 ON t1.site_id = t3.id
-        WHERE t1.status = 1 AND t1.teacher_id = #{dto.teacherId}
+        WHERE t1.status = 1 AND t1.teacher_id like concat('%', #{dto.teacherId},'%')
         AND t1.weeks = #{dto.week} AND t1.schedule_date = #{dto.adjustDate}
         <if test="dto.classId != null and dto.classId != ''">
             and t1.class_id = #{dto.classId}
@@ -57,7 +57,7 @@
     </select>
     <select id="getClassListByTeacherId" parameterType="com.xjrsoft.module.schedule.dto.ClassOptionDto" resultType="com.xjrsoft.module.schedule.vo.ClassOptionVo">
         SELECT id,name FROM base_class WHERE delete_mark = 0 AND id IN (
-            SELECT DISTINCT class_id FROM course_table WHERE teacher_id = #{dto.userId}
+            SELECT DISTINCT class_id FROM course_table WHERE teacher_id like concat('%', #{dto.userId},'%')
         )
     </select>
 </mapper>