成长路径

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

modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/ElasticsearchConfig.java

@@ -20,7 +20,7 @@ import com.xboe.common.utils.StringUtil;
 public class ElasticsearchConfig {
 	
 	@Value("${xboe.elasticsearch.server.ip}")
-	private String esIp="127.0.0.1";
+	private String esIp="10.251.88.214";
 	
 	@Value("${xboe.elasticsearch.server.port}")
 	private int esPort=9200;

servers/boe-server-all/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -16,38 +16,38 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<spring-cloud.version>2021.0.5</spring-cloud.version>
-        <spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
-        <nacos-client.version>2.2.0</nacos-client.version>
+		<spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
+		<nacos-client.version>2.2.0</nacos-client.version>
 	</properties>
 	<dependencies>
 		<!-- 引入Cloud -->
-	     <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-            <version>${spring-cloud-alibaba.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.alibaba.nacos</groupId>
-                    <artifactId>nacos-client</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-            <version>${nacos-client.version}</version>
-        </dependency>
-        <!-- end -->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+			<version>${spring-cloud-alibaba.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.alibaba.nacos</groupId>
+					<artifactId>nacos-client</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba.nacos</groupId>
+			<artifactId>nacos-client</artifactId>
+			<version>${nacos-client.version}</version>
+		</dependency>
+		<!-- end -->
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-ooxml</artifactId>
 			<version>4.0.1</version>
 		</dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.8.16</version>
-        </dependency>
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-all</artifactId>
+			<version>5.8.16</version>
+		</dependency>
 		<dependency>
 			<groupId>com.xboe</groupId>
 			<artifactId>xboe-api</artifactId>
@@ -58,7 +58,7 @@
 			<artifactId>xboe-module-scorm</artifactId>
 			<version>1.0.0</version>
 		</dependency>
-		 <dependency>
+		<dependency>
 			<groupId>com.xboe</groupId>
 			<artifactId>xboe-core</artifactId>
 			<version>1.0.0</version>
@@ -84,7 +84,6 @@
 			<artifactId>xboe-module-es</artifactId>
 			<version>1.0.0</version>
 		</dependency>
-
 		<dependency>
 			<groupId>it.sauronsoftware</groupId>
 			<artifactId>jave</artifactId>
@@ -93,9 +92,9 @@
 			<systemPath>${project.basedir}/src/main/resources/libs/jave-1.0.2.jar</systemPath>
 		</dependency>
 		<dependency>
-		    <groupId>com.auth0</groupId>
-		    <artifactId>java-jwt</artifactId>
-		    <version>3.18.3</version>
+			<groupId>com.auth0</groupId>
+			<artifactId>java-jwt</artifactId>
+			<version>3.18.3</version>
 		</dependency>
 		<!--
 		<dependency>
@@ -110,8 +109,8 @@
 			<artifactId>commons-lang3</artifactId>
 		</dependency>
 		<dependency>
-		    <groupId>commons-codec</groupId>
-		    <artifactId>commons-codec</artifactId>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
 		</dependency>
 
 		<dependency>
@@ -130,10 +129,10 @@
 			<groupId>org.springframework.session</groupId>
 			<artifactId>spring-session-data-redis</artifactId>
 		</dependency>
-		 <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
@@ -185,13 +184,13 @@
 		</dependency>
 
 		<!-- aspose -->
-        <dependency>
-            <groupId>com.aspose</groupId>
-            <artifactId>slides</artifactId>
-            <version>15.9.0</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/src/main/resources/aspose/aspose.slides-15.9.0.jar</systemPath>
-        </dependency>
+		<dependency>
+			<groupId>com.aspose</groupId>
+			<artifactId>slides</artifactId>
+			<version>15.9.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/src/main/resources/aspose/aspose.slides-15.9.0.jar</systemPath>
+		</dependency>
 		<dependency>
 			<groupId>com.aspose</groupId>
 			<artifactId>words</artifactId>
@@ -214,20 +213,20 @@
 			<version>3.0.3</version>
 		</dependency>
 		<dependency>
-            <groupId>org.elasticsearch.client</groupId>
-            <artifactId>elasticsearch-rest-high-level-client</artifactId>
-            <version>7.9.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <version>7.9.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.elasticsearch.client</groupId>
-            <artifactId>elasticsearch-rest-client</artifactId>
-            <version>7.9.0</version>
-        </dependency>
+			<groupId>org.elasticsearch.client</groupId>
+			<artifactId>elasticsearch-rest-high-level-client</artifactId>
+			<version>7.9.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.elasticsearch</groupId>
+			<artifactId>elasticsearch</artifactId>
+			<version>7.9.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.elasticsearch.client</groupId>
+			<artifactId>elasticsearch-rest-client</artifactId>
+			<version>7.9.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.retry</groupId>
 			<artifactId>spring-retry</artifactId>
@@ -236,32 +235,32 @@
 	</dependencies>
 	<build>
 		<resources>
-	       <resource>
-	          <filtering>true</filtering>
-	          <directory>src/main/resources</directory>
-	          <includes>
-	              <include>application-${profileActive}.properties</include>
-	              <include>application.properties</include>
-	          </includes>
-	        </resource>
-	         <resource>
-	          <filtering>false</filtering>
-	          <directory>src/main/resources</directory>
-	          <excludes>
-	              <exclude>*.properties</exclude>
-	          </excludes>
-	        </resource>
-	    </resources>
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>application-${profileActive}.properties</include>
+					<include>application.properties</include>
+				</includes>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/resources</directory>
+				<excludes>
+					<exclude>*.properties</exclude>
+				</excludes>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <!-- <version>3.8.0</version> -->
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<!-- <version>3.8.0</version> -->
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -272,8 +271,8 @@
 							<artifactId>lombok</artifactId>
 						</exclude>
 					</excludes>
-                    <includeSystemScope>true</includeSystemScope>
-                </configuration>
+					<includeSystemScope>true</includeSystemScope>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>
@@ -296,12 +295,12 @@
 				<profileActive>test</profileActive>
 			</properties>
 		</profile>
-        <profile>
-            <id>test135</id>
-            <properties>
-                <profileActive>test135</profileActive>
-            </properties>
-        </profile>
+		<profile>
+			<id>test135</id>
+			<properties>
+				<profileActive>test135</profileActive>
+			</properties>
+		</profile>
 		<profile>
 			<id>dev</id>
 			<properties>

servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java

@@ -4,21 +4,23 @@ import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.lang.Opt;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.nacos.shaded.com.google.gson.*;
 import com.xboe.api.vo.*;
 import com.xboe.module.course.vo.StudyCourseVo;
 import com.xboe.module.course.vo.TeacherInfoVo;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.module.dict.entity.DictDto;
+import com.xboe.module.exam.entity.AloneExam;
 import com.xboe.module.exam.entity.ExamTest;
 import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.system.user.dao.UserDao;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
+import java.time.LocalDateTime;
+import java.util.*;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -63,6 +65,10 @@ public class ThirdApi {
 
     @Value("${manageApi.editExam}")
     private String editExam;
+
+    @Value("${coursesuilt.syncExamScoreToCourseSuite}")
+    private String syncExamScoreToCourseSuite;
+
     //获取例外人员的id
     public  List<String> getUserId(){
         String responseBody = Optional.ofNullable(HttpRequest.get(infarasApiUrl+"?pid=316&type=1").execute() //prod 316
@@ -231,5 +237,21 @@ public class ThirdApi {
 
     }
 
+    public void syncExamScoreToCourseSuite(AloneExam aloneExam,String token) {
+        Gson gson = new GsonBuilder()
+                .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer())
+                .create();
 
+        String json = gson.toJson(aloneExam);
+        String resp = HttpRequest.post(syncExamScoreToCourseSuite)
+                .body(json)
+                .header("token", token)
+                .execute()
+                .body();
+
+        if (StringUtils.isBlank(resp)){
+            return;
+        }
+        JSONUtil.toBean(resp, SyncExamScoreBean.class).success();
+    }
 }

servers/boe-server-all/src/main/java/com/xboe/api/vo/CheckExamBandingBean.java

@@ -0,0 +1,31 @@
+package com.xboe.api.vo;
+
+import cn.hutool.json.JSONUtil;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Data
+@Slf4j
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CheckExamBandingBean {
+
+    private boolean show;
+    private String version;
+    private int code;
+    private String msg;
+    private Object data;
+    private boolean success;
+
+    public CheckExamBandingBean success() {
+        if (this.code!=200) {
+            log.error("获取绑定关系失败----{}", JSONUtil.toJsonPrettyStr(this));
+            return null;
+        }
+        return this;
+    }
+}

servers/boe-server-all/src/main/java/com/xboe/api/vo/GetUserIdByWorkNumResult.java

@@ -0,0 +1,40 @@
+package com.xboe.api.vo;
+
+import cn.hutool.json.JSONUtil;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+import java.util.HashMap;
+
+/**
+ * Auto-generated: 2022-12-10 14:3:18
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+@Data
+@Slf4j
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class GetUserIdByWorkNumResult {
+
+    private String error;
+    private String message;
+    private String permissions;
+    private HashMap<String,String> result;
+    private int status;
+    private Date timestamp;
+
+    public GetUserIdByWorkNumResult success() {
+        if (this.status != 200) {
+            log.error("获取用户ID列表失败----{}", JSONUtil.toJsonPrettyStr(this));
+            return null;
+        }
+        return this;
+    }
+}

servers/boe-server-all/src/main/java/com/xboe/api/vo/LocalDateTimeSerializer.java

@@ -0,0 +1,19 @@
+package com.xboe.api.vo;
+
+import com.alibaba.nacos.shaded.com.google.gson.JsonElement;
+import com.alibaba.nacos.shaded.com.google.gson.JsonPrimitive;
+import com.alibaba.nacos.shaded.com.google.gson.JsonSerializationContext;
+import com.alibaba.nacos.shaded.com.google.gson.JsonSerializer;
+
+import java.lang.reflect.Type;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+public class LocalDateTimeSerializer implements JsonSerializer<LocalDateTime> {
+    private  final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    @Override
+    public JsonElement serialize(LocalDateTime src, Type typeOfSrc, JsonSerializationContext context) {
+        return new JsonPrimitive(formatter.format(src));
+    }
+}

servers/boe-server-all/src/main/java/com/xboe/api/vo/SyncExamScoreBean.java

@@ -0,0 +1,31 @@
+package com.xboe.api.vo;
+
+import cn.hutool.json.JSONUtil;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Data
+@Slf4j
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SyncExamScoreBean {
+
+    private boolean show;
+    private String version;
+    private int code;
+    private String msg;
+    private Object data;
+    private boolean success;
+
+    public SyncExamScoreBean success() {
+        if (this.code!=200) {
+            log.error("同步考试到boe库失败----{}", JSONUtil.toJsonPrettyStr(this));
+            return null;
+        }
+        return this;
+    }
+}

servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java

@@ -133,4 +133,6 @@ public interface CacheName {
      * 字典缓存key
      * */
     String KEY_DICT="dict";
+
+    String STUDY_KEY = "StudyKey:";
 }

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

@@ -9,12 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.xboe.common.PageList;
 import com.xboe.common.Pagination;
@@ -1164,5 +1159,11 @@ public class CourseManageApi extends ApiBaseController{
 		return success(courses);
 	}
 
+	@GetMapping("/getCourseCoverUrl")
+	public JsonResponse<Map<String, String>> getCourseCoverUrl(@RequestParam String courseIds){
+		Map<String, String> courseUrlMap = courseService.getCourseCoverUrl(courseIds);
+		return success(courseUrlMap);
+	}
+
 
 }

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

@@ -1,21 +1,33 @@
 package com.xboe.module.course.api;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import com.xboe.api.ThirdApi;
-import com.xboe.api.vo.AuditList;
-import com.xboe.api.vo.AuditListParam;
-import com.xboe.api.vo.UserDynamic;
-import com.xboe.api.vo.UserdynamicParam;
-import com.xboe.common.OrderCondition;
-import com.xboe.core.JsonResponseStatus;
+import com.xboe.core.orm.FieldFilters;
+import com.xboe.module.course.entity.*;
 import com.xboe.module.course.vo.TeacherVo;
-import com.xboe.module.usergroup.entity.UserGroupItem;
+import com.xboe.school.study.dao.StudyCourseDao;
+import com.xboe.school.study.entity.StudyHomeWork;
+import com.xboe.school.study.service.IStudyHomeWorkService;
+import com.xboe.school.study.service.IStudyService;
+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;
@@ -34,11 +46,6 @@ import com.xboe.core.api.ApiBaseController;
 import com.xboe.module.course.dto.CourseQueryDto;
 import com.xboe.module.course.dto.CourseTeacherDto;
 import com.xboe.module.course.dto.RankingDto;
-import com.xboe.module.course.entity.Course;
-import com.xboe.module.course.entity.CourseContent;
-import com.xboe.module.course.entity.CourseCrowd;
-import com.xboe.module.course.entity.CourseSection;
-import com.xboe.module.course.entity.CourseTeacher;
 import com.xboe.module.course.service.ICourseContentService;
 import com.xboe.module.course.service.ICourseSectionService;
 import com.xboe.module.course.service.ICourseService;
@@ -67,19 +74,19 @@ public class CoursePortalApi extends ApiBaseController{
 
 	@Resource
 	private ICourseService courseService;
-	
+
 	@Resource
 	private ITeacherService teacherService;
-	
+
 	@Resource
 	private ICourseContentService contentService;
-	
+
 	@Resource
 	private ICourseSectionService sectionService;
 
 	@Resource
 	private ICourseTeacherService courseTeacherService;
-	
+
 	@Autowired
 	private IUserGroupService userGroupService;
 
@@ -89,6 +96,15 @@ public class CoursePortalApi extends ApiBaseController{
 	@Resource
 	private ThirdApi thirdApi;
 
+	@Autowired
+	IStudyHomeWorkService shomeworkService;
+
+	@Autowired
+	IStudyService studyService;
+
+	@Autowired
+	StudyCourseDao studyCourseDao;
+
 	@Autowired
 	StringRedisTemplate redisTemplate;
 
@@ -108,9 +124,9 @@ public class CoursePortalApi extends ApiBaseController{
 		Map<String,Object> list=courseService.findImages(cids);
 		return success(list);
 	}
-	
+
 	/**
-	* 人气榜
+	 * 人气榜
 	 * */
 	@PostMapping("/ranking")
 	public JsonResponse<List<RankingDto>> Ranking(Integer type,Integer time){
@@ -136,7 +152,7 @@ public class CoursePortalApi extends ApiBaseController{
 		return success(rankingDtos);
 	}
 
-	
+
 	/**
 	 * 查询列表，数量，类型，最新，最热
 	 * @param num
@@ -162,7 +178,7 @@ public class CoursePortalApi extends ApiBaseController{
 		}
 		dto.setDevice(device);
 		try {
-			
+
 			List<Course> list=courseService.findList(num, dto);
 			return success(list);
 		}catch(Exception e) {
@@ -170,10 +186,10 @@ public class CoursePortalApi extends ApiBaseController{
 			return error("查询课程列表失败",e.getMessage());
 		}
 	}
-	
+
 	@PostMapping("/pagelist-new")
 	public JsonResponse<PageList<Course>> findNewPage(Pagination pager,CourseQueryDto dto){
-		
+
 		//只是查询已发布的
 
 		dto.setPublish(true);
@@ -195,9 +211,9 @@ public class CoursePortalApi extends ApiBaseController{
 				}
 			}
 		}
-		
+
 		return success(coursePageList);
-		
+
 	}
 
 	/**
@@ -208,7 +224,7 @@ public class CoursePortalApi extends ApiBaseController{
 	 */
 	@PostMapping("/pagelist")
 	public JsonResponse<PageList<Course>> findPage(Pagination pager,CourseQueryDto dto){
-		
+
 		//只是查询已发布的
 
 		dto.setPublish(true);
@@ -229,11 +245,11 @@ public class CoursePortalApi extends ApiBaseController{
 				}
 			}
 		}
-		
+
 		return success(coursePageList);
-		
+
 	}
-	
+
 	/**
 	 * 获取详细信息
 	 * @param id
@@ -244,19 +260,19 @@ public class CoursePortalApi extends ApiBaseController{
 		if(StringUtils.isBlank(id)) {
 			return badRequest("参数错误，未指定课程");
 		}
-		
+
 		//当前对于课程不增加浏览量，课程的意义并不是看过
 //		if(addView==null) {
 //			addView=false;
 //		}
-		
+
 		Map<String,Object> rs=new HashMap<String,Object>();
 		Course course=courseService.getAddView(id);
 		if(course==null || course.getDeleted()){
 			return badRequest("课程不存在或已被删除");
 		}
 		rs.put("course",course);
-		
+
 		List<CourseCrowd> courseCrowdList = courseService.findCrowdByCourseId(id);
 		if(crowd!=null && crowd) {
 			rs.put("crowds",courseCrowdList);
@@ -299,7 +315,7 @@ public class CoursePortalApi extends ApiBaseController{
 		List<CourseContent> cclist=contentService.getByCourseId(id);
 		List<CourseSection> sectionlist=sectionService.getByCourseId(id);
 		List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);
-		
+
 
 		//获取教师的介绍信息,因为一门课程 的教师不会太多，所以这里简单直接遍历查询，后续再优化
 		for(CourseTeacher ct : teachers) {
@@ -319,7 +335,7 @@ public class CoursePortalApi extends ApiBaseController{
 					}
 				}
 			}
-			
+
 		}
 
 		rs.put("isCrowd",pass);
@@ -328,7 +344,7 @@ public class CoursePortalApi extends ApiBaseController{
 		rs.put("teachers",teachers);
 		//查询课程
 		return success(rs);
-		
+
 	}
 	private void getTeacherInfo(String token, List<String> teacherIds) {
 		List<TeacherVo> teacherInfo = thirdApi.getTeacherInfo(teacherIds, token);
@@ -347,7 +363,102 @@ public class CoursePortalApi extends ApiBaseController{
 		}
 
 	}
+	//作业导出
+	@GetMapping("/export")
+	public JsonResponse<String> export(String courseName,String courseId,String contentId,String name,Integer status) throws IOException {
+		Map<String, String>map=new HashMap<>();
+		List<String> userIds = studyCourseDao.findList(FieldFilters.eq("courseId", courseId)).stream().filter(Objects::nonNull).map(StudyCourse::getAid).collect(Collectors.toList());
+		if (userIds.isEmpty()){
+			return error("查询不到用户");
+		}
+		List<User>user=studyService.getUserNo(userIds);
+		try {//筛选出的人员
+			List<StudyCourseItem> list = studyService.getList(courseId, contentId, name, status);
+			if(list.isEmpty()){
+				return success("暂无数据");
+			}
+			for (StudyCourseItem s : list) {
+				List<StudyHomeWork> studyHomeWorks = shomeworkService.getByStudyIdAndContentId(s.getStudyId(), contentId).stream().filter(e-> !Objects.equals(e.getFilePath(), "")).filter(e->e.getFilePath()!=null).collect(Collectors.toList());
+				if(studyHomeWorks.isEmpty()){
+					return success("暂无数据");
+				}
+				studyHomeWorks.forEach(e->{
+					user.forEach(u->{
+						if(u.getId().equals(s.getAid())){
+							//取后缀
+							int dotIndex = e.getFilePath().lastIndexOf('.'); // 查找最后一个'.'的位置
+							String extension = e.getFilePath().substring(dotIndex);
+							map.put(u.getName()+"-"+u.getUserNo()+extension,"/home/www/elearning/upload"+e.getFilePath());
+						}
+					});
+				});
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException("导出异常"+e.getMessage());
+		}
+		long totalFileSize = map.values().stream()
+				.mapToLong(path -> new File(path).length())
+				.sum();
+		// 检查文件总大小是否超过 2GB
+		if (totalFileSize > 2L * 1024 * 1024 * 1024) {
+			return success("您要下载的作业过大,请分批下载或联系管理员!");
+		}
 
+//		String encodedFilename = URLEncoder.encode(courseName+"【作业】.zip")
+//				.replace("+", "%20") // 空格替换为"%20"
+//				.replace("%2F", "/"); // 解决斜杠问题
+//		StringBuilder contentDispositionValue = new StringBuilder();
+//		contentDispositionValue.append("attachment; filename=\"")
+//				.append(encodedFilename)
+//				.append("\"")
+//				.append("; filename*=utf-8''")
+//				.append(encodedFilename);
+//
+//        // 设置响应类型和Content-Disposition头
+//		response.setContentType("application/zip");
+
+		// 创建一个临时文件用于存储ZIP文件
+		File tempZipFile = new File("/home/www/elearning/upload/temp.zip");
+
+		try (ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(tempZipFile))) {
+			for (Map.Entry<String, String> e : map.entrySet()) {
+				File fileToZip = new File(e.getValue());
+				// 添加 ZIP 条目
+				ZipEntry entry = new ZipEntry(e.getKey());
+				entry.setSize(fileToZip.length());
+
+				zos.putNextEntry(entry);
+
+				try (FileInputStream fis = new FileInputStream(fileToZip)) {
+					byte[] buffer = new byte[4096];
+					int len;
+					while ((len = fis.read(buffer)) > 0) {
+						zos.write(buffer, 0, len);
+					}
+				}
+
+				zos.closeEntry();
+			}
+		}
+		// 将临时文件移动到指定位置
+		Path source = tempZipFile.toPath();
+		//生成uuid
+		String uuid = UUID.randomUUID().toString();
+		Path destination = Paths.get("/home/www/elearning/upload/saveZip/" + uuid + ".zip");
+
+		// 删除目标文件如果已存在
+		if (Files.exists(destination)) {
+			Files.delete(destination);
+		}
+
+		// 移动文件
+		Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);
+
+		// 返回文件路径给前端
+		String filePath = destination.toAbsolutePath().toString();
+		return success(filePath);
+	}
 	@GetMapping("/detail-study")
 	public JsonResponse<List<CourseStudyVo>> detailStudy(String courseId, String aid){
 		if(StringUtil.isBlank(courseId)){
@@ -392,7 +503,7 @@ public class CoursePortalApi extends ApiBaseController{
 									cv.setStatus(9);
 								}
 							}
-						//音视频
+							//音视频
 						}else{
 							cv.setStatus(study.getStatus());
 

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

@@ -340,9 +340,8 @@ public interface ICourseService {
      * */
     List<Course> mobiledelList(Integer num,CourseQueryDto courseQueryDto);
 
-
-
-
-
-
+    /**
+     * 获取课程封面
+     * */
+    Map<String, String> getCourseCoverUrl(String courseIds);
 }

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

@@ -1979,5 +1979,16 @@ public class CourseServiceImpl implements ICourseService {
         return courseDao.findListByHql("Select new Course(id,studys,score) from Course where id in(?1)", ids);
     }
 
+	@Override
+	public Map<String, String> getCourseCoverUrl(String courseIds) {
+		List<String> courseIdList = Arrays.asList(courseIds.split(","));
+		List<Course> courseList = courseDao.findList(FieldFilters.in("id", courseIdList));
+		Map<String, String> coverUrlMap = courseList.stream()
+				.filter(course -> StringUtils.isNotBlank(course.getCoverImg()))
+				.collect(Collectors.toMap(Course::getId, Course::getCoverImg));
+
+		return coverUrlMap;
+	}
+
 
 }

servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java

@@ -14,15 +14,11 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.xboe.module.exam.entity.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.dao.DuplicateKeyException;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -41,9 +37,6 @@ import com.xboe.core.cache.IXaskCache;
 import com.xboe.core.cache.XaskCacheProvider;
 import com.xboe.core.exception.XaskException;
 import com.xboe.module.exam.dto.AloneExamExportDto;
-import com.xboe.module.exam.entity.AloneExam;
-import com.xboe.module.exam.entity.AloneExamAnswer;
-import com.xboe.module.exam.entity.ExamTest;
 import com.xboe.module.exam.service.IAloneExamService;
 import com.xboe.module.exam.service.IExamPaperService;
 import com.xboe.module.exam.service.IExamTestService;
@@ -553,6 +546,7 @@ public class AloneExamApi extends ApiBaseController {
         	//转化成百分数
         	//answer.setScore(this.calculateScore(detail));
             service.submit(answer,scoreType);
+            service.syncExamScoreToCourseSuite(answer, request);
             return success(map);
         } catch (Exception e) {
             log.error("提交答卷错误", e);

servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java

@@ -3,14 +3,12 @@ package com.xboe.module.exam.api;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.xboe.api.ThirdApi;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
 import org.hibernate.exception.ConstraintViolationException;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+
 
 import com.xboe.common.PageList;
 import com.xboe.common.Pagination;
@@ -23,6 +21,8 @@ import com.xboe.module.exam.service.IExamTestService;
 
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.List;
+
 /**
  * 考试
  * */
@@ -33,8 +33,10 @@ public class ExamTestApi extends ApiBaseController {
 	
     @Resource
     private IExamTestService examTestService;
+
     @Resource
-    ThirdApi thirdApi;
+    private ThirdApi thirdApi;
+
     /**
      *查询考试，分页，搜索,资源归属，状态
      **/
@@ -183,4 +185,21 @@ public class ExamTestApi extends ApiBaseController {
             return error("上下级失败",e.getMessage());
         }
     }
+
+    /**
+     * 引用关系移除
+     * */
+    @PostMapping("/removeRel")
+    public JsonResponse<Boolean> removeRel(@RequestParam List<String> ids){
+        if(CollectionUtil.isEmpty(ids)){
+            return badRequest("参数异常");
+        }
+        try {
+            examTestService.removeRel(ids);
+            return success(true);
+        } catch (Exception e) {
+            log.error("引用关系移除异常",e);
+            return error("引用关系移除异常",e.getMessage());
+        }
+    }
 }

servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/AloneExam.java

@@ -65,6 +65,7 @@ public class AloneExam extends IdBaseEntity {
     private String ucode;
     
     /**关联类型*/
+    /**关联类型 新增关联类型14，代表成长路径图*/
     @Column(name = "ref_type", length = 30)
     private String refType;
     

servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java

@@ -178,4 +178,14 @@ public class ExamTest extends BaseEntity {
     
     @Transient
     private String paperName;
+
+    /** 关联类型，1、项目 2、学习路径图 3、面授课 14、成长路径图 */
+    @Column(name = "ref_type")
+    private Integer refType;
+
+    @Column(name = "ref_id")
+    private String refId;
+
+    @Column(name = "ref_status")
+    private Integer refStatus;
 }

servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java

@@ -10,6 +10,7 @@ import com.xboe.module.exam.dto.TestUserQuery;
 import com.xboe.module.exam.entity.AloneExam;
 import com.xboe.module.exam.entity.AloneExamAnswer;
 import com.xboe.module.exam.vo.AloneExamQuery;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 独立考试的处理。此信息无删除操作，更新也只是更新answerJson字段
@@ -92,10 +93,18 @@ public interface IAloneExamService {
 
 	/**
 	 * 提交考试
+	 *
 	 * @param aea
 	 */
-	void submit(AloneExamAnswer aea,Integer scoreType);
-	
+	void submit(AloneExamAnswer aea, Integer scoreType);
+
+	/**
+	 * 同步考试成绩
+	 * @param aea
+	 * @param request
+	 */
+	void syncExamScoreToCourseSuite(AloneExamAnswer aea, HttpServletRequest request);
+
 	/**
 	 * 更新答案
 	 * @param id

servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IExamTestService.java

@@ -3,6 +3,8 @@ package com.xboe.module.exam.service;
 import com.xboe.common.PageList;
 import com.xboe.module.exam.entity.ExamTest;
 
+import java.util.List;
+
 public interface IExamTestService {
     /**
      * 分页查，状态，搜索，资源归属
@@ -51,4 +53,5 @@ public interface IExamTestService {
      * */
     void enabled(String id,Boolean enabled);
 
+    void removeRel(List<String> ids);
 }

servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java

@@ -1,17 +1,6 @@
 package com.xboe.module.exam.service.impl;
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
+import com.xboe.api.ThirdApi;
 import com.xboe.common.OrderCondition;
 import com.xboe.common.PageList;
 import com.xboe.common.utils.StringUtil;
@@ -20,6 +9,7 @@ import com.xboe.core.orm.QueryBuilder;
 import com.xboe.core.orm.UpdateBuilder;
 import com.xboe.module.exam.dao.AloneExamAnswerDao;
 import com.xboe.module.exam.dao.AloneExamDao;
+import com.xboe.module.exam.dao.ExamTestDao;
 import com.xboe.module.exam.dto.TestUserAnswerDto;
 import com.xboe.module.exam.dto.TestUserDto;
 import com.xboe.module.exam.dto.TestUserQuery;
@@ -28,23 +18,47 @@ import com.xboe.module.exam.entity.AloneExamAnswer;
 import com.xboe.module.exam.entity.ExamTest;
 import com.xboe.module.exam.service.IAloneExamService;
 import com.xboe.module.exam.vo.AloneExamQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 @Service
 public class AloneExamServiceImpl implements IAloneExamService{
 
+	private static final Logger log = LoggerFactory.getLogger(AloneExamServiceImpl.class);
 	@Resource
 	AloneExamAnswerDao dao;
 	
 	@Resource
 	AloneExamDao aeDao;
+
+	@Autowired
+	private ThirdApi thirdApi;
+
 	
 	@Override
 	@Transactional
 	public void save(AloneExamAnswer aea){
 		dao.save(aea);
+		AloneExam ae=aeDao.findOne(FieldFilters.eq("aid", aea.getAid()),FieldFilters.eq("testId", aea.getTestId()));
+		int currentTimes = ae.getTimes() != null ? ae.getTimes() : 0;
 		//更新状态
 		aeDao.update(UpdateBuilder.from(AloneExam.class)
 				.addUpdateField("status", AloneExam.STATUS_NORMAL)
+				.addUpdateField("times", currentTimes+1)
 				.addFilter(FieldFilters.eq("aid", aea.getAid()))
 				.addFilter(FieldFilters.eq("testId", aea.getTestId()))
 				.addFilter(FieldFilters.eq("status",AloneExam.STATUS_NONE))
@@ -53,8 +67,8 @@ public class AloneExamServiceImpl implements IAloneExamService{
 	}
 
 	@Override
-	@Transactional
-	public void submit(AloneExamAnswer aea,Integer scoreType){
+	@Transactional(propagation = Propagation.REQUIRES_NEW)
+	public void submit(AloneExamAnswer aea, Integer scoreType){
 		//dao.update(aea);
 		aea.setStatus(AloneExamAnswer.STATUS_FINISH);
 		LocalDateTime now=LocalDateTime.now();
@@ -102,6 +116,27 @@ public class AloneExamServiceImpl implements IAloneExamService{
 //			}
 		}
 	}
+	@Override
+	public void syncExamScoreToCourseSuite(AloneExamAnswer aea, HttpServletRequest request) {
+		String token = request.getHeader("Xboe-Access-Token");
+		if (StringUtils.isEmpty(token)) {
+			token = request.getHeader("token");
+		}
+
+		String finalToken = token;
+		CompletableFuture.supplyAsync(() -> {
+			AloneExam aloneExam = aeDao.findOne(FieldFilters.eq("aid", aea.getAid()), FieldFilters.eq("testId", aea.getTestId()));
+			if (aloneExam.getRefType().equals("14")){
+				thirdApi.syncExamScoreToCourseSuite(aloneExam, finalToken);
+			}
+			return "完成结果";
+		}).exceptionally(ex -> {
+			log.error("异步操作中发生错误: " + ex.getMessage(), ex);
+			return "发生错误";
+		}).thenAccept(result -> {
+			log.info("同步考试成绩到课程项目完成：" + result);
+		});
+	}
 
 	@Override
 	@Transactional

servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java

@@ -122,4 +122,10 @@ public class ExamTestServiceImpl implements IExamTestService {
 		}
 		return null;
 	}
+
+    @Override
+    public void removeRel(List<String> ids) {
+        String idsStr = String.join(",", ids);
+        examTestDao.sqlUpdate("update boe_exam_test set ref_status=0 where id in (?1)",idsStr);
+    }
 }

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

@@ -3,13 +3,11 @@ package com.xboe.school.study.api;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
-import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
 import com.xboe.api.ThirdApi;
-import com.xboe.api.vo.*;
+import com.xboe.constants.CacheName;
 import com.xboe.module.course.vo.TeacherVo;
-import com.xboe.module.usergroup.entity.UserGroupItem;
 import com.xboe.module.usergroup.service.IUserGroupService;
 import com.xboe.school.study.dao.StudyCourseDao;
 import org.apache.commons.lang3.ArrayUtils;
@@ -66,9 +64,7 @@ import javax.servlet.http.HttpServletRequest;
 @RestController
 @RequestMapping(value="/xboe/school/study/course")
 public class StudyCourseApi extends ApiBaseController{
-
-
-
+	
 	@Autowired
 	IStudyCourseService service;
 	
@@ -324,31 +320,35 @@ public class StudyCourseApi extends ApiBaseController{
 		if (StringUtils.isEmpty(token)) {
 			token = request.getHeader("token");
 		}
-
-
 		//检查是否已存在
 		StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId());
-
-		// 20240815 特训营结营考试 临时代码
-//		if(item != null && redisTemplate.opsForValue().get(item.getId())==null){
-//			redisTemplate.opsForValue().set(item.getId(),item.getId());
-//			//设置过期时间为1天
-//			redisTemplate.expire(item.getId(), 60, TimeUnit.SECONDS);
-//		}else{
-//			return success("");
-//		}
 		if(item!=null) {
-			//如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况
-			if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) {
-				studyService.updateProcess(item.getId(), sci.getStudyId(), sci.getCourseId(), sci.getContentTotal(), sci.getProgress(),token);
+			String studyKey = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + item.getCourseId()+":"+cuser.getAccountId()+":"+item.getContentId();
+			String studyKey2 = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + sci.getCourseId()+":"+cuser.getAccountId()+":"+sci.getContentId();
+			redisTemplate.opsForValue().set(studyKey,
+					String.valueOf(item.getProgress()), 2, TimeUnit.HOURS);
+			String progressStr = redisTemplate.opsForValue().get(studyKey2);
+			if (progressStr != null && !progressStr.isEmpty()) {
+				// 尝试将 Redis 中的字符串转换为整数
+				int redisProgress = Integer.parseInt(progressStr);
+				// 假设 item.getProgress() 返回的是 int 类型
+				int sciProgress = sci.getProgress();
+
+				if (redisProgress < sciProgress && redisProgress < 100) {
+					// 执行一些操作
+//					if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) {
+//					}
+					studyService.updateProcess(item.getId(), sci.getStudyId(), sci.getCourseId(), sci.getContentTotal(), sci.getProgress(),token);
+				}
 			}
 			//追加学习时长
 			studyService.appendStudyDuration(sci.getStudyId(),item.getId(),sci.getContentId(),sci.getDuration());
 			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token);
 			log.info("在线课学习记录"+allUserList);
 			return success(item.getId());
+			//如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况
 		}
-		
+
 		if(StringUtils.isBlank(sci.getCourseId())){
 			return error("无课程信息");
 		}
@@ -421,14 +421,6 @@ public class StudyCourseApi extends ApiBaseController{
 		StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId());
 		if(item!=null) {
 			//如果记录存在，但是进度不到100，未完成情况，就更新进度，一期不会有这种情况
-			// 20240815 特训营结营考试 临时代码
-//			if(item != null && redisTemplate.opsForValue().get(item.getId())==null){
-//				redisTemplate.opsForValue().set(item.getId(),item.getId());
-//				//设置过期时间为1天
-//				redisTemplate.expire(item.getId(), 60, TimeUnit.SECONDS);
-//			}else{
-//				return success("");
-//			}
 			if(item.getProgress()<100) {
 				studyService.updateProcess(item.getId(),sci.getStudyId(),sci.getCourseId(), sci.getContentTotal(),100,token);
 			}
@@ -534,14 +526,6 @@ public class StudyCourseApi extends ApiBaseController{
 			token = request.getHeader("token");
 		}
 		try {
-			// 20240815 特训营结营考试 临时代码
-//			if(itemId != null && redisTemplate.opsForValue().get(itemId)==null){
-//				redisTemplate.opsForValue().set(itemId,itemId);
-//				//设置过期时间为1天
-//				redisTemplate.expire(itemId, 60, TimeUnit.SECONDS);
-//			}else{
-//				return success(true);
-//			}
 			studyService.finishVideoStudyItem(itemId, studyId,courseId,cnum,token);
 			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token);
 			log.info("在线课学习记录"+allUserList);
@@ -723,10 +707,9 @@ public class StudyCourseApi extends ApiBaseController{
 			return error("查询失败",e.getMessage());
 		}
 	}
-
 	
 	@RequestMapping(value="/study-course-content",method = {RequestMethod.GET,RequestMethod.POST})
-	public JsonResponse<StudyCourseItem> findStudyCourseItem(String studyId,String contentId, HttpServletRequest request){
+	public JsonResponse<StudyCourseItem> findStudyCourseItem(String studyId,String contentId){
 		if(StringUtils.isBlank(studyId)){
 			return error("无学习信息");
 		}

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

@@ -1,5 +1,6 @@
 package com.xboe.school.study.service;
 
+import java.util.Collection;
 import java.util.List;
 
 import com.xboe.school.study.entity.StudyHomeWork;
@@ -29,4 +30,6 @@ public interface IStudyHomeWorkService {
 	 * @return
 	 */
 	List<StudyHomeWork> getByStudyIdAndContentId(String studyId,String contentId);
+
+	List<StudyHomeWork>getByStudnetNameAndContentId(List<String> studentName, String contentId);
 }

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

@@ -7,6 +7,7 @@ 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;
 
 /**
  * 学习情况处理,比较综合一个处理类
@@ -95,4 +96,8 @@ public interface IStudyService {
 	 * @return
 	 */
 	PageList<StudyCourseItem> findItemPage(int pageIndex, int pageSize, String contentId, String courseId, String name, Integer status);
+
+    List<StudyCourseItem> getList(String courseId, String contentId, String name, Integer status);
+
+    List<User> getUserNo(List<String> userIds);
 }

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

@@ -89,4 +89,9 @@ public class StudyHomeWorkServiceImpl implements IStudyHomeWorkService{
 		return dao.findList(FieldFilters.eq("studyId", studyId),FieldFilters.eq("contentId", contentId));
 	}
 
+	@Override
+	public List<StudyHomeWork> getByStudnetNameAndContentId(List<String> studentName, String contentId) {
+		return dao.findList(FieldFilters.in("student_name", studentName),FieldFilters.eq("contentId", contentId));
+	}
+
 }

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

@@ -1,6 +1,5 @@
 package com.xboe.school.study.service.impl;
 
-import java.math.BigInteger;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -8,12 +7,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Resource;
 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.stereotype.Service;
@@ -272,6 +271,39 @@ public class StudyServiceImpl implements IStudyService{
 		
 	}
 
+	@Override
+	public List<StudyCourseItem> getList(String courseId, String contentId, String name, Integer status) {
+
+		QueryBuilder query=QueryBuilder.from(StudyCourseItem.class);
+
+		OrderCondition	oc=OrderCondition.desc("id");
+		query.addOrder(oc);
+		if(StringUtils.isNotBlank(contentId)) {
+			query.addFilter(FieldFilters.eq("contentId",contentId));
+		}
+		if(StringUtils.isNotBlank(courseId)) {
+			query.addFilter(FieldFilters.eq("courseId",courseId));
+		}
+
+		if(status!=null) {
+			if(status==1) {
+				query.addFilter(FieldFilters.eq("progress", 0));
+			}else {
+				query.addFilter(FieldFilters.eq("progress",100));
+			}
+
+		}
+		if(StringUtils.isNotBlank(name)) {
+			query.addFilter(FieldFilters.eq("aname", name));
+		}
+		return scItemDao.findList(query.builder());
+	}
+
+	@Override
+	public List<User> getUserNo(List<String> userIds) {
+		return userDao.findList(FieldFilters.in("id", userIds));
+	}
+
 	@Override
 	@Transactional
 	public void updateProcess(String studyContentId,String studyId, String courseId,Integer total, Integer progress,String token) {

servers/boe-server-all/src/main/resources/application-pro.properties

@@ -1,9 +1,9 @@
 # cloud nacos config
-spring.cloud.nacos.discovery.server-addr=10.251.129.51:8848
+spring.cloud.nacos.discovery.server-addr=10.251.113.100:8848
 
 ## redis
 spring.redis.database=1
-spring.redis.host=10.251.129.122
+spring.redis.host=10.251.88.213
 spring.redis.password=qwert!W588
 spring.redis.port=6379
 
@@ -16,7 +16,7 @@ spring.datasource.driverClassName=com.mysql.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://10.251.129.129:8066/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 #spring.datasource.username=admin
 #spring.datasource.password=ocYMC>!{8G
-spring.datasource.url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=admin
 spring.datasource.password=boeRds01
 
@@ -53,6 +53,7 @@ xboe.externalinterface.url.system=http://127.0.0.1:9091
 ## ?????????????
 xboe.old.base.url=https://u.boe.com
 
+
 ## ???????api??
 xboe.stat.base.url=http://127.0.0.1:9080
 xboe.server.userbasic.url=https://u.boe.com/userbasic
@@ -63,7 +64,7 @@ jasypt.encryptor.algorithm=PBEWithMD5AndDES
 jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator
 
 # elasticsearch config
-xboe.elasticsearch.server.ip=10.251.129.21
+xboe.elasticsearch.server.ip=10.251.88.218
 xboe.elasticsearch.server.port=9200
 xboe.elasticsearch.server.user=
 xboe.elasticsearch.server.password=

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

@@ -56,7 +56,7 @@ logging.config=classpath:log/logback-@profileActive@.xml
 # config.id.generator.datacenter.num=1
 
 #boe.domain=https://pretest.zcwytd.com
-boe.domain=https://u.boe.com
+boe.domain=http://127.0.0.1
 #boe.domain=http://localhost:30001
 orgTree.orgTreeList=${boe.domain}/userbasic/org/list
 # ????id????????????
@@ -73,5 +73,6 @@ infrasApi.dict=${boe.domain}/infrasApi/dict/list
 manageApi.stu.offcourse=${boe.domain}/manageApi/stu/offcourse/getOffCourseId
 manageApi.editExam=${boe.domain}/manageApi/admin/project/editExam
 #获取离职教师id
-userBasic.getTeacherIds=${boe.domain}/userbasic/user/getTeacherInfo
-coursesuilt.getStudyStatus=${boe.domain}/manageApi/stu/project/completeStatus
+userBasic.getTeacherIds=${boe.domain}/userbasic/user/getTeacherInfocoursesuilt.getStudyStatus=${boe.domain}/manageApi/stu/project/completeStatus
+coursesuilt.checkBanding=${boe.domain}/manageApi/stu/task/exam/checkBanding
+coursesuilt.syncExamScoreToCourseSuite=${boe.domain}/manageApi/stu/task/exam/syncExamScoreToCourseSuite

servers/boe-server-basic/src/main/resources/application-pro.properties

@@ -1,6 +1,6 @@
 ## redis
 spring.redis.database=3
-spring.redis.host=10.251.129.122
+spring.redis.host=10.251.88.213
 spring.redis.password=qwert!W588
 spring.redis.port=6379
 
@@ -14,7 +14,7 @@ spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 # 当前数据库 basic 对应的数据库
 spring.datasource.db1.driverClassName=com.mysql.jdbc.Driver
-spring.datasource.db1.jdbc-url=jdbc:mysql://10.251.129.126:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.db1.jdbc-url=jdbc:mysql://10.251.88.216:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.db1.username=admin
 spring.datasource.db1.password=boeRds01
 
@@ -23,7 +23,7 @@ spring.datasource.db1.password=boeRds01
 # 主数据库 all 对应的数据库
 spring.datasource.db2.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.db2.jdbc-url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.db2.jdbc-url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.db2.username=admin
 spring.datasource.db2.password=boeRds01
 
@@ -48,6 +48,7 @@ xboe.upload.file.http_path=https://u.boe.com/upload
 ## 新系统的内部地址，可以不通过nginx调用
 xboe.inner.data.sync.baseurl=http://127.0.0.1:9090
 
+
 #加密盐
 #jasypt.encryptor.password=jasypt
 jasypt.encryptor.algorithm=PBEWithMD5AndDES

servers/boe-server-course/src/main/resources/application-pro.properties

@@ -1,15 +1,15 @@
 ## redis
 spring.redis.database=2
-spring.redis.host=127.0.0.1
-spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
+spring.redis.host=10.251.88.214
+spring.redis.password=qwert!W588
 spring.redis.port=6379
 
 ## datasource config
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-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.password=ENC(lAoFOYuc8CAypPtigTNLYg==)
+spring.datasource.url=jdbc:mysql:/10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.username=admin
+spring.datasource.password=boeRds01
 
 logging.level.org.hibernate.SQL=ERROR
 # logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE

servers/boe-server-old/src/main/resources/application-pro.properties

@@ -1,6 +1,6 @@
 ## redis
 spring.redis.database=2
-spring.redis.host=127.0.0.1
+spring.redis.host=10.251.88.214
 spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
 spring.redis.port=6379
 
@@ -8,7 +8,7 @@ spring.redis.port=6379
 spring.jpa.hibernate.ddl-auto=none
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
 spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)
 

servers/boe-server-task/src/main/resources/application-pro.properties

@@ -1,16 +1,16 @@
 ## redis
 spring.redis.database=2
-spring.redis.host=127.0.0.1
+spring.redis.host=10.251.88.214
 spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
 spring.redis.port=6379
 
 # cloud nacos config
-spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848
+spring.cloud.nacos.discovery.server-addr=10.251.113.100:8848
 
 ## datasource config
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
 spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)
 
@@ -33,7 +33,6 @@ xboe.upload.file.http_path=http://localhost:9090/cdn/upload
 
 ## 外部接口调用地址 旧系统机构及用户数据接口
 xboe.externalinterface.url.system=http://localhost:9091
-
 #加密盐
 #jasypt.encryptor.password=jasypt
 jasypt.encryptor.algorithm=PBEWithMD5AndDES

servers/modify-221027/src/main/resources/application-pro.properties

@@ -7,7 +7,7 @@ spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 # 当前数据库 basic 对应的数据库
-spring.datasource.url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=admin
 spring.datasource.password=boeRds01
 

servers/modify-user/src/main/resources/application-pro.properties

@@ -7,7 +7,7 @@ spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 # 当前数据库 basic 对应的数据库
-spring.datasource.url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=admin
 spring.datasource.password=boeRds01
 

servers/org-user-sync/src/main/resources/application-pro.properties

@@ -1,4 +1,3 @@
-
 # datasource config
 # basic数据库
 spring.jpa.hibernate.ddl-auto=none
@@ -9,7 +8,7 @@ spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 # 原数据库 old 对应的数据库
 spring.datasource.db1.driverClassName=com.mysql.jdbc.Driver
-spring.datasource.db1.jdbc-url=jdbc:mysql://10.251.129.126:3306/elearninglms?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.db1.jdbc-url=jdbc:mysql://10.251.88.216:3306/elearninglms?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.db1.username=admin
 spring.datasource.db1.password=boeRds01
 
@@ -18,7 +17,7 @@ spring.datasource.db1.password=boeRds01
 # 新主数据库 all 对应的数据库
 spring.datasource.db2.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.db2.jdbc-url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.db2.jdbc-url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.db2.username=admin
 spring.datasource.db2.password=boeRds01