tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复开课首页数据不正确的问题，修复签到报错问题

Browse Source
beetlsql3-dev
yaodan 2 years ago
parent 52be3a1516
commit cd40990a37
5 changed files with 161 additions and 121 deletions
Show Stats Download Patch File Download Diff File

153
web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java
Unescape Escape View File

@ -8,10 +8,7 @@ import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.util.enums.DelFlagEnum; import com.ibeetl.admin.core.util.enums.DelFlagEnum;
import com.ibeetl.jlw.dao.*; import com.ibeetl.jlw.dao.*;
import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.enums.ChatLogSendTypeEnum; import com.ibeetl.jlw.enums.*;
import com.ibeetl.jlw.enums.GlobalPushStatusEnum;
import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import com.ibeetl.jlw.enums.SignInTypeEnum;
import com.ibeetl.jlw.web.query.*; import com.ibeetl.jlw.web.query.*;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.query.LambdaQuery; import org.beetl.sql.core.query.LambdaQuery;
@ -28,48 +25,79 @@ import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.HOMEWOR
/** /**
* 统计分析service * 统计分析service
*
* @Version 0.0.1 * @Version 0.0.1
* @Author 许良彤 * @Author 许良彤
* @Date 2022/10/7 12:25 * @Date 2022/10/7 12:25
*
*/ */
@Service @Service
public class StatisticalAnalysisService { public class StatisticalAnalysisService {
@Autowired private StatisticalAnalysisDao statisticalAnalysisDao;
@Autowired private TeacherOpenCourseMergeSchoolClassService teacherOpenCourseMergeSchoolClassService; @Autowired
@Autowired private TeacherOpenCourseMergeStudentService teacherOpenCourseMergeStudentService; private TeacherOpenCourseMergeSchoolClassService teacherOpenCourseMergeSchoolClassService;
@Autowired private TeacherOpenCourseNoticeService teacherOpenCourseNoticeService; @Autowired
@Autowired private StudentService studentService; private TeacherOpenCourseMergeStudentService teacherOpenCourseMergeStudentService;
@Autowired private TeacherService teacherService; @Autowired
@Autowired private CourseInfoService courseInfoService; private TeacherOpenCourseNoticeService teacherOpenCourseNoticeService;
@Autowired private ResourcesApplicationService resourcesApplicationService; @Autowired
@Autowired private UniversitiesCollegesDao universitiesCollegesDao; private StudentService studentService;
@Autowired private SysLogDao sysLogDao; @Autowired
@Autowired private UniversitiesCollegesService universitiesCollegesService; private TeacherService teacherService;
@Autowired private CoreUserDao coreUserDao;
@Autowired private ResourcesTrainingDao resourcesTrainingService; @Autowired
@Autowired private ResourcesInfoService resourcesInfoService; private ResourcesApplicationService resourcesApplicationService;
@Autowired private ResourcesQuestionService resourcesQuestionService; @Autowired
@Autowired private TeacherOpenCourseStudentSigninLogService teacherOpenCourseStudentSigninLogService; private UniversitiesCollegesDao universitiesCollegesDao;
@Autowired private TeacherOpenCourseQuestionSettingService teacherOpenCourseQuestionSettingService; @Autowired
@Autowired private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService; private SysLogDao sysLogDao;
@Autowired private TeacherOpenCourseQuestionLogService teacherOpenCourseQuestionLogService; @Autowired
@Autowired private TeacherOpenCourseHandsOnService teacherOpenCourseHandsOnService; private UniversitiesCollegesService universitiesCollegesService;
@Autowired private TeacherOpenCourseHandsOnSimulationTasksService teacherOpenCourseHandsOnSimulationTasksService; @Autowired
@Autowired private HandsOnAchievementService handsOnAchievementService; private CoreUserDao coreUserDao;
@Autowired private TeacherOpenCourseChatLogService teacherOpenCourseChatLogService; @Autowired
@Autowired private TeacherOpenCourseDao teacherOpenCourseService; private ResourcesTrainingDao resourcesTrainingService;
@Autowired private TeacherOpenCourseQuestionSettingDao teacherOpenCourseQuestionSettingDao; @Autowired
@Autowired private HandsOnDao handsOnService; private ResourcesInfoService resourcesInfoService;
@Autowired private ResourcesCompetitionDao resourcesCompetitionService; @Autowired
@Autowired private TeacherOpenCourseScoreDashboardDao teacherOpenCourseScoreDashboardDao; private ResourcesQuestionService resourcesQuestionService;
@Autowired private QuestionLogSummaryDao questionLogSummaryDao; @Autowired
@Autowired private TeacherOpenCourseQuestionLogDao teacherOpenCourseQuestionLogDao; private TeacherOpenCourseStudentSigninLogService teacherOpenCourseStudentSigninLogService;
@Autowired private ResourcesQuestionSnapshotService resourcesQuestionSnapshotService; @Autowired
@Autowired private ResourcesQuestionSnapshotDao resourcesQuestionSnapshotDao; private TeacherOpenCourseQuestionSettingService teacherOpenCourseQuestionSettingService;
@Autowired private UniversitiesCollegesJurisdictionExperimentalSystemDao universitiesCollegesJurisdictionExperimentalSystemDao; @Autowired
@Autowired private UniversitiesCollegesJurisdictionCurriculumResourcesService universitiesCollegesJurisdictionCurriculumResourcesService; private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService;
@Autowired
private TeacherOpenCourseQuestionLogService teacherOpenCourseQuestionLogService;
@Autowired
private TeacherOpenCourseHandsOnService teacherOpenCourseHandsOnService;
@Autowired
private TeacherOpenCourseHandsOnSimulationTasksService teacherOpenCourseHandsOnSimulationTasksService;
@Autowired
private HandsOnAchievementService handsOnAchievementService;
@Autowired
private TeacherOpenCourseChatLogService teacherOpenCourseChatLogService;
@Autowired
private TeacherOpenCourseDao teacherOpenCourseService;
@Autowired
private TeacherOpenCourseQuestionSettingDao teacherOpenCourseQuestionSettingDao;
@Autowired
private HandsOnDao handsOnService;
@Autowired
private ResourcesCompetitionDao resourcesCompetitionService;
@Autowired
private TeacherOpenCourseScoreDashboardDao teacherOpenCourseScoreDashboardDao;
@Autowired
private UniversitiesCollegesJurisdictionExperimentalSystemDao universitiesCollegesJurisdictionExperimentalSystemDao;
@Autowired
private UniversitiesCollegesJurisdictionCurriculumResourcesService universitiesCollegesJurisdictionCurriculumResourcesService;
@Autowired
private TeacherOpenCourseMergeResourcesInfoService teacherOpenCourseMergeResourcesInfoService;
@Autowired
private TeacherOpenCourseMergeResourcesQuestionService teacherOpenCourseMergeResourcesQuestionService;
private static final String PATTERN = "(?<=\"code\":\\[\").*?(?=\"\\],)"; private static final String PATTERN = "(?<=\"code\":\\[\").*?(?=\"\\],)";
@ -77,6 +105,7 @@ public class StatisticalAnalysisService {
/** /**
* 统计分析 * 统计分析
*
* @param * @param
*/ */
public Map<String, Object> detail(Long teacherOpenCourseId, Date stime, Date etime) { public Map<String, Object> detail(Long teacherOpenCourseId, Date stime, Date etime) {
@ -101,9 +130,9 @@ public class StatisticalAnalysisService {
long count1 = scoreDashboards.stream().filter(v -> long count1 = scoreDashboards.stream().filter(v ->
"不及格".equals(v.getLastStatus()) || "E".equals(v.getLastStatus())).count(); "不及格".equals(v.getLastStatus()) || "E".equals(v.getLastStatus())).count();
long l = scoreDashboards.size() - count1; long l = scoreDashboards.size() - count1;
data.put("passRate", NumberUtil.formatPercent(NumberUtil.div(l,studentList.size()), 0)); data.put("passRate", NumberUtil.formatPercent(NumberUtil.div(l, studentList.size()), 0));
data.put("studentPassNum",l ); data.put("studentPassNum", l);
}else { } else {
data.put("passRate", "0%"); data.put("passRate", "0%");
data.put("studentPassNum", 0); data.put("studentPassNum", 0);
} }
@ -130,9 +159,9 @@ public class StatisticalAnalysisService {
//签到数量 //签到数量
data.put("signInNum", collect.size()); data.put("signInNum", collect.size());
//到课率 //到课率
if(CollectionUtil.isNotEmpty(collect)) { if (CollectionUtil.isNotEmpty(collect)) {
data.put("signInRate", NumberUtil.div(NumberUtil.toBigDecimal(collect.size()), NumberUtil.toBigDecimal(signinLogs.size()), 2).multiply(BigDecimal.valueOf(100)).intValue()); data.put("signInRate", NumberUtil.div(NumberUtil.toBigDecimal(collect.size()), NumberUtil.toBigDecimal(signinLogs.size()), 2).multiply(BigDecimal.valueOf(100)).intValue());
}else { } else {
data.put("signInRate", 0); data.put("signInRate", 0);
} }
//章节练习 //章节练习
@ -156,7 +185,7 @@ public class StatisticalAnalysisService {
List<TeacherOpenCourseQuestionLog> values = teacherOpenCourseQuestionLogService.getValues(teacherOpenCourseQuestionLogQuery); List<TeacherOpenCourseQuestionLog> values = teacherOpenCourseQuestionLogService.getValues(teacherOpenCourseQuestionLogQuery);
int size = values.stream().map(TeacherOpenCourseQuestionLog::getStudentId).collect(Collectors.toSet()).size(); int size = values.stream().map(TeacherOpenCourseQuestionLog::getStudentId).collect(Collectors.toSet()).size();
data.put("chapterPeople", size); data.put("chapterPeople", size);
}else { } else {
data.put("chapterPeople", 0); data.put("chapterPeople", 0);
} }
//课程实操 //课程实操
@ -178,7 +207,7 @@ public class StatisticalAnalysisService {
List<HandsOnAchievement> assessmentList = handsOnAchievementService.getValues(achievementQuery); List<HandsOnAchievement> assessmentList = handsOnAchievementService.getValues(achievementQuery);
long count = assessmentList.stream().map(HandsOnAchievement::getStudentId).count(); long count = assessmentList.stream().map(HandsOnAchievement::getStudentId).count();
data.put("handsOnPeople", count); data.put("handsOnPeople", count);
}else { } else {
data.put("handsOnPeople", 0); data.put("handsOnPeople", 0);
} }
//作业 //作业
@ -193,7 +222,7 @@ public class StatisticalAnalysisService {
List<TeacherOpenCourseQuestionLog> values = teacherOpenCourseQuestionLogService.getValues(teacherOpenCourseQuestionLogQuery); List<TeacherOpenCourseQuestionLog> values = teacherOpenCourseQuestionLogService.getValues(teacherOpenCourseQuestionLogQuery);
int size = values.stream().map(TeacherOpenCourseQuestionLog::getStudentId).collect(Collectors.toSet()).size(); int size = values.stream().map(TeacherOpenCourseQuestionLog::getStudentId).collect(Collectors.toSet()).size();
data.put("homeworkPeople", size); data.put("homeworkPeople", size);
}else { } else {
//作业参与人数 //作业参与人数
data.put("homeworkPeople", 0); data.put("homeworkPeople", 0);
} }
@ -207,7 +236,7 @@ public class StatisticalAnalysisService {
List<TeacherOpenCourseQuestionLog> values = teacherOpenCourseQuestionLogService.getValues(teacherOpenCourseQuestionLogQuery); List<TeacherOpenCourseQuestionLog> values = teacherOpenCourseQuestionLogService.getValues(teacherOpenCourseQuestionLogQuery);
int size = values.stream().map(TeacherOpenCourseQuestionLog::getStudentId).collect(Collectors.toSet()).size(); int size = values.stream().map(TeacherOpenCourseQuestionLog::getStudentId).collect(Collectors.toSet()).size();
data.put("examPeople", size); data.put("examPeople", size);
}else { } else {
//考试参与人数 //考试参与人数
data.put("examPeople", 0); data.put("examPeople", 0);
} }
@ -232,6 +261,7 @@ public class StatisticalAnalysisService {
/** /**
* 首页 * 首页
*
* @param * @param
* @return * @return
*/ */
@ -261,24 +291,37 @@ public class StatisticalAnalysisService {
List<TeacherOpenCourseMergeStudent> studentList = teacherOpenCourseMergeStudentService.getValuesByQueryNotWithPermission(studentQuery); List<TeacherOpenCourseMergeStudent> studentList = teacherOpenCourseMergeStudentService.getValuesByQueryNotWithPermission(studentQuery);
data.put("studentNum", studentList.size()); data.put("studentNum", studentList.size());
//课件 //课件
TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery = new TeacherOpenCourseMergeResourcesInfoQuery();
teacherOpenCourseMergeResourcesInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId);
teacherOpenCourseMergeResourcesInfoQuery.setResourcesInfoStatus(GlobalUpStatusEnum.UP);
List<TeacherOpenCourseMergeResourcesInfo> resourcesInfoList = teacherOpenCourseMergeResourcesInfoService.getValuesByQueryNotWithPermission(teacherOpenCourseMergeResourcesInfoQuery);
data.put("coursewareNum", resourcesInfoList.size());
TeacherOpenCourseMergeCourseInfoQuery courseInfoQuery = new TeacherOpenCourseMergeCourseInfoQuery(); TeacherOpenCourseMergeCourseInfoQuery courseInfoQuery = new TeacherOpenCourseMergeCourseInfoQuery();
courseInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId); courseInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId);
courseInfoQuery.setCourseInfoStatus(1); courseInfoQuery.setCourseInfoStatus(1);
List<TeacherOpenCourseMergeCourseInfo> courseInfos = teacherOpenCourseMergeCourseInfoService.getValuesByQueryNotWithPermission(courseInfoQuery); List<TeacherOpenCourseMergeCourseInfo> courseInfos = teacherOpenCourseMergeCourseInfoService.getValuesByQueryNotWithPermission(courseInfoQuery);
data.put("coursewareNum", courseInfos.size());
//视频 //视频
List<TeacherOpenCourseMergeCourseInfo> videoCount = courseInfos.stream().filter(v -> v.getCourseVideoId() != null).collect(Collectors.toList()); List<TeacherOpenCourseMergeCourseInfo> videoCount = courseInfos.stream().filter(v -> v.getCourseVideoId() != null).collect(Collectors.toList());
data.put("videoNum", videoCount.size()); data.put("videoNum", videoCount.size());
//题目 //题目
//习题总数 //习题总数
TeacherOpenCourseMergeResourcesQuestionQuery teacherOpenCourseMergeResourcesQuestionQuery = new TeacherOpenCourseMergeResourcesQuestionQuery();
teacherOpenCourseMergeResourcesQuestionQuery.setTeacherOpenCourseId(teacherOpenCourseId);
teacherOpenCourseMergeResourcesQuestionQuery.setQuestionStatus(1);
List<TeacherOpenCourseMergeResourcesQuestion> questionList = teacherOpenCourseMergeResourcesQuestionService.getValuesByQueryNotWithPermission(teacherOpenCourseMergeResourcesQuestionQuery);
data.put("subjectNum", questionList.size());
TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery = new TeacherOpenCourseQuestionSettingQuery(); TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery = new TeacherOpenCourseQuestionSettingQuery();
teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseId(teacherOpenCourseId); teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseId(teacherOpenCourseId);
teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH); teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH);
teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1); teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
List<TeacherOpenCourseQuestionSettingPure> courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery); List<TeacherOpenCourseQuestionSettingPure> courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery);
List<TeacherOpenCourseQuestionSettingPure> collect1 = courseQuestionSettings.stream().filter(v -> v.getTeacherOpenCourseQuestionSettingType().equals(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE)).collect(Collectors.toList()); //List<TeacherOpenCourseQuestionSettingPure> collect1 = courseQuestionSettings.stream().filter(v -> v.getTeacherOpenCourseQuestionSettingType().equals(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE)).collect(Collectors.toList());
data.put("subjectNum", collect1.size());
//案例 //案例
TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery = new TeacherOpenCourseHandsOnQuery(); TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery = new TeacherOpenCourseHandsOnQuery();
teacherOpenCourseHandsOnQuery.setTeacherOpenCourseId(teacherOpenCourseId); teacherOpenCourseHandsOnQuery.setTeacherOpenCourseId(teacherOpenCourseId);
@ -459,13 +502,13 @@ public class StatisticalAnalysisService {
List<String> xList = new ArrayList<>(); List<String> xList = new ArrayList<>();
List<Long> yList = new ArrayList<>(); List<Long> yList = new ArrayList<>();
collect.forEach((x,y) -> { collect.forEach((x, y) -> {
xList.add(x); xList.add(x);
yList.add(y); yList.add(y);
}); });
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("xList" , xList); map.put("xList", xList);
map.put("yList" , yList); map.put("yList", yList);
return map; return map;
} }
} }

28
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
Unescape Escape View File

@ -720,25 +720,6 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
return target; return target;
} }
/**
* 修改章节点的父类ID字段
*
* @param courseInfoList 系统课程列表
* @param somecourseInfoIdPair 一些修改前修改后的ID对（指定一些修改的ID对）
*/
public void updateSpecifyIdTargetList(List<CourseInfo> courseInfoList,
@NotEmpty(message = "ID对不能为空！") Map<Long, Long> somecourseInfoIdPair) {
for (CourseInfo courseInfo : courseInfoList) {
somecourseInfoIdPair.forEach((oldId, newId) -> {
if (courseInfo.getCourseInfoId().equals(oldId)) {
courseInfo.setCourseInfoId(newId);
}
if (courseInfo.getCourseInfoParentId().equals(oldId)) {
courseInfo.setCourseInfoParentId(newId);
}
});
}
}
/** /**
* 修改章节点的父类ID字段 * 修改章节点的父类ID字段
@ -755,14 +736,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
if (somecourseInfoIdPair.containsKey(courseInfo.getCourseInfoParentId())) { if (somecourseInfoIdPair.containsKey(courseInfo.getCourseInfoParentId())) {
courseInfo.setCourseInfoParentId(somecourseInfoIdPair.get(courseInfo.getCourseInfoParentId())); courseInfo.setCourseInfoParentId(somecourseInfoIdPair.get(courseInfo.getCourseInfoParentId()));
} }
//somecourseInfoIdPair.forEach((oldId, newId) -> {
// if (courseInfo.getTeacherOpenCourseMergeCourseInfoId().equals(oldId)) {
// courseInfo.setTeacherOpenCourseMergeCourseInfoId(newId);
// }
// if (courseInfo.getCourseInfoParentId().equals(oldId)) {
// courseInfo.setCourseInfoParentId(newId);
// }
//});
} }
} }

8
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java
Unescape Escape View File

@ -372,7 +372,7 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
// 获取登录用户，教师身份不支持IP签到，教师只能手动签到 // 获取登录用户，教师身份不支持IP签到，教师只能手动签到
// 获取学生信息 // 获取学生信息
Student student = getStudent(); Student student = getStudent();
Assert.notNull(student, "IP签到方式，只允许学生进行操作！"); Assert.notNull(student, "验证码签到方式，只允许学生进行操作！");
// 获取学生信息 // 获取学生信息
Assert.isTrue(schoolClassIdJudgment(student.getClassId(), signinSetting), "该学生所在的班级不符合签到要求！"); Assert.isTrue(schoolClassIdJudgment(student.getClassId(), signinSetting), "该学生所在的班级不符合签到要求！");
@ -582,8 +582,12 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
BeanUtil.copyProperties(signinSetting, entity); BeanUtil.copyProperties(signinSetting, entity);
DateTime now = DateUtil.date(); DateTime now = DateUtil.date();
//获取现在的时间 精确到分
// 默认的一些属性填充。添加主表 // 默认的一些属性填充。添加主表
entity.setTeacherOpenCourseStudentSigninSettingSessionTime(now); DateTime parse = DateUtil.parse(DateUtil.format(now, "yyyy-MM-dd HH:mm"), "yyyy-MM-dd HH:mm");
entity.setTeacherOpenCourseStudentSigninSettingSessionTime(parse);
entity.setTeacherOpenCourseStudentSigninSettingStartTime(now); entity.setTeacherOpenCourseStudentSigninSettingStartTime(now);
entity.setTeacherOpenCourseStudentSigninSettingEndTime(now); entity.setTeacherOpenCourseStudentSigninSettingEndTime(now);
entity.setTeacherOpenCourseStudentSigninSettingAddTime(now); entity.setTeacherOpenCourseStudentSigninSettingAddTime(now);

92
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java
Unescape Escape View File

@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -44,14 +45,17 @@ import static com.ibeetl.admin.core.util.BeanUtil.copyAllPropertiesSupportExtMap
@Transactional @Transactional
@Validated @Validated
@Slf4j @Slf4j
public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseService<TeacherOpenCourseStudentSigninSetting> implements DeleteResourcesBy{ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseService<TeacherOpenCourseStudentSigninSetting> implements DeleteResourcesBy {
@Autowired private TeacherOpenCourseStudentSigninSettingDao teacherOpenCourseStudentSigninSettingDao; @Autowired
@Autowired private TeacherOpenCourseStudentSigninLogDao teacherOpenCourseStudentSigninLogDao; private TeacherOpenCourseStudentSigninSettingDao teacherOpenCourseStudentSigninSettingDao;
@Autowired private TeacherOpenCourseStudentSigninSettingQueryValidator settingQueryValidator; @Autowired
private TeacherOpenCourseStudentSigninLogDao teacherOpenCourseStudentSigninLogDao;
@Autowired
private TeacherOpenCourseStudentSigninSettingQueryValidator settingQueryValidator;
public PageQuery<TeacherOpenCourseStudentSigninSetting>queryByCondition(PageQuery query){ public PageQuery<TeacherOpenCourseStudentSigninSetting> queryByCondition(PageQuery query) {
PageQuery ret = teacherOpenCourseStudentSigninSettingDao.queryByCondition(query); PageQuery ret = teacherOpenCourseStudentSigninSettingDao.queryByCondition(query);
queryListAfter(ret.getList()); queryListAfter(ret.getList());
// setSummaryInfo(ret.getList()); // setSummaryInfo(ret.getList());
return ret; return ret;
@ -59,6 +63,7 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
/** /**
* 根据签到ID，设置汇总数据 * 根据签到ID，设置汇总数据
*
* @param list * @param list
*/ */
private void setSummaryInfo(List<TeacherOpenCourseStudentSigninSetting> list) { private void setSummaryInfo(List<TeacherOpenCourseStudentSigninSetting> list) {
@ -82,24 +87,24 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
} }
} }
public PageQuery<TeacherOpenCourseStudentSigninSetting>queryByConditionQuery(PageQuery query){ public PageQuery<TeacherOpenCourseStudentSigninSetting> queryByConditionQuery(PageQuery query) {
PageQuery ret = teacherOpenCourseStudentSigninSettingDao.queryByConditionQuery(query); PageQuery ret = teacherOpenCourseStudentSigninSettingDao.queryByConditionQuery(query);
queryListAfter(ret.getList()); queryListAfter(ret.getList());
return ret; return ret;
} }
public void deleteByList(List list){ public void deleteByList(List list) {
String ids = ""; String ids = "";
ToolUtils.deleteNullList(list); ToolUtils.deleteNullList(list);
for(int i=0;null != list && i<list.size();i++){ for (int i = 0; null != list && i < list.size(); i++) {
ids += list.get(i).toString()+(i==list.size()-1?"":","); ids += list.get(i).toString() + (i == list.size() - 1 ? "" : ",");
} }
if(StringUtils.isNotBlank(ids)){ if (StringUtils.isNotBlank(ids)) {
teacherOpenCourseStudentSigninSettingDao.deleteByIds(ids); teacherOpenCourseStudentSigninSettingDao.deleteByIds(ids);
} }
} }
public void deleteTeacherOpenCourseStudentSigninSetting(String ids){ public void deleteTeacherOpenCourseStudentSigninSetting(String ids) {
try { try {
teacherOpenCourseStudentSigninSettingDao.deleteTeacherOpenCourseStudentSigninSettingByIds(ids); teacherOpenCourseStudentSigninSettingDao.deleteTeacherOpenCourseStudentSigninSettingByIds(ids);
} catch (Exception e) { } catch (Exception e) {
@ -107,7 +112,7 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
} }
} }
public String addAll(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery){ public String addAll(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery) {
String msg = ""; String msg = "";
List<TeacherOpenCourseStudentSigninSetting> teacherOpenCourseStudentSigninSettingList = new ArrayList<>(); List<TeacherOpenCourseStudentSigninSetting> teacherOpenCourseStudentSigninSettingList = new ArrayList<>();
try { try {
@ -115,11 +120,12 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
} catch (Exception e) { } catch (Exception e) {
try { try {
teacherOpenCourseStudentSigninSettingList.add(JSONObject.parseObject(teacherOpenCourseStudentSigninSettingQuery.getTeacherOpenCourseStudentSigninSettingJsonStr(), TeacherOpenCourseStudentSigninSetting.class)); teacherOpenCourseStudentSigninSettingList.add(JSONObject.parseObject(teacherOpenCourseStudentSigninSettingQuery.getTeacherOpenCourseStudentSigninSettingJsonStr(), TeacherOpenCourseStudentSigninSetting.class));
} catch (Exception e1) {} } catch (Exception e1) {
}
} }
ToolUtils.deleteNullList(teacherOpenCourseStudentSigninSettingList); ToolUtils.deleteNullList(teacherOpenCourseStudentSigninSettingList);
if(null != teacherOpenCourseStudentSigninSettingList && teacherOpenCourseStudentSigninSettingList.size()>0){ if (null != teacherOpenCourseStudentSigninSettingList && teacherOpenCourseStudentSigninSettingList.size() > 0) {
for(int i=0;i<teacherOpenCourseStudentSigninSettingList.size();i++){ for (int i = 0; i < teacherOpenCourseStudentSigninSettingList.size(); i++) {
TeacherOpenCourseStudentSigninSetting teacherOpenCourseStudentSigninSetting = teacherOpenCourseStudentSigninSettingList.get(i); TeacherOpenCourseStudentSigninSetting teacherOpenCourseStudentSigninSetting = teacherOpenCourseStudentSigninSettingList.get(i);
teacherOpenCourseStudentSigninSetting.setUserId(teacherOpenCourseStudentSigninSettingQuery.getUserId()); teacherOpenCourseStudentSigninSetting.setUserId(teacherOpenCourseStudentSigninSettingQuery.getUserId());
teacherOpenCourseStudentSigninSetting.setOrgId(teacherOpenCourseStudentSigninSettingQuery.getOrgId()); teacherOpenCourseStudentSigninSetting.setOrgId(teacherOpenCourseStudentSigninSettingQuery.getOrgId());
@ -136,6 +142,17 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
teacherOpenCourseStudentSigninSetting.setTeacherOpenCourseStudentSigninSettingAddTime(new Date()); teacherOpenCourseStudentSigninSetting.setTeacherOpenCourseStudentSigninSettingAddTime(new Date());
// 默认是未开始的状态 // 默认是未开始的状态
teacherOpenCourseStudentSigninSetting.setTeacherOpenCourseStudentSigninSettingStartStatus(StartStatusEnum.READY); teacherOpenCourseStudentSigninSetting.setTeacherOpenCourseStudentSigninSettingStartStatus(StartStatusEnum.READY);
//获取现在时间 只保留到分钟
Date now = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String nowTime = dateFormat.format(now);
try {
now = dateFormat.parse(nowTime);
}catch (Exception e){
throw new PlatformException("时间转换异常", e);
}
teacherOpenCourseStudentSigninSetting.setTeacherOpenCourseStudentSigninSettingSessionTime(now);
teacherOpenCourseStudentSigninSettingDao.insert(teacherOpenCourseStudentSigninSetting); teacherOpenCourseStudentSigninSettingDao.insert(teacherOpenCourseStudentSigninSetting);
teacherOpenCourseStudentSigninSettingQuery.setTeacherOpenCourseStudentSigninSettingId(teacherOpenCourseStudentSigninSetting.getTeacherOpenCourseStudentSigninSettingId()); teacherOpenCourseStudentSigninSettingQuery.setTeacherOpenCourseStudentSigninSettingId(teacherOpenCourseStudentSigninSetting.getTeacherOpenCourseStudentSigninSettingId());
JsonResult jsonResult = new JsonResult(); JsonResult jsonResult = new JsonResult();
@ -145,35 +162,35 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
return jsonResult; return jsonResult;
} }
public String edit(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery){ public String edit(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery) {
String msg = ""; String msg = "";
TeacherOpenCourseStudentSigninSetting teacherOpenCourseStudentSigninSetting = teacherOpenCourseStudentSigninSettingQuery.pojo(); TeacherOpenCourseStudentSigninSetting teacherOpenCourseStudentSigninSetting = teacherOpenCourseStudentSigninSettingQuery.pojo();
teacherOpenCourseStudentSigninSettingDao.updateTemplateById(teacherOpenCourseStudentSigninSetting); teacherOpenCourseStudentSigninSettingDao.updateTemplateById(teacherOpenCourseStudentSigninSetting);
return msg; return msg;
} }
public String updateGivenByIds(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery){ public String updateGivenByIds(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery) {
String msg = ""; String msg = "";
if(StringUtils.isNotBlank(teacherOpenCourseStudentSigninSettingQuery.get_given())){ if (StringUtils.isNotBlank(teacherOpenCourseStudentSigninSettingQuery.get_given())) {
boolean flag = teacherOpenCourseStudentSigninSettingDao.updateGivenByIds(teacherOpenCourseStudentSigninSettingQuery) > 0; boolean flag = teacherOpenCourseStudentSigninSettingDao.updateGivenByIds(teacherOpenCourseStudentSigninSettingQuery) > 0;
if(!flag){ if (!flag) {
msg = "更新指定参数失败"; msg = "更新指定参数失败";
} }
}else{ } else {
msg = "指定参数为空"; msg = "指定参数为空";
} }
return msg; return msg;
} }
public List<TeacherOpenCourseStudentSigninSetting> getValues (Object paras){ public List<TeacherOpenCourseStudentSigninSetting> getValues(Object paras) {
return sqlManager.select(SqlId.of("jlw.teacherOpenCourseStudentSigninSetting.getTeacherOpenCourseStudentSigninSettingValues"), TeacherOpenCourseStudentSigninSetting.class, paras); return sqlManager.select(SqlId.of("jlw.teacherOpenCourseStudentSigninSetting.getTeacherOpenCourseStudentSigninSettingValues"), TeacherOpenCourseStudentSigninSetting.class, paras);
} }
public List<TeacherOpenCourseStudentSigninSetting> getValuesByQuery (TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery){ public List<TeacherOpenCourseStudentSigninSetting> getValuesByQuery(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery) {
return teacherOpenCourseStudentSigninSettingDao.getValuesByQuery(teacherOpenCourseStudentSigninSettingQuery); return teacherOpenCourseStudentSigninSettingDao.getValuesByQuery(teacherOpenCourseStudentSigninSettingQuery);
} }
public List<TeacherOpenCourseStudentSigninSetting> getValuesByQueryNotWithPermission (TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery){ public List<TeacherOpenCourseStudentSigninSetting> getValuesByQueryNotWithPermission(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery) {
return teacherOpenCourseStudentSigninSettingDao.getValuesByQueryNotWithPermission(teacherOpenCourseStudentSigninSettingQuery); return teacherOpenCourseStudentSigninSettingDao.getValuesByQueryNotWithPermission(teacherOpenCourseStudentSigninSettingQuery);
} }
@ -181,35 +198,36 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
dictParser(obj); dictParser(obj);
} }
public TeacherOpenCourseStudentSigninSetting getInfo (Long teacherOpenCourseStudentSigninSettingId){ public TeacherOpenCourseStudentSigninSetting getInfo(Long teacherOpenCourseStudentSigninSettingId) {
TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery = new TeacherOpenCourseStudentSigninSettingQuery(); TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery = new TeacherOpenCourseStudentSigninSettingQuery();
teacherOpenCourseStudentSigninSettingQuery.setTeacherOpenCourseStudentSigninSettingId(teacherOpenCourseStudentSigninSettingId); teacherOpenCourseStudentSigninSettingQuery.setTeacherOpenCourseStudentSigninSettingId(teacherOpenCourseStudentSigninSettingId);
teacherOpenCourseStudentSigninSettingQuery.setTeacherOpenCourseStudentSigninSettingStatusPlural("1,2");//需要根据实际情况来 teacherOpenCourseStudentSigninSettingQuery.setTeacherOpenCourseStudentSigninSettingStatusPlural("1,2");//需要根据实际情况来
List<TeacherOpenCourseStudentSigninSetting> list = teacherOpenCourseStudentSigninSettingDao.getValuesByQuery(teacherOpenCourseStudentSigninSettingQuery); List<TeacherOpenCourseStudentSigninSetting> list = teacherOpenCourseStudentSigninSettingDao.getValuesByQuery(teacherOpenCourseStudentSigninSettingQuery);
if(null != list && list.size()>0){ if (null != list && list.size() > 0) {
return list.get(0); return list.get(0);
}else{ } else {
return null; return null;
} }
} }
public TeacherOpenCourseStudentSigninSetting getInfo (TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery){ public TeacherOpenCourseStudentSigninSetting getInfo(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery) {
List<TeacherOpenCourseStudentSigninSetting> list = teacherOpenCourseStudentSigninSettingDao.getValuesByQuery(teacherOpenCourseStudentSigninSettingQuery); List<TeacherOpenCourseStudentSigninSetting> list = teacherOpenCourseStudentSigninSettingDao.getValuesByQuery(teacherOpenCourseStudentSigninSettingQuery);
if(null != list && list.size()>0){ if (null != list && list.size() > 0) {
return list.get(0); return list.get(0);
}else{ } else {
return null; return null;
} }
} }
/** /**
* 设置签到配置的状态 开始，结束 * 设置签到配置的状态 开始，结束
*
* @param id * @param id
* @param status * @param status
*/ */
public void updateStatus(@NotNull(message = "签到配置ID不能为空！") Long id, public void updateStatus(@NotNull(message = "签到配置ID不能为空！") Long id,
@NotNull(message = "签到状态不能为空！") @NotNull(message = "签到状态不能为空！")
Integer status) { Integer status) {
TeacherOpenCourseStudentSigninSetting model = new TeacherOpenCourseStudentSigninSetting(); TeacherOpenCourseStudentSigninSetting model = new TeacherOpenCourseStudentSigninSetting();
model.setTeacherOpenCourseStudentSigninSettingId(id); model.setTeacherOpenCourseStudentSigninSettingId(id);
@ -226,17 +244,19 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
settingQuery.set_given( settingQuery.set_given(
"teacherOpenCourseStudentSigninSettingAddTime," + "teacherOpenCourseStudentSigninSettingAddTime," +
"teacherOpenCourseStudentSigninSettingEndTime," + "teacherOpenCourseStudentSigninSettingEndTime," +
"teacherOpenCourseStudentSigninSettingStartStatus"); "teacherOpenCourseStudentSigninSettingStartStatus");
updateGivenByIds(settingQuery); updateGivenByIds(settingQuery);
} break; }
break;
case 2: { case 2: {
// 结束时间，赋值 // 结束时间，赋值
model.setTeacherOpenCourseStudentSigninSettingEndTime(new Date()); model.setTeacherOpenCourseStudentSigninSettingEndTime(new Date());
model.setTeacherOpenCourseStudentSigninSettingStartStatus(StartStatusEnum.END); model.setTeacherOpenCourseStudentSigninSettingStartStatus(StartStatusEnum.END);
updateTemplate(model); updateTemplate(model);
} break; }
break;
} }

1
web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java
Unescape Escape View File

@ -45,7 +45,6 @@ public class StatisticalAnalysisController {
/** /**
* 首页数据 * 首页数据
* @param map
* @return * @return
*/ */
@RequestMapping("/indexDetail.do") @RequestMapping("/indexDetail.do")

Write Preview
Loading…
Cancel
Save