成长路径图，解除绑定接口去除

成长路径图，内部考试引用关系，以及导入bug修复
成长路径图，考试添加关联字段
2025-12-09 10:56:50 +08:00 · 2024-07-17 10:20:23 +08:00 · 2024-07-15 10:21:32 +08:00 · 2024-07-11 16:33:22 +08:00 · 2024-07-11 11:07:26 +08:00 · 2024-07-10 16:55:17 +08:00
45 changed files with 1938 additions and 2417 deletions
--- a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/ElasticsearchConfig.java
+++ b/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="10.251.88.214";
+	private String esIp="127.0.0.1";
 	
 	@Value("${xboe.elasticsearch.server.port}")
 	private int esPort=9200;
--- a/servers/boe-server-all/pom.xml
+++ b/servers/boe-server-all/pom.xml
@@ -84,6 +84,7 @@
 			<artifactId>xboe-module-es</artifactId>
 			<version>1.0.0</version>
 		</dependency>
+
 		<dependency>
 			<groupId>it.sauronsoftware</groupId>
 			<artifactId>jave</artifactId>
--- a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
@@ -11,7 +11,6 @@ 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;
@@ -63,8 +62,8 @@ public class ThirdApi {
    @Value("${coursesuilt.getStudyStatus}")
    private String getStudyStatus;

-    @Value("${manageApi.editExam}")
-    private String editExam;
+    @Value("${userBasic.getUserIdByWorkNum}")
+    private String getUserIdByWorkNum;

    @Value("${coursesuilt.syncExamScoreToCourseSuite}")
    private String syncExamScoreToCourseSuite;
@@ -213,14 +212,6 @@ public class ThirdApi {
        return studyCourseResult.getResult();
    }

-    public void sqlUpdate(ExamTest examTest, String token) {
-        examTest.setSysUpdateTime(null);
-        examTest.setSysCreateTime(null);
-        examTest.setPublishTime(null);
-        String resp = Optional.ofNullable(HttpRequest.post(editExam).body(JSONUtil.toJsonStr(examTest)).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败"));
-        Opt.ofBlankAble(resp).map(t -> JSONUtil.toBean(t, DynamicBean.class).success());
-    }
-
    public static void main(String[] args) {
        String token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJjb21wYW55Q29kZSI6IkMwMDEiLCJ1SWQiOiI5NjUzNDIwMjc0OTc2MDcxNjgiLCJjb21wYW55SWQiOiIxMDQxNjczOTc3Mzc5OTQ2NDk2IiwibG9naW5JZCI6IjE2ODg0NDg5MjIwNzY0OTE3NzgiLCJpc3MiOiJodHRwOi8vdS5ib2UuY29tIiwiR2l2ZW5OYW1lIjoiYm9ldSIsImV4cCI6MTY5MTM5OTc2NzU1OCwidXNlck5hbWUiOiLmnY7njonlhrAiLCJ1c2VySWQiOiI2QjA0OUZBRi1DMzE0LTdDQ0YtMEQyOC0wRDIzRjRDNDI1MzEifQ==.8b52dcf4d48a790ed258b9ca2b279bb269f5301722095382fbd352705b51c893";
        String resp = Optional.ofNullable(HttpRequest.post("https://u-pre.boe.com/statApi/xboe/m/stat/userdynamic/list").body(JSONUtil.toJsonStr(UserdynamicParam.builder().
@@ -232,9 +223,24 @@ public class ThirdApi {
        List<UserDynamic> list = a.getResult().getList();
        System.out.println("  list = " +list.size());
        System.out.println("  list = " +list);
+    }


-
+    public HashMap<String, String> getUserIdByWorkNum(String token, List<String> workNumList) {
+        // 将workNum列表转换为逗号分隔的字符串
+        String workNums = workNumList.stream()
+                .collect(Collectors.joining(","));
+        // 构建请求URL
+        String url = getUserIdByWorkNum+"?workNums=" + workNums;
+        String respStr = Optional.ofNullable(
+                HttpRequest.get(url)
+                .header("token", token)
+                .execute().body()
+        ).orElseThrow(() -> new RuntimeException("Token校验失败"));
+        // 解析JSON字符串为HashMap
+        GetUserIdByWorkNumResult getUserIdByWorkNumResult = JSONUtil.parseObj(respStr).toBean(GetUserIdByWorkNumResult.class);
+        HashMap<String, String> result = getUserIdByWorkNumResult.getResult();
+        return result;
    }

    public void syncExamScoreToCourseSuite(AloneExam aloneExam,String token) {
--- a/servers/boe-server-all/src/main/java/com/xboe/api/vo/CheckExamBandingBean.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/api/vo/CheckExamBandingBean.java
@@ -1,12 +1,17 @@
 package com.xboe.api.vo;

 import cn.hutool.json.JSONUtil;
+import com.xboe.school.study.entity.StudyCourse;
 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;
+import java.util.List;
+
@Data
@Slf4j
@Builder
--- a/servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java
@@ -133,6 +133,4 @@ public interface CacheName {
     * 字典缓存key
     * */
    String KEY_DICT="dict";
-
-    String STUDY_KEY = "StudyKey:";
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserOrgIds.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserOrgIds.java
@@ -17,7 +17,5 @@ public class UserOrgIds {
 	private Map<String,Boolean> permissions=new HashMap<String,Boolean>(); 
 	
 	private List<String> ids;
-	//hrbp只读权限
-	private List<String> readIds;
 	
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java
@@ -229,10 +229,8 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
 	public UserOrgIds getOrgIds() {
 		UserOrgIds uids=new UserOrgIds();
 		List<String> orgIds = new ArrayList<>();
-		List<String> readIds = new ArrayList<>();
 		
 		uids.setIds(orgIds);
-		uids.setReadIds(readIds);
 		String token = TokenProxy.getToken(request);
 		String type="application/json";
 		String[] headers=new String[] {"token",token,"Content-Type",type};
@@ -283,8 +281,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
 					while (elements.hasNext()){
 						String oid=elements.next().asText();
 						if(!orgSetIds.contains(oid)) {
-//							orgIds.add(oid);
-							readIds.add(oid);
+							orgIds.add(oid);
 						}
 					}
 				}
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java
@@ -1,7 +1,11 @@
 	package com.xboe.module.course.api;

 import java.io.OutputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;

 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -9,7 +13,12 @@ import javax.servlet.http.HttpServletResponse;

 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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 com.xboe.common.PageList;
 import com.xboe.common.Pagination;
@@ -125,6 +134,7 @@ public class CourseManageApi extends ApiBaseController{
 	        }else {
 	        	dto.setIsSystemAdmin(false);
 	        }
+	        
 	        String ids="";
 	        if(userOrgIds.getIds()!=null && !userOrgIds.getIds().isEmpty())
 	        {
@@ -132,14 +142,12 @@ public class CourseManageApi extends ApiBaseController{
 	        }
 	        //log.info("获取到的用户的组织机构权限ids",ids);
 	        String aid=getCurrent().getAccountId();
-//			String aid="1706272694871445506";
 	        //如果前端查询当前人的，这里去掉
 	        if(StringUtils.isNotBlank(dto.getAid())) {
 	        	dto.setAid(null);
 	        }
 	        dto.setOrgAid(aid);
 	        dto.setOrgIds(ids);
-			dto.setReadIds(userOrgIds.getReadIds());
 	        PageList<Course> coursePageList = courseService.findPage(pager.getPageIndex(), pager.getPageSize(),dto);
 			return success(coursePageList);
        }catch(Exception e) {
@@ -1159,11 +1167,5 @@ 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);
-	}
-

 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java
@@ -1,33 +1,21 @@
 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.core.orm.FieldFilters;
-import com.xboe.module.course.entity.*;
+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.module.course.vo.TeacherVo;
-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 com.xboe.module.usergroup.entity.UserGroupItem;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -46,6 +34,11 @@ 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;
@@ -96,15 +89,6 @@ public class CoursePortalApi extends ApiBaseController{
 	@Resource
 	private ThirdApi thirdApi;

-	@Autowired
-	IStudyHomeWorkService shomeworkService;
-
-	@Autowired
-	IStudyService studyService;
-
-	@Autowired
-	StudyCourseDao studyCourseDao;
-
 	@Autowired
 	StringRedisTemplate redisTemplate;

@@ -363,102 +347,7 @@ 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)){
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseContentDao.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseContentDao.java
@@ -1,13 +1,10 @@
 package com.xboe.module.course.dao;

-import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

 import com.xboe.core.orm.BaseDao;
 import com.xboe.module.course.entity.CourseContent;

-import java.util.List;
-
@Repository
 public class CourseContentDao extends BaseDao<CourseContent> {
 	
@@ -23,5 +20,4 @@ public class CourseContentDao extends BaseDao<CourseContent> {
 		int count=count(hql, courseId);
 		return count;
    }
-
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java
@@ -2,8 +2,6 @@ package com.xboe.module.course.dto;

 import lombok.Data;

-import java.util.List;
-
 /**
 * 课程查询的条件对象
 */
@@ -104,9 +102,6 @@ public class CourseQueryDto {
     * */
    private String orgIds;

-    //hrpb只读
-    private List<String> readIds;
-
    /**用户权限的查询*/
    private String orgAid;

@@ -115,11 +110,6 @@ public class CourseQueryDto {
     */
    private Boolean isSystemAdmin;

-    /**
-     * 是否是新建在线可
-     */
-    private Boolean isCreateCourse;
-
    private Boolean visible;

    private String refId;
@@ -139,5 +129,4 @@ public class CourseQueryDto {
     * 登录人id
     */
    private String userId;
-
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java
@@ -371,9 +371,6 @@ public class Course extends BaseEntity {
    @Column(name = "ref_type",length=32,columnDefinition="varchar(32) comment '反向关联的类型'")
    private String refType;
    
-    @Transient
-    private Boolean isPermission=true;
-    
    @Transient
    private String orgName;
    
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java
@@ -84,11 +84,6 @@ public class CourseContent extends BaseEntity {
    @Column(name = "duration")
    private Integer duration;
    
-    /**
-     * 视频播放进度
-     * */
-    @Column(name = "progress_video")
-    private Float progressVideo;
    
    /**用于学习时的状态显示，非存储字段*/
    @Transient
@@ -106,20 +101,5 @@ public class CourseContent extends BaseEntity {
    	this.contentRefId=contentRefId;
    }
    
-    @Override
-    public String toString() {
-        return "CourseContent{" +
-                "rid='" + rid + '\'' +
-                ", typeId='" + typeId + '\'' +
-                ", courseId='" + courseId + '\'' +
-                ", csectionId='" + csectionId + '\'' +
-                ", sortIndex=" + sortIndex +
-                ", contentType=" + contentType +
-                ", contentName='" + contentName + '\'' +
-                ", contentRefId='" + contentRefId + '\'' +
-                ", content='" + content + '\'' +
-                ", duration=" + duration +
-                ", status=" + status +
-                '}';
-    }
+
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseContentService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseContentService.java
@@ -82,7 +82,4 @@ public interface ICourseContentService{
 	 * @return
 	 */
 	CourseAssess getAssess(String ccid);
-
-	void updateProcessVideo(String contentId, String courseId, Float processVideo);
-
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java
@@ -340,8 +340,9 @@ public interface ICourseService {
     * */
    List<Course> mobiledelList(Integer num,CourseQueryDto courseQueryDto);

-    /**
-     * 获取课程封面
-     * */
-    Map<String, String> getCourseCoverUrl(String courseIds);
+
+
+
+
+
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseAuditServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseAuditServiceImpl.java
@@ -214,12 +214,6 @@ public class CourseAuditServiceImpl implements ICourseAuditService{
 						UpdateBuilder.create("lastState", CourseHRBPAudit.STATUS_PASS)
 				);

-				//设置课程状态已审核完成，这里是管理员的审核
-				courseDao.updateMultiFieldById(courseId,
-						UpdateBuilder.create("published", pass),
-						UpdateBuilder.create("erasable", false), //设置以后不能物理删除了
-						UpdateBuilder.create("publishTime", LocalDateTime.now()));
-
 				//发布到全文检索中
 				Course c=courseDao.get(courseId);
 				publishUtil.fullTextPublish(c);
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java
@@ -1,7 +1,5 @@
 package com.xboe.module.course.service.impl;

-import java.sql.PreparedStatement;
-import java.sql.SQLException;
 import java.util.List;

 import javax.annotation.Resource;
@@ -143,17 +141,6 @@ public class CourseContentServiceImpl implements ICourseContentService {
 		return assess;
 	}

-	@Override
-	@Transactional
-	public void updateProcessVideo(String id, String courseId, Float progressVideo) {
-		// 处理 processVideo 为 null 的情况
-		if (progressVideo == null) {
-			progressVideo = 0.00f;
-		}
-		String sql = "UPDATE boe_course_content SET progress_video = "+ progressVideo+" WHERE id = "+ id+" AND course_id = "+ courseId+" ";
-		ccDao.sqlUpdate(sql);
-	}
-
 	@Override
 	@Transactional
 	public void updateName(String id, String name) {
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
@@ -3,26 +3,17 @@ package com.xboe.module.course.service.impl;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.function.Predicate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;

 import javax.annotation.Resource;
-import javax.management.Query;

-import com.xboe.api.ThirdApi;
-import com.xboe.core.orm.*;
-import com.xboe.data.dto.UserData;
-import com.xboe.school.study.dao.StudyCourseDao;
-import com.xboe.school.study.entity.StudyCourse;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.mapping.IdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +26,11 @@ import com.xboe.common.beans.KeyValue;
 import com.xboe.common.utils.IDGenerator;
 import com.xboe.common.utils.StringUtil;
 import com.xboe.core.event.IEventDataSender;
+import com.xboe.core.orm.FieldFilters;
+import com.xboe.core.orm.IFieldFilter;
+import com.xboe.core.orm.LikeMatchMode;
+import com.xboe.core.orm.QueryBuilder;
+import com.xboe.core.orm.UpdateBuilder;
 import com.xboe.module.course.dao.CourseContentDao;
 import com.xboe.module.course.dao.CourseCrowdDao;
 import com.xboe.module.course.dao.CourseDao;
@@ -116,11 +112,8 @@ public class CourseServiceImpl implements ICourseService {
 	@Autowired(required = false)
 	private IEventDataSender eventSender;
  
-
-  
    /**
     * 生成过滤条件
-     *
     * @param dto
     * @return
     */
@@ -261,133 +254,36 @@ public class CourseServiceImpl implements ICourseService {
 		return courseDao.findList(query.builder());
 	}
 	
-
-    //	public PageList<Course> findPage(int pageIndex, int pageSize, CourseQueryDto dto) {
-//		List<IFieldFilter> filters = createFilters(dto);
-//		List<IFieldFilter> filters1 = createFilters(dto);
-//		List<IFieldFilter> filters2 = createFilters(dto);
-////		String s = redisTemplate.opsForValue().get("course_search");
-////		Set<String>list=new HashSet<>();
-////		if(s!=null&&!s.isEmpty()){
-////			list=Arrays.stream(s.split(",")).collect(Collectors.toSet());
-////		}else {
-////			Set<String> ss = getSeache(dto);
-////			String courseSearch=String.join(",",ss);
-////			redisTemplate.opsForValue().set("course_search",courseSearch);
-////			//设置过期时间为1分钟
-////			redisTemplate.expire("course_search", 1, TimeUnit.MINUTES);
-////		}
-//		Set<String> list = getSeache(dto);
-//		//有权限的查询，也同时查询出创建人的数据，在权限上
-//        if(TempFilterConfig.Manager_CourseFile_ByOrgIds) {
-//        	if(dto.getIsSystemAdmin()==null || !dto.getIsSystemAdmin()) {
-//        		if(StringUtil.isNotBlank(dto.getOrgIds())){
-//        			//log.info("【"+dto.getOrgAid()+"】 按机构过滤和自己创建的课程");
-//        			//log.info(" orgids  "+dto.getOrgIds());
-//     	        	if(dto.getOrgIds().contains(",")){
-//     					String[] split = dto.getOrgIds().split(",");
-//     					List<String> strings = Arrays.asList(split);
-////     					filters.add(FieldFilters.or(FieldFilters.in("orgId",strings),FieldFilters.eq("sysCreateAid",dto.getOrgAid())));
-//						filters.add(FieldFilters.in("orgId",strings));
-//						filters1.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid()));
-//						if(!list.isEmpty()){
-//							filters2.add(FieldFilters.in("id",list));
-//						}
-//     				}else {
-////     	        		filters.add(FieldFilters.or(FieldFilters.eq("orgId",dto.getOrgIds()),FieldFilters.eq("sysCreateAid",dto.getOrgAid())));
-//						filters.add(FieldFilters.eq("orgId",dto.getOrgIds()));
-//						filters1.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid()));
-//						if(!list.isEmpty()){
-//							filters2.add(FieldFilters.in("id",list));
-//						}
-//     				}
-//     			}
-//				if (!StringUtil.isNotBlank(dto.getOrgIds())){
-//     				//log.info("【"+dto.getOrgAid()+"】 机构ids没有， 只查询自己创建的课程");
-//     				//没有机构权限，只能查出自己创建的
-////     				filters.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid()));
-//					filters1.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid()));
-//					if(!list.isEmpty()){
-//						filters2.add(FieldFilters.in("id",list));
-//					}
-//     			}
-//        	}else {
-//        		//log.info("【"+dto.getOrgAid()+"】IsSystemAdmin is true 不过机构过滤，查询全部");
-//        	}
-//	    }
-//
-//		//自动添加过滤已删除
-//		filters.add(FieldFilters.eq("deleted",false));
-//		filters1.add(FieldFilters.eq("deleted",false));
-//		filters2.add(FieldFilters.eq("deleted",false));
-//		//同时查出所有项目内课程
-//		OrderCondition oc=null;
-//		if(StringUtils.isNotBlank(dto.getOrderField())) {
-//			if(dto.getOrderAsc()||dto.getOrderAsc()==null) {
-//				oc=OrderCondition.asc(dto.getOrderField());
-//			}else {
-//				oc=OrderCondition.desc(dto.getOrderField());
-//			}
-//		}else {
-//			oc=OrderCondition.desc("id");
-//		}
-//		List<Course> listByFilters = new ArrayList<>();
-//		//根据组织筛选
-//		if(StringUtil.isNotBlank(dto.getOrgIds())){
-//			listByFilters = courseDao.findListByFilters(oc, filters);
-//		}
-//		//根据创建人筛选
-//		List<Course> listByFilters1;
-//		if(!list.isEmpty()){
-//		   listByFilters1 = courseDao.findListByFilters(oc, filters1);
-//		} else {
-//            listByFilters1 = new ArrayList<>();
-//        }
-//        //根据list筛选
-////		List<Course> listByFilters2 = courseDao.findListByFilters(oc, filters2);
-//		//去除根据组织和创建人筛选的课程id
-//		List<Course> finalListByFilters = listByFilters;
-////		List<Course> collect = list.stream()
-////				.filter(element -> !finalListByFilters.contains(element))
-////				.filter(element -> !listByFilters1.contains(element)).collect(Collectors.toList());
-////		List<String> courseIds = collect.stream().map(Course::getId).collect(Collectors.toList());
-//		//合并
-//		List<Course> mergedList = Stream.concat(listByFilters.stream(), listByFilters1.stream())
-//				// 使用distinct()配合自定义的去重条件
-//				.filter(distinctByKey(c -> c.getId()))
-//				.collect(Collectors.toList());
-////		PageList<Course> rs=courseDao.findPage(pageIndex, pageSize, filters, oc);
-////		long endTime = System.nanoTime();
-//		//log.info("查询出的条数:"+rs.getCount());
-//		if(!mergedList.isEmpty()){
-//			//去掉未发布的课程
-//			mergedList.removeIf(e->{
-//				if(!e.getPublished()&&courseIds.contains(e.getId())){
-//					return true;
-//				}
-//				return false;
-//			});
-//			//
-//			//将需要隐藏的做标记
-//			mergedList.forEach(e->{
-//				if(courseIds.contains(e.getId())){
-//					e.setIsPermission(false);
-//				}else {
-//					e.setIsPermission(true);
-//				}
-//			});
-//		}
-//		List<Course> paginate = paginate(mergedList, pageIndex, pageSize);
-//		PageList<Course> rs=new PageList<>();
-//		rs.setCount(mergedList.size());
-//		rs.setList(paginate);
-//		return rs;
-//	}
 	@Override
 	public PageList<Course> findPage(int pageIndex, int pageSize, CourseQueryDto dto) {
-        List<IFieldFilter> filters2 = createFilters(dto);
-        filters2.add(FieldFilters.eq("deleted", false));
-        //同时查出所有项目内课程
+		List<IFieldFilter> filters = createFilters(dto);
+		
+		//有权限的查询，也同时查询出创建人的数据，在权限上		
+        if(TempFilterConfig.Manager_CourseFile_ByOrgIds) {
+        	if(dto.getIsSystemAdmin()==null || !dto.getIsSystemAdmin()) {
+        		
+        		if(StringUtil.isNotBlank(dto.getOrgIds())){
+        			//log.info("【"+dto.getOrgAid()+"】 按机构过滤和自己创建的课程");
+        			//log.info(" orgids  "+dto.getOrgIds());
+     	        	if(dto.getOrgIds().contains(",")){
+     					String[] split = dto.getOrgIds().split(",");
+     					List<String> strings = Arrays.asList(split);
+     					filters.add(FieldFilters.or(FieldFilters.in("orgId",strings),FieldFilters.eq("sysCreateAid",dto.getOrgAid())));
+     				}else {
+     	        		filters.add(FieldFilters.or(FieldFilters.eq("orgId",dto.getOrgIds()),FieldFilters.eq("sysCreateAid",dto.getOrgAid())));
+     				}
+     			}else {
+     				//log.info("【"+dto.getOrgAid()+"】 机构ids没有， 只查询自己创建的课程");
+     				//没有机构权限，只能查出自己创建的
+     				filters.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid()));
+     			}
+        	}else {
+        		//log.info("【"+dto.getOrgAid()+"】IsSystemAdmin is true 不过机构过滤，查询全部");
+        	}
+	    }
+		
+		//自动添加过滤已删除
+		filters.add(FieldFilters.eq("deleted",false));
 		OrderCondition oc=null;
 		if(StringUtils.isNotBlank(dto.getOrderField())) {
 			if(dto.getOrderAsc()||dto.getOrderAsc()==null) {
@@ -398,225 +294,11 @@ public class CourseServiceImpl implements ICourseService {
 		}else {
 			oc=OrderCondition.desc("id");
 		}
-        //组织id
-        List<String> strings = new ArrayList<>();
-        if (StringUtil.isNotBlank(dto.getOrgIds())) {
-            if (dto.getOrgIds().contains(",")) {
-                String[] split = dto.getOrgIds().split(",");
-                strings = Arrays.asList(split);
-            } else {
-                strings.add(dto.getOrgIds());
-            }
-        }
-        Set<String> seache = getSeache(dto);
-        //查出全部的课程
-        List<Course> listByFilters2 = courseDao.findListByFilters(oc, filters2);
-        if (TempFilterConfig.Manager_CourseFile_ByOrgIds) {
-            if (dto.getIsSystemAdmin() == null || !dto.getIsSystemAdmin()) {
-                List<String> finalStrings = strings;
-                log.info("dto为"+dto);
-                if(dto.getIsCreateCourse()!=null&&dto.getIsCreateCourse()){
-                    listByFilters2.removeIf(e -> {
-                        //去掉未发布的课程
-                        if (!e.getPublished() && seache.contains(e.getId()) && !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())) {
-                            return true;
-                        }
-                        //去掉所有条件都不符合的课程
-                        if(!seache.contains(e.getId())&&!dto.getReadIds().contains(e.getId())&& !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())){
-                            return true;
-                        }
-                        return false;
-                    });
-                    //将需要隐藏的做标记
-                    listByFilters2.forEach(e -> {
-                        if ((seache.contains(e.getId())||dto.getReadIds().contains(e.getOrgId())) && !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())) {
-                            e.setIsPermission(false);
-                        } else {
-                            e.setIsPermission(true);
-                        }
-                    });
-                    listByFilters2.sort(Comparator.comparing(Course::getIsPermission).reversed());
-                }else{
-                    List<Course> collect = listByFilters2.stream().filter(e ->dto.getReadIds().contains(e.getOrgId())||dto.getOrgAid().equals(e.getSysCreateAid())||finalStrings.contains(e.getOrgId())).collect(Collectors.toList());
-                    List<Course> paginate = paginate(collect, pageIndex, pageSize);
-                    PageList<Course> rs = new PageList<>();
-                    rs.setCount(collect.size());
-                    rs.setList(paginate);
+
+		PageList<Course>  rs=courseDao.findPage(pageIndex, pageSize, filters, oc);
+		//log.info("查询出的条数:"+rs.getCount());
 		return rs;
 	}
-            }
-        }
-        List<Course> paginate = paginate(listByFilters2, pageIndex, pageSize);
-        PageList<Course> rs = new PageList<>();
-        rs.setCount(listByFilters2.size());
-        rs.setList(paginate);
-        return rs;
-    }
-
-    private Set<String> getSeache(CourseQueryDto dto) {
-        //需要设置为隐藏的课程id
-        Set<String> list = new HashSet<>();
-        List<String> list1 = getProject(dto);
-        List<String> list2 = getRouter(dto);
-//		//有受众权限的课程
-        if (dto.getAudiences() != null && !dto.getAudiences().isEmpty()) {
-            List<String> audiences = getAudiences(dto);
-            list.addAll(audiences);
-        }
-//		//没有受众的课程
-        List<String> noAudiences = getNoAudiences(dto);
-        list.addAll(noAudiences);
-//		//成长路径的课
-//        List<String> grow = getGrow(dto);
-//		//已报名的课
-        List<String> enroll = getEnroll(dto);
-//        list.addAll(grow);
-        list.addAll(enroll);
-        list.addAll(list1);
-        list.addAll(list2);
-        return list;
-    }
-
-    private List<String> getRouter(CourseQueryDto dto) {
-        String sql = "SELECT DISTINCT\n" +
-                "rt.course_id\n" +
-                "FROM\n" +
-                "boe_new.student s INNER JOIN boe_new.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
-                "\n" +
-                "WHERE\n" +
-                "\n" +
-                "s.deleted = 0 \n" +
-                "and rt.deleted=0\n" +
-                "and rt.type=1\n" +
-                "and c.deleted=0\n" +
-                "AND s.type =2 \n" +
-                "AND s.student_id = ?1";
-        List<String> list = courseTeacherDao.sqlFindList(sql, dto.getOrgAid());
-        List<String> list1 = new ArrayList<>();
-        for (Object obj : list) {
-            list1.add(obj.toString());
-        }
-
-        return list1;
-    }
-
-    private List<String> getProject(CourseQueryDto dto) {
-        String sql = "SELECT DISTINCT\n" +
-                "pt.course_id\n" +
-                "FROM\n" +
-                "boe_new.student s INNER JOIN boe_new.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
-                "\n" +
-                "WHERE\n" +
-                "\n" +
-                "s.deleted = 0 \n" +
-                "and pt.deleted=0\n" +
-                "and pt.type=1\n" +
-                "and c.deleted=0\n" +
-                "AND s.type =1 \n" +
-                "AND s.student_id = ?1\n";
-        List<Long> list = courseTeacherDao.sqlFindList(sql, dto.getOrgAid());
-        List<String> list1 = new ArrayList<>();
-        for (Object obj : list) {
-            list1.add(obj.toString());
-        }
-        return list1;
-    }
-
-    private List<String> getAudiences(CourseQueryDto dto) {
-        List<String> s = Arrays.asList(dto.getAudiences().split(","));
-        String sql = "SELECT DISTINCT\n" +
-                "\tcc.course_id \n" +
-                "FROM\n" +
-                "\t`boe_course_crowd` cc\n" +
-                "\tINNER JOIN boe_course c ON cc.course_id = c.id \n" +
-                "WHERE\n" +
-                "\tcc.group_id IN (?1) \n" +
-                "\tAND c.deleted =0 ";
-        List<Long> list = courseTeacherDao.sqlFindList(sql, s);
-        List<String> list1 = new ArrayList<>();
-        for (Object obj : list) {
-            list1.add(obj.toString());
-        }
-
-        return list1;
-    }
-
-    private List<String> getNoAudiences(CourseQueryDto dto) {
-        String sql = "SELECT\n" +
-                "\tc.id \n" +
-                "FROM\n" +
-                "\tboe_course c \n" +
-                "WHERE\n" +
-                "\t NOT EXISTS ( SELECT 1 FROM boe_course_crowd cc where cc.course_id = c.id  ) \n" +
-                "\tAND c.deleted =0 \n";
-        List<Course> list = courseDao.sqlFindList(sql);
-        List<String> list1 = new ArrayList<>();
-        for (Object obj : list) {
-            list1.add(obj.toString());
-        }
-        return list1;
-    }
-
-    private List<String> getGrow(CourseQueryDto dto) {
-        String sql = "SELECT DISTINCT\n" +
-                "\tc.id \n" +
-                "FROM\n" +
-                "\tboe_new.student s\n" +
-                "\tINNER JOIN boe_new.grow_task gt ON s.pid = gt.grow_id\n" +
-                "\tINNER JOIN boe_course c ON gt.course_id = c.id \n" +
-                "WHERE\n" +
-                "\ts.type = 14 \n" +
-                "\tAND gt.type = 1 \n" +
-                "\tAND s.deleted = 0 \n" +
-                "\tAND gt.deleted = 0 \n" +
-                "\tAND c.deleted = 0\n" +
-                "\tAND s.student_id = ?1\n";
-        List<Long> list = courseTeacherDao.sqlFindList(sql, dto.getOrgAid());
-        List<String> list1 = new ArrayList<>();
-        for (Object obj : list) {
-            list1.add(obj.toString());
-        }
-        return list1;
-    }
-
-    private List<String> getEnroll(CourseQueryDto dto) {
-        String sql = "SELECT DISTINCT\n" +
-                "\tsc.course_id \n" +
-                "FROM\n" +
-                "\tboe_study_course sc\n" +
-                "\tINNER JOIN boe_course c ON sc.course_id = c.id \n" +
-                "WHERE\n" +
-                "\tsc.aid = ?1 \n" +
-                "\tAND c.deleted =0";
-        List<Long> list = courseTeacherDao.sqlFindList(sql, dto.getOrgAid());
-        List<String> list1 = new ArrayList<>();
-        for (Object obj : list) {
-            list1.add(obj.toString());
-        }
-
-        return list1;
-    }
-
-    public static <T> List<T> paginate(List<T> list, int pageNumber, int pageSize) {
-        if (list == null || list.isEmpty() || pageNumber <= 0 || pageSize <= 0) {
-            return null;
-        }
-
-        int fromIndex = (pageNumber - 1) * pageSize;
-        int toIndex = Math.min(fromIndex + pageSize, list.size());
-
-        if (fromIndex >= list.size()) {
-            // 请求的页码超过了最大页数，返回空列表
-            return null;
-        }
-
-        return list.subList(fromIndex, toIndex);
-    }
-
-    private static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
-        Set<Object> seen = ConcurrentHashMap.newKeySet();
-        return t -> seen.add(keyExtractor.apply(t));
-    }

 	@Override
 	public List<Course> findList(CourseQueryDto dto) {
@@ -861,7 +543,6 @@ public class CourseServiceImpl implements ICourseService {
 		//记录删除日志信息
 		
 	}
-
 	@Override
 	public Course get(String id) {
 		Course c=courseDao.get(id);
@@ -918,7 +599,6 @@ public class CourseServiceImpl implements ICourseService {

 	/**
 	 * 追加修改日志，共用方法，在其它的修改的地方也可能调用
-     *
 	 * @param old
 	 * @param now
 	 */
@@ -1202,6 +882,7 @@ public class CourseServiceImpl implements ICourseService {
 //			log.error("课程发布全文检索失败",e);
 //		}
 //	}
+
 	@Override
 	public void audit(String auditId, String courseId, Boolean pass, String aid, String name, String remark,boolean publish,Integer from) {

@@ -1347,10 +1028,9 @@ public class CourseServiceImpl implements ICourseService {
 			
 		}
 	}
-
 	/**
 	 * 赋值赞踩数
-     */
+	 * */
 	@Override
 	public void updateTrampleCount(String id,Integer trampleCount) {
 		courseDao.updateMultiFieldById(id,UpdateBuilder.create("trampleCount", trampleCount));
@@ -1359,7 +1039,7 @@ public class CourseServiceImpl implements ICourseService {

 	/**
 	 * 赋值点赞数
-     */
+	 * */

 	@Override
 	public List<CourseTeacher> findTeachersByCourseId(String courseId) {
@@ -1416,6 +1096,7 @@ public class CourseServiceImpl implements ICourseService {
 	}

 	
+
 	@Override
 	public List<RankingDto> scoreList(int num,int index) {
 		QueryBuilder builder = QueryBuilder.from(Course.class);
@@ -1569,6 +1250,7 @@ public class CourseServiceImpl implements ICourseService {
 	}


+
 	@Override
 	public int countWaitAudit(String aid) {
 		//查询待审核的课程
@@ -1808,7 +1490,7 @@ public class CourseServiceImpl implements ICourseService {
 	
 	/**
 	 * 返回当前课程名字
-     */
+	 * */
 	private String courseName(String id){
 		Course course = courseDao.get(id);
 		return course.getName();
@@ -1955,7 +1637,8 @@ public class CourseServiceImpl implements ICourseService {
 					"teacher_name from boe_course_teacher where course_id=?1";
 			courseTeacherDao.sqlUpdate(sqlTeacher, id);

-        } else {
+		}
+		else{
 			mess="长度超出范围";
 		}
 		return mess;
@@ -1979,16 +1662,7 @@ 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;
-	}


 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java
@@ -1,5 +1,6 @@
 package com.xboe.module.exam.api;

+import java.io.IOException;
 import java.io.OutputStream;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -14,6 +15,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import com.xboe.module.exam.dto.SaveExamScoreDto;
 import com.xboe.module.exam.entity.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -701,4 +703,19 @@ public class AloneExamApi extends ApiBaseController {
    	}
    }

+
+
+    /**
+     *
+     * @param request
+     * @param saveExamScoreDtoList
+     * @return
+     * @throws IOException
+     */
+    @PostMapping("/examScoreBatchAdd")
+    public JsonResponse examScoreBatchAdd(HttpServletRequest request, @RequestBody List<SaveExamScoreDto> saveExamScoreDtoList){
+        service.examScoreBatchAdd(request, saveExamScoreDtoList);
+        return success("导入成功");
+    }
+
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java
@@ -166,12 +166,12 @@ public class ExamQuestionApi extends ApiBaseController {
                return badRequest("请上传正确的试题文件");
            }
            //获取表头
-            Row row = sheetAt.getRow(2);
+            Row row = sheetAt.getRow(1);
            //从第二行开始获取数据
            List<ExamQuestion> examQuestions1 = new ArrayList<>();
            QuestionDto questionDto = new QuestionDto();

-            for (int i=3;i<sheetAt.getPhysicalNumberOfRows();i++) {
+            for (int i=2;i<sheetAt.getPhysicalNumberOfRows();i++) {
                //获取每一行

                Row row1 = sheetAt.getRow(i);
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java
@@ -7,8 +7,6 @@ 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 com.xboe.common.PageList;
 import com.xboe.common.Pagination;
@@ -84,31 +82,14 @@ public class ExamTestApi extends ApiBaseController {
     * */
    @PostMapping("update")
    @AutoLog(module = "考试",action = "修改考试",info = "修改考试")
-    public JsonResponse<ExamTest> update(@RequestBody ExamTest examTest, HttpServletRequest request){
+    public JsonResponse<ExamTest> update(@RequestBody ExamTest examTest){
        if(StringUtil.isBlank(examTest.getTestName())){
            return badRequest("标题为空");
        }
-
-        // 确保examTest有一个有效的主键ID（如果适用）
-        // 这取决于您的业务逻辑是否允许更新主键
-        // 通常，更新操作不会改变主键
-        if (examTest.getId() == null) {
-            return badRequest("更新操作需要有效的主键ID");
-        }
-        String token = request.getHeader("Xboe-Access-Token");
-        if (StringUtils.isEmpty(token)) {
-            token = request.getHeader("token");
-        }
        try {
            examTestService.update(examTest);
-            thirdApi.sqlUpdate(examTest,token);
            return success(examTest);
-        } catch (ConstraintViolationException e) {
-            // 捕获约束违反异常，并返回一个更具体的错误消息
-            log.error("修改失败，违反了约束条件", e);
-            return error("修改失败，违反了约束条件（可能是主键已存在）");
        } catch (Exception e) {
-            // 捕获其他所有异常
            log.error("修改失败",e);
            return error("修改失败",e.getMessage());
        }
@@ -135,10 +116,16 @@ public class ExamTestApi extends ApiBaseController {
     * */
    @GetMapping("/delete")
    @AutoLog(module = "考试",action = "删除考试",info = "删除考试")
-    public JsonResponse<Boolean> delete(String id){
+    public JsonResponse<Boolean> delete(String id, HttpServletRequest request){
        if(StringUtil.isBlank(id)){
            return badRequest("缺少必要参数");
        }
+
+        String token = request.getHeader("Xboe-Access-Token");
+        if (StringUtil.isEmpty(token)) {
+            token = request.getHeader("token");
+        }
+
        try {
            examTestService.delete(id);
            return success(true);
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/dto/SaveExamScoreDto.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/dto/SaveExamScoreDto.java
@@ -0,0 +1,122 @@
+package com.xboe.module.exam.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.time.LocalDateTime;
+
+/**
+ * 单独的考虑答卷信息
+ */
+@Data
+public class SaveExamScoreDto {
+    /**
+     * 用户姓名
+     */
+    private String userId;
+
+
+    /**
+     * 用户姓名
+     */
+    private String userName;
+
+    /**
+     * 考试id
+     */
+    private String testId;
+
+//    /**
+//     * 考试名称
+//     */
+//    private String testName;
+
+//    /**
+//     * 考试时长 分钟
+//     */
+//    private Integer testDuration;
+
+    /**
+     * 试题排列 1试题乱序，2选项乱序，3全部乱序
+     */
+    private Integer arrange;
+
+//    /**
+//     * 及格线
+//     */
+//    private Integer passLine;
+
+    /**
+     * 账户的代码，用于区别于同姓名的用户
+     */
+    private String workNum;
+
+
+    /**
+     * 独立考试任务的id
+     */
+    private String aloneId;
+
+    /**
+     * 试卷总分
+     */
+    @Column(name = "total_score")
+    private Float totalScore;
+
+
+//    /**
+//     * 答卷内容
+//     */
+//    @Column(name = "answer_json", columnDefinition = "mediumtext")
+//    private String answerJson;
+
+    // todo by yyk 2024-05-17 14:10:32 确定分数
+    /**
+     * 用户的实际得分
+     */
+    private Float realScore;
+
+//    /**
+//     * 用时秒
+//     */
+//    private Integer useMinute;
+
+
+    /**
+     * 最终成绩，如果是百分制，用户的实际得分会换算为百分制
+     */
+    private Float score;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    private LocalDateTime endTime;
+    
+
+//    /**
+//     * 完成状态
+//     */
+//    private Integer status;
+
+//    /**
+//     * 考试次数
+//     */
+//    private Integer times;
+
+
+//    /**
+//     * 记录最后的操作时间
+//     */
+//    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+//    private LocalDateTime lastTime;
+
+
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java
@@ -28,7 +28,7 @@ public class ExamTest extends BaseEntity {
    /**
    * 考试名称
     * */
-    @Column(name = "test_name",length = 50)
+    @Column(name = "test_name",nullable = false,length = 50)
    private String testName;
    
    /**
@@ -46,7 +46,7 @@ public class ExamTest extends BaseEntity {
    /**
    * 考试时长    分钟
     * */
-    @Column(name = "test_duration")
+    @Column(name = "test_duration",nullable = false)
    private Integer testDuration;
    /**
     * 显示解析
@@ -101,19 +101,19 @@ public class ExamTest extends BaseEntity {
    /**
     * 试卷的ID
     */
-    @Column(name = "paper_id",length=20)
+    @Column(name = "paper_id",nullable = false,length=20)
    private String paperId;
    
    /**
     * 考试的类型
     * */
-    @Column(name = "test_type")
+    @Column(name = "test_type",nullable = false)
    private Integer testType;
    
    /**
     * 发布状态 ，是否已发布
     */
-    @Column(name = "published",length = 1)
+    @Column(name = "published",length = 1,nullable = false)
    private Boolean published;
    /**
     * 发布时间
@@ -154,7 +154,7 @@ public class ExamTest extends BaseEntity {
    /**
     * 范围，1表独立使用，2表课程内部
     * */
-    @Column(name = "range_type")
+    @Column(name = "range_type",nullable = false)
    private Integer rangeType;

    /**
@@ -173,7 +173,7 @@ public class ExamTest extends BaseEntity {


    /**启用的，上架*/
-    @Column(name = "enabled", length = 1)
+    @Column(name = "enabled", nullable = false, length = 1)
    private Boolean enabled;
    
    @Transient
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java
@@ -5,6 +5,7 @@ import java.util.Map;

 import com.xboe.common.OrderCondition;
 import com.xboe.common.PageList;
+import com.xboe.module.exam.dto.SaveExamScoreDto;
 import com.xboe.module.exam.dto.TestUserDto;
 import com.xboe.module.exam.dto.TestUserQuery;
 import com.xboe.module.exam.entity.AloneExam;
@@ -166,4 +167,6 @@ public interface IAloneExamService {
 	 */
 	PageList<TestUserDto> findTestUserAnswers(TestUserQuery params) throws Exception;

+	void examScoreBatchAdd(HttpServletRequest request, List<SaveExamScoreDto> saveExamScoreDtoList);
+
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java
@@ -1,6 +1,27 @@
 package com.xboe.module.exam.service.impl;

+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
 import com.xboe.api.ThirdApi;
+import com.xboe.module.exam.dao.ExamTestDao;
+import com.xboe.module.exam.dto.*;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.xboe.common.OrderCondition;
 import com.xboe.common.PageList;
 import com.xboe.common.utils.StringUtil;
@@ -9,31 +30,12 @@ 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;
 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.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;
+import org.springframework.transaction.support.DefaultTransactionDefinition;

@Service
 public class AloneExamServiceImpl implements IAloneExamService{
@@ -45,6 +47,9 @@ public class AloneExamServiceImpl implements IAloneExamService{
 	@Resource
 	AloneExamDao aeDao;

+	@Autowired
+	private ExamTestDao examTestDao;
+
 	@Autowired
 	private ThirdApi thirdApi;

@@ -462,4 +467,86 @@ public class AloneExamServiceImpl implements IAloneExamService{
 		rs.setPageSize(params.getPageSize());
 		return rs;
 	}
+
+
+	@Autowired
+	private PlatformTransactionManager transactionManager;
+
+
+	@Override
+	public void examScoreBatchAdd(HttpServletRequest request, List<SaveExamScoreDto> saveExamScoreDtoList) {
+		List<String> workNumList = saveExamScoreDtoList.stream().map(SaveExamScoreDto::getWorkNum).collect(Collectors.toList());
+
+		String token = request.getHeader("Xboe-Access-Token");
+		if (StringUtils.isEmpty(token)) {
+			token = request.getHeader("token");
+		}
+		HashMap<String, String> userIdAndWorkNumMap = thirdApi.getUserIdByWorkNum(token, workNumList);
+
+		saveExamScoreDtoList.forEach(examScoreDto -> {
+			TransactionStatus status = null; // 事务状态
+
+			try {
+				// 获取事务定义
+				DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+				// 设置事务隔离级别
+				def.setIsolationLevel(DefaultTransactionDefinition.ISOLATION_READ_COMMITTED);
+				// 设置事务传播行为
+				def.setPropagationBehavior(DefaultTransactionDefinition.PROPAGATION_REQUIRED);
+				// 获取事务状态
+				status = transactionManager.getTransaction(def);
+
+				AloneExamAnswer aloneExamAnswer = new AloneExamAnswer();
+				BeanUtils.copyProperties(examScoreDto, aloneExamAnswer);
+
+				String userId = userIdAndWorkNumMap.get(examScoreDto.getWorkNum());
+				aloneExamAnswer.setAid(userId);
+				aloneExamAnswer.setName(examScoreDto.getUserName());
+				aloneExamAnswer.setUcode(examScoreDto.getWorkNum());
+				aloneExamAnswer.setStatus(AloneExamAnswer.STATUS_FINISH);
+//				aloneExamAnswer.setUseSecond(examScoreDto.getUseMinute()*60);
+
+				ExamTest examTest = examTestDao.get(examScoreDto.getTestId());
+				aloneExamAnswer.setPassLine(examTest.getPassLine());
+				aloneExamAnswer.setArrange(examTest.getArrange());
+				aloneExamAnswer.setTestDuration(examTest.getTestDuration());
+
+				// 获取考试任务ID
+				AloneExam aloneExam=aeDao.findOne(FieldFilters.eq("aid", userId),FieldFilters.eq("testId", examScoreDto.getTestId()));
+				aloneExamAnswer.setAloneId(aloneExam.getId());
+				// 添加答卷
+				dao.save(aloneExamAnswer);
+
+				// 更新状态,状态是未完成的，这里会有问题
+				int currentTimes = aloneExam.getTimes() != null ? aloneExam.getTimes() : 0;
+				if(examTest.getScoringType()!=null && examTest.getScoringType()==2) {
+					//最后一次的分数为准
+					aeDao.update(UpdateBuilder.from(AloneExam.class)
+							.addUpdateField("status", AloneExam.STATUS_FINISH)
+							.addUpdateField("score", examScoreDto.getScore())
+							.addUpdateField("times", currentTimes+1)
+							.addFilter(FieldFilters.eq("aid", userId))
+							.addFilter(FieldFilters.eq("testId", examScoreDto.getTestId()))
+							.builder());
+				} else {
+					if (aloneExam.getStatus() == AloneExam.STATUS_FINISH) {
+						if (aloneExam.getScore() < examScoreDto.getScore()) {
+							aeDao.updateMultiFieldById(aloneExam.getId(),  UpdateBuilder.create("score", examScoreDto.getScore()), UpdateBuilder.create("times", currentTimes+1));
+						}
+					} else {
+						aeDao.updateMultiFieldById(aloneExam.getId(), UpdateBuilder.create("status", AloneExam.STATUS_FINISH), UpdateBuilder.create("score", examScoreDto.getScore()), UpdateBuilder.create("times", currentTimes+1));
+					}
+				}
+
+				// 提交事务
+				transactionManager.commit(status);
+			} catch (Exception e) {
+				// 如果发生异常，回滚事务
+				if (status != null && !status.isCompleted()) {
+					transactionManager.rollback(status);
+				}
+				throw new RuntimeException(e);
+			}
+		});
+	}
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java
@@ -70,18 +70,7 @@ public class ExamTestServiceImpl implements IExamTestService {

    @Override
    public void update(ExamTest examTest) {
-        if (examTest.getId() == null) {
-            throw new IllegalArgumentException("ID must not be null");
-        }
-        String sql = "update boe_exam_test set arrange = "+ examTest.getArrange() +", deadline_time = '"+examTest.getDeadlineTime() +"' , " +
-                "entrance_time = '"+examTest.getEntranceTime() +"' , paper_id = "+examTest.getPaperId() +",pass_line = "+examTest.getPassLine() +
-                ", percent_score = "+examTest.getPercentScore() +" ,publish_time = '"+examTest.getPublishTime()+"' , published = "+examTest.getPublished()+
-                ",random_count = "+examTest.getRandomCount()+" ,random_mode = "+examTest.getRandomMode()+",range_type = "+examTest.getRangeType() +
-                ",scoring_type = "+examTest.getScoringType() +",show_analysis="+examTest.getShowAnalysis() +",show_answer = "+examTest.getShowAnswer() +
-                ",test_duration = "+examTest.getTestDuration() +",test_name = '"+examTest.getTestName() +"',test_remark= '"+examTest.getTestRemark() +
-                "',test_type= "+examTest.getTestType() +" ,test_up = '"+examTest.getTestUp() +"' ,test_front= '"+examTest.getTestFront() +
-                "',times = '"+examTest.getTimes() +"'  where id = "+examTest.getId()+"";
-        examTestDao.sqlUpdate(sql);
+        examTestDao.update(examTest);
    }
    
    @Override
@@ -95,7 +84,7 @@ public class ExamTestServiceImpl implements IExamTestService {

    @Override
    public Boolean has(String paperId) {
-    	ExamTest et=examTestDao.findOne(FieldFilters.eq("paperId", paperId),FieldFilters.eq("deleted", false));
+    	ExamTest et=examTestDao.findOne(FieldFilters.eq("paperId", paperId));
    	//String etId= (String)examTestDao.findField("id", FieldFilters.eq("paperId", paperId));
        if(et==null){
            return true;
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
@@ -3,13 +3,14 @@ package com.xboe.school.study.api;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;

-import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
+import cn.hutool.core.util.ArrayUtil;
 import com.xboe.api.ThirdApi;
-import com.xboe.constants.CacheName;
+import com.xboe.api.vo.*;
 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;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -323,30 +324,15 @@ public class StudyCourseApi extends ApiBaseController{
 		//检查是否已存在
 		StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId());
 		if(item!=null) {
-			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()) {
-//					}
+			//如果记录存在，但是进度不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())){
@@ -543,7 +529,7 @@ public class StudyCourseApi extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/study-video-time")
-	public JsonResponse<Boolean> study(String itemId,Integer videoTime,String contentId , String courseId,Float progressVideo){
+	public JsonResponse<Boolean> study(String studyId,String itemId,Integer videoTime){
 		
 		if(StringUtils.isBlank(itemId)){
 			return error("参数错误");
@@ -554,9 +540,6 @@ public class StudyCourseApi extends ApiBaseController{
 		//检查是否已存在
 		try {
 			studyService.updateLastTime(itemId,videoTime,getCurrent().getAccountId());
-			if (contentId != null && courseId != null && progressVideo != null){
-				contentService.updateProcessVideo(contentId, courseId, progressVideo);
-			}
 			return success(true);
 		}catch(Exception e) {
 			log.error("记录最后学习时间错误",e);
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java
@@ -7,7 +7,6 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;

 import com.xboe.api.ThirdApi;
-import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.entity.StudyCourse;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,8 +32,6 @@ import javax.servlet.http.HttpServletRequest;
@RestController
@RequestMapping(value="/xboe/school/study/exam")
 public class StudyExamApi extends ApiBaseController{
-	@Autowired
-	StudyCourseDao scDao;

 	@Autowired
 	IStudyExamService sexamService;
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyHomeWorkService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyHomeWorkService.java
@@ -1,6 +1,5 @@
 package com.xboe.school.study.service;

-import java.util.Collection;
 import java.util.List;

 import com.xboe.school.study.entity.StudyHomeWork;
@@ -30,6 +29,4 @@ public interface IStudyHomeWorkService {
 	 * @return
 	 */
 	List<StudyHomeWork> getByStudyIdAndContentId(String studyId,String contentId);
-
-	List<StudyHomeWork>getByStudnetNameAndContentId(List<String> studentName, String contentId);
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java
@@ -7,7 +7,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;

 /**
 * 学习情况处理,比较综合一个处理类
@@ -96,8 +95,4 @@ 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);
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudySignupService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudySignupService.java
@@ -6,7 +6,6 @@ import com.xboe.common.OrderCondition;
 import com.xboe.common.PageList;
 import com.xboe.common.beans.KeyValue;
 import com.xboe.school.study.entity.StudyCourse;
-import com.xboe.school.study.entity.StudyCourseItem;
 import com.xboe.school.study.entity.StudySignup;

 /**
@@ -50,13 +49,6 @@ public interface IStudySignupService {
 	 */
 	StudyCourse addSignup(StudySignup signup);
 	
-
-	/**
-	 * 管理员添加报名课件
-	 * @param signup
-	 */
-	StudyCourseItem addStudyCourseItem(StudySignup signup);
-	
 	/**
 	 * 删除报名，只有未审核过的才可以删除
 	 * @param id
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java
@@ -44,7 +44,7 @@ public class StudyAssessServiceImpl implements IStudyAssessService{
 			LocalDateTime ldt=LocalDateTime.now();
 			sci.setStudyId(assess.getStudyId());
 			sci.setContentId(assess.getContentId());
-			sci.setContentName("评估");
+			//sci.setContentName(homework.getContentName());
 			sci.setCourseId(assess.getCourseId());
 			//sci.setCsectionId(homework.getCsectionId());
 			sci.setProgress(100);//直接设置为学习完成
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
@@ -82,7 +82,7 @@ public class StudyExamServiceImpl implements IStudyExamService{
 			LocalDateTime ldt=LocalDateTime.now();
 			sci.setStudyId(exam.getStudyId());
 			sci.setContentId(exam.getContentId());
-			sci.setContentName("考试");
+			//sci.setContentName(homework.getContentName());
 			sci.setCourseId(exam.getCourseId());
 			//sci.setCsectionId(homework.getCsectionId());
 			sci.setProgress(prog);//直接设置为学习完成
@@ -112,34 +112,29 @@ public class StudyExamServiceImpl implements IStudyExamService{
 			if(cexam.getScoringType()==CourseExam.SCORINGTYPE_LAST){
 				scItemDao.updateFieldById(exam.getStudyItemId(), "score",exam.getScore());
 				scItemDao.updateFieldById(exam.getStudyItemId(), "progress",prog);
-				if(exam.getScore()>=exam.getPassLine()){
+			}
+			if(prog==100){
 				scItemDao.updateFieldById(exam.getStudyId(), "progress",100);
 				scItemDao.updateFieldById(exam.getStudyId(), "finish_time",LocalDateTime.now());
 				scItemDao.updateFieldById(exam.getStudyId(), "status",StudyCourseItem.STATUS_FINISH);
-					scItemDao.updateFieldById(exam.getStudyId(), "score",exam.getScore());
-					//scDao.updateFieldById(exam.getStudyId(), "last_score",100.0f);
-				}
+				scItemDao.updateFieldById(exam.getStudyId(), "score",100.0f);
 			}
 		}
+
 		//1最高一次,用于最高一次的计算
 		if(cexam.getScoringType()==CourseExam.SCORINGTYPE_MAX) {
-			Float f=(Float)dao.findField("max(score)", FieldFilters.eq("contentId", exam.getContentId()), FieldFilters.eq("courseId", exam.getCourseId()), FieldFilters.eq("studyId", exam.getStudyId()));
+			Float f=(Float)dao.findField("max(score)", FieldFilters.eq("contentId", exam.getContentId()));
 			scItemDao.updateFieldById(exam.getStudyItemId(), "score", f);
 			scItemDao.updateFieldById(exam.getStudyItemId(), "status", f>=exam.getPassLine()?StudyCourseItem.STATUS_FINISH:StudyCourseItem.STATUS_STUDYING);
 			scItemDao.updateFieldById(exam.getStudyItemId(), "progress",f>=exam.getPassLine()?100:f.intValue());
-
 			if(f>=exam.getPassLine()){
 				scItemDao.updateFieldById(exam.getStudyId(), "progress",100);
 				scItemDao.updateFieldById(exam.getStudyId(), "finish_time",LocalDateTime.now());
 				scItemDao.updateFieldById(exam.getStudyId(), "status",StudyCourseItem.STATUS_FINISH);
-				scItemDao.updateFieldById(exam.getStudyId(), "score",exam.getScore());
-				//scDao.updateFieldById(exam.getStudyId(), "last_score",100.0f);
+				scItemDao.updateFieldById(exam.getStudyId(), "score",100.0f);
+			}
 		}

-		}
-		int totalContent = courseContentDao.getCount(exam.getCourseId());
-		scDao.finishCheck(exam.getStudyId(),exam.getCourseId(),totalContent,token);
-		scDao.updateFieldById(exam.getStudyId(), "last_score",exam.getScore());
 		//执行完毕 清除redis记录
 //		redisTemplate.delete(key);
 		return "";
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java
@@ -46,7 +46,7 @@ public class StudyHomeWorkServiceImpl implements IStudyHomeWorkService{
 			LocalDateTime ldt=LocalDateTime.now();
 			sci.setStudyId(homework.getStudyId());
 			sci.setContentId(homework.getContentId());
-			sci.setContentName(homework.getHwName());
+			//sci.setContentName(homework.getContentName());
 			sci.setCourseId(homework.getCourseId());
 			//sci.setCsectionId(homework.getCsectionId());
 			sci.setProgress(100);//直接设置为学习完成
@@ -67,7 +67,7 @@ public class StudyHomeWorkServiceImpl implements IStudyHomeWorkService{
 			//只是保留一条作业记录，不再保存多条记录了
 			//dao.save(homework);
 			//设置id。然后进行悠
-			homework.setId(homework.getStudyItemId());
+			homework.setId(obj.toString());
 			dao.update(homework);
 		}
 	}
@@ -89,9 +89,4 @@ 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));
-	}
-
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
@@ -1,18 +1,15 @@
 package com.xboe.school.study.service.impl;

 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 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.api.ThirdApi;
 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;
@@ -97,12 +94,8 @@ public class StudyServiceImpl implements IStudyService{
 		//sci.setProgress(100);//直接设置为学习完成
 		sci.setLastTime(ldt);
 		scItemDao.saveOrUpdate(sci);
-		if (sci.getId() != null){
+		
 		dto.setStudyItemId(sci.getId());
-		}else {
-			log.info("学习记录插入失败"+sci.getId());
-			throw new IllegalArgumentException("学习记录插入失败");
-		}
 		//检查是否全部学习完成
 		scDao.finishCheck(dto.getStudyId(),dto.getCourseId(),dto.getContentTotal(),token);
 		
@@ -170,112 +163,12 @@ public class StudyServiceImpl implements IStudyService{

 	@Override
 	public PageList<StudyCourseItem> findItemPage(int pageIndex, int pageSize, String contentId, String courseId,String name,Integer status) {
+		
 		QueryBuilder query=QueryBuilder.from(StudyCourseItem.class);
+		
 		query.setPageIndex(pageIndex);
 		query.setPageSize(pageSize);
 		
-		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(StringUtils.isNotBlank(name)) {
-			query.addFilter(FieldFilters.eq("aname", name));
-		}
-		int pageIndex2 = (pageIndex-1)*10;
-		if(status!=null) {
-			if(status==3) {
-				query.addFilter(FieldFilters.eq("status", 2));
-				return scItemDao.findPage(query.builder());
-			}else if(status==2){
-				query.addFilter(FieldFilters.eq("status",9));
-				return scItemDao.findPage(query.builder());
-			}else if (status == 1) {
-				String sql = "select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.content_id,0 as progress,1 as status from boe_study_course bsc " +
-						" left join boe_study_course_item item on bsc.course_id = item.course_id and bsc.id = item.study_id" +
-						" where bsc.course_id = '"+courseId+"' and bsc.aname like '%"+name+"%' and bsc.id not in(" +
-						" select item.study_id from boe_study_course_item item " +
-						" where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' and item.aname like '%"+name+"%' group by item.study_id" +
-						" ) group by bsc.id limit "+ pageIndex2+","+ pageSize+";";
-
-				String sql2 = "select count(*) as total from (select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.content_id,0 as progress,1 as status from boe_study_course bsc " +
-						" left join boe_study_course_item item on bsc.course_id = item.course_id and bsc.id = item.study_id" +
-						" where bsc.course_id = '"+courseId+"' and bsc.aname like '%"+name+"%' and bsc.id not in(" +
-						" select item.study_id from boe_study_course_item item " +
-						" where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' and item.aname like '%"+name+"%' group by item.study_id" +
-						" ) group by bsc.id) as total";
-				log.info("资源完成情况未开始sql"+sql);
-				List<Object[]> list = scDao.sqlFindList(sql);
-				log.info("资源完成情况人数"+list);
-				int totalCount = scDao.sqlCount(sql2);
-				List<StudyCourseItem> item = new ArrayList<>();
-				for (Object[] objs : list) {
-					StudyCourseItem sc = new StudyCourseItem();
-					sc.setProgress(Integer.valueOf(objs[5].toString()));
-					sc.setStatus(Integer.valueOf(objs[6].toString()));
-					sc.setAname(objs[3].toString());
-					item.add(sc);
-				}
-				log.info("资源完成情况人员"+item);
-				PageList<StudyCourseItem> pageList = new PageList<>(item);
-				pageList.setCount(totalCount);
-				pageList.setPageSize(pageSize);
-				pageList.setList(item);
-				return pageList;
-			}
-		}
-		String sql = "select a.id, a.course_id, a.course_name, a.aname, " +
-				"IFNULL(b.finish_time, '0') as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " +
-				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "' and aname like '%"+name+"%') a " +
-				"left join " +
-				"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status " +
-				"from boe_study_course bsc left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
-				"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' and item.aname like '%"+name+"%' group by bsc.id) b " +
-				"on a.course_id = b.course_id and a.id = b.id " +
-				"group by a.id limit "+ pageIndex2+","+ pageSize+";";
-		String sql2 = "select count(*) as total from (select a.id, a.course_id, a.course_name, a.aname, " +
-				"IFNULL(b.finish_time, 0) as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " +
-				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "' and aname like '%"+name+"%') a " +
-				"left join " +
-				"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status " +
-				"from boe_study_course bsc left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
-				"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' and item.aname like '%"+name+"%' group by bsc.id) b " +
-				"on a.course_id = b.course_id and a.id = b.id " +
-				"group by a.id) as total";
-		log.info("资源完成情况全部sql"+sql);
-		List<Object[]> list = scDao.sqlFindList(sql);
-		log.info("资源完成情况人数"+list);
-		int totalCount = scDao.sqlCount(sql2);
-		List<StudyCourseItem> item = new ArrayList<>();
-		for (Object[] objs : list) {
-			StudyCourseItem sc = new StudyCourseItem();
-			if (!"0".equals(objs[4].toString())) {
-				DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-				LocalDateTime finishTime = LocalDateTime.parse(objs[4].toString(), formatter);
-				sc.setFinishTime(finishTime);
-			}
-			sc.setProgress(Integer.valueOf(objs[5].toString()));
-			sc.setStatus(Integer.valueOf(objs[6].toString()));
-			sc.setAname(objs[3].toString());
-			item.add(sc);
-		}
-		log.info("资源完成情况人员"+item);
-		PageList<StudyCourseItem> pageList = new PageList<>(item);
-		pageList.setCount(totalCount);
-		pageList.setPageSize(pageSize);
-		pageList.setList(item);
-		return pageList;
-		
-	}
-
-	@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)) {
@@ -296,12 +189,8 @@ public class StudyServiceImpl implements IStudyService{
 		if(StringUtils.isNotBlank(name)) {
 			query.addFilter(FieldFilters.eq("aname", name));
 		}
-		return scItemDao.findList(query.builder());
-	}
+		return scItemDao.findPage(query.builder());
 		
-	@Override
-	public List<User> getUserNo(List<String> userIds) {
-		return userDao.findList(FieldFilters.in("id", userIds));
 	}

 	@Override
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java
@@ -4,15 +4,9 @@ import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.List;
-import java.util.Optional;

 import javax.transaction.Transactional;

-import com.xboe.module.course.dao.CourseContentDao;
-import com.xboe.module.course.dto.CourseContentDto;
-import com.xboe.module.course.entity.CourseContent;
-import com.xboe.school.study.dao.StudyCourseItemDao;
-import com.xboe.school.study.entity.StudyCourseItem;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,12 +40,6 @@ public class StudySignupServiceImpl implements IStudySignupService{
 	@Autowired
 	StudyCourseDao studyCourseDao;
 	
-	@Autowired
-	StudyCourseItemDao scItemDao;
-
-	@Autowired
-	CourseContentDao contentDao;
-
 	@Autowired(required = false)
 	ICourseStudySearch esSearch;
 	
@@ -81,6 +69,7 @@ public class StudySignupServiceImpl implements IStudySignupService{
 		signupDao.save(signup);
 		//添加到课程学习
 		LocalDateTime now=LocalDateTime.now();
+		
 		StudyCourse sc=new StudyCourse();
 		sc.setAddTime(now);
 		sc.setAid(signup.getAid());
@@ -135,40 +124,11 @@ public class StudySignupServiceImpl implements IStudySignupService{
 		//courseDao.updateMultiFieldById(signup.getCourseId(),UpdateBuilder.create("studys", "studys+1",FieldUpdateType.EXPRESSION));
 	}

-	@Override
-	public StudyCourseItem addStudyCourseItem(StudySignup signup) {
-		String sql = "select id,course_id,content_name from boe_course_content where course_id = '"+signup.getCourseId()+"'";
-		List<Object[]> courseContents = contentDao.sqlFindList(sql);
-		if (!courseContents.isEmpty()) {
-			log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.size());
-			for (Object[] objs : courseContents){
-				log.info("查看在线课内容数据: {}", objs[0].toString());
-				// 使用toString()或自定义格式化字符串
-				StudyCourseItem scitem = new StudyCourseItem();
-				// 设置scitem的属性
-				scitem.setAname(signup.getName());
-				scitem.setAid(signup.getAid());
-				scitem.setCourseId(signup.getCourseId());
-				scitem.setProgress(0);
-				scitem.setScore(0f);
-				scitem.setStatus(1);
-				scitem.setContentId(objs[0].toString());
-				scitem.setStudyId(signup.getStudyId());
-				// 如果需要，可以取消注释以下行来设置contentName
-				// scitem.setContentName(c.getContentName());
-				scItemDao.save(scitem);
-			}
-		} else {
-			log.info("没有找到在线课内容数据。");
-		}
-		return null;
-	}
 	@Override
 	public void addList(List<StudySignup> list) {
 		//用于管理员添加报名
 		for(StudySignup ss : list) {
 			addSignup(ss);
-//			addStudyCourseItem(ss);
 		}
 	}

@@ -176,6 +136,7 @@ public class StudySignupServiceImpl implements IStudySignupService{
 	public void audit(String id, String aid, String user, boolean pass, String remark) {
 		if(pass) {
 			StudySignup signup =signupDao.get(id);
+			
 			//是否需要检查是否已报名
 			StudyCourse sc=new StudyCourse();
 			sc.setAddTime(LocalDateTime.now());
--- a/servers/boe-server-all/src/main/resources/application-pro.properties
+++ b/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.113.100:8848
+spring.cloud.nacos.discovery.server-addr=10.251.129.51:8848

 ## redis
 spring.redis.database=1
-spring.redis.host=10.251.88.213
+spring.redis.host=10.251.129.122
 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.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=admin
 spring.datasource.password=boeRds01

@@ -53,7 +53,6 @@ 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
@@ -64,7 +63,7 @@ jasypt.encryptor.algorithm=PBEWithMD5AndDES
 jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator

 # elasticsearch config
-xboe.elasticsearch.server.ip=10.251.88.218
+xboe.elasticsearch.server.ip=10.251.129.21
 xboe.elasticsearch.server.port=9200
 xboe.elasticsearch.server.user=
 xboe.elasticsearch.server.password=
--- a/servers/boe-server-all/src/main/resources/application.properties
+++ b/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=http://127.0.0.1
+boe.domain=https://u.boe.com
 #boe.domain=http://localhost:30001
 orgTree.orgTreeList=${boe.domain}/userbasic/org/list
 # ????id????????????
@@ -71,8 +71,9 @@ audience.getOrgUsers=${boe.domain}/userbasic/user/getOrgUsers
 infrasApi.dict=${boe.domain}/infrasApi/dict/list
 #获取非报名课id
 manageApi.stu.offcourse=${boe.domain}/manageApi/stu/offcourse/getOffCourseId
-manageApi.editExam=${boe.domain}/manageApi/admin/project/editExam
 #获取离职教师id
-userBasic.getTeacherIds=${boe.domain}/userbasic/user/getTeacherInfocoursesuilt.getStudyStatus=${boe.domain}/manageApi/stu/project/completeStatus
+userBasic.getTeacherIds=${boe.domain}/userbasic/user/getTeacherInfo
+userBasic.getUserIdByWorkNum=${boe.domain}/userbasic/user/getUserIdByWorkNum
+coursesuilt.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
--- a/servers/boe-server-basic/src/main/resources/application-pro.properties
+++ b/servers/boe-server-basic/src/main/resources/application-pro.properties
@@ -1,6 +1,6 @@
 ## redis
 spring.redis.database=3
-spring.redis.host=10.251.88.213
+spring.redis.host=10.251.129.122
 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.88.216:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+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.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.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+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.username=admin
 spring.datasource.db2.password=boeRds01

@@ -48,7 +48,6 @@ 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
--- a/servers/boe-server-course/src/main/resources/application-pro.properties
+++ b/servers/boe-server-course/src/main/resources/application-pro.properties
@@ -1,15 +1,15 @@
 ## redis
 spring.redis.database=2
-spring.redis.host=10.251.88.214
-spring.redis.password=qwert!W588
+spring.redis.host=127.0.0.1
+spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
 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:/10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
-spring.datasource.username=admin
-spring.datasource.password=boeRds01
+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==)

 logging.level.org.hibernate.SQL=ERROR
 # logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
--- a/servers/boe-server-old/src/main/resources/application-pro.properties
+++ b/servers/boe-server-old/src/main/resources/application-pro.properties
@@ -1,6 +1,6 @@
 ## redis
 spring.redis.database=2
-spring.redis.host=10.251.88.214
+spring.redis.host=127.0.0.1
 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://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
 spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)

--- a/servers/boe-server-task/src/main/resources/application-pro.properties
+++ b/servers/boe-server-task/src/main/resources/application-pro.properties
@@ -1,16 +1,16 @@
 ## redis
 spring.redis.database=2
-spring.redis.host=10.251.88.214
+spring.redis.host=127.0.0.1
 spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
 spring.redis.port=6379

 # cloud nacos config
-spring.cloud.nacos.discovery.server-addr=10.251.113.100:8848
+spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848

 ## datasource config
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
 spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)

@@ -33,6 +33,7 @@ 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
--- a/servers/modify-221027/src/main/resources/application-pro.properties
+++ b/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.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=admin
 spring.datasource.password=boeRds01

--- a/servers/modify-user/src/main/resources/application-pro.properties
+++ b/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.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=admin
 spring.datasource.password=boeRds01

--- a/servers/org-user-sync/src/main/resources/application-pro.properties
+++ b/servers/org-user-sync/src/main/resources/application-pro.properties
@@ -1,3 +1,4 @@
+
 # datasource config
 # basic数据库
 spring.jpa.hibernate.ddl-auto=none
@@ -8,7 +9,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.88.216:3306/elearninglms?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.db1.jdbc-url=jdbc:mysql://10.251.129.126:3306/elearninglms?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.db1.username=admin
 spring.datasource.db1.password=boeRds01

@@ -17,7 +18,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.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+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.username=admin
 spring.datasource.db2.password=boeRds01
Author	SHA1	Message	Date
yang	897a44e2c3	成长路径图，解除绑定接口去除	2024-07-17 10:20:23 +08:00
yang	a019726181	成长路径图，内部考试引用关系，以及导入bug修复	2024-07-15 10:21:32 +08:00
yang	3b34cc1bde	成长路径图，考试添加关联字段	2024-07-11 16:33:22 +08:00
yang	be18e35583	成长路径图，考试导入完成状态去除	2024-07-11 11:07:26 +08:00
yang	bd25fc1d1a	成长路径图，考试同步,限制事务范围	2024-07-10 16:55:17 +08:00
yang	91b0b899b0	成长路径图，考试同步,限制事务范围	2024-07-10 16:28:42 +08:00
yang	983313e845	成长路径图，考试同步	2024-07-10 14:25:18 +08:00
yang	f4c1bd7eed	成长路径图，考试次数	2024-07-10 12:49:19 +08:00
yang	0ac6622526	成长路径图，去除导入同步	2024-07-10 08:51:24 +08:00
yang	9a83f64e38	成长路径图，导入添加同步信息	2024-07-09 13:50:55 +08:00
yang	26a2a8e709	成长路径图，bug修复	2024-07-08 16:06:42 +08:00
yang	170dc45c64	成长路径图，导入考试去除属性	2024-07-08 14:49:54 +08:00
yang	5594e07264	成长路径图，考试计数	2024-07-08 14:49:31 +08:00
yang	13b5e6ab4c	成长路径图，考试实时同步,去除异常	2024-07-08 11:35:47 +08:00
yang	e144fde444	成长路径图，考试实时同步	2024-07-08 11:12:57 +08:00
yang	a4f260b99a	成长路径图，考试	2024-07-03 09:01:53 +08:00
yang	de7d26f447	成长路径图，考试绑定	2024-07-01 11:14:04 +08:00
yang	e2e0aeb9cb	成长路径图，考试绑定	2024-07-01 10:36:06 +08:00
yang	bcdc784e7d	成长路径图，保存考试信息	2024-06-23 22:03:07 +08:00
yang	7c4a6feb78	成长路径图，保存考试信息	2024-06-23 17:56:03 +08:00
yang	aa245e52c6	成长路径图，保存考试信息	2024-06-22 11:29:22 +08:00