Compare commits

..

1 Commits

Author SHA1 Message Date
670788339
d3e84feb48 日志 2025-03-29 12:58:43 +08:00
12 changed files with 163 additions and 217 deletions

View File

@@ -2,16 +2,11 @@ package com.xboe.data.service.impl;
import java.time.LocalDateTime;
import javax.annotation.Resource;
import javax.transaction.Transactional;
import com.boe.feign.api.serverall.entity.UserData;
import com.xboe.constants.CacheName;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.retry.annotation.Recover;
import org.springframework.retry.annotation.Retryable;
import org.springframework.stereotype.Service;
@@ -44,9 +39,6 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
@Autowired
TeacherDao teacherDao;
@Resource
private CacheManager cacheManager;
@Override
@Transactional
@@ -67,8 +59,6 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
a.setDeleted(user.getDeleted());
}
a.setLoginName(user.getCode());
a.setMobile(user.getMobile());
a.setEmail(user.getEmail());
log.info("更新账号code");
accountDao.update(a);
} else {
@@ -81,18 +71,14 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
a.setRegTime(LocalDateTime.now());
a.setSysId(user.getKid());
a.setStatus(1);
a.setMobile(user.getMobile());
a.setEmail(user.getEmail());
accountDao.save(a);
log.info("账号不存在,新添加账号【" + user.getId() + "");
}
if (u != null) {
//更新部分用户字段
u.setDepartId(user.getDepartId());
u.setDepartName(user.getDepartName());
u.setName(user.getName());
u.setMobileNo(user.getMobile());
//2022-12-8 去掉用户类型的更新,因为返回的数据都是学员,
//u.setUserType(user.getUserType());
if (user.getLearningDuration() > 0) { //不大于0才会更新
@@ -120,17 +106,9 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
} else {
u.setShowHome(true);//band16以下及其它无bandLevel的信息
}
u.setMobileNo(user.getMobile());
userDao.save(u);
log.info("添加新用户");
}
Cache cache = cacheManager.getCache(CacheName.NAME_USER);
if(cache != null) {
cache.evict(CacheName.KEY_ACCOUNT + user.getId());
cache.evict(CacheName.KEY_USER + user.getId());
}
//对机构的判断,不为空时才会处理,为空时不处理
if (StringUtils.isNotBlank(user.getDepartId())) {
org = orgDao.get(user.getDepartId());

View File

@@ -314,10 +314,8 @@ public class CoursePortalApi extends ApiBaseController{
User user = userService.get(ct.getTeacherId());
if(t!=null) {
ct.setRemark(t.getDescription());
ct.setSupplier(t.getSupplier());
ct.setTeacherType(t.getTeacherType());
if(redisTemplate.opsForValue().get(ct.getTeacherId())!=null){
if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null || t.getTeacherType() == 1)){
if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
ct.setTeacherName("BOE教师");
}
teacherCourseDto.setCourseId(ct.getCourseId());
@@ -329,15 +327,13 @@ public class CoursePortalApi extends ApiBaseController{
teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
teacherCourseDto.setId(ct.getId());
if(user!=null){
teacherCourseDto.setUserNo(user.getUserNo());
}
teacherCourseDto.setUserNo(user.getUserNo());
teacherCourseDtos.add(teacherCourseDto);
}else if (redisTemplate.opsForValue().get(ct.getTeacherId())==null){
List<String> list=new ArrayList<>();
list.add(ct.getTeacherId());
getTeacherInfo(request.getHeader("Xboe-Access-Token"),list);
if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null || t.getTeacherType() == 1)){
if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
ct.setTeacherName("BOE教师");
}
teacherCourseDto.setCourseId(ct.getCourseId());
@@ -349,9 +345,7 @@ public class CoursePortalApi extends ApiBaseController{
teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
teacherCourseDto.setId(ct.getId());
if(user!=null){
teacherCourseDto.setUserNo(user.getUserNo());
}
teacherCourseDto.setUserNo(user.getUserNo());
teacherCourseDtos.add(teacherCourseDto);
}
}

View File

@@ -341,5 +341,8 @@ public interface ICourseService {
List<Course> mobiledelList(Integer num,CourseQueryDto courseQueryDto);
List<Course> findByIds(List<String> courseIds);
}

View File

@@ -14,7 +14,6 @@ import java.util.stream.Stream;
import javax.annotation.Resource;
import javax.management.Query;
import cn.hutool.core.collection.CollectionUtil;
import com.xboe.api.ThirdApi;
import com.xboe.core.orm.*;
import com.xboe.school.study.dao.StudyCourseDao;
@@ -449,7 +448,6 @@ public class CourseServiceImpl implements ICourseService {
List<Course> paginate = paginate(listByFilters2, pageIndex, pageSize);
PageList<Course> rs = new PageList<>();
rs.setCount(listByFilters2.size());
rs.setPageSize(pageSize);
rs.setList(paginate);
return rs;
}
@@ -1569,13 +1567,6 @@ public class CourseServiceImpl implements ICourseService {
return list;
}
@Override
public List<Course> findByIds(List<String> courseIds) {
QueryBuilder query = QueryBuilder.from(Course.class);
query.addFilter(FieldFilters.in("id", courseIds));
return courseDao.findList(query.builder());
}
@Override
public int countWaitAudit(String aid) {

View File

@@ -214,11 +214,11 @@ public class StudyCourseApi extends ApiBaseController{
redisTemplate.opsForValue().set(teacherVo.get(0).getTeacherId(), teacherVo.get(0).getStatus());
//设置过期时间为1天
redisTemplate.expire(teacherVo.get(0).getTeacherId(), 24 * 60 * 60, TimeUnit.SECONDS);
if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null || t.getTeacherType() == 1)){
if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && t.getTeacherType() == 1 ){
ct.setTeacherName("BOE教师");
}
}
if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null || t.getTeacherType() == 1)){
if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && t.getTeacherType() == 1 ){
ct.setTeacherName("BOE教师");
}
}

View File

@@ -3,16 +3,9 @@ package com.xboe.school.study.api;
import java.io.IOException;
import java.time.ZoneOffset;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import cn.hutool.core.collection.CollectionUtil;
import com.xboe.module.course.entity.Course;
import com.xboe.module.course.service.ICourseService;
import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -49,15 +42,6 @@ public class StudyCourseESApi extends ApiBaseController{
@Autowired
IStudyCourseService service;
@Autowired
ICourseService courseService;
@Value("${xboe.upload.file.http_path}")
private String httpPath;
@Value("${xboe.image.course.default}")
private String defaultCourseImage;
@Resource
private PhpOnlineStudyRecordScheduledTasks phpOnlineStudyRecordScheduledTasks;
@@ -70,61 +54,13 @@ public class StudyCourseESApi extends ApiBaseController{
try {
dto.setAccountId(getCurrent().getAccountId());
PageList<CourseStudyDto> rs=search.search(page.getStartRow(),page.getPageSize(), dto);
handleCourseImage(rs);
return success(rs);
}catch(Exception e) {
log.error("查询报名学习ES失败",e);
return error("查询失败",e.getMessage());
}
}
private void handleCourseImage(PageList<CourseStudyDto> rs) {
if (rs == null || CollectionUtil.isEmpty(rs.getList())) {
return;
}
List<String> emptyImageCourseIds = Lists.newArrayList();
for(CourseStudyDto courseStudyDto : rs.getList()) {
if(StringUtils.isBlank(courseStudyDto.getCourseImage())) {
// 过滤课程类型
if(courseStudyDto.getCourseType()==10
|| courseStudyDto.getCourseType()==20){
emptyImageCourseIds.add(courseStudyDto.getCourseId());
}else{
log.warn("课程图片为空课程id为{},课程类型:{}",courseStudyDto.getCourseId(),courseStudyDto.getCourseType());
}
}
}
if(CollectionUtil.isEmpty(emptyImageCourseIds)){
return;
}
List<Course> courseList = courseService.findByIds(emptyImageCourseIds);
if(CollectionUtil.isNotEmpty(courseList)){
// courseList转换成map
Map<String, Course> courseMap = courseList.stream().collect(Collectors.toMap(Course::getId, course -> course));
// 赋值ES图片
for(CourseStudyDto courseStudyDto : rs.getList()) {
if(emptyImageCourseIds.contains(courseStudyDto.getCourseId())) {
Course currentCourse = courseMap.get(courseStudyDto.getCourseId());
if(null!=currentCourse){
if(StringUtils.isNotBlank(currentCourse.getCoverImg())){
// 拼接域名
courseStudyDto.setCourseImage(httpPath + currentCourse.getCoverImg());
}else{
// 赋值默认图片
courseStudyDto.setCourseImage(defaultCourseImage);
}
}
}
}
}
}
@RequestMapping(value="/list-by-ids",method = {RequestMethod.POST})
public JsonResponse<List<StudyCourse>> search(@RequestBody List<String> ids){
if(ids.isEmpty()) {

View File

@@ -33,6 +33,7 @@ public class StudyCourseTask {
* */
@XxlJob("saveStudyCourseItemLastTime")
public void saveStudyCourseItemLastTime() {
log.info("------定时任务-获取redis 中学习结束的数据更新入库------" );
// 1. 定义匹配模式匹配所有目标key
final String KEY_PATTERN = "studyContentId:*:last_active";
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
@@ -47,9 +48,10 @@ public class StudyCourseTask {
// 3. 遍历处理符合条件的key
while (cursor.hasNext()) {
String redisKey = new String(cursor.next());
log.info("------定时任务-获取redis 中学习结束的数据更新入库------redisKey = " + redisKey );
// 4. 获取剩余TTL
Long ttl = redisTemplate.getExpire(redisKey, TimeUnit.SECONDS);
log.info("------定时任务-获取redis 中学习结束的数据更新入库------ttl = " + ttl );
// 5. 过滤条件:剩余时间 >= 29天23小时30分钟转换为秒
// 总需时间 = (30天 - 30分钟) = 29天23小时30分钟 = 2590200秒
// 5分钟 300秒 || 2592000 - 300 = 2591700
@@ -69,7 +71,7 @@ public class StudyCourseTask {
if (partValues.length >= 2){
timestamp = LocalDateTime.parse(partValues[1], formatter);
}
log.info("-定时任务-获取redis 中学习结束的数据更新入库---studyContentId = " + studyContentId + ",lastStudyTime = " + lastStudyTime + ", timestamp = " + timestamp);
// 8. 更新数据库(调用已有服务方法)
studyService.updateStudyCourseItemLastTime(studyContentId, lastStudyTime, timestamp);

View File

@@ -1,105 +1,159 @@
boe:
domain: http://192.168.0.253
spring:
# application.yml
servlet:
multipart:
max-file-size: 1000MB
max-request-size: 1000MB
web:
resources:
static-locations: file:E:/Projects/BOE/java/static
cloud:
nacos:
discovery:
server-addr: 192.168.0.253:8848
config:
server-addr: 192.168.0.253:8848
max-file-size: 500MB
max-request-size: 500MB
redis:
database: 1
host: 192.168.0.253
host: 192.168.0.101
password: boe@123
port: 6379
lettuce:
pool:
max-active: 8
min-idle: 0
max-idle: 30
max-wait: 10000ms
shutdown-timeout: 100ms
jpa:
database: MYSQL
properties:
hibernate:
naming_strategy: org.hibernate.cfg.EJB3NamingStrategy
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext
show-sql: true
hibernate:
ddl-auto: none
ddl-auto: update
datasource:
driverClassName: com.mysql.jdbc.Driver
url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
username: root
password: boe#1234A
type: com.zaxxer.hikari.HikariDataSource
hikari:
auto-commit: true
minimum-idle: 5
idle-timeout: 60000
connection-timeout: 30000
max-lifetime: 1800000
maximum-pool-size: 20
logging:
level:
org:
hibernate:
SQL: ERROR
config: classpath:log/logback-@profileActive@.xml
web:
resources:
static-locations: file:E:/Projects/BOE/10/static
server:
port: 9090
servlet:
multipart:
max-file-size: 500MB
max-request-size: 500MB
session:
timeout: 30m
encoding:
charset: UTF-8
enabled: true
force: true
tomcat:
uri-encoding: UTF-8
servlet:
multipart:
maxFileSize: 1024MB
maxRequestSize: 1024MB
mvc:
static-path-pattern: /cdn/**
#logging.level.org.hibernate.SQL=DEBUG
#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
#logging.config=classpath:log/logback-@profileActive@.xml
# logging:
# config: classpath:log/logback-${spring.profiles.active}.xml
# level:
# org:
# hibernate:
# SQL: DEBUG
# type:
# descriptor:
# sql:
# BasicBinder: TRACE
xcaching:
specs:
favorites:
timeout: 10s
praises:
timeout: 10s
shares:
timeout: 10s
xboe:
api:
cross_filter: true
local:
dev: true
upload:
file:
temp_path: /tmp
temp_path: D:/Projects/BOE/10/static/temp
save_path: /home/www/elearning/upload
http_path: http://192.168.0.253/upload
http_path: http://127.0.0.1/upload
externalinterface:
url:
system: http://127.0.0.1:9091
system: http://localhost:9091
old:
base:
url: http://192.168.0.253
url: http://192.168.0.101
server:
userbasic:
url: http://192.168.0.101/userbasic
stat:
base:
url: http://127.0.0.1:9080
server:
userbasic:
url: http://192.168.0.253/userbasic
elasticsearch:
server:
ip: 192.168.0.253
ip: 192.168.0.101
port: 9200
user:
password:
email:
url: http://192.168.0.253/api/b1/email/send
url: http://192.168.0.101/api/b1/email/send
from: boeu_learning@boe.com.cn
user:
security:
jasypt:
encryptor:
algorithm: PBEWithMD5AndDES
iv-generator-classname: org.jasypt.iv.NoIvGenerator
image:
course:
default: http://192.168.0.253/pc/images/bgimg/course.png
xxl:
job:
accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
admin:
addresses: http://192.168.0.253/jobAdmin
executor:
appname: java-servers-job-api
port: 9995
address:
ip:
logpath: /var/log/xxl-job/dw/
logretentiondays: 30
aop-log-record:
#是否开启日志记录
enabled: true
#不进行拦截的包或者类
excludeClassNames:
activemq:
broker-url: tcp://192.168.0.253:61616
user: admin
password: admin
elasticsearch:
host: 192.168.0.253
port: 9200
jasypt:
encryptor:
algorithm: PBEWithMD5AndDES
iv-generator-classname: org.jasypt.iv.NoIvGenerator
boe:
domain: http://127.0.0.1
ok:
http:
connect-timeout: 30
read-timeout: 30
write-timeout: 30
max-idle-connections: 200
keep-alive-duration: 300
orgTree:
orgTreeList: ${boe.domain}/userbasic/org/list
orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
userBasic:
searchUserList: ${boe.domain}/userbasic/user/list
getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
audience:
usersByAudienceList: ${boe.domain}/userbasic/audience/memberList
getOrgUsers: ${boe.domain}/userbasic/user/getOrgUsers
statApi:
userdynamicList: ${boe.domain}/statApi/xboe/m/stat/userdynamic/list
infrasApi:
dict: ${boe.domain}/infrasApi/dict/list
manageApi:
stu:
offcourse: ${boe.domain}/manageApi/stu/offcourse/getOffCourseId
editExam: ${boe.domain}/manageApi/admin/project/editExam
getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
coursesuilt:
getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus

View File

@@ -108,9 +108,7 @@ xboe:
from: boeu_learning@boe.com.cn
user:
security:
image:
course:
default: http://10.251.132.75/pc/images/bgimg/course.png
jasypt:
encryptor:
algorithm: PBEWithMD5AndDES

View File

@@ -74,9 +74,6 @@ xboe:
encryptor:
algorithm: PBEWithMD5AndDES
iv-generator-classname: org.jasypt.iv.NoIvGenerator
image:
course:
default: https://u.boe.com/pc/images/bgimg/course.png
xxl:
job:
accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0

View File

@@ -84,7 +84,7 @@ xboe:
file:
temp_path: /tmp
save_path: /home/www/elearning/upload
http_path: https://u-pre.boe.com/upload
http_path: http://10.251.186.27/upload
externalinterface:
url:
system: http://localhost:9091
@@ -108,9 +108,7 @@ xboe:
from: boeu_learning@boe.com.cn
user:
security:
image:
course:
default: https://u-pre.boe.com/pc/images/bgimg/course.png
jasypt:
encryptor:
algorithm: PBEWithMD5AndDES

View File

@@ -1,13 +1,13 @@
# application-pro.yml
# application-dev.yml
spring:
redis:
database: 1
host: 192.168.0.253
password: boe@123
database: 2
port: 6379
host: 192.168.0.101
password: boe@123
jpa:
hibernate:
ddl-auto: update
ddl-auto: none
open-in-view: false
properties:
hibernate:
@@ -16,46 +16,41 @@ spring:
driverClassName: com.mysql.jdbc.Driver
db1:
driverClassName: com.mysql.jdbc.Driver
jdbc-url: jdbc:mysql://192.168.0.253:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
jdbc-url: jdbc:mysql://192.168.0.101:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
username: root
password: boe#1234A
db2:
driverClassName: com.mysql.jdbc.Driver
jdbc-url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
jdbc-url: jdbc:mysql://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
username: root
password: boe#1234A
web:
resources:
static-locations: file:E:/Projects/BOE/java/static
web:
resources:
static-locations: file:E:/Projects/BOE/java/static
logging:
level:
org:
hibernate:
SQL: ERROR
# type:
# descriptor:
# sql:
# BasicBinder: TRACE
SQL: DEBUG
type:
descriptor:
sql:
BasicBinder: TRACE
config: classpath:log/logback-dev.xml
xboe:
api:
cross_filter: true
upload:
file:
temp_path: /tmp
save_path: /home/www/elearning/upload
http_path: http://192.168.0.253/upload
temp_path: E:/Projects/BOE/java/static/temp
save_path: E:/Projects/BOE/java/static/upload
http_path: http://localhost:9090/upload
inner:
data:
sync:
baseurl: http://127.0.0.1:9090
baseurl: http://localhost:9090
jasypt:
encryptor:
algorithm: PBEWithMD5AndDES
iv-generator-classname: org.jasypt.iv.NoIvGenerator
iv-generator-classname: org.jasypt.iv.NoIvGenerator