修改注解

# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java

servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java

@@ -2,11 +2,16 @@ 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;
@@ -39,6 +44,9 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
     @Autowired
     TeacherDao teacherDao;
 
+    @Resource
+    private CacheManager cacheManager;
+
 
     @Override
     @Transactional
@@ -59,6 +67,8 @@ 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 {
@@ -71,14 +81,18 @@ 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才会更新
@@ -106,9 +120,17 @@ 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());

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java

@@ -314,8 +314,10 @@ 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")){
+					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null ||  t.getTeacherType() == 1)){
 						ct.setTeacherName("BOE教师");
 					}
 					teacherCourseDto.setCourseId(ct.getCourseId());
@@ -327,13 +329,15 @@ public class CoursePortalApi extends ApiBaseController{
 					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
 					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
 					teacherCourseDto.setId(ct.getId());
-					teacherCourseDto.setUserNo(user.getUserNo());
+					if(user!=null){
+						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")){
+					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null ||  t.getTeacherType() == 1)){
 						ct.setTeacherName("BOE教师");
 					}
 					teacherCourseDto.setCourseId(ct.getCourseId());
@@ -345,7 +349,9 @@ public class CoursePortalApi extends ApiBaseController{
 					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
 					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
 					teacherCourseDto.setId(ct.getId());
-					teacherCourseDto.setUserNo(user.getUserNo());
+					if(user!=null){
+						teacherCourseDto.setUserNo(user.getUserNo());
+					}
 					teacherCourseDtos.add(teacherCourseDto);
 				}
 			}

servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java

@@ -448,6 +448,7 @@ 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;
     }

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

@@ -1,9 +1,14 @@
 package com.xboe.school.study.api;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
 import com.xboe.api.ThirdApi;
 import com.xboe.constants.CacheName;
@@ -214,11 +219,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.getTeacherType() == 1 ){
+				if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && (  t==null ||  t.getTeacherType() == 1)){
 					ct.setTeacherName("BOE教师");
 				}
 			}
-			if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && t.getTeacherType() == 1  ){
+			if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && (  t==null ||  t.getTeacherType() == 1)){
 				ct.setTeacherName("BOE教师");
 			}
 		}
@@ -253,6 +258,49 @@ public class StudyCourseApi extends ApiBaseController{
 			rs.put("progress", sc.getProgress());
 			//查询上次学习的是什么资源。查询用户的学习情况
 			List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
+			// 和内容匹配，根据内容的视频时长，计算学习进度
+			if(CollectionUtil.isNotEmpty(items) && CollectionUtil.isNotEmpty(cclist)){
+				// 根据ID转换map
+				Map<String, CourseContent> contentMap = cclist.stream().collect(Collectors.toMap(CourseContent::getId, Function.identity()));
+				for (StudyCourseItem item : items) {
+					CourseContent content = contentMap.get(item.getContentId());
+					if(null == content){
+						continue;
+					}
+
+					if(null==item.getLastStudyTime()
+							|| item.getLastStudyTime()<=0
+							|| null==content.getDuration()
+							|| content.getDuration()<=0){
+						continue;
+					}
+
+					// 查询redis上面的key，并解析value获取到lastStudyTime
+					String lastActive = redisTemplate.opsForValue().get("studyContentId:" + item.getId() + ":last_active");
+					if (StringUtil.isNotBlank(lastActive)) {
+						String[] parts = lastActive.split("&");
+						if (parts.length == 2) {
+							int lastStudyTimeRedis = Integer.parseInt(parts[0]);
+							log.info("study-video-time-redis获取---lastStudyTimeRedis = " + lastStudyTimeRedis);
+							if(lastStudyTimeRedis>0){
+								item.setLastStudyTime(lastStudyTimeRedis);
+							}
+						}
+					}
+
+					BigDecimal lastStudyTime = new BigDecimal(item.getLastStudyTime());
+					BigDecimal duration = new BigDecimal(content.getDuration());
+					BigDecimal progress = lastStudyTime.divide(duration, 10, RoundingMode.HALF_UP);
+					if(progress.compareTo(BigDecimal.ZERO) < 0){
+						progress = BigDecimal.ZERO;
+					}else if(progress.compareTo(BigDecimal.ONE) > 0){
+						progress = BigDecimal.ONE;
+					}
+
+					item.setProgressVideo(progress);
+				}
+			}
+
 			rs.put("contentStudys",items);//学习的内容
 		}
 		

servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyCourseItem.java

@@ -1,10 +1,12 @@
 package com.xboe.school.study.entity;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xboe.core.SysConstant;
@@ -128,5 +130,11 @@ public class StudyCourseItem extends IdEntity {
      */
     @Column(name = "status",length=1)
     private Integer status;
-    
+
+    /**
+     * 视频播放进度
+     * */
+    @Transient
+    private BigDecimal progressVideo;
+
 }

servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java

@@ -8,7 +8,6 @@ import com.xboe.common.PageList;
 import com.xboe.school.study.dto.StudyContentDto;
 import com.xboe.school.study.entity.StudyCourseItem;
 import com.xboe.school.study.entity.StudyTime;
-import com.xboe.system.user.entity.User;
 
 /**
  * 学习情况处理,比较综合一个处理类
@@ -36,11 +35,12 @@ public interface IStudyService {
 	
 	/**
 	 * 更新最后的学习时间，及学习时间点
+	 *
 	 * @param studyContentId
 	 * @param lastStudyTime
 	 * @param aid
 	 */
-	void updateLastTime(String studyContentId,int lastStudyTime,String aid);
+	void updateLastTime(String studyContentId, int lastStudyTime, String aid);
 
 	/**
 	 * 资源学习记录

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

@@ -10,10 +10,6 @@ import java.util.Map;
 
 import javax.transaction.Transactional;
 
-import com.xboe.module.article.entity.Article;
-import com.xboe.module.interaction.entity.Shares;
-import com.xboe.school.study.entity.StudyCourse;
-import com.xboe.system.user.entity.User;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;

servers/boe-server-all/src/main/resources/application-dev.yml

@@ -1,159 +1,102 @@
+boe:
+  domain: http://192.168.0.253
 spring:
-  # application.yml
   servlet:
     multipart:
-      max-file-size: 500MB
-      max-request-size: 500MB
-  redis:
-    database: 1
-    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: update
-  datasource:
-    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
+      max-file-size: 1000MB
+      max-request-size: 1000MB
   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
-
+      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
+  redis:
+    database: 1
+    host: 192.168.0.253
+    password: boe@123
+    port: 6379
+  jpa:
+    hibernate:
+      ddl-auto: none
+  datasource:
+    driverClassName: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.0.253: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
 xboe:
   api:
     cross_filter: true
-  local:
-    dev: true
   upload:
     file:
-      temp_path: D:/Projects/BOE/10/static/temp
+      temp_path: /tmp
       save_path: /home/www/elearning/upload
-      http_path: http://127.0.0.1/upload
+      http_path: http://192.168.0.253/upload
   externalinterface:
     url:
-      system: http://localhost:9091
+      system: http://127.0.0.1:9091
   old:
     base:
-      url: http://192.168.0.101
-  server:
-    userbasic:
-      url: http://192.168.0.101/userbasic
+      url: http://192.168.0.253
   stat:
     base:
       url: http://127.0.0.1:9080
+  server:
+    userbasic:
+      url: http://192.168.0.253/userbasic
   elasticsearch:
     server:
-      ip: 192.168.0.101
+      ip: 192.168.0.253
       port: 9200
       user:
       password:
   email:
-    url: http://192.168.0.101/api/b1/email/send
+    url: http://192.168.0.253/api/b1/email/send
     from: boeu_learning@boe.com.cn
     user:
     security:
-
-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
+  jasypt:
+    encryptor:
+      algorithm: PBEWithMD5AndDES
+      iv-generator-classname: org.jasypt.iv.NoIvGenerator
+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

servers/boe-server-basic/src/main/resources/application-dev.yml

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