From 0c5b8c3a74eff559f8559bc8c0a98c73837aaea2 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 28 May 2024 09:49:48 +0800 Subject: [PATCH 1/7] =?UTF-8?q?680=E5=9C=A8=E7=BA=BF=E8=AF=BE=E6=9C=AA?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8F=8A=E6=A0=BC=E7=BA=BF=E6=97=B6=E8=80=83?= =?UTF-8?q?=E8=AF=95=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/study/service/impl/StudyExamServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java index 688f565e..67a076d1 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java @@ -67,7 +67,12 @@ public class StudyExamServiceImpl implements IStudyExamService{ //用于计算考试成绩 CourseExam cexam=cexamDao.get(exam.getTestId()); - int prog=exam.getScore().intValue()>=exam.getPassLine()?100:exam.getScore().intValue(); + Integer passLine = 0; + if( exam.getPassLine() !=null){ + passLine = exam.getPassLine(); + } + + int prog=exam.getScore().intValue()>= passLine?100:exam.getScore().intValue(); //完成处理，判断是否已存在 Object obj=scItemDao.findField("id", FieldFilters.eq("studyId", exam.getStudyId()), FieldFilters.eq("contentId", exam.getContentId())); int status=exam.getScore()>=exam.getPassLine()?StudyCourseItem.STATUS_FINISH:StudyCourseItem.STATUS_STUDYING; From 2650e96a47f9175090ae5784a8805053e0c505d0 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 28 May 2024 19:48:19 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/study/service/impl/StudyExamServiceImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java index 67a076d1..688f565e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java @@ -67,12 +67,7 @@ public class StudyExamServiceImpl implements IStudyExamService{ //用于计算考试成绩 CourseExam cexam=cexamDao.get(exam.getTestId()); - Integer passLine = 0; - if( exam.getPassLine() !=null){ - passLine = exam.getPassLine(); - } - - int prog=exam.getScore().intValue()>= passLine?100:exam.getScore().intValue(); + int prog=exam.getScore().intValue()>=exam.getPassLine()?100:exam.getScore().intValue(); //完成处理，判断是否已存在 Object obj=scItemDao.findField("id", FieldFilters.eq("studyId", exam.getStudyId()), FieldFilters.eq("contentId", exam.getContentId())); int status=exam.getScore()>=exam.getPassLine()?StudyCourseItem.STATUS_FINISH:StudyCourseItem.STATUS_STUDYING; From 011d61f932a8d9be9f4179f1a06de0a1f6586ff9 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 28 May 2024 19:59:57 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/study/service/impl/StudyExamServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java index 688f565e..bd087326 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java @@ -67,7 +67,13 @@ public class StudyExamServiceImpl implements IStudyExamService{ //用于计算考试成绩 CourseExam cexam=cexamDao.get(exam.getTestId()); - int prog=exam.getScore().intValue()>=exam.getPassLine()?100:exam.getScore().intValue(); + Integer passLine = 0; + if( exam.getPassLine() !=null){ + passLine = exam.getPassLine(); + } + + int prog=exam.getScore().intValue()>= passLine?100:exam.getScore().intValue(); +// int prog=exam.getScore().intValue()>=exam.getPassLine()?100:exam.getScore().intValue(); //完成处理，判断是否已存在 Object obj=scItemDao.findField("id", FieldFilters.eq("studyId", exam.getStudyId()), FieldFilters.eq("contentId", exam.getContentId())); int status=exam.getScore()>=exam.getPassLine()?StudyCourseItem.STATUS_FINISH:StudyCourseItem.STATUS_STUDYING; From bf8dd3412e6f5a100561239cb562cd66afa7c51f Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 28 May 2024 20:10:53 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=8F=8A=E6=A0=BC=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/study/service/impl/StudyExamServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java index bd087326..8d007c59 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java @@ -67,13 +67,11 @@ public class StudyExamServiceImpl implements IStudyExamService{ //用于计算考试成绩 CourseExam cexam=cexamDao.get(exam.getTestId()); - Integer passLine = 0; - if( exam.getPassLine() !=null){ - passLine = exam.getPassLine(); + if( exam.getPassLine() ==null){ + exam.setPassLine(0); } - int prog=exam.getScore().intValue()>= passLine?100:exam.getScore().intValue(); -// int prog=exam.getScore().intValue()>=exam.getPassLine()?100:exam.getScore().intValue(); + int prog=exam.getScore().intValue()>=exam.getPassLine()?100:exam.getScore().intValue(); //完成处理，判断是否已存在 Object obj=scItemDao.findField("id", FieldFilters.eq("studyId", exam.getStudyId()), FieldFilters.eq("contentId", exam.getContentId())); int status=exam.getScore()>=exam.getPassLine()?StudyCourseItem.STATUS_FINISH:StudyCourseItem.STATUS_STUDYING; From aad54ee66fc3f6728a31627b3a9b190aea960cf7 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 29 May 2024 17:59:07 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boe-server-all/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/resources/application.properties b/servers/boe-server-all/src/main/resources/application.properties index 9dd37d3d..7f8192bc 100644 --- a/servers/boe-server-all/src/main/resources/application.properties +++ b/servers/boe-server-all/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.profiles.active=dev +spring.profiles.active=@profileActive@ spring.application.name=boe-server-all server.port=9090 server.servlet.session.timeout=30m From ac931216aaeee174a8ba2a50c7e75d579125c1e6 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 29 May 2024 18:17:12 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/UrlSecurityFilterImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/UrlSecurityFilterImpl.java b/servers/boe-server-all/src/main/java/com/xboe/UrlSecurityFilterImpl.java index d61157ae..67e6ab63 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/UrlSecurityFilterImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/UrlSecurityFilterImpl.java @@ -48,7 +48,7 @@ public class UrlSecurityFilterImpl implements IUrlSecurityFilter{ return false; } - return false; + return true; } } From a35c1faa49b48b0143854e11a589f067b1b72bc0 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Thu, 6 Jun 2024 16:32:33 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AD=A6=E5=91=98=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5=E7=9A=84bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/exam/api/ExamTestApi.java | 18 ++++++++++++++++-- .../com/xboe/module/exam/entity/ExamTest.java | 16 +++++++++------- .../exam/service/impl/ExamTestServiceImpl.java | 13 ++++++++++++- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java index 9b083070..f774c236 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java @@ -2,6 +2,7 @@ package com.xboe.module.exam.api; import javax.annotation.Resource; +import org.hibernate.exception.ConstraintViolationException; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -81,12 +82,25 @@ public class ExamTestApi extends ApiBaseController { if(StringUtil.isBlank(examTest.getTestName())){ return badRequest("标题为空"); } + + // 确保examTest有一个有效的主键ID（如果适用） + // 这取决于您的业务逻辑是否允许更新主键 + // 通常，更新操作不会改变主键 + if (examTest.getId() == null) { + return badRequest("更新操作需要有效的主键ID"); + } + try { examTestService.update(examTest); return success(examTest); + } catch (ConstraintViolationException e) { + // 捕获约束违反异常，并返回一个更具体的错误消息 + log.error("修改失败，违反了约束条件", e); + return error("修改失败，违反了约束条件（可能是主键已存在）"); } catch (Exception e) { - log.error("修改失败",e); - return error("修改失败",e.getMessage()); + // 捕获其他所有异常 + log.error("修改失败", e); + return error("修改失败", e.getMessage()); } } /**、 diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java index fb665bc2..0dc21c0c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java @@ -28,7 +28,7 @@ public class ExamTest extends BaseEntity { /** * 考试名称 * */ - @Column(name = "test_name",nullable = false,length = 50) + @Column(name = "test_name",length = 50) private String testName; /** @@ -46,7 +46,7 @@ public class ExamTest extends BaseEntity { /** * 考试时长 分钟 * */ - @Column(name = "test_duration",nullable = false) + @Column(name = "test_duration") private Integer testDuration; /** * 显示解析 @@ -101,19 +101,19 @@ public class ExamTest extends BaseEntity { /** * 试卷的ID */ - @Column(name = "paper_id",nullable = false,length=20) + @Column(name = "paper_id",length=20) private String paperId; /** * 考试的类型 * */ - @Column(name = "test_type",nullable = false) + @Column(name = "test_type") private Integer testType; /** * 发布状态 ，是否已发布 */ - @Column(name = "published",length = 1,nullable = false) + @Column(name = "published",length = 1) private Boolean published; /** * 发布时间 @@ -154,7 +154,7 @@ public class ExamTest extends BaseEntity { /** * 范围，1表独立使用，2表课程内部 * */ - @Column(name = "range_type",nullable = false) + @Column(name = "range_type") private Integer rangeType; /** @@ -173,9 +173,11 @@ public class ExamTest extends BaseEntity { /**启用的，上架*/ - @Column(name = "enabled", nullable = false, length = 1) + @Column(name = "enabled", length = 1) private Boolean enabled; @Transient private String paperName; + + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java index 5b9bf331..8414badb 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java @@ -70,7 +70,18 @@ public class ExamTestServiceImpl implements IExamTestService { @Override public void update(ExamTest examTest) { - examTestDao.update(examTest); + if (examTest.getId() == null) { + throw new IllegalArgumentException("ID must not be null"); + } + String sql = "update boe_exam_test set arrange = "+ examTest.getArrange() +", deadline_time = '"+examTest.getDeadlineTime() +"' , " + + "entrance_time = '"+examTest.getEntranceTime() +"' , paper_id = "+examTest.getPaperId() +",pass_line = "+examTest.getPassLine() + + ", percent_score = "+examTest.getPercentScore() +" ,publish_time = '"+examTest.getPublishTime()+"' , published = "+examTest.getPublished()+ + ",random_count = "+examTest.getRandomCount()+" ,random_mode = "+examTest.getRandomMode()+",range_type = "+examTest.getRangeType() + + ",scoring_type = "+examTest.getScoringType() +",show_analysis="+examTest.getShowAnalysis() +",show_answer = "+examTest.getShowAnswer() + + ",test_duration = "+examTest.getTestDuration() +",test_name = '"+examTest.getTestName() +"',test_remark= "+examTest.getTestRemark() + + ",test_type= "+examTest.getTestType() +" ,test_up = '"+examTest.getTestUp() +"' ,test_front= "+examTest.getTestFront() + + ",times = '"+examTest.getTimes() +"' where id = "+examTest.getId()+""; + examTestDao.sqlUpdate(sql); } @Override