修改python运行不了的问题

新增排序等
newBigdata
yz 10 months ago
parent 60a69b2247
commit 6748509626

@ -2,20 +2,26 @@ package com.sztzjy.financial_bigdata.controller.common;
import com.github.pagehelper.PageInfo;
import com.sztzjy.financial_bigdata.annotation.AnonymousAccess;
import com.sztzjy.financial_bigdata.entity.SysCourse;
import com.sztzjy.financial_bigdata.entity.SysCourseChapter;
import com.sztzjy.financial_bigdata.entity.SysCourseChapterExample;
import com.sztzjy.financial_bigdata.config.Constant;
import com.sztzjy.financial_bigdata.entity.*;
import com.sztzjy.financial_bigdata.entity.sys_dto.SysCourseChapterDto;
import com.sztzjy.financial_bigdata.entity.sys_dto.SysCourseDto;
import com.sztzjy.financial_bigdata.mapper.SysCourseChapterMapper;
import com.sztzjy.financial_bigdata.mapper.SysCourseMapper;
import com.sztzjy.financial_bigdata.service.common.ICourseService;
import com.sztzjy.financial_bigdata.util.ResultEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@RestController
@Api(tags = "课程相关")
@ -25,6 +31,22 @@ public class CourseController {
ICourseService courseService;
@Autowired
SysCourseChapterMapper chapterMapper;
@Autowired
SysCourseMapper courseMapper;
//编辑课程顺序
@GetMapping("updateCourseSequence")
@ApiOperation("编辑课程顺序")
@AnonymousAccess
public ResultEntity updateCourseSequence(@RequestParam String courseId,@ApiParam("序号")@RequestParam Integer sequence,@RequestParam String schoolId){
if(!Constant.BUILT_IN_SCHOOL_ID.equals(schoolId)){
return new ResultEntity<>(HttpStatus.BAD_REQUEST,"权限不足");
}
SysCourse sysCourse = courseMapper.selectByPrimaryKey(courseId);
sysCourse.setSequence(sequence);
courseMapper.updateByPrimaryKey(sysCourse);
return new ResultEntity(HttpStatus.OK, "编辑顺序成功");
}
//查看课程
@GetMapping("selectCourse")
@ -37,6 +59,25 @@ public class CourseController {
return new ResultEntity(HttpStatus.OK, "展示成功", pageInfo);
}
//资源管理-查看课程列表
@GetMapping("selectCourseList")
@ApiOperation("资源管理-查看课程列表")
@AnonymousAccess
public ResultEntity<List<SysCourse>> selectCourseList(@RequestParam String schoolId){
SysCourseExample example = new SysCourseExample();
SysCourseExample.Criteria criteria = example.createCriteria();
if(Constant.BUILT_IN_SCHOOL_ID.equals(schoolId)){
criteria.andSchoolIdEqualTo(schoolId);
}else {
List<String> list = new ArrayList<>();
list.add(schoolId);
list.add(Constant.BUILT_IN_SCHOOL_ID);
criteria.andSchoolIdIn(list);
}
List<SysCourse> courseList = courseMapper.selectByExample(example);
return new ResultEntity(HttpStatus.OK,"展示成功",courseList);
}
//根据课程id查询该课程下的所有章节
@GetMapping("selectChapterByCourseId")
@ApiOperation("查询课程下的所有章节")
@ -75,4 +116,63 @@ public class CourseController {
return new ResultEntity<>(HttpStatus.BAD_REQUEST,"删除课程失败");
}
}
//增加章节
@GetMapping("insertChapter")
@ApiOperation("增加章节")
@AnonymousAccess
public ResultEntity insertChapter(@ApiParam("新增课程对象") @RequestBody SysCourseChapter chapter,@RequestParam String schoolId) {
if(!Constant.BUILT_IN_SCHOOL_ID.equals(schoolId)){
return new ResultEntity<>(HttpStatus.BAD_REQUEST,"权限不足");
}
if(StringUtils.isBlank(chapter.getChapterName())){
return new ResultEntity<>(HttpStatus.BAD_REQUEST,"章节名未填写");
}
if(StringUtils.isBlank(chapter.getCourseId())){
return new ResultEntity<>(HttpStatus.BAD_REQUEST,"课程id未上传");
}
if(chapter.getSequence()==null){
return new ResultEntity<>(HttpStatus.BAD_REQUEST,"顺序未填写");
}
chapter.setChapterId(String.valueOf(UUID.randomUUID()));
int insert = chapterMapper.insert(chapter);
if (insert==1){
return new ResultEntity<>(HttpStatus.OK,"新增章节成功");
}else {
return new ResultEntity<>(HttpStatus.BAD_REQUEST,"新增章节失败");
}
}
//删除章节
@GetMapping("deleteChapter")
@ApiOperation("删除章节")
@AnonymousAccess
public ResultEntity deleteChapter(@ApiParam("删除章节Id") @RequestParam String chapterId,
@RequestParam String schoolId){
if(Constant.BUILT_IN_SCHOOL_ID.equals(schoolId)){
return new ResultEntity<>(HttpStatus.BAD_REQUEST,"权限不足");
}
int i = chapterMapper.deleteByPrimaryKey(chapterId);
if (i==1){
return new ResultEntity<>(HttpStatus.OK,"删除章节成功");
}else {
return new ResultEntity<>(HttpStatus.BAD_REQUEST,"删除章节失败");
}
}
//编辑课程顺序
@GetMapping("updateChapterSequence")
@ApiOperation("编辑章节顺序")
@AnonymousAccess
public ResultEntity updateChapterSequence(@RequestParam String chapterId,@ApiParam("序号")@RequestParam Integer sequence,@RequestParam String schoolId){
if(!Constant.BUILT_IN_SCHOOL_ID.equals(schoolId)){
return new ResultEntity<>(HttpStatus.BAD_REQUEST,"权限不足");
}
SysCourseChapter chapter = chapterMapper.selectByPrimaryKey(chapterId);
chapter.setSequence(sequence);
chapterMapper.updateByPrimaryKey(chapter);
return new ResultEntity(HttpStatus.OK, "编辑顺序成功");
}
}

@ -65,7 +65,7 @@ public class PythonController {
} else {
// 执行失败,输出错误信息
System.err.println("Error executing Python code:\n" + errors.toString());
return new ResultEntity(HttpStatus.BAD_REQUEST,errors.toString());
return new ResultEntity(HttpStatus.OK,errors.toString());
}
} catch (IOException | InterruptedException e) {
e.printStackTrace();
@ -76,7 +76,16 @@ public class PythonController {
public static void main(String[] args) {
String pythonCode = "num=100\na=2\nb=2\nc=a+b\nprint(c)\n";
String pythonCode = "def is_even(number):\n" +
" if number ___ 2 == 0:\n" +
" return True\n" +
" else:\n" +
" return ___\n" +
"num = 10\n" +
"if is_even(num):\n" +
" print(f\"{num} 是偶数\")\n" +
"else:\n" +
" ___(f\"{num} 是奇数\")";
try {
// 创建一个新的进程来执行Python代码

@ -15,6 +15,7 @@ import java.util.List;
@RestController
@Api(tags = "教师端--资源中心-实训案例步骤")
@RequestMapping("api/tea/caseStepController")
public class TeaCaseStepController {
@Autowired
ITeaCaseStepService caseStepService;

@ -12,6 +12,7 @@ import com.sztzjy.financial_bigdata.util.file.IFileUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.FileSystemResource;
@ -52,9 +53,9 @@ public class TeaResourceCenterController {
@ApiOperation("上传资源文件")
@AnonymousAccess
public ResultEntity uploadResource(@RequestParam MultipartFile file,
@ApiParam("学校id") @RequestParam(required = false) String schoolId,
@ApiParam("学校id") @RequestParam String schoolId,
@ApiParam("课程Id") @RequestParam String courseId,
@ApiParam("章节id") @RequestParam String chapterId,
@ApiParam("章节id") @RequestParam(required = false) String chapterId,
@ApiParam("上传文件类型 文件/视频") @RequestParam String type) {
Boolean flag = resourceCenterService.uploadResource(file, schoolId, courseId,type,chapterId);
if (flag) {

@ -9,10 +9,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@ -20,6 +17,7 @@ import java.util.List;
@RestController
@Api(tags = "教师端--资源中心-实训案例数据集相关")
@RequestMapping("api/tea/teaResourceDataController")
public class TeaResourceDataController {
@Autowired
ITeaResourceDataService resourceDataService;

@ -1,5 +1,7 @@
package com.sztzjy.financial_bigdata.entity;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
/**
*
@ -41,6 +43,9 @@ public class SysCaseQuestion {
@ApiModelProperty("上下架状态")
private Boolean unmountStatus;
@ApiModelProperty("新增时间")
private Date insertTime;
@ApiModelProperty("题目内容")
private String content;
@ -132,6 +137,14 @@ public class SysCaseQuestion {
this.unmountStatus = unmountStatus;
}
public Date getInsertTime() {
return insertTime;
}
public void setInsertTime(Date insertTime) {
this.insertTime = insertTime;
}
public String getContent() {
return content;
}

@ -1,6 +1,7 @@
package com.sztzjy.financial_bigdata.entity;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class SysCaseQuestionExample {
@ -863,6 +864,66 @@ public class SysCaseQuestionExample {
addCriterion("unmount_status not between", value1, value2, "unmountStatus");
return (Criteria) this;
}
public Criteria andInsertTimeIsNull() {
addCriterion("insert_time is null");
return (Criteria) this;
}
public Criteria andInsertTimeIsNotNull() {
addCriterion("insert_time is not null");
return (Criteria) this;
}
public Criteria andInsertTimeEqualTo(Date value) {
addCriterion("insert_time =", value, "insertTime");
return (Criteria) this;
}
public Criteria andInsertTimeNotEqualTo(Date value) {
addCriterion("insert_time <>", value, "insertTime");
return (Criteria) this;
}
public Criteria andInsertTimeGreaterThan(Date value) {
addCriterion("insert_time >", value, "insertTime");
return (Criteria) this;
}
public Criteria andInsertTimeGreaterThanOrEqualTo(Date value) {
addCriterion("insert_time >=", value, "insertTime");
return (Criteria) this;
}
public Criteria andInsertTimeLessThan(Date value) {
addCriterion("insert_time <", value, "insertTime");
return (Criteria) this;
}
public Criteria andInsertTimeLessThanOrEqualTo(Date value) {
addCriterion("insert_time <=", value, "insertTime");
return (Criteria) this;
}
public Criteria andInsertTimeIn(List<Date> values) {
addCriterion("insert_time in", values, "insertTime");
return (Criteria) this;
}
public Criteria andInsertTimeNotIn(List<Date> values) {
addCriterion("insert_time not in", values, "insertTime");
return (Criteria) this;
}
public Criteria andInsertTimeBetween(Date value1, Date value2) {
addCriterion("insert_time between", value1, value2, "insertTime");
return (Criteria) this;
}
public Criteria andInsertTimeNotBetween(Date value1, Date value2) {
addCriterion("insert_time not between", value1, value2, "insertTime");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {

@ -68,6 +68,20 @@ public class ExerciseServiceImpl implements IExerciseService {
return dtos;
}else {
if(StringUtils.isBlank(bloBs.getLearningEvalAnswer())){ //判断是否提交过 未提交
if(bloBs.getLearningEvalIdlist()==null){
List<SysObjectiveQuestion> objectiveQuestionList = objectiveService.selectObjectQuestionListByChapterId(chapterId);
for (int i = 0; i < objectiveQuestionList.size(); i++) {
SysObjectiveQuestion objectiveQuestion = objectiveQuestionList.get(i);
String objectiveId = objectiveQuestion.getObjectiveId();
objectiveIds.add(objectiveId);
objectiveQuestion.setAnswer("");
SysObjectiveQuestionDto sysObjectiveQuestionDto = new SysObjectiveQuestionDto("0","",objectiveQuestion);
dtos.add(sysObjectiveQuestionDto);
}
bloBs.setLearningEvalIdlist(String.valueOf(objectiveIds));
trainingMapper.updateByPrimaryKey(bloBs);
return dtos;
}
List<String> learningEvalIdlist = Arrays.asList(bloBs.getLearningEvalIdlist().substring(1, bloBs.getLearningEvalIdlist().length() - 1).split(", "));
for (int i = 0; i < learningEvalIdlist.size(); i++) {
String objectiveId = learningEvalIdlist.get(i);

@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@ -28,6 +29,7 @@ public class TeaCaseServiceImpl implements ITeaCaseService {
public Boolean insertCase(SysCaseQuestion caseQuestion) {
caseQuestion.setCaseId(String.valueOf(UUID.randomUUID()));
caseQuestion.setUnmountStatus(true);
caseQuestion.setInsertTime(new Date());
if(Constant.BUILT_IN_SCHOOL_ID.equals(caseQuestion.getSchoolId())){
caseQuestion.setInputType(Constant.INPUT_TYPE_BUILT_IN);
}else {
@ -53,6 +55,7 @@ public class TeaCaseServiceImpl implements ITeaCaseService {
if(StringUtils.isNotBlank(keyword)){
criteria.andTitleLike(keyword);
}
example.setOrderByClause("insert_time desc");
List<SysCaseQuestion> sysCaseQuestions = caseQuestionMapper.selectByExample(example);
PageInfo<SysCaseQuestion> pageInfo = new PageInfo<>(sysCaseQuestions);
return pageInfo;
@ -66,6 +69,7 @@ public class TeaCaseServiceImpl implements ITeaCaseService {
@Override
public Boolean caseBatchDelete(List<String> caseIdList, String schoolId) {
int flag=0;
for (int i = 0; i < caseIdList.size(); i++) {
String caseId = caseIdList.get(i);
SysCaseQuestion sysCaseQuestion = caseQuestionMapper.selectByPrimaryKey(caseId);
@ -73,14 +77,19 @@ public class TeaCaseServiceImpl implements ITeaCaseService {
if (sysCaseQuestion.getSchoolId().equals(Constant.BUILT_IN_SCHOOL_ID)) {
continue;
} else {
flag++;
caseQuestionMapper.deleteByPrimaryKey(caseId);
continue;
}
} else {
flag++;
caseQuestionMapper.deleteByPrimaryKey(caseId);
continue;
}
}
if(flag==0){
return false;
}
return true;
}

@ -25,7 +25,6 @@ public class TeaResourceCenterServiceImpl implements ITeaResourceCenterService {
public Boolean uploadResource(MultipartFile file, String schoolId,String courseId,String type,String chapterId) {
String uploadUrl = fileUtil.upload(file);
TeaResourceCenter resourceCenter=new TeaResourceCenter();
resourceCenter.setChapterId(chapterId);
resourceCenter.setResourceId(String.valueOf(UUID.randomUUID()));
resourceCenter.setResourceName(file.getOriginalFilename());
resourceCenter.setResourceUrl(uploadUrl);
@ -33,6 +32,9 @@ public class TeaResourceCenterServiceImpl implements ITeaResourceCenterService {
resourceCenter.setSchoolId(schoolId);
resourceCenter.setType(type);
resourceCenter.setImageUrl(null);
if(Constant.BUILT_IN_SCHOOL_ID.equals(schoolId)){
resourceCenter.setChapterId(chapterId);
}
int insert = resourceCenterMapper.insert(resourceCenter);
if(insert!=0){
return true;
@ -69,7 +71,15 @@ public class TeaResourceCenterServiceImpl implements ITeaResourceCenterService {
public List<TeaResourceCenter> selectResourceByChapterId(String schoolId, String chapterId) {
TeaResourceCenterExample example=new TeaResourceCenterExample();
TeaResourceCenterExample.Criteria criteria = example.createCriteria();
criteria.andChapterIdEqualTo(chapterId).andSchoolIdEqualTo(schoolId);
if(Constant.BUILT_IN_SCHOOL_ID.equals(schoolId)){
criteria.andSchoolIdEqualTo(schoolId);
}else {
List<String> schoolIds=new ArrayList<>();
schoolIds.add(Constant.BUILT_IN_SCHOOL_ID);
schoolIds.add(schoolId);
criteria.andSchoolIdIn(schoolIds);
}
criteria.andChapterIdEqualTo(chapterId);
List<TeaResourceCenter> teaResourceCenterList = resourceCenterMapper.selectByExample(example);
return teaResourceCenterList;
}

@ -13,6 +13,7 @@
<result column="type" jdbcType="VARCHAR" property="type" />
<result column="school_id" jdbcType="VARCHAR" property="schoolId" />
<result column="unmount_status" jdbcType="BIT" property="unmountStatus" />
<result column="insert_time" jdbcType="TIMESTAMP" property="insertTime" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.sztzjy.financial_bigdata.entity.SysCaseQuestion">
<result column="content" jdbcType="LONGVARCHAR" property="content" />
@ -77,7 +78,7 @@
</sql>
<sql id="Base_Column_List">
case_id, course_id, course_name, chapter_id, chapter_name, title, resource_data,
input_type, type, school_id, unmount_status
input_type, type, school_id, unmount_status, insert_time
</sql>
<sql id="Blob_Column_List">
content
@ -134,13 +135,13 @@
insert into sys_case_question (case_id, course_id, course_name,
chapter_id, chapter_name, title,
resource_data, input_type, type,
school_id, unmount_status, content
)
school_id, unmount_status, insert_time,
content)
values (#{caseId,jdbcType=VARCHAR}, #{courseId,jdbcType=VARCHAR}, #{courseName,jdbcType=VARCHAR},
#{chapterId,jdbcType=VARCHAR}, #{chapterName,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR},
#{resourceData,jdbcType=VARCHAR}, #{inputType,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
#{schoolId,jdbcType=VARCHAR}, #{unmountStatus,jdbcType=BIT}, #{content,jdbcType=LONGVARCHAR}
)
#{schoolId,jdbcType=VARCHAR}, #{unmountStatus,jdbcType=BIT}, #{insertTime,jdbcType=TIMESTAMP},
#{content,jdbcType=LONGVARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.sztzjy.financial_bigdata.entity.SysCaseQuestion">
insert into sys_case_question
@ -178,6 +179,9 @@
<if test="unmountStatus != null">
unmount_status,
</if>
<if test="insertTime != null">
insert_time,
</if>
<if test="content != null">
content,
</if>
@ -216,6 +220,9 @@
<if test="unmountStatus != null">
#{unmountStatus,jdbcType=BIT},
</if>
<if test="insertTime != null">
#{insertTime,jdbcType=TIMESTAMP},
</if>
<if test="content != null">
#{content,jdbcType=LONGVARCHAR},
</if>
@ -263,6 +270,9 @@
<if test="record.unmountStatus != null">
unmount_status = #{record.unmountStatus,jdbcType=BIT},
</if>
<if test="record.insertTime != null">
insert_time = #{record.insertTime,jdbcType=TIMESTAMP},
</if>
<if test="record.content != null">
content = #{record.content,jdbcType=LONGVARCHAR},
</if>
@ -284,6 +294,7 @@
type = #{record.type,jdbcType=VARCHAR},
school_id = #{record.schoolId,jdbcType=VARCHAR},
unmount_status = #{record.unmountStatus,jdbcType=BIT},
insert_time = #{record.insertTime,jdbcType=TIMESTAMP},
content = #{record.content,jdbcType=LONGVARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@ -301,7 +312,8 @@
input_type = #{record.inputType,jdbcType=VARCHAR},
type = #{record.type,jdbcType=VARCHAR},
school_id = #{record.schoolId,jdbcType=VARCHAR},
unmount_status = #{record.unmountStatus,jdbcType=BIT}
unmount_status = #{record.unmountStatus,jdbcType=BIT},
insert_time = #{record.insertTime,jdbcType=TIMESTAMP}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@ -339,6 +351,9 @@
<if test="unmountStatus != null">
unmount_status = #{unmountStatus,jdbcType=BIT},
</if>
<if test="insertTime != null">
insert_time = #{insertTime,jdbcType=TIMESTAMP},
</if>
<if test="content != null">
content = #{content,jdbcType=LONGVARCHAR},
</if>
@ -357,6 +372,7 @@
type = #{type,jdbcType=VARCHAR},
school_id = #{schoolId,jdbcType=VARCHAR},
unmount_status = #{unmountStatus,jdbcType=BIT},
insert_time = #{insertTime,jdbcType=TIMESTAMP},
content = #{content,jdbcType=LONGVARCHAR}
where case_id = #{caseId,jdbcType=VARCHAR}
</update>
@ -371,7 +387,8 @@
input_type = #{inputType,jdbcType=VARCHAR},
type = #{type,jdbcType=VARCHAR},
school_id = #{schoolId,jdbcType=VARCHAR},
unmount_status = #{unmountStatus,jdbcType=BIT}
unmount_status = #{unmountStatus,jdbcType=BIT},
insert_time = #{insertTime,jdbcType=TIMESTAMP}
where case_id = #{caseId,jdbcType=VARCHAR}
</update>
</mapper>
Loading…
Cancel
Save