hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-13 12:56:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy0525-llf' into dev0525

Browse Source 
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java
This commit is contained in:
zhaolongfei
2024-05-28 15:41:32 +08:00
parent 8e3231b506 3803babc76
commit f61c7ed83f
8 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/boe-server-all/src/main/java/com/xboe/UrlSecurityFilterImpl.java
View File

@@ -48,7 +48,7 @@ public class UrlSecurityFilterImpl implements IUrlSecurityFilter{
return false; return false;
} }
return true; return false;
} }
} }

5
servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
View File

@@ -330,7 +330,6 @@ public class StudyCourseApi extends ApiBaseController{
} }
//追加学习时长 //追加学习时长
studyService.appendStudyDuration(sci.getStudyId(),item.getId(),sci.getContentId(),sci.getDuration()); studyService.appendStudyDuration(sci.getStudyId(),item.getId(),sci.getContentId(),sci.getDuration());
//System.out.println("在线课学习记录"+allUserList);
return success(item.getId()); return success(item.getId());
} }
@@ -399,11 +398,11 @@ public class StudyCourseApi extends ApiBaseController{
} }
// LocalDateTime now=LocalDateTime.now(); // LocalDateTime now=LocalDateTime.now();
CurrentUser cuser=getCurrent(); CurrentUser cuser=getCurrent();
//检查是否已存在
String token = request.getHeader("Xboe-Access-Token"); String token = request.getHeader("Xboe-Access-Token");
if (StringUtils.isEmpty(token)) { if (StringUtils.isEmpty(token)) {
token = request.getHeader("token"); token = request.getHeader("token");
} }
//检查是否已存在
StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId()); StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId());
if(item!=null) { if(item!=null) {
//如果记录存在，但是进度不到100，未完成情况，就更新进度，一期不会有这种情况 //如果记录存在，但是进度不到100，未完成情况，就更新进度，一期不会有这种情况
@@ -509,8 +508,6 @@ public class StudyCourseApi extends ApiBaseController{
} }
try { try {
studyService.finishVideoStudyItem(itemId, studyId,courseId,cnum,token); studyService.finishVideoStudyItem(itemId, studyId,courseId,cnum,token);
List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId, courseId, token);
log.info("在线课学习记录"+allUserList);
return success(true); return success(true);
}catch(Exception e) { }catch(Exception e) {
log.error("记录内容学习完成错误",e); log.error("记录内容学习完成错误",e);

2
servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java
View File

@@ -65,7 +65,7 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
UpdateBuilder.create("status",StudyCourse.STATUS_STUDYING)); UpdateBuilder.create("status",StudyCourse.STATUS_STUDYING));
} }
List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId,courseId, token); List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token);
log.info("在线课学习记录"+allUserList); log.info("在线课学习记录"+allUserList);
} }

3
servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java
View File

@@ -4,10 +4,8 @@ import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.transaction.Transactional; import javax.transaction.Transactional;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -38,6 +36,7 @@ public class StudyAssessServiceImpl implements IStudyAssessService{
@Override @Override
@Transactional @Transactional
public void save(StudyAssess assess,String token) { public void save(StudyAssess assess,String token) {
//完成处理，判断是否已存在 //完成处理，判断是否已存在
Object obj=scItemDao.findField("id", FieldFilters.eq("studyId", assess.getStudyId()), FieldFilters.eq("contentId", assess.getContentId())); Object obj=scItemDao.findField("id", FieldFilters.eq("studyId", assess.getStudyId()), FieldFilters.eq("contentId", assess.getContentId()));
if(obj==null) { if(obj==null) {

2
servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java
View File

@@ -37,7 +37,7 @@ public class StudyHomeWorkServiceImpl implements IStudyHomeWorkService{
@Override @Override
@Transactional @Transactional
public void save(StudyHomeWork homework,String token) { public void save(StudyHomeWork homework,String token) {
//完成处理，判断是否已存在 //完成处理，判断是否已存在
Object obj=scItemDao.findField("id", FieldFilters.eq("studyId", homework.getStudyId()), FieldFilters.eq("contentId", homework.getContentId())); Object obj=scItemDao.findField("id", FieldFilters.eq("studyId", homework.getStudyId()), FieldFilters.eq("contentId", homework.getContentId()));

2
servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
View File

@@ -5,8 +5,10 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.annotation.Resource;
import javax.transaction.Transactional; import javax.transaction.Transactional;
import com.xboe.api.ThirdApi;
import com.xboe.school.study.entity.StudyCourse; import com.xboe.school.study.entity.StudyCourse;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

24
servers/boe-server-all/src/main/resources/application-dev.properties
View File

@@ -1,11 +1,11 @@
## redis ## redis
spring.redis.database=4 spring.redis.database=1
spring.redis.host=127.0.0.1 #spring.redis.host=127.0.0.1
spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) #spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
spring.redis.port=6379
#spring.redis.host=124.70.92.162
#spring.redis.password=qwert!W577
#spring.redis.port=6379 #spring.redis.port=6379
spring.redis.host=124.70.92.162
spring.redis.password=qwert!W577
spring.redis.port=6379
# cloud nacos config # cloud nacos config
spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
@@ -15,12 +15,12 @@ spring.jpa.show-sql = true
spring.jpa.hibernate.ddl-auto=update spring.jpa.hibernate.ddl-auto=update
spring.datasource.driverClassName=com.mysql.jdbc.Driver spring.datasource.driverClassName=com.mysql.jdbc.Driver
# spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boeu_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
spring.datasource.username=root #spring.datasource.username=root
spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==) #spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)
#spring.datasource.url=jdbc:mysql://124.70.92.162:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull spring.datasource.url=jdbc:mysql://10.251.160.40:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
#spring.datasource.username=boe_base spring.datasource.username=admin
#spring.datasource.password=k3DbtrcCkKAcFYzd spring.datasource.password=boeRds01
logging.level.org.hibernate.SQL=DEBUG logging.level.org.hibernate.SQL=DEBUG
logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE

2
servers/boe-server-all/src/main/resources/application.properties
View File

@@ -1,4 +1,4 @@
spring.profiles.active=@profileActive@ spring.profiles.active=dev
spring.application.name=boe-server-all spring.application.name=boe-server-all
server.port=9090 server.port=9090
server.servlet.session.timeout=30m server.servlet.session.timeout=30m