From d5c7f485091d29c3f469ad82847ed93b315b22a1 Mon Sep 17 00:00:00 2001
From: 胡仁荣 <897853850@qq.com>
Date: 星期二, 09 五月 2023 18:26:08 +0800
Subject: [PATCH] 新增作业分类
---
src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java | 36 ++++++++++++++++++++++++++++++------
src/main/java/com/qxueyou/scc/sys/action/LoginController.java | 8 ++++----
src/main/java/com/qxueyou/scc/controller/VideoLiveController.java | 11 +++++++++++
3 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java b/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
index 33e20fe..359b4b1 100644
--- a/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
+++ b/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
@@ -8,6 +8,7 @@
import com.alibaba.fastjson.JSONObject;
import com.hankcs.hanlp.corpus.tag.Nature;
import com.qxueyou.scc.sdk.MTCloud;
+import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -122,6 +123,7 @@
options.put("robotNumber", 1);
options.put("robotType", 1);
options.put("pptDisplay", 1);
+ options.put("modetype", 6);
//灏唋ong绫诲瀷杞崲涓篠tring绫诲瀷
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
@@ -157,6 +159,15 @@
return new Result(true,"寮�鍚垚鍔�",protocol);
}
+ @ApiOperation(value = "鍦ㄧ嚎鏃堕暱")
+ @GetMapping(value = "onlineCommunication")
+ public Result onlineCommunication(String courseId,Integer page, Integer size) throws Exception {
+ MTCloud client = new MTCloud();
+ HashMap<Object,Object> options = new HashMap<Object, Object>();
+ options.put("ssl", false);
+ String res = client.courseVisitorList("3360573",10,1,options);
+ return new Result(true,"寮�鍚垚鍔�",res);
+ }
/**
* 鏌ヨ鐩存挱璇︽儏
*
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 859e5e5..4a51522 100644
--- a/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
+++ b/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
@@ -390,8 +390,8 @@
if(StringUtils.isEmpty(password)) {
return new Result(false, "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖");
}
- hql = "from User where deleteFlag is false and account = ? and password = ?";
- params = CollectionUtils.newList(account,password);
+ hql = "from User where deleteFlag is false and account = ?";
+ params = CollectionUtils.newList(account);
}
if(StringUtils.isNotEmpty(organizationId)){
@@ -421,7 +421,7 @@
String salt = user.getSalt();
String newPassword= DigestUtils.md5DigestAsHex((salt+password).getBytes());
//姣旇緝鐢ㄦ埛杈撳叆鐨勫瘑鐮佸姞瀵嗗悗鐨勫瓧绗︿覆鏄惁璺熸敞鍐屾椂濉啓鐨勫姞瀵嗗瘑鐮佺浉鍚�
- if("study".equals(logType) || "portal".equals(logType)){
+ if("study".equals(logType) || "portal".equals(logType) || "adminis".equals(logType)){
if (!newPassword.equals(user.getPassword())) {
return new Result(false, "鐢ㄦ埛璐︽埛銆佸瘑鐮侀敊璇垨缂哄皯鍑瘉");
}
@@ -615,7 +615,7 @@
@ApiOperation(value = "淇敼瀵嗙爜", notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "usedPass", value = "鑰佸瘑鐮�", required = false, paramType="query", dataType = "String"),
- @ApiImplicitParam(name = "pass", value = "鏂板瘑鐮�", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "pass", value = "鏂板瘑鐮�", required = false, paramType=" query", dataType = "String"),
})
@RequestMapping(value = "updatePassword", method = RequestMethod.POST)
@ResponseBody
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 cfb6802..b43fee9 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
@@ -10,7 +10,9 @@
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.RandomUtil;
import com.qxueyou.scc.admin.classes.model.ClsClass;
+import com.qxueyou.scc.base.dao.CommonDAO;
import com.qxueyou.scc.exam.model.ExamResultV;
+import com.qxueyou.scc.exercise.model.ExerciseCompleteInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -47,6 +49,9 @@
@Autowired
StudentDAO dao;
+
+ @Autowired
+ CommonDAO commonDAO;
@Override
public Result insertStudent(String classId, String name, String studentNo, boolean sex, String phoneNo, String orgId) {
@@ -224,6 +229,7 @@
public Result doActivateStudent(String[] studentIds) {
for (String studentId : studentIds) {
activateStudent(studentId, StuStudent.STATUS_ACTIVE);
+ ModeUpdate(studentId,StuStudent.STATUS_ACTIVE);
}
return new Result(true);
}
@@ -232,6 +238,24 @@
public Result doDeActivateStudent(String[] studentIds) {
for (String studentId : studentIds) {
activateStudent(studentId, StuStudent.STATUS_DEACTIVE);
+ ModeUpdate(studentId,StuStudent.STATUS_DEACTIVE);
+ }
+ return new Result(true);
+ }
+
+ private Result ModeUpdate(String studentId,String status){
+ if(status.equals(StuStudent.STATUS_ACTIVE)){
+ 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);
+ }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);
}
return new Result(true);
}
@@ -244,13 +268,13 @@
}
TraceUtils.setUpdateTrace(student);
- String currentTime = LocalDateTimeUtil.format(LocalDateTime.now(), "yyMMddHHmmssSSS");
-
- String examCardNo = currentTime.concat(RandomUtil.randomNumbers(1));
-
- student.setStudentNumber(examCardNo);
+// String currentTime = LocalDateTimeUtil.format(LocalDateTime.now(), "yyMMddHHmmssSSS");
+//
+// String examCardNo = currentTime.concat(RandomUtil.randomNumbers(1));
+//
+// student.setStudentNumber(examCardNo);
student.setStatus(status);
- save(student);
+ commonDAO.update(student);
clsService.addStudent(student.getClassId(), StuStudent.STATUS_DEACTIVE.equals(status) ? -1 : 1);
--
Gitblit v1.8.0