mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-09 19:06:49 +08:00
Compare commits
10 Commits
zcwy1108-l
...
zcwy1021-l
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
00deb3f825 | ||
|
|
76a10ec726 | ||
|
|
b6f188389d | ||
|
|
f61f344f60 | ||
|
|
2a214530f6 | ||
|
|
05656669ca | ||
|
|
5905fd6db8 | ||
|
|
ddd35b4731 | ||
|
|
5af8ca335c | ||
|
|
cd029d43c1 |
@@ -15,7 +15,7 @@ public class CaseScheduledTasks {
|
||||
/**
|
||||
* 每月的第一天的1:00执行
|
||||
*/
|
||||
// @Scheduled(cron = "0 0 1 1 * ?")
|
||||
@Scheduled(cron = "0 0 1 1 * ?")
|
||||
public void refreshViewsRankOfMajor() {
|
||||
casesService.refreshViewsRankOfMajor();
|
||||
}
|
||||
|
||||
@@ -282,7 +282,7 @@ public class CoursePortalApi extends ApiBaseController{
|
||||
if (!Objects.isNull(studyCourse)){
|
||||
pass = true;
|
||||
}
|
||||
if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty() && !StringUtils.isEmpty(audiences)) {
|
||||
if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty()) {
|
||||
List<String> audienceList = Arrays.asList(audiences.split(",")); // 此用户所在受众组
|
||||
log.error("---------------参数------------ audienceList = " + audienceList);
|
||||
for (CourseCrowd c : courseCrowdList) {
|
||||
|
||||
@@ -141,11 +141,11 @@ public class CourseWareApi extends ApiBaseController {
|
||||
String time = signStr.substring(0, signStr.indexOf("/"));// 时间字符中,long
|
||||
String cfid = signStr.substring(index+1);// 文件路径
|
||||
|
||||
// if (!time.equals(cookieTime)) {
|
||||
// log.info("请求头时间和解析后的时间对比:"+"解析时间:"+time+" 请求头时间:"+cookieTime);
|
||||
// log.info("解密后的字符串的时间拼接:"+signStr);
|
||||
// return badRequest("验证错误");
|
||||
// }
|
||||
if (!time.equals(cookieTime)) {
|
||||
log.info("请求头时间和解析后的时间对比:"+"解析时间:"+time+" 请求头时间:"+cookieTime);
|
||||
log.info("解密后的字符串的时间拼接:"+signStr);
|
||||
return badRequest("验证错误");
|
||||
}
|
||||
if(StringUtils.isBlank(cfid) || cfid.length()<10) {
|
||||
log.info("查看时间文件路径:"+cfid);
|
||||
log.info("解密后的字符串的时间拼接:"+signStr);
|
||||
|
||||
@@ -10,8 +10,6 @@ import com.xboe.core.orm.BaseDao;
|
||||
import com.xboe.core.orm.IFieldFilter;
|
||||
import com.xboe.module.course.entity.CourseFile;
|
||||
|
||||
import javax.transaction.Transactional;
|
||||
|
||||
|
||||
@Repository
|
||||
public class CourseFileDao extends BaseDao<CourseFile> {
|
||||
@@ -23,5 +21,4 @@ public class CourseFileDao extends BaseDao<CourseFile> {
|
||||
PageList<CourseFile> page = this.getGenericDao().findPage(pageIndex, pageSize, getEntityClass(), filters,order);
|
||||
return page;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -54,6 +54,4 @@ public interface ICourseFileService {
|
||||
* @param deleted
|
||||
*/
|
||||
void delete(String id,boolean deleted);
|
||||
|
||||
// void updateDuration(String contentRefId, Integer duration);
|
||||
}
|
||||
|
||||
@@ -7,7 +7,6 @@ import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
import com.xboe.common.OrderCondition;
|
||||
import com.xboe.common.PageList;
|
||||
import com.xboe.core.cache.IXaskCache;
|
||||
import com.xboe.core.cache.XaskCacheProvider;
|
||||
import com.xboe.core.orm.FieldFilters;
|
||||
@@ -15,9 +14,11 @@ import com.xboe.core.orm.UpdateBuilder;
|
||||
import com.xboe.module.course.dao.*;
|
||||
import com.xboe.module.course.dto.CourseContentDto;
|
||||
import com.xboe.module.course.dto.SortItem;
|
||||
import com.xboe.module.course.entity.*;
|
||||
import com.xboe.module.course.entity.CourseAssess;
|
||||
import com.xboe.module.course.entity.CourseContent;
|
||||
import com.xboe.module.course.entity.CourseExam;
|
||||
import com.xboe.module.course.entity.CourseHomeWork;
|
||||
import com.xboe.module.course.service.ICourseContentService;
|
||||
import com.xboe.module.course.service.ICourseFileService;
|
||||
import com.xboe.module.exam.dao.ExamPaperDao;
|
||||
import com.xboe.module.exam.vo.TestQuestionVo;
|
||||
import com.xboe.standard.enums.BoedxContentType;
|
||||
@@ -56,8 +57,7 @@ public class CourseContentServiceImpl implements ICourseContentService {
|
||||
|
||||
@Resource
|
||||
private ExamPaperDao examPaperDao;
|
||||
@Resource
|
||||
private ICourseFileService courseFileService;
|
||||
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
@@ -83,7 +83,6 @@ public class CourseContentServiceImpl implements ICourseContentService {
|
||||
ccDao.save(cc);
|
||||
}else {
|
||||
ccDao.update(cc);
|
||||
// courseFileService.updateDuration(cc.getContentRefId(),cc.getDuration());
|
||||
cc.setSysVersion(ccDao.getVersion(cc.getId()));
|
||||
}
|
||||
//添加或保存其它信息
|
||||
|
||||
@@ -98,14 +98,4 @@ public class CourseFileServiceImpl implements ICourseFileService {
|
||||
public CourseFile get(String id) {
|
||||
return courseFileDao.get(id);
|
||||
}
|
||||
|
||||
|
||||
// @Override
|
||||
// public void updateDuration(String contentRefId,Integer duration) {
|
||||
// if (duration == null) {
|
||||
// duration = 0;
|
||||
// }
|
||||
// String sql = "UPDATE boe_course_file SET duration = "+ duration+" WHERE id = "+ contentRefId+" ";
|
||||
// courseFileDao.sqlUpdate(sql);
|
||||
// }
|
||||
}
|
||||
|
||||
@@ -253,7 +253,6 @@ public class StudyCourseApi extends ApiBaseController{
|
||||
List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
|
||||
rs.put("contentStudys",items);//学习的内容
|
||||
}
|
||||
|
||||
return success(rs);
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ import java.util.Set;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.xboe.core.SysConstant;
|
||||
import com.xboe.standard.BaseConstant;
|
||||
import com.xboe.system.assist.entity.XUploadResultDto;
|
||||
@@ -117,17 +118,11 @@ public class SysUploaderApi extends ApiBaseController{
|
||||
// ex.printStackTrace();
|
||||
log.error("处理失败",ex);
|
||||
}
|
||||
Long ls = 0L;
|
||||
XUploadResultDto dto=new XUploadResultDto();
|
||||
String fileFullPath = SysConstant.getConfigValue(BaseConstant.CONFIG_UPLOAD_FILES_SAVEPATH) + xur.getFilePath();
|
||||
try {
|
||||
Encoder encoder = new Encoder();
|
||||
MultimediaInfo m = encoder.getInfo(new File(fileFullPath));
|
||||
ls = m.getDuration() / 1000;//秒
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
log.error("读取视频时长错误");
|
||||
}
|
||||
Encoder encoder = new Encoder();
|
||||
MultimediaInfo m = encoder.getInfo(new File(fileFullPath));
|
||||
Long ls = m.getDuration() / 1000;//秒
|
||||
dto.setDuration(ls);
|
||||
dto.setDisplayName(xur.getDisplayName());
|
||||
dto.setFilePath(xur.getFilePath());
|
||||
|
||||
Reference in New Issue
Block a user