From 792da3dcdef9679c36adc4d54f3bff0f415c0fe2 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期四, 11 五月 2023 16:53:23 +0800
Subject: [PATCH] 111
---
src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java | 12 ++++--
src/test/java/com/qxueyou/scc/SccApplicationTests.java | 32 +++++++++-------
src/main/java/com/qxueyou/scc/sys/action/LoginController.java | 4 +-
src/main/java/com/qxueyou/scc/controller/VideoLiveController.java | 19 ++++++++-
4 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java b/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
index f18bac9..bab0bf5 100644
--- a/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
+++ b/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
@@ -7,6 +7,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hankcs.hanlp.corpus.tag.Nature;
+import com.qxueyou.scc.base.dao.CommonDAO;
import com.qxueyou.scc.sdk.MTCloud;
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
@@ -136,11 +137,11 @@
JSONObject data = jsonObject.getJSONObject("data");
String course_id = (String) data.get("course_id");
// System.out.println(Integer.parseInt(course_id));
- if(Nature.s !=null) {
+ if(jsonObject.getString("code").equals("0")) {
liveService.add(name, content,teacherId,teacherName,subjectId,subjectName,definition,imgPath, new Date(startTime), new Date(endTime),Integer.parseInt(course_id), isPlayBack, StringUtils.isEmpty(classIds)?null:CollectionUtils.newList(String.class,classIds.split(",")));
return new Result(true, "鎴愬姛", s);
}
- return new Result(false);
+ return new Result(false,jsonObject.getString("msg"));
}
@ApiOperation(value = "寮�鍚洿鎾�")
@@ -159,7 +160,19 @@
return new Result(true,"寮�鍚垚鍔�",protocol);
}
- @ApiOperation(value = "鍦ㄧ嚎鏃堕暱")
+ @ApiOperation(value = "淇敼鐩存挱鐘舵��")
+ @GetMapping(value = "updateLive")
+ public Result updateLive(Integer courseId) {
+
+ MediaVideoLive revamp = liveService.revamp(courseId);
+ revamp.setStatus(MediaVideoLive.STATUS_LIVE_STOP);
+ CommonDAO commonDAO=new CommonDAO();
+ commonDAO.update(revamp);
+
+ return new Result(true,"鍏抽棴鎴愬姛");
+ }
+
+ @ApiOperation(value = "鍦ㄧ嚎鏃堕暱")
@GetMapping(value = "onlineCommunication")
public Result onlineCommunication(String courseId,Integer page, Integer size) throws Exception {
MTCloud client = new MTCloud();
diff --git a/src/main/java/com/qxueyou/scc/sys/action/LoginController.java b/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
index ea9cd48..9f89e5d 100644
--- a/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
+++ b/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
@@ -217,8 +217,8 @@
// 鏌ヨ鐢ㄦ埛淇℃伅
String uuNumber=null;
String uuReNumber=null;
- String hql = "from User where deleteFlag is false and account = ?";
- List<Object> params = CollectionUtils.newList(account);
+ String hql = "from User where deleteFlag is false and account = ? and password= ?";
+ List<Object> params = CollectionUtils.newList(account,password);
User user = commonDAO.findUnique(hql,params, User.class);
if (user == null ) {
return new Result(false, "鐢ㄦ埛璐︽埛銆佸瘑鐮侀敊璇�");
diff --git a/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java b/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
index b43fee9..2321c67 100644
--- a/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
+++ b/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
@@ -248,14 +248,18 @@
String hql = "from ExerciseCompleteInfo where studentId=? and deleteFlag is false";
List<Object> Params = CollectionUtils.newList(studentId);
ExerciseCompleteInfo unique = findUnique(hql, Params, ExerciseCompleteInfo.class);
- unique.setDeleteFlag(false);
- commonDAO.update(unique);
+ if(unique!=null) {
+ unique.setDeleteFlag(false);
+ commonDAO.update(unique);
+ }
}else {
String hql = "from ExerciseCompleteInfo where studentId=? and deleteFlag is false";
List<Object> Params = CollectionUtils.newList(studentId);
ExerciseCompleteInfo unique = findUnique(hql, Params, ExerciseCompleteInfo.class);
- unique.setDeleteFlag(true);
- commonDAO.update(unique);
+ if(unique!=null){
+ unique.setDeleteFlag(true);
+ commonDAO.update(unique);
+ }
}
return new Result(true);
}
diff --git a/src/test/java/com/qxueyou/scc/SccApplicationTests.java b/src/test/java/com/qxueyou/scc/SccApplicationTests.java
index e33bc27..1de5075 100644
--- a/src/test/java/com/qxueyou/scc/SccApplicationTests.java
+++ b/src/test/java/com/qxueyou/scc/SccApplicationTests.java
@@ -1,16 +1,20 @@
package com.qxueyou.scc;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringRunner;
-//
-//@RunWith(SpringRunner.class)
-//@SpringBootTest
-//public class SccApplicationTests {
-//
-// @Test
-// public void contextLoads() {
-// }
-//
-//}
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.DigestUtils;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SccApplicationTests {
+
+ @Test
+ public void contextLoads() {
+
+ String newPassword= DigestUtils.md5DigestAsHex(("ccaa2322-2d5e-4981-af79-23d69378a18c"+"0000").getBytes());
+ System.out.println(newPassword);
+ }
+
+}
--
Gitblit v1.8.0