|
@@ -4,17 +4,15 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
-import cn.hutool.db.Db;
|
|
|
|
|
import com.alibaba.excel.support.ExcelTypeEnum;
|
|
import com.alibaba.excel.support.ExcelTypeEnum;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.google.gson.JsonArray;
|
|
import com.google.gson.JsonArray;
|
|
|
|
|
+import com.google.gson.JsonElement;
|
|
|
import com.google.gson.JsonObject;
|
|
import com.google.gson.JsonObject;
|
|
|
import com.google.gson.JsonParser;
|
|
import com.google.gson.JsonParser;
|
|
|
-import com.xjrsoft.common.constant.GlobalConstant;
|
|
|
|
|
import com.xjrsoft.common.enums.DeleteMark;
|
|
import com.xjrsoft.common.enums.DeleteMark;
|
|
|
import com.xjrsoft.common.enums.EnabledMark;
|
|
import com.xjrsoft.common.enums.EnabledMark;
|
|
|
import com.xjrsoft.common.model.result.RT;
|
|
import com.xjrsoft.common.model.result.RT;
|
|
|
-import com.xjrsoft.common.utils.DatasourceUtil;
|
|
|
|
|
import com.xjrsoft.module.courseTable.entity.CourseTable;
|
|
import com.xjrsoft.module.courseTable.entity.CourseTable;
|
|
|
import com.xjrsoft.module.courseTable.service.ICourseTableService;
|
|
import com.xjrsoft.module.courseTable.service.ICourseTableService;
|
|
|
import com.xjrsoft.module.schedule.dto.CourseTableAdjustDto;
|
|
import com.xjrsoft.module.schedule.dto.CourseTableAdjustDto;
|
|
@@ -22,39 +20,34 @@ import com.xjrsoft.module.schedule.dto.CourseTableDto;
|
|
|
import com.xjrsoft.module.schedule.dto.CourseTablePreCheckDto;
|
|
import com.xjrsoft.module.schedule.dto.CourseTablePreCheckDto;
|
|
|
import com.xjrsoft.module.schedule.dto.ScheduleWeekExportQueryDto;
|
|
import com.xjrsoft.module.schedule.dto.ScheduleWeekExportQueryDto;
|
|
|
import com.xjrsoft.module.schedule.entity.CourseReceiveMsg;
|
|
import com.xjrsoft.module.schedule.entity.CourseReceiveMsg;
|
|
|
-import com.xjrsoft.module.schedule.entity.JianyueData;
|
|
|
|
|
import com.xjrsoft.module.schedule.service.ICourseReceiveMsgService;
|
|
import com.xjrsoft.module.schedule.service.ICourseReceiveMsgService;
|
|
|
-import com.xjrsoft.module.schedule.service.IJianyueDataService;
|
|
|
|
|
-import com.xjrsoft.module.schedule.util.DataUtil;
|
|
|
|
|
import com.xjrsoft.module.schedule.util.ScheduleUtil;
|
|
import com.xjrsoft.module.schedule.util.ScheduleUtil;
|
|
|
import com.xjrsoft.module.schedule.vo.CourseListVo;
|
|
import com.xjrsoft.module.schedule.vo.CourseListVo;
|
|
|
import com.xjrsoft.module.schedule.vo.CourseTableVo;
|
|
import com.xjrsoft.module.schedule.vo.CourseTableVo;
|
|
|
import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
|
|
import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
|
|
|
import com.xjrsoft.module.student.service.impl.IBaseStudentSchoolRollService;
|
|
import com.xjrsoft.module.student.service.impl.IBaseStudentSchoolRollService;
|
|
|
import com.xjrsoft.module.teacher.entity.BaseTeacher;
|
|
import com.xjrsoft.module.teacher.entity.BaseTeacher;
|
|
|
|
|
+import com.xjrsoft.module.teacher.entity.XjrUser;
|
|
|
import com.xjrsoft.module.teacher.service.IBaseTeacherService;
|
|
import com.xjrsoft.module.teacher.service.IBaseTeacherService;
|
|
|
-import com.xjrsoft.module.textbook.dto.TextbookClaimExportQueryDto;
|
|
|
|
|
|
|
+import com.xjrsoft.module.teacher.service.ITeacherbaseManagerService;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
|
-import org.apache.commons.lang3.concurrent.BasicThreadFactory;
|
|
|
|
|
import org.springframework.http.ResponseEntity;
|
|
import org.springframework.http.ResponseEntity;
|
|
|
-import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
+import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
|
+import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
|
+import org.springframework.web.bind.annotation.RequestParam;
|
|
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
-import javax.sql.DataSource;
|
|
|
|
|
import javax.validation.Valid;
|
|
import javax.validation.Valid;
|
|
|
import java.io.ByteArrayOutputStream;
|
|
import java.io.ByteArrayOutputStream;
|
|
|
-import java.sql.SQLException;
|
|
|
|
|
import java.time.DayOfWeek;
|
|
import java.time.DayOfWeek;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
import java.time.format.DateTimeFormatter;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
|
|
-import java.util.HashSet;
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
|
|
-import java.util.Set;
|
|
|
|
|
-import java.util.concurrent.CompletableFuture;
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* @title: 课表
|
|
* @title: 课表
|
|
@@ -70,10 +63,11 @@ public class ScheduleController {
|
|
|
|
|
|
|
|
|
|
|
|
|
private final ICourseReceiveMsgService courseReceiveMsgService;
|
|
private final ICourseReceiveMsgService courseReceiveMsgService;
|
|
|
- private final IJianyueDataService jianyueDataService;
|
|
|
|
|
|
|
+// private final IJianyueDataService jianyueDataService;
|
|
|
private final ICourseTableService courseTableService;
|
|
private final ICourseTableService courseTableService;
|
|
|
private final IBaseStudentSchoolRollService baseStudentSchoolRollService;
|
|
private final IBaseStudentSchoolRollService baseStudentSchoolRollService;
|
|
|
private final IBaseTeacherService baseTeacherService;
|
|
private final IBaseTeacherService baseTeacherService;
|
|
|
|
|
+ private final ITeacherbaseManagerService teacherService;
|
|
|
|
|
|
|
|
@GetMapping(value = "/receive-msg")
|
|
@GetMapping(value = "/receive-msg")
|
|
|
@ApiOperation(value="接收消息")
|
|
@ApiOperation(value="接收消息")
|
|
@@ -245,4 +239,28 @@ public class ScheduleController {
|
|
|
ByteArrayOutputStream bot = courseTableService.listScheduleWeekExportQuery(dto);
|
|
ByteArrayOutputStream bot = courseTableService.listScheduleWeekExportQuery(dto);
|
|
|
return RT.fileStream(bot.toByteArray(), "scheduleWeek" + ExcelTypeEnum.XLSX.getValue());
|
|
return RT.fileStream(bot.toByteArray(), "scheduleWeek" + ExcelTypeEnum.XLSX.getValue());
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ @GetMapping(value = "/access-token")
|
|
|
|
|
+ @ApiOperation(value = "获取单点登录地址")
|
|
|
|
|
+ @SaCheckPermission("evaluateobject:detail")
|
|
|
|
|
+ public RT<String> getAccessToken(CourseTablePreCheckDto dto) throws Exception {
|
|
|
|
|
+ XjrUser xjrUser = teacherService.getById(StpUtil.getLoginIdAsLong());
|
|
|
|
|
+ long timeMillis = System.currentTimeMillis();
|
|
|
|
|
+ String sign = ScheduleUtil.createSign(timeMillis);
|
|
|
|
|
+
|
|
|
|
|
+ JsonObject jsonObject = new JsonObject();
|
|
|
|
|
+ jsonObject.addProperty("mobileNo", xjrUser.getMobile());
|
|
|
|
|
+
|
|
|
|
|
+ String url = ScheduleUtil.apiUrl + "auth/user/token";
|
|
|
|
|
+ try {
|
|
|
|
|
+ String result = ScheduleUtil.doPost(url, jsonObject.toString(), sign, timeMillis);
|
|
|
|
|
+ JsonParser parser = new JsonParser();
|
|
|
|
|
+ JsonObject resultJson = parser.parse(result).getAsJsonObject();
|
|
|
|
|
+ JsonObject dataJson = resultJson.get("data").getAsJsonObject();
|
|
|
|
|
+ String loginUrl = ScheduleUtil.hostUrl + "?access_token=" + dataJson.get("access_token").getAsString();
|
|
|
|
|
+ return RT.ok(loginUrl);
|
|
|
|
|
+ }catch (Exception e){
|
|
|
|
|
+ return RT.error(e.getMessage());
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|