修复1155报错、阶段性审核信息

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

@@ -159,13 +159,36 @@ public class CourseManageApi extends ApiBaseController{
 	public void fullAuditInfo(List<Course> list){
 		List<String> courseIdList = list.stream().map(Course::getId).collect(Collectors.toList());
 		List<CourseHRBPAudit> auditList = hrbpAuditService.listByCourseIds(courseIdList);
-		Map<String,CourseHRBPAudit> map = auditList.stream().collect(Collectors.toMap(CourseHRBPAudit::getCourseId, i->i));
+		Map<String,CourseHRBPAudit> map = new HashMap<>();
+		for(CourseHRBPAudit audit : auditList){
+			CourseHRBPAudit r = map.get(audit.getCourseId());
+			//可能存在多个审核记录，取时间最新的那一条
+			if(r == null || r.getAddTime().isBefore(audit.getAddTime())){
+				map.put(audit.getCourseId(),audit);
+			}
+		}
+
 		list.forEach(item ->{
 			CourseHRBPAudit audit = map.get(item.getId());
 			if(audit != null){
-				//暂时获取这两个字段,之后看是否需要调整
-				item.setAuditUser(audit.getAuditUser());
-				item.setAuditTime(audit.getAuditTime());
+				//公开课审核完成取公开课的审核信息
+				if(StringUtils.isNotEmpty(audit.getLastAname())){
+					item.setAuditUser(audit.getLastAname());
+					item.setAuditTime(audit.getLastTime());
+				}else if(CourseHRBPAudit.FORWARD_TEACHER == audit.getForward()){
+					//转发到教师审核取教师审核信息
+					item.setAuditUser(audit.getToName());
+				}else if (CourseHRBPAudit.FORWARD_TO_FINISH == audit.getForward()){
+					//老师审核完成
+					item.setAuditUser(audit.getAuditUser());
+					if(CourseHRBPAudit.STATUS_NOPASS ==audit.getStatus()){
+						//老师审核不通过时取老师的审核时间
+						item.setAuditTime(audit.getToAuditTime());
+					}
+				}else {
+					item.setAuditUser(audit.getAuditUser());
+					item.setAuditTime(audit.getAuditTime());
+				}
 			}
 		});
 

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

@@ -1164,6 +1164,7 @@ public class CourseServiceImpl implements ICourseService {
         hrbpAudit.setCourseId(c.getId());
         hrbpAudit.setAddTime(LocalDateTime.now());
         hrbpAudit.setAid(full.getAuditUser().getAid());
+        hrbpAudit.setAuditUser(full.getAuditUser().getName());//提前保存审核hrbp的名字，用于显示下一步审核人
         hrbpAudit.setAuditRemark("");
         hrbpAudit.setForward(CourseHRBPAudit.FORWARD_NONE);
         hrbpAudit.setStatus(CourseHRBPAudit.STATUS_NONE);

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

@@ -196,7 +196,7 @@ public class StudyCourseApi extends ApiBaseController{
 		log.info("---- KJB 获取课程详情 ---");
 		CourseFullText courseFullText = new CourseFullText();
 		courseFullText.setId(cid);
-		courseFullTextApi.getCourseFromKJB(courseFullText,course1);
+		courseFullTextApi.getCourseFromKJB(courseFullText,course);
 		rs.put("course",course1);
 		//rs.put("course",course);
 

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

@@ -9,20 +9,20 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 10.232.28.76:8848,10.232.28.83:8848,10.232.28.77:8848
+        server-addr: 10.251.113.100:8848
       config:
-        server-addr: 10.232.28.76:8848,10.232.28.83:8848,10.232.28.77:8848
+        server-addr: 10.251.113.100:8848
   redis:
     database: 1
-    host: 10.232.27.44
-    password: j2ZsxUyl
+    host: 10.251.88.213
+    password: qwert!W588
     port: 6379
   jpa:
     hibernate:
       ddl-auto: none
   datasource:
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://10.232.27.47:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
     username: admin
     password: boeRds01
     type: com.zaxxer.hikari.HikariDataSource
@@ -34,7 +34,7 @@ spring:
       max-lifetime: 1800000
       maximum-pool-size: 20
   activemq:
-    broker-url: tcp://10.232.28.73:61616
+    broker-url: tcp://10.251.113.100:61616
     user: admin
     password: admin
   jms:
@@ -67,7 +67,7 @@ xboe:
       url: https://u.boe.com/userbasic
   elasticsearch:
     server:
-      ip: 10.232.27.40
+      ip: 10.251.88.218
       port: 9200
       user:
       password:
@@ -338,16 +338,13 @@ aop-log-record:
   #不进行拦截的包或者类
   excludeClassNames:
   activemq:
-    broker-url: tcp://10.232.28.73:61616
+    broker-url: tcp://10.251.113.100:61616
     user: admin
     password: admin
   elasticsearch:
-    host: 10.232.27.40
+    host: 10.251.88.218
     port: 9200
 
 kjb:
   aicoreUrl: http://10.232.28.95:8080
-  videoUrlPrefix: https://u.boe.com/upload
-
-boe:
-  domain: https://u.boe.com
+  videoUrlPrefix: https://u.boe.com/upload

servers/boe-server-all/src/main/resources/log/logback-prod.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
     <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
-    <property name="log.path" value="/data/logs/${spring.application.name}"/>
+    <property name="log.path" value="/home/logs/${spring.application.name}"/>
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>

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

@@ -2,8 +2,8 @@
 spring:
   redis:
     database: 1
-    host: 10.232.27.44
-    password: j2ZsxUyl
+    host: 10.251.88.213
+    password: qwert!W588
     port: 6379
   jpa:
     hibernate:
@@ -16,12 +16,12 @@ spring:
     driverClassName: com.mysql.jdbc.Driver
     db1:
       driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://10.232.27.47:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://10.251.88.216:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
       username: admin
       password: boeRds01
     db2:
       driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://10.232.27.47:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
       username: admin
       password: boeRds01
 

servers/boe-server-basic/src/main/resources/log/logback-prod.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
     <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
-    <property name="log.path" value="/data/logs/${spring.application.name}"/>
+    <property name="log.path" value="/home/logs/${spring.application.name}"/>
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>