Merge remote-tracking branch '104/master' into 104-master

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

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

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

servers/boe-server-all/pom.xml

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

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

@@ -12,12 +12,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.system.ApplicationPid;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @Configuration
 @SpringBootApplication
 @EnableCaching
 @EnableAsync
 @EnableRetry
+@EnableScheduling
 public class BoeServerAllApplication {
 
 	public static void main(String[] args) {

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

@@ -4,22 +4,24 @@ import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.lang.Opt;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.nacos.shaded.com.google.gson.*;
 import com.xboe.api.vo.*;
 import com.xboe.module.course.vo.StudyCourseVo;
 import com.xboe.module.course.vo.TeacherInfoVo;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.module.dict.entity.DictDto;
-import com.xboe.module.exam.entity.AloneExam;
+import com.xboe.module.exam.entity.ExamTest;
 import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.system.user.dao.UserDao;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
-import java.util.*;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -62,12 +64,8 @@ public class ThirdApi {
     @Value("${coursesuilt.getStudyStatus}")
     private String getStudyStatus;
 
-    @Value("${userBasic.getUserIdByWorkNum}")
-    private String getUserIdByWorkNum;
-
-    @Value("${coursesuilt.syncExamScoreToCourseSuite}")
-    private String syncExamScoreToCourseSuite;
-
+    @Value("${manageApi.editExam}")
+    private String editExam;
     //获取例外人员的id
     public  List<String> getUserId(){
         String responseBody = Optional.ofNullable(HttpRequest.get(infarasApiUrl+"?pid=316&type=1").execute() //prod 316
@@ -212,6 +210,14 @@ 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().
@@ -223,41 +229,43 @@ public class ThirdApi {
         List<UserDynamic> list = a.getResult().getList();
         System.out.println("  list = " +list.size());
         System.out.println("  list = " +list);
+
+
+
     }
 
+    /**
+     * 获取案例浏览记录
+     */
+    public UserDynamicResult getAllUserdynamicListOfCaseRead(UserdynamicParam userdynamicParam, String token) {
+        String s = buildFormData(userdynamicParam);
+        String resp = Optional.ofNullable(HttpRequest
+                .post(userdynamicListUrl)
+                .header("Content-Type", "application/x-www-form-urlencoded")
+                .body(s)
+                .header("XBOE-Access-Token", token)
+                .execute().body()).orElseThrow(() -> new RuntimeException("token校验失败"));
 
-    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;
+        DynamicBean dynamicBean = JSONUtil.toBean(resp, DynamicBean.class);
+        UserDynamicResult userdynamicResult = dynamicBean.getResult();
+        return userdynamicResult;
     }
 
-    public void syncExamScoreToCourseSuite(AloneExam aloneExam,String token) {
-        Gson gson = new GsonBuilder()
-                .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer())
-                .create();
+    private String buildFormData(UserdynamicParam param) {
+        StringBuilder builder = new StringBuilder();
+        try {
+            builder.append("pageIndex=").append(URLEncoder.encode(param.getPageIndex().toString(), "UTF-8"));
 
-        String json = gson.toJson(aloneExam);
-        String resp = HttpRequest.post(syncExamScoreToCourseSuite)
-                .body(json)
-                .header("token", token)
-                .execute()
-                .body();
-
-        if (StringUtils.isBlank(resp)){
-            return;
+            builder.append("&pageSize=").append(URLEncoder.encode(param.getPageSize().toString(), "UTF-8"));
+            builder.append("&contentType=").append(URLEncoder.encode(param.getContentType().toString(), "UTF-8"));
+            builder.append("&aid=").append(URLEncoder.encode(param.getAid().toString(), "UTF-8"));
+            builder.append("&eventKey=").append(URLEncoder.encode("ReadCase", "UTF-8"));
+            if (param.getHidden() != null) {
+                builder.append("&hidden=").append(URLEncoder.encode(param.getHidden(), "UTF-8"));
+            }
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
         }
-        JSONUtil.toBean(resp, SyncExamScoreBean.class).success();
+        return builder.toString();
     }
 }

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

@@ -1,36 +0,0 @@
-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
-@NoArgsConstructor
-@AllArgsConstructor
-public class CheckExamBandingBean {
-
-    private boolean show;
-    private String version;
-    private int code;
-    private String msg;
-    private Object data;
-    private boolean success;
-
-    public CheckExamBandingBean success() {
-        if (this.code!=200) {
-            log.error("获取绑定关系失败----{}", JSONUtil.toJsonPrettyStr(this));
-            return null;
-        }
-        return this;
-    }
-}

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

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

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

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

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

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

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

@@ -133,4 +133,26 @@ public interface CacheName {
      * 字典缓存key
      * */
     String KEY_DICT="dict";
+
+    String STUDY_KEY = "StudyKey:";
+
+    /**
+     * 季度观看量排行key
+     * */
+    String CASE_RANK_VIEWS_QUARTER="case:rank:views:quarter";
+
+    /**
+     * 总观看排行key
+     * */
+    String CASE_RANK_VIEWS_ALL="case:rank:views:all";
+
+    /**
+     * 季度点赞排行key
+     * */
+    String CASE_RANK_PRAISE_QUARTER ="case:rank:praise:quarter";
+
+    /**
+     * 总点赞排行key
+     * */
+    String CASE_RANK_PRAISE_ALL="case:rank:praise:all";
 }

servers/boe-server-all/src/main/java/com/xboe/data/dto/UserOrgIds.java

@@ -17,5 +17,7 @@ public class UserOrgIds {
 	private Map<String,Boolean> permissions=new HashMap<String,Boolean>(); 
 	
 	private List<String> ids;
+	//hrbp只读权限
+	private List<String> readIds;
 	
 }

servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java

@@ -229,8 +229,10 @@ 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};
@@ -281,7 +283,8 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
 					while (elements.hasNext()){
 						String oid=elements.next().asText();
 						if(!orgSetIds.contains(oid)) {
-							orgIds.add(oid);
+//							orgIds.add(oid);
+							readIds.add(oid);
 						}
 					}
 				}

servers/boe-server-all/src/main/java/com/xboe/enums/CasesRankEnum.java

@@ -0,0 +1,26 @@
+package com.xboe.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import static com.xboe.constants.CacheName.*;
+
+/**
+ * 案例排行榜类型
+ */
+@AllArgsConstructor
+@Getter
+public enum CasesRankEnum {
+
+    QUARTER_VIEWS(1,"季度观看量排行",CASE_RANK_VIEWS_QUARTER),
+    ALL_VIEWS(2,"总观看排行",CASE_RANK_VIEWS_ALL),
+    QUARTER_PRAISES(3,"季度点赞排行",CASE_RANK_PRAISE_QUARTER),
+    ALL_PRAISES(4,"总点赞排行",CASE_RANK_PRAISE_ALL),
+    ;
+
+    private Integer type;
+    private String name;
+    private String cacheKey;
+
+
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CaseScheduledTasks.java

@@ -0,0 +1,29 @@
+package com.xboe.module.boecase.api;
+
+import com.xboe.module.boecase.service.ICasesService;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+public class CaseScheduledTasks {
+
+    @Resource
+    private ICasesService casesService;
+
+    @Scheduled(cron = "0 0 1 1 * ?")  // 每月的第一天的1:00执行
+    public void refreshViewsRankOfMajor() {
+        casesService.refreshViewsRankOfMajor();
+    }
+
+    /**
+     * 季初执行，cron表达式设置为每个季度的第一个月的第一天的特定时间。每个季度的第一个月是1月、4月、7月和10月：
+     */
+    @Scheduled(cron = "0 0 2 1 1,4,7,10 ?")
+    public void refreshLastQuarterStatistics() {
+        casesService.refreshLastQuarterStatistics();
+    }
+
+
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java

@@ -11,18 +11,14 @@ import com.xboe.module.boecase.dao.CasesMajorTypeDao;
 import com.xboe.module.boecase.dto.*;
 import com.xboe.module.boecase.entity.CasesMajorType;
 import com.xboe.module.boecase.service.ICasesRecommendPushRecordService;
-import com.xboe.module.boecase.vo.CaseExportVo;
+import com.xboe.module.boecase.vo.*;
 import com.xboe.module.dict.entity.DictItem;
 import com.xboe.module.excel.ExportsExcelSenderUtil;
 
 import com.xboe.system.user.dao.UserDao;
 import com.xboe.system.user.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
@@ -39,6 +35,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 
@@ -127,25 +124,12 @@ public class CasesApi extends ApiBaseController {
     @PostMapping("/queryListV2")
     public JsonResponse<PageList<Cases>> queryCaseBreV2(@Validated @RequestBody CasePageVo req) {
         String type = req.getType();
-        PageList<Cases> subViews1;
-        PageList<Cases> subViews2;
-        PageList<Cases> views = null;
         req.setUserId(getCurrent().getAccountId());
-        if (StringUtils.isNotEmpty(type)) {
-            if ("recommend".equals(type)) {
-                views = casesService.queryRecommendPageCasesV2(req);
-            } else {
-                views = casesService.queryPageCasesV2(req);
-            }
+        PageList<Cases> views = null;
+        if (type.equals("recommend")) {
+            views = casesService.queryRecommendPageCasesV2(req);
         } else {
-            PageDto pageDto = new PageDto();
-            pageDto.setPageIndex(req.getPageIndex());
-            pageDto.setPageSize(req.getPageSize());
-            req.setPageSize(1000000);
-            req.setPageIndex(1);
-            subViews1 = casesService.queryRecommendPageCasesV2(req);
-            subViews2 = casesService.queryPageCasesV2(req);
-            views = merge(subViews1, subViews2, pageDto);
+            views = casesService.queryPageCasesV2(req);
         }
 
         if (views != null) {
@@ -175,24 +159,6 @@ public class CasesApi extends ApiBaseController {
         return success(views);
     }
 
-    public static PageList<Cases> merge(PageList<Cases> pageList1, PageList<Cases> pageList2, PageDto pageDto) {
-        List<Cases> mergedCaseList = new ArrayList<>();
-        mergedCaseList.addAll(pageList1.getList());
-        mergedCaseList.addAll(pageList2.getList());
-        List<Cases> pageCaseList = mergedCaseList.stream()
-                .skip((long) (pageDto.getPageIndex() - 1) * pageDto.getPageSize())
-                .limit(pageDto.getPageSize())
-                .collect(Collectors.toList());
-        int totalCount = pageList1.getCount() + pageList2.getCount();
-        int pageSize = pageDto.getPageSize();
-
-        PageList<Cases> mergePageList = new PageList<>();
-        mergePageList.setList(pageCaseList);
-        mergePageList.setCount(totalCount);
-        mergePageList.setPageSize(pageSize);
-        return mergePageList;
-    }
-
     @PostMapping("/caseYears")
     public JsonResponse<List<String>> caseYears() {
         List<String> result = casesService.getCaseYears();
@@ -646,7 +612,8 @@ public class CasesApi extends ApiBaseController {
         if (ids.isEmpty()) {
             return badRequest("参数异常");
         }
-        List<Cases> cases = casesService.ids(ids);
+        String accountId = getCurrent().getAccountId();
+        List<Cases> cases = casesService.ids(ids,accountId);
         return success(cases);
     }
 
@@ -654,7 +621,7 @@ public class CasesApi extends ApiBaseController {
      * 设置/取消优秀案例
      */
     @PostMapping("/excellent")
-    public JsonResponse<Boolean> excellent(String id, Boolean excellent) {
+    public JsonResponse<Boolean> excellent(String id, Boolean excellent,String excellentReason) {
         if (StringUtil.isBlank(id)) {
             return badRequest("参数异常");
         }
@@ -662,12 +629,145 @@ public class CasesApi extends ApiBaseController {
             excellent = false;//默认设置取消
         }
         try {
-            casesService.excellent(id, excellent);
+            casesService.excellent(id, excellent,excellentReason);
             return success(true);
         } catch (Exception e) {
             return error("设置或者取消失败", e.getMessage());
         }
     }
 
+    /**
+     * 不同专业分类下排行榜刷新
+     * 注意！！！定时统计任务是在本月月初执行的，而上榜时间是在上个月最后一天23:59:59
+     */
+    @PostMapping("/refreshViewsRankOfMajor")
+    public JsonResponse<Boolean> refreshViewsRankOfMajor() {
+        casesService.refreshViewsRankOfMajor();
+        return success(true);
+    }
+
+    @PostMapping("/refreshLastQuarterStatistics")
+    public JsonResponse<Boolean> refreshLastQuarterStatistics() {
+        casesService.refreshLastQuarterStatistics();
+        return success(true);
+    }
+
+
+    /**
+     * 热度榜（当前季度、总榜）  按观看量排行
+     * @param pageSize
+     * @param rankType 1：当前季度，2：总榜
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    @GetMapping("/queryPopularity")
+    public JsonResponse<List<CaseRankingVo>> queryPopularity(@RequestParam(required = false) Integer pageSize,@RequestParam Integer rankType) {
+        List<CaseRankingVo> caseRankingVoList =casesService.queryRank(pageSize,rankType);
+        return success(caseRankingVoList);
+    }
+
+
+    /**
+     * 好评榜 （当前季度、总榜） 按点赞量排行
+     * @param pageSize
+     * @param rankType
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    @GetMapping("/queryHighOpinion")
+    public JsonResponse<List<CaseRankingVo>> queryHighOpinion(@RequestParam(required = false) Integer pageSize,@RequestParam Integer rankType) {
+        List<CaseRankingVo> caseRankingVoList =casesService.queryRank(pageSize,rankType);
+        return success(caseRankingVoList);
+    }
+
+    /**
+     * 不同专业月热度榜  按观看量排行
+     */
+    @SuppressWarnings("unchecked")
+    @GetMapping("/queryPopularityOfMajor")
+    public JsonResponse<List<Cases>> queryPopularityOfMajor(@RequestParam(required = false) Integer pageSize,
+                                                            @RequestParam String majorId,
+                                                            @RequestParam LocalDateTime rankMonth) {
+        String accountId = getCurrent().getAccountId();
+        List<Cases> caseRankingVoList =casesService.queryPopularityOfMajor(pageSize,majorId,rankMonth,accountId);
+        return success(caseRankingVoList);
+    }
+
+
+    /**
+     * 所有上榜的的(专业ID-时间), 用于下拉框.优化可将majorName一并查询，返回为List<List<Entity>> todo by anyone
+     */
+    @GetMapping("/queryAllTimePopularityOfMajor")
+    public JsonResponse<Map<String, List<String>>> queryAllTimePopularityOfMajor() {
+        Map<String, List<String>> time = casesService.queryAllTimePopularityOfMajor();
+        return success(time);
+    }
+
+
+    /**
+     * 查询推荐案例榜单
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    @GetMapping("/queryRecommendRank")
+    public JsonResponse<List<CasesQueryRecommendRankVo>> queryRecommendRank(@RequestParam(required = false,defaultValue = "3") Integer pageSize) {
+        List<CasesQueryRecommendRankVo> list = casesService.queryRecommendRank(pageSize);
+        return success(list);
+    }
+
+    /**
+     * 案例上榜
+     */
+    @SuppressWarnings("unchecked")
+    @PostMapping("/riseIntoRank")
+    public JsonResponse<Boolean> riseIntoRank(@RequestParam Long caseId) {
+        casesService.riseIntoRank(caseId,getCurrent());
+        return success(true);
+    }
+
+    /**
+     * 案例下榜
+     */
+    @SuppressWarnings("unchecked")
+    @PostMapping("/cancelRiseIntoRank")
+    public JsonResponse<Boolean> cancelRiseIntoRank(@RequestParam Long caseId) {
+        casesService.cancelRiseIntoRank(caseId);
+        return success(true);
+    }
+
+    /**
+     * 推荐案例调整排名
+     */
+    @SuppressWarnings("unchecked")
+    @PostMapping("/adjustRank")
+    public JsonResponse<Boolean> adjustRank(@RequestParam List<Long> caseIds) {
+        casesService.adjustRank(caseIds);
+        return success(true);
+    }
+
+    /**
+     * 查询收藏
+     * @param pageIndex
+     * @param pageSize
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    @GetMapping("/queryFavoriteCaseOfIndex")
+    public JsonResponse<PageList<FavoriteCaseOfIndexVo>> queryFavoriteCaseOfIndex(@RequestParam(required = false,defaultValue = "1") Integer pageIndex,
+                                                                            @RequestParam(required = false,defaultValue = "5") Integer pageSize) {
+        String accountId = this.getCurrent().getAccountId();
+        PageList<FavoriteCaseOfIndexVo> casesList = casesService.queryFavoriteCaseOfIndex(pageIndex,pageSize,accountId);
+        return success(casesList);
+    }
+
+    @GetMapping("/browsingHistory")
+    public JsonResponse<PageList<CasesBrowsingHistoryVo>> browsingHistory(@RequestParam(required = false,defaultValue = "1") Integer pageIndex,
+                                                                          @RequestParam(required = false,defaultValue = "5") Integer pageSize,
+                                                                          HttpServletRequest request) {
+        String accountId = this.getCurrent().getAccountId();
+        PageList<CasesBrowsingHistoryVo> casesList = casesService.browsingHistory(pageIndex,pageSize,accountId,request);
+        return success(casesList);
+    }
+
 
 }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesDao.java

@@ -1,18 +1,24 @@
 package com.xboe.module.boecase.dao;
 
-import java.util.List;
-
-import org.springframework.stereotype.Repository;
-
 import com.xboe.common.OrderCondition;
 import com.xboe.common.PageList;
 import com.xboe.core.orm.BaseDao;
+import com.xboe.core.orm.FieldFilters;
 import com.xboe.core.orm.IFieldFilter;
 import com.xboe.module.boecase.entity.Cases;
-import com.xboe.core.orm.FieldFilters;
-import com.xboe.module.boecase.dto.CaseVo;
+import com.xboe.module.boecase.vo.CaseRankingVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Repository;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+import static com.xboe.enums.CasesRankEnum.*;
 
 @Repository
+@Slf4j
 public class CasesDao extends BaseDao<Cases> {
 
     /**
@@ -35,4 +41,106 @@ public class CasesDao extends BaseDao<Cases> {
     public Cases getByTitle(String title) {
         return this.getGenericDao().findOne(Cases.class, FieldFilters.eq("title", title));
     }
+
+    public HashMap<String, Object> findExcellentCount(List<String> authorIdList) {
+        String sql =
+                "SELECT author_id,COUNT(1) AS excellentCount\n" +
+                "FROM boe_cases \n" +
+                "WHERE excellent = 1 AND author_id IN (?1) AND deleted=0 \n" +
+                "GROUP BY author_id";
+        List<Object[]> list = this.sqlFindList(sql, authorIdList);
+
+        HashMap<String, Object> map = new HashMap<>();
+
+        list.forEach(objects -> {
+            String authorId = objects[0].toString();
+            int excellentCount = Integer.parseInt(objects[1].toString());
+            map.put(authorId, excellentCount);
+        });
+
+        return map;
+    }
+
+    private List<CaseRankingVo> handleCaseRank(List<Object[]> listFields) {
+        List<CaseRankingVo> list = new ArrayList<>();
+        for (Object[] o : listFields) {
+            CaseRankingVo dto = new CaseRankingVo();
+            dto.setCaseId(String.valueOf(o[0]));
+            dto.setCaseTitle((String) o[1]);
+            list.add(dto);
+        }
+        return list;
+    }
+
+    public List<CaseRankingVo> findPopularityOfAll(Integer pageSize) {
+
+        String sql =
+                "SELECT id,title\n" +
+                "FROM boe_cases \n" +
+                "WHERE deleted=0\n" +
+                "ORDER BY views DESC,sys_create_time DESC\n" +
+                "LIMIT ?1";
+
+        List<Object[]> listFields = this.sqlFindList(sql, pageSize);
+        List<CaseRankingVo> caseRankingVoList = handleCaseRank(listFields);
+        return caseRankingVoList;
+    }
+
+    public List<CaseRankingVo> findPopularityOfQuarter(Integer pageSize) {
+        String sql =
+                "SELECT id,title\n" +
+                "FROM boe_cases \n" +
+                "WHERE deleted=0\n" +
+                "ORDER BY (views-last_quarter_views) DESC,sys_create_time DESC \n" +
+                "LIMIT ?1";
+
+        List<Object[]> listFields = this.sqlFindList(sql, pageSize);
+
+        List<CaseRankingVo> caseRankingVoList = handleCaseRank(listFields);
+        return caseRankingVoList;
+    }
+
+    public List<CaseRankingVo> findHighOpinionOfAll(Integer pageSize) {
+        String sql =
+                "SELECT id,title\n" +
+                        "FROM boe_cases \n" +
+                        "WHERE deleted=0\n" +
+                        "ORDER BY praises DESC,sys_create_time DESC \n" +
+                        "LIMIT ?1";
+        List<Object[]> listFields = this.sqlFindList(sql, pageSize);
+        List<CaseRankingVo> caseRankingVoList = handleCaseRank(listFields);
+        return caseRankingVoList;
+    }
+
+
+    public List<CaseRankingVo> findHighOpinionOfQuarter(Integer pageSize) {
+        String sql =
+                "SELECT id,title\n" +
+                        "FROM boe_cases \n" +
+                        "WHERE deleted=0\n" +
+                        "ORDER BY (praises-last_quarter_praises) DESC,sys_create_time DESC \n" +
+                        "LIMIT ?1";
+
+        List<Object[]> listFields = this.sqlFindList(sql, pageSize);
+        List<CaseRankingVo> caseRankingVoList = handleCaseRank(listFields);
+        return caseRankingVoList;
+    }
+
+    public List<CaseRankingVo> findRank(Integer pageSize, Integer rankType) {
+        List<CaseRankingVo> popularityOfQuarter = Collections.emptyList();
+        if (rankType == QUARTER_VIEWS.getType()){
+            popularityOfQuarter = findPopularityOfQuarter(pageSize);
+        }
+        if (rankType == ALL_VIEWS.getType()){
+            popularityOfQuarter = findPopularityOfAll(pageSize);
+        }
+        if (rankType == QUARTER_PRAISES.getType()){
+            popularityOfQuarter = findHighOpinionOfQuarter(pageSize);
+        }
+        if (rankType == ALL_PRAISES.getType()){
+            popularityOfQuarter =  findHighOpinionOfAll(pageSize);
+        }
+        return popularityOfQuarter;
+    }
+
 }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRankDao.java

@@ -0,0 +1,87 @@
+package com.xboe.module.boecase.dao;
+
+import com.xboe.core.orm.BaseDao;
+import com.xboe.module.boecase.entity.CasesRank;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Repository;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Repository
+@Slf4j
+public class CasesRankDao extends BaseDao<CasesRank> {
+
+    public List<CasesRank> findViewsRankRecordByCaseId(String caseId) {
+        String sql =
+                    "SELECT bdmt.name,bcvr.rise_rank_time,bcvr.rank,bcvr.major_id \n" +
+                    "FROM\n" +
+                    "  boe_cases_rank bcvr\n" +
+                    "JOIN boe_dict_major_type bdmt \n" +
+                    "  ON bdmt.code = bcvr.major_id \n" +
+                    "WHERE bcvr.case_id = ?1 AND bcvr.deleted=0 AND bdmt.deleted=0\n" +
+                    "ORDER BY bcvr.sys_update_time DESC \n" +
+                    "LIMIT 2;";
+
+        List<Object[]> list = this.sqlFindList(sql, caseId);
+
+        List<CasesRank> resultList = new ArrayList<>();
+        for (Object[] o : list) {
+            CasesRank casesRank = new CasesRank();
+            casesRank.setMajorName(o[0].toString());
+            casesRank.setRiseRankTime(((Timestamp) o[1]).toLocalDateTime());
+            casesRank.setRank(Integer.valueOf(o[2].toString()));
+            casesRank.setMajorId(o[3].toString());
+            resultList.add(casesRank);
+        }
+        return resultList;
+    }
+
+    public HashMap<String, Object> findViewTopCount(List<String> authorIdList) {
+        String sql=
+                "SELECT author_id,COUNT(1) as viewTopCount\n" +
+                "FROM boe_cases bc JOIN boe_cases_rank bcvr ON bcvr.case_id = bc.id\n" +
+                "WHERE bc.author_id IN (?1) \n" +
+                "    AND bcvr.deleted = 0 \n" +
+                "    AND bc.deleted = 0\n" +
+                "GROUP BY bc.author_id;";
+        List<Object[]> list = this.sqlFindList(sql, authorIdList);
+
+        HashMap<String, Object> map = new HashMap<>();
+
+        list.forEach(objects -> {
+            String authorId = objects[0].toString();
+            Integer viewTopCount = Integer.parseInt(objects[1].toString());
+            map.put(authorId, viewTopCount);
+        });
+
+        return map;
+    }
+
+
+    public List<HashMap<String, Object>> findPopularityOfMajor(Integer pageSize, LocalDateTime startTime, LocalDateTime endTime, String majorId) {
+
+        String sql =
+                "SELECT bcr.case_id,bcr.rank\n" +
+                        "FROM boe_cases_rank bcr\n" +
+                        "JOIN boe_cases bc on bcr.case_id = bc.id\n" +
+                        "WHERE bcr.deleted=0 AND bc.deleted=0 AND bcr.rise_rank_time BETWEEN ?1 and ?2 AND major_id=?3\n" +
+                        "ORDER BY rank\n" +
+                        "LIMIT ?4";
+
+        List<Object[]> listFields = this.sqlFindList(sql, startTime, endTime,majorId,pageSize);
+
+        List<HashMap<String, Object>> collect = listFields.stream().map(item -> {
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("caseId", item[0].toString());
+            map.put("rank", item[1].toString());
+            return map;
+        }).collect(Collectors.toList());
+
+        return collect;
+    }
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java

@@ -21,50 +21,79 @@ import java.util.List;
  */
 @Repository
 public interface CasesRecordDao extends JpaRepository<Cases, String>, JpaSpecificationExecutor<Cases> {
-    @Query(nativeQuery = true, value = "select c.* from ( select b.*" +
-            " from boe_cases_recommend_push_record a left JOIN boe_cases b on a.case_id = b.id" +
-            " where b.deleted=0 and a.push_status = 3 and a.deleted=0 and  a.push_user_id= :#{#condition.userId}" +
-            " and if(IFNULL(:#{#condition.keyWord},'')!='',b.title like CONCAT('%',:#{#condition.keyWord},'%')" +
-            " or b.author_name like CONCAT('%',:#{#condition.keyWord},'%')" +
-            " or b.keyword1 like CONCAT('%',:#{#condition.keyWord},'%')" +
-            " or b.keyword2 like CONCAT('%',:#{#condition.keyWord},'%')" +
-            " or b.keyword3 like CONCAT('%',:#{#condition.keyWord},'%')" +
-            " or b.keyword4 like CONCAT('%',:#{#condition.keyWord},'%')" +
-            " or b.keyword5 like CONCAT('%',:#{#condition.keyWord},'%'),1=1)" +
-            " and if(:#{#condition.yearsEmpty},1=1, YEAR(b.sys_create_time) in (:#{#condition.years}))" +
-            " and if(:#{#condition.caseIdsEmpty}, 1=1, b.id in (:#{#condition.caseIds}))" +
-            " and ("+
-            " if(:#{#condition.allOrgEmpty}, 1=1, 1=2)" +
-            " or if(:#{#condition.org1Empty}, 1=2, b.org_domain_parent in (:#{#condition.org1}))" +
-            " or if(:#{#condition.org2Empty}, 1=2, b.org_domain_parent2 in (:#{#condition.org2}))" +
-            " or if(:#{#condition.org3Empty}, 1=2, b.org_domain_parent3 in (:#{#condition.org3}))" +
-            ")" +
-            " and if(:#{#condition.isSysType1Empty} , 1=1, b.sys_type1 = :#{#condition.sysType1} )"+
-            " and if(:#{#condition.isSysType2Empty} , 1=1, b.sys_type2 = :#{#condition.sysType2} )"+
-            " and if(:#{#condition.isSysType3Empty} , 1=1, b.sys_type3 = :#{#condition.sysType3} )"+
-            " order by  a.sys_create_time DESC, a.read_flag ASC) as c group by c.id",
-            countQuery = "select count(*) FROM (select c.* from ( select b.*" +
-                    " from boe_cases_recommend_push_record a left JOIN boe_cases b on a.case_id = b.id " +
-                    " where b.deleted=0 and a.push_status = 3  and a.deleted=0  and  a.push_user_id= :#{#condition.userId}" +
-                    " and if(IFNULL(:#{#condition.keyWord},'')!='',b.title like CONCAT('%',:#{#condition.keyWord},'%')" +
-                    " or b.author_name like CONCAT('%',:#{#condition.keyWord},'%')" +
-                    " or b.keyword1 like CONCAT('%',:#{#condition.keyWord},'%')" +
-                    " or b.keyword2 like CONCAT('%',:#{#condition.keyWord},'%')" +
-                    " or b.keyword3 like CONCAT('%',:#{#condition.keyWord},'%')" +
-                    " or b.keyword4 like CONCAT('%',:#{#condition.keyWord},'%')" +
-                    " or b.keyword5 like CONCAT('%',:#{#condition.keyWord},'%'),1=1)" +
-                    " and if(:#{#condition.yearsEmpty},1=1, YEAR(b.sys_create_time) in (:#{#condition.years}))" +
-                    " and if(:#{#condition.caseIdsEmpty}, 1=1, b.id in (:#{#condition.caseIds}))" +
-                    " and ("+
-                    " if(:#{#condition.allOrgEmpty}, 1=1, 1=2)" +
-                    " or if(:#{#condition.org1Empty}, 1=1, b.org_domain_parent in (:#{#condition.org1}))" +
-                    " or if(:#{#condition.org2Empty}, 1=1, b.org_domain_parent2 in (:#{#condition.org2}))" +
-                    " or if(:#{#condition.org3Empty}, 1=1, b.org_domain_parent3 in (:#{#condition.org3}))" +
-                    ")" +
-                    " and if(:#{#condition.isSysType1Empty} , 1=1, b.sys_type1 = :#{#condition.sysType1} )"+
-                    " and if(:#{#condition.isSysType2Empty} , 1=1, b.sys_type2 = :#{#condition.sysType2} )"+
-                    " and if(:#{#condition.isSysType3Empty} , 1=1, b.sys_type3 = :#{#condition.sysType3} )"+
-                    " order by  a.sys_create_time DESC, a.read_flag ASC ) as c group by c.id) as d")
+    @Query(nativeQuery = true, value =
+            " SELECT c.* FROM ( " +
+                    "   SELECT b.*,a.sys_create_time as recommendPushTime" +
+                    "   FROM boe_cases_recommend_push_record a " +
+                    "   LEFT JOIN boe_cases b ON a.case_id = b.id " +
+                    "   WHERE b.deleted = 0 " +
+                    "   AND a.push_status = 3 " +
+                    "   AND a.deleted = 0 " +
+                    "   AND a.push_user_id = :#{#condition.userId} " +
+                    "   AND IF(IFNULL(:#{#condition.keyWord}, '') != '', " +
+                    "       b.title LIKE CONCAT('%', :#{#condition.keyWord}, '%') " +
+                    "       OR b.author_name LIKE CONCAT('%', :#{#condition.keyWord}, '%') " +
+                    "       OR b.keyword1 LIKE CONCAT('%', :#{#condition.keyWord}, '%') " +
+                    "       OR b.keyword2 LIKE CONCAT('%', :#{#condition.keyWord}, '%') " +
+                    "       OR b.keyword3 LIKE CONCAT('%', :#{#condition.keyWord}, '%') " +
+                    "       OR b.keyword4 LIKE CONCAT('%', :#{#condition.keyWord}, '%') " +
+                    "       OR b.keyword5 LIKE CONCAT('%', :#{#condition.keyWord}, '%'), " +
+                    "       1 = 1) " +
+                    "   AND IF(:#{#condition.yearsEmpty}, 1 = 1, YEAR(b.sys_create_time) IN (:#{#condition.years})) " +
+                    "   AND IF(:#{#condition.caseIdsEmpty}, 1 = 1, b.id IN (:#{#condition.caseIds})) " +
+                    "   AND ( " +
+                    "       IF(:#{#condition.allOrgEmpty}, 1 = 1, 1 = 2) " +
+                    "       OR IF(:#{#condition.org1Empty}, 1 = 2, b.org_domain_parent IN (:#{#condition.org1})) " +
+                    "       OR IF(:#{#condition.org2Empty}, 1 = 2, b.org_domain_parent2 IN (:#{#condition.org2})) " +
+                    "       OR IF(:#{#condition.org3Empty}, 1 = 2, b.org_domain_parent3 IN (:#{#condition.org3})) " +
+                    "   ) " +
+                    "   AND IF(:#{#condition.isSysType1Empty}, 1 = 1, b.sys_type1 = :#{#condition.sysType1}) " +
+                    "   AND IF(:#{#condition.isSysType2Empty}, 1 = 1, b.sys_type2 = :#{#condition.sysType2}) " +
+                    "   AND IF(:#{#condition.isSysType3Empty}, 1 = 1, b.sys_type3 = :#{#condition.sysType3}) " +
+                    " ) AS c GROUP BY c.id " +
+                    "  ORDER BY " +
+                    "   IF(:#{#condition.orderField}='views' and :#{#condition.orderAsc}=true,c.views, null) asc," +
+                    "   IF(:#{#condition.orderField}='views' and :#{#condition.orderAsc}=false,c.views, null) desc," +
+                    "   IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=true ,c.sys_create_time,null) asc," +
+                    "   IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=false , c.sys_create_time,null) desc," +
+                    "   IF(:#{#condition.orderField}='recommendPushTime', c.recommendPushTime,null) desc",
+            countQuery =
+                    " SELECT count(*) FROM ( " +
+                            "   SELECT b.*,a.sys_create_time as recommendPushTime" +
+                            "   FROM boe_cases_recommend_push_record a " +
+                            "   LEFT JOIN boe_cases b ON a.case_id = b.id " +
+                            "   WHERE b.deleted = 0 " +
+                            "   AND a.push_status = 3 " +
+                            "   AND a.deleted = 0 " +
+                            "   AND a.push_user_id = :#{#condition.userId} " +
+                            "   AND IF(IFNULL(:#{#condition.keyWord}, '') != '', " +
+                            "       b.title LIKE CONCAT('%', :#{#condition.keyWord}, '%') " +
+                            "       OR b.author_name LIKE CONCAT('%', :#{#condition.keyWord}, '%') " +
+                            "       OR b.keyword1 LIKE CONCAT('%', :#{#condition.keyWord}, '%') " +
+                            "       OR b.keyword2 LIKE CONCAT('%', :#{#condition.keyWord}, '%') " +
+                            "       OR b.keyword3 LIKE CONCAT('%', :#{#condition.keyWord}, '%') " +
+                            "       OR b.keyword4 LIKE CONCAT('%', :#{#condition.keyWord}, '%') " +
+                            "       OR b.keyword5 LIKE CONCAT('%', :#{#condition.keyWord}, '%'), " +
+                            "       1 = 1) " +
+                            "   AND IF(:#{#condition.yearsEmpty}, 1 = 1, YEAR(b.sys_create_time) IN (:#{#condition.years})) " +
+                            "   AND IF(:#{#condition.caseIdsEmpty}, 1 = 1, b.id IN (:#{#condition.caseIds})) " +
+                            "   AND ( " +
+                            "       IF(:#{#condition.allOrgEmpty}, 1 = 1, 1 = 2) " +
+                            "       OR IF(:#{#condition.org1Empty}, 1 = 2, b.org_domain_parent IN (:#{#condition.org1})) " +
+                            "       OR IF(:#{#condition.org2Empty}, 1 = 2, b.org_domain_parent2 IN (:#{#condition.org2})) " +
+                            "       OR IF(:#{#condition.org3Empty}, 1 = 2, b.org_domain_parent3 IN (:#{#condition.org3})) " +
+                            "   ) " +
+                            "   AND IF(:#{#condition.isSysType1Empty}, 1 = 1, b.sys_type1 = :#{#condition.sysType1}) " +
+                            "   AND IF(:#{#condition.isSysType2Empty}, 1 = 1, b.sys_type2 = :#{#condition.sysType2}) " +
+                            "   AND IF(:#{#condition.isSysType3Empty}, 1 = 1, b.sys_type3 = :#{#condition.sysType3}) " +
+                            " ) AS c GROUP BY c.id " +
+                            "  ORDER BY " +
+                            "   IF(:#{#condition.orderField}='views' and :#{#condition.orderAsc}=true,c.views, null) asc," +
+                            "   IF(:#{#condition.orderField}='views' and :#{#condition.orderAsc}=false,c.views, null) desc," +
+                            "   IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=true ,c.sys_create_time,null) asc," +
+                            "   IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=false , c.sys_create_time,null) desc," +
+                            "   IF(:#{#condition.orderField}='recommendPushTime', c.recommendPushTime,null) desc"
+    )
     Page<Cases> queryList(Pageable pageable, @Param("condition") CasePageVo casePage);
 
 

servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java

@@ -3,6 +3,7 @@ package com.xboe.module.boecase.entity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xboe.core.SysConstant;
 import com.xboe.core.orm.BaseEntity;
+import com.xboe.module.boecase.vo.CaseViewRankingItemVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -248,16 +249,7 @@ public class Cases extends BaseEntity {
     @Column(name = "case_value")
     private String caseValue;
 
-    // 种类字段1
-    // 暂不上线
-//    @Column(name = "sys_type1")
-//    private String sysType1;
-    //种类字段2
-//    @Column(name = "sys_type2")
-//    private String sysType2;
-    //种类字段3
-//    @Column(name = "sys_type3")
-//    private String sysType3;
+
 
     /**
      * 最佳案例标识
@@ -272,6 +264,48 @@ public class Cases extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime excellentTime;
 
+    /**
+     * 最佳时间
+     * */
+    @Column(name = "excellent_reason")
+    private String excellentReason;
+
+    /**
+     * 上月浏览量
+     */
+    @Column(name = "last_month_views")
+    private Integer lastMonthViews;
+
+    /**
+     * 上季度浏览量
+     */
+    @Column(name = "last_quarter_views")
+    private Integer lastQuarterViews;
+
+    /**
+     * 上季度点赞量
+     */
+    @Column(name = "last_quarter_praises")
+    private Integer lastQuarterPraises;
+
+    /**
+     * 推荐榜排序
+     * */
+    @Column(name = "recommend_rank")
+    private Integer recommendRank;
+
+    /**
+     * 推送用户名称
+     */
+    @Column(name = "recommend_rank_push_user_name")
+    private String recommendRankPushUserName;
+
+    /**
+     * 推送时间
+     */
+    @Column(name = "recommend_rank_push_time")
+    private LocalDateTime recommendRankPushTime;
+
     /**
      * type 种类
      * 区分 案例/推荐案例
@@ -279,11 +313,6 @@ public class Cases extends BaseEntity {
     @Transient
     private String type;
 
-    /**
-     * id
-     */
-
-
     @Transient
     private List<String> majorIds;
 
@@ -296,6 +325,15 @@ public class Cases extends BaseEntity {
     @Transient
     private String refId;
 
+    @Transient
+    private String excellentTag;
+
+    @Transient
+    private List<CaseViewRankingItemVo> viewRankTags;
+
+    @Transient
+    private List<String> authorTags;
+
     public String getRefId() {
         return refId;
     }
@@ -380,7 +418,7 @@ public class Cases extends BaseEntity {
         this.title=title;
     }
     public Cases(String id,String title,String summary,String coverUrl,String authorId,String authorName,LocalDateTime sysCreateTime,Integer breCommend,Integer views,Integer comments,Integer praises,Integer shares,Integer favorites,Boolean deleted
-    ,String sysCreateBy,String sysCreateAid){
+            ,String sysCreateBy,String sysCreateAid){
         this.title=title;
         super.setId(id);
         this.authorId=authorId;
@@ -398,7 +436,6 @@ public class Cases extends BaseEntity {
         this.favorites=favorites;
         super.setDeleted(deleted);
     }
-
     public Cases(String title) {
         this.title = title;
     }
@@ -415,4 +452,29 @@ public class Cases extends BaseEntity {
         this.authorName = authorName;
         this.confidentialityLevel = confidentialityLevel;
     }
+
+    public Cases(String id,String title,String summary,String coverUrl,String authorId,String authorName,LocalDateTime sysCreateTime,Integer breCommend,Integer views,Integer comments,Integer praises,Integer shares,Integer favorites,Boolean deleted
+            ,String sysCreateBy,String sysCreateAid,String keyword1,String keyword2,String keyword3,String keyword4,String keyword5){
+        this.title=title;
+        super.setId(id);
+        this.authorId=authorId;
+        this.authorName=authorName;
+        super.setSysCreateTime(sysCreateTime);
+        super.setSysCreateAid(sysCreateAid);
+        super.setSysCreateBy(sysCreateBy);
+        this.summary=summary;
+        this.coverUrl=coverUrl;
+        this.breCommend=breCommend;
+        this.views=views;
+        this.comments=comments;
+        this.praises=praises;
+        this.shares=shares;
+        this.favorites=favorites;
+        this.keyword1=keyword1;
+        this.keyword2=keyword2;
+        this.keyword3=keyword3;
+        this.keyword4=keyword4;
+        this.keyword5=keyword5;
+        super.setDeleted(deleted);
+    }
 }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRank.java

@@ -0,0 +1,61 @@
+package com.xboe.module.boecase.entity;
+
+import com.xboe.core.SysConstant;
+import com.xboe.core.orm.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.time.LocalDateTime;
+
+/**
+* 案例推荐表
+* @TableName boe_cases_rank
+*/
+@Data
+@NoArgsConstructor
+@Entity
+@EqualsAndHashCode(callSuper = false)
+@Table(name = SysConstant.TABLE_PRE+"cases_rank")
+public class CasesRank extends BaseEntity {
+
+    /**
+    * 案例ID
+    */
+    @Column(name = "case_id")
+    private Long caseId;
+
+    /**
+     * 专业ID
+     */
+    @Column(name = "major_id")
+    private String majorId;
+
+    /**
+    * 排名
+    */
+    @Column(name = "rank")
+    private Integer rank;
+
+    /**
+    * 浏览量每月增量
+    */
+    @Column(name = "monthly_increment")
+    private Integer monthlyIncrement;
+
+
+    @Column(name = "rise_rank_time")
+    private LocalDateTime riseRankTime;
+
+    @Transient
+    private String majorName;
+
+    public CasesRank(String majorId, LocalDateTime riseRankTime) {
+        this.majorId = majorId;
+        this.riseRankTime = riseRankTime;
+    }
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommend.java

@@ -54,8 +54,15 @@ public class CasesRecommend extends BaseEntity {
     public CasesRecommend() {
     }
 
+
     public CasesRecommend(String id, String recommendOrgName) {
         this.setId(id);
         this.recommendOrgName = recommendOrgName;
     }
+
+    public CasesRecommend(String id, String recommendOrgName,LocalDateTime recommendTime) {
+        this.setId(id);
+        this.recommendOrgName = recommendOrgName;
+        this.recommendTime = recommendTime;
+    }
 }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java

@@ -1,14 +1,22 @@
 package com.xboe.module.boecase.service;
 
-import java.util.List;
-
 import com.xboe.common.PageList;
 import com.xboe.core.CurrentUser;
 import com.xboe.module.boecase.dto.*;
 import com.xboe.module.boecase.entity.Cases;
+import com.xboe.module.boecase.vo.CasesBrowsingHistoryVo;
+import com.xboe.module.boecase.vo.CaseRankingVo;
+import com.xboe.module.boecase.vo.CasesQueryRecommendRankVo;
+import com.xboe.module.boecase.vo.FavoriteCaseOfIndexVo;
 import com.xboe.module.dict.entity.DictItem;
 import com.xboe.school.vo.CasesVo;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.transaction.Transactional;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
 public interface ICasesService{
     /**
      * 案例分页搜索，是否被推荐
@@ -91,7 +99,7 @@ public interface ICasesService{
     /**
      * 用于二次查询
      * */
-    List<Cases> ids(List<String> ids);
+    List<Cases> ids(List<String> ids, String accountId);
 
     /**
      *二期 首页的推荐案例
@@ -101,7 +109,7 @@ public interface ICasesService{
     /**
      * 设置或者取消优秀案例
      * */
-    void excellent(String id,Boolean excellent);
+    void excellent(String id, Boolean excellent, String excellentReason);
 
 
     PageList<Cases> queryRecommendPageCasesV2(CasePageVo req);
@@ -110,5 +118,27 @@ public interface ICasesService{
 
     List<String> getCaseYears();
 
+    @Transactional
+    void refreshViewsRankOfMajor();
+
+    void refreshLastQuarterStatistics();
+
+    List<CasesQueryRecommendRankVo> queryRecommendRank(Integer pageSize);
+
+    void riseIntoRank(Long caseId, CurrentUser currentUser);
+
+    void cancelRiseIntoRank(Long caseId);
+
+    void adjustRank(List<Long> caseIdList);
+
+    List<CaseRankingVo> queryRank(Integer pageSize, Integer rankType);
+
+    List<Cases> queryPopularityOfMajor(Integer pageSize, String majorId, LocalDateTime month, String accountId);
+
+    PageList<FavoriteCaseOfIndexVo> queryFavoriteCaseOfIndex(Integer pageIndex, Integer pageSize, String accountId);
+
+    PageList<CasesBrowsingHistoryVo> browsingHistory(Integer pageIndex, Integer pageSize, String accountId, HttpServletRequest request);
+
+    Map<String, List<String>> queryAllTimePopularityOfMajor();
 }
 

servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java

@@ -2,8 +2,14 @@ package com.xboe.module.boecase.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.xboe.api.ThirdApi;
+import com.xboe.api.vo.UserDynamic;
+import com.xboe.api.vo.UserDynamicResult;
+import com.xboe.api.vo.UserdynamicParam;
 import com.xboe.common.OrderCondition;
 import com.xboe.common.OrderDirection;
 import com.xboe.common.PageList;
@@ -11,29 +17,40 @@ import com.xboe.common.utils.IDGenerator;
 import com.xboe.common.utils.StringUtil;
 import com.xboe.core.CurrentUser;
 import com.xboe.core.orm.*;
+import com.xboe.enums.CasesRankEnum;
 import com.xboe.module.boecase.dao.*;
 import com.xboe.module.boecase.dto.*;
-import com.xboe.module.boecase.entity.Cases;
-import com.xboe.module.boecase.entity.CasesMajorType;
-import com.xboe.module.boecase.entity.CasesRecommend;
-import com.xboe.module.boecase.entity.CasesRecommendPushRecord;
+import com.xboe.module.boecase.entity.*;
 import com.xboe.module.boecase.service.ICasesService;
+import com.xboe.module.boecase.vo.*;
 import com.xboe.module.dict.dao.SysDictionaryDao;
 import com.xboe.module.dict.entity.DictItem;
+import com.xboe.module.interaction.entity.Favorites;
 import com.xboe.orm.CustomFieldInFilter;
 import com.xboe.school.vo.CasesVo;
+import com.xboe.standard.enums.BoedxResourceType;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import javax.transaction.Transactional;
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Array;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
 
 @Slf4j
 @Service
@@ -61,6 +78,15 @@ public class CasesServiceImpl implements ICasesService {
     @Autowired
     private CasesRecommendDao casesRecommendDao;
 
+    @Resource
+    private CasesRankDao casesRankDao;
+
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Resource
+    private ThirdApi thirdApi;
+
     /**
      * 案例分页查询，用于门户的查询
      */
@@ -178,12 +204,6 @@ public class CasesServiceImpl implements ICasesService {
     @Override
     public PageList<Cases> queryPageCasesV2(CasePageVo caseVo) {
 
-        String type = caseVo.getType();
-        if (!StrUtil.equals(type,"excellent")) {
-            caseVo.setOrderField("");
-            caseVo.setOrderAsc(null);
-        }
-
         String keyword = caseVo.getKeyWord();
         QueryBuilder query = QueryBuilder.from(Cases.class);
         PageList<Cases> page = null;
@@ -296,18 +316,16 @@ public class CasesServiceImpl implements ICasesService {
             filters.add(FieldFilters.eq("excellent", caseVo.getExcellent()));
         }
         OrderCondition order = null;
-        if (StringUtils.isNotBlank(caseVo.getOrderField())) {
-            if (caseVo.getOrderAsc() == null || caseVo.getOrderAsc()) {
+        if (StringUtils.isNotBlank(caseVo.getOrderField()) && caseVo.getOrderAsc() != null && ("sysCreateTime".equals(caseVo.getOrderField()) || "views".equals(caseVo.getOrderField()))) {
+            if (caseVo.getOrderAsc()) {
                 order = OrderCondition.asc(caseVo.getOrderField());
             } else {
                 order = OrderCondition.desc(caseVo.getOrderField());
             }
-        }
-        if (StrUtil.equals(type,"new")) {
+        } else {
             order = OrderCondition.desc("sysCreateTime");
-        } else if (StrUtil.equals(type,"hot")) {
-            order = OrderCondition.desc("views");
         }
+
         if(Objects.nonNull(order)) {
             query.addOrder(order);
         }
@@ -315,53 +333,18 @@ public class CasesServiceImpl implements ICasesService {
         query.setPageIndex(caseVo.getPageIndex());
         query.setPageSize(caseVo.getPageSize());
         page = casesDao.findPage(query.builder());
-        List<Cases> list = page.getList();
-        list.forEach(it->{
+        List<Cases> casesList = page.getList();
+        casesList.forEach(it->{
             it.setBreCommend(0);
         });
-        if (CollUtil.isNotEmpty(list) && StrUtil.isNotBlank(caseVo.getUserId())) {
-            List<String> caseIds = list.stream().map(Cases::getId).collect(Collectors.toList());
-            QueryBuilder recommendCasesQuery = QueryBuilder.from(CasesRecommendPushRecord.class);
-            recommendCasesQuery.addField("new CasesRecommendPushRecord(id,recommendId,caseId)");
-            List<IFieldFilter> subFilters = new ArrayList<>();
-            subFilters.add(FieldFilters.eq("pushUserId", caseVo.getUserId()));
-            subFilters.add(FieldFilters.in("caseId", caseIds));
-            subFilters.add(FieldFilters.eq("pushStatus", 3));
-            subFilters.add(FieldFilters.eq("deleted", Boolean.FALSE));
-
-            QueryBuilder queryBuilder = recommendCasesQuery.addFilters(subFilters)
-                    .addOrder("sysCreateTime", OrderDirection.DESC)
-                    .addGroupBy("caseId");
-            List<CasesRecommendPushRecord> pushRecords = casesRecommendPushRecordDao.findList(queryBuilder.builder());
-            if (CollUtil.isNotEmpty(pushRecords)) {
-                List<String> rIds = pushRecords.stream().map(CasesRecommendPushRecord::getRecommendId).distinct().collect(Collectors.toList());
-                QueryBuilder builder = QueryBuilder.from(CasesRecommend.class);
-                builder.addField("new CasesRecommend(id,recommendOrgName)");
-                List<IFieldFilter> recommendFilters = new ArrayList<>();
-                recommendFilters.add(FieldFilters.eq("deleted", Boolean.FALSE));
-                recommendFilters.add(FieldFilters.in("id", rIds));
-                builder.addFilters(recommendFilters);
-                List<CasesRecommend> recommands = casesRecommendDao.findList(builder.builder());
-                if (CollUtil.isNotEmpty(recommands)) {
-                    Map<String, String> collect = recommands.stream().collect(Collectors.toMap(k -> k.getId(), v -> v.getRecommendOrgName()));
-                    list.forEach(it -> {
-                        CasesRecommendPushRecord one = CollUtil.findOne(pushRecords, (a) -> StrUtil.equals(a.getCaseId(), it.getId()));
-                        if (Objects.nonNull(one)) {
-                            String recommendOrgName = collect.get(one.getRecommendId());
-                            it.setBreCommend(1);
-                            it.setRecommendOrgName(recommendOrgName);
-                        } else {
-                            it.setBreCommend(0);
-                        }
-                    });
-                }
-            }
-
-        }
+        casesList = caseListCommonHandle(casesList, caseVo.getUserId());
+        page.setList(casesList);
 
         return page;
     }
 
+
+
     @Override
     public PageList<Cases> queryRecommendPageCasesV2(CasePageVo caseVo) {
 
@@ -408,37 +391,68 @@ public class CasesServiceImpl implements ICasesService {
         caseVo.setOrg2(level2);
         caseVo.setOrg3(level3);
 
+        Set<String> validOrderFields = new HashSet<>();
+        validOrderFields.add("sysCreateTime");
+        validOrderFields.add("views");
+        validOrderFields.add("recommendPushTime");
+        if (StringUtils.isBlank(caseVo.getOrderField()) || caseVo.getOrderAsc() == null || !validOrderFields.contains(caseVo.getOrderField())) {
+            caseVo.setOrderField("recommendPushTime");
+            caseVo.setOrderAsc(false);
+        }
+
         Page<Cases> cases = casesRecordDao.queryList(pageRequest,caseVo);
         PageList<Cases> pageList = new PageList<>();
         pageList.setCount((int) cases.getTotalElements());
         pageList.setPageSize(cases.getSize());
         List<Cases> content = cases.getContent();
-        List<String> caseIds = content.stream().map(Cases::getId).collect(Collectors.toList());
-        String userId = caseVo.getUserId();
-        if (CollUtil.isNotEmpty(caseIds)) {
-            QueryBuilder recommendCasesQuery = QueryBuilder.from(CasesRecommendPushRecord.class);
-            recommendCasesQuery.addField("new CasesRecommendPushRecord(id,recommendId,caseId)");
-            List<IFieldFilter> subFilters = new ArrayList<>();
-            subFilters.add(FieldFilters.eq("pushUserId", userId));
-            subFilters.add(FieldFilters.in("caseId", caseIds));
-            subFilters.add(FieldFilters.eq("pushStatus", 3));
-            subFilters.add(FieldFilters.eq("deleted", Boolean.FALSE));
 
-            QueryBuilder queryBuilder = recommendCasesQuery.addFilters(subFilters)
+        caseListCommonHandle(content, caseVo.getUserId());
+
+        pageList.setList(content);
+        return pageList;
+    }
+
+    private List<Cases> caseListCommonHandle(List<Cases> casesList, String accountId) {
+        if (CollUtil.isEmpty(casesList)) {
+            return casesList;
+        }
+        //1.推荐案例数据处理
+        recommendCasesDataHandle(casesList, accountId);
+        //2.标签处理，添加作者标签和新的案例标签
+        addAuthorTagAndCaseNewTag(casesList);
+
+        return casesList;
+    }
+
+    private void recommendCasesDataHandle(List<Cases> casesList, String accountId) {
+        if (StrUtil.isNotBlank(accountId)) {
+            List<String> caseIdList = casesList.stream().map(Cases::getId).collect(Collectors.toList());
+            QueryBuilder queryBuilder = QueryBuilder.from(CasesRecommendPushRecord.class)
+                    .addField("new CasesRecommendPushRecord(id,recommendId,caseId)")
+                    .addFilters(Arrays.asList(
+                            FieldFilters.eq("pushUserId", accountId),
+                            FieldFilters.in("caseId", caseIdList),
+                            FieldFilters.eq("pushStatus", 3),
+                            FieldFilters.eq("deleted", Boolean.FALSE)
+                    ))
                     .addOrder("sysCreateTime", OrderDirection.DESC)
                     .addGroupBy("caseId");
+
             List<CasesRecommendPushRecord> pushRecords = casesRecommendPushRecordDao.findList(queryBuilder.builder());
+
             if (CollUtil.isNotEmpty(pushRecords)) {
                 List<String> rIds = pushRecords.stream().map(CasesRecommendPushRecord::getRecommendId).distinct().collect(Collectors.toList());
-                QueryBuilder builder = QueryBuilder.from(CasesRecommend.class);
-                List<IFieldFilter> recommendFilters = new ArrayList<>();
-                recommendFilters.add(FieldFilters.eq("deleted", Boolean.FALSE));
-                recommendFilters.add(FieldFilters.in("id", rIds));
-                builder.addFilters(recommendFilters);
+                QueryBuilder builder = QueryBuilder.from(CasesRecommend.class)
+                        .addField("new CasesRecommend(id,recommendOrgName,recommendTime)")
+                        .addFilters(Arrays.asList(
+                                FieldFilters.eq("deleted", Boolean.FALSE),
+                                FieldFilters.in("id", rIds)
+                        ));
+
                 List<CasesRecommend> recommands = casesRecommendDao.findList(builder.builder());
                 if (CollUtil.isNotEmpty(recommands)) {
-                    Map<String, CasesRecommend> collect = recommands.stream().collect(Collectors.toMap(k -> k.getId(), item->item));
-                    content.forEach(it -> {
+                    Map<String, CasesRecommend> collect = recommands.stream().collect(Collectors.toMap(k -> k.getId(), item -> item));
+                    casesList.forEach(it -> {
                         CasesRecommendPushRecord one = CollUtil.findOne(pushRecords, (a) -> StrUtil.equals(a.getCaseId(), it.getId()));
                         if (Objects.nonNull(one)) {
                             CasesRecommend recommend = collect.get(one.getRecommendId());
@@ -446,13 +460,76 @@ public class CasesServiceImpl implements ICasesService {
                             it.setRefId(one.getId());
                             it.setRecommendOrgName(recommend.getRecommendOrgName());
                             it.setSysCreateTime(recommend.getRecommendTime());
+                        } else {
+                            it.setBreCommend(0);
                         }
                     });
                 }
             }
         }
-        pageList.setList(content);
-        return pageList;
+    }
+
+    /**
+     * 添加案例标签、作者标签（最佳案例N篇、上榜浏览量TOP榜单N次）、案例标签（xx分类浏览量TOP、最佳案例）
+     */
+    private void addAuthorTagAndCaseNewTag(List<Cases> caseList) {
+        if (CollUtil.isEmpty(caseList)) {
+            return;
+        }
+
+        List<String> authorIdList = caseList.stream().map(Cases::getAuthorId).distinct().collect(Collectors.toList());
+        HashMap<String, Object> excellentCountMap = casesDao.findExcellentCount(authorIdList);
+        HashMap<String, Object> viewTopCountMap = casesRankDao.findViewTopCount(authorIdList);
+
+
+        caseList.forEach(e -> {
+            // 获取最新的两个浏览量上榜记录
+            List<CasesRank> viewsRankRecords = casesRankDao.findViewsRankRecordByCaseId(e.getId());
+            if (CollUtil.isNotEmpty(viewsRankRecords)) {
+                // 拼接生成浏览量排行榜的标签
+                List<CaseViewRankingItemVo> viewRankTags = viewsRankRecords.stream().map(casesRank -> {
+                    String pattern = casesRank.getRiseRankTime().getMonthValue() < 10 ? "yy年M月" : "yy年MM月";
+                    DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+                    String time = casesRank.getRiseRankTime().format(formatter);
+
+                    // 2023年6月 经营管理类 浏览量 TOP1
+                    String viewRankTag = time + casesRank.getMajorName() + "类浏览量TOP" + (casesRank.getRank() + 1);
+
+                    CaseViewRankingItemVo caseViewRankingItemVo = new CaseViewRankingItemVo();
+                    caseViewRankingItemVo.setMajorId(String.valueOf(casesRank.getMajorId()));
+                    caseViewRankingItemVo.setMajorName(casesRank.getMajorName());
+                    caseViewRankingItemVo.setTagName(viewRankTag);
+                    caseViewRankingItemVo.setRiseRankTime(casesRank.getRiseRankTime());
+
+                    return caseViewRankingItemVo;
+                }).collect(Collectors.toList());
+                e.setViewRankTags(viewRankTags);
+
+            }
+
+            // 拼接生成年度最佳标签
+            if (e.getExcellent()!=null && e.getExcellent()) {
+                if (e.getDraftingTime()!=null){
+                    e.setExcellentTag(e.getDraftingTime().format(DateTimeFormatter.ofPattern("yy年"))+"度最佳");
+                } else {
+                    e.setExcellentTag(e.getSysCreateTime().format(DateTimeFormatter.ofPattern("yy年"))+"度最佳");
+                }
+            }
+
+            List<String> authorTags = new ArrayList<>();
+
+            if (excellentCountMap.get(e.getAuthorId())!=null){
+                String authorTagOfExcellent = excellentCountMap.get(e.getAuthorId()) + "篇最佳案例";
+                authorTags.add(authorTagOfExcellent);
+            }
+
+            if (viewTopCountMap.get(e.getAuthorId())!=null){
+                String authorTagOfView = "上榜浏览量TOP榜单" + viewTopCountMap.get(e.getAuthorId()) + "次";
+                authorTags.add(authorTagOfView);
+            }
+
+            e.setAuthorTags(authorTags);
+        });
     }
 
     public static void main(String[] args) {
@@ -945,11 +1022,12 @@ public class CasesServiceImpl implements ICasesService {
     }
 
     @Override
-    public List<Cases> ids(List<String> ids) {
+    public List<Cases> ids(List<String> ids, String accountId) {
         QueryBuilder builder = QueryBuilder.from(Cases.class);
         builder.addFilter(FieldFilters.in("id", ids));
-        builder.addFields("new Cases(id,title,summary,coverUrl,authorId,authorName,sysCreateTime,breCommend,views,comments,praises,shares,favorites,deleted,sysCreateBy,sysCreateAid)");
+        builder.addFields("new Cases(id,title,summary,coverUrl,authorId,authorName,sysCreateTime,breCommend,views,comments,praises,shares,favorites,deleted,sysCreateBy,sysCreateAid,keyword1,keyword2,keyword3,keyword4,keyword5)");
         List<Cases> cases = casesDao.findList(builder.builder());
+        cases = caseListCommonHandle(cases, accountId);
         return cases;
     }
 
@@ -1078,15 +1156,362 @@ public class CasesServiceImpl implements ICasesService {
     }
 
     @Override
-    public void excellent(String id, Boolean excellent) {
+    public void excellent(String id, Boolean excellent, String excellentReason) {
         //取消时，把时间清空
         if (excellent) {
-            casesDao.updateMultiFieldById(id, UpdateBuilder.create("excellent", excellent), UpdateBuilder.create("excellentTime", LocalDateTime.now()));
+            casesDao.updateMultiFieldById(id, UpdateBuilder.create("excellent", excellent), UpdateBuilder.create("excellentTime", LocalDateTime.now()), UpdateBuilder.create("excellentReason", excellentReason));
         } else {
-            casesDao.updateMultiFieldById(id, UpdateBuilder.create("excellent", excellent), UpdateBuilder.create("excellentTime", null));
+            casesDao.updateMultiFieldById(id, UpdateBuilder.create("excellent", excellent), UpdateBuilder.create("excellentTime", null), UpdateBuilder.create("excellentReason", null));
         }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void refreshViewsRankOfMajor(){
+        log.info("开始执行每月案例浏览量相关定时任务");
+        // 获取上个月的第一天的00:00
+//        LocalDateTime firstDayOfLastMonth = LocalDateTime.now().minusMonths(1).with(TemporalAdjusters.firstDayOfMonth()).toLocalDate().atStartOfDay();
+        // 获取上个月的最后一天的23:59:59,将其设置为上榜时间。注意，定时统计任务是在本月月初执行的，而上榜时间是在上个月最后一天23:59:59
+        LocalDateTime lastDayOfLastMonth = LocalDateTime.now().minusMonths(1).with(TemporalAdjusters.lastDayOfMonth()).toLocalDate().atTime(23, 59, 59); // 设置为当天的几乎结束时刻
+
+        int count = casesRankDao.sqlCount("SELECT count(1) FROM boe_cases_rank WHERE deleted=0 AND rise_rank_time = ?1" , lastDayOfLastMonth);
+        if (count > 0){
+            log.info("已生成上个月排行榜数据，本次不执行");
+            throw new RuntimeException("已生成上个月排行榜数据，请将上月排行榜数据删除");
+        }
+
+        //获取案例当月排名
+//        String sql =
+//                "SELECT bc.id,bcmt.major_id,bc.views - COALESCE(bc.last_month_views, 0) AS increment\n" +
+//                "FROM boe_cases bc\n" +
+//                "JOIN boe_cases_major_type bcmt ON bcmt.case_id = bc.id and bc.deleted=0 and file_path is not null and file_path!='' and bc.views - COALESCE(bc.last_month_views, 0)!=0";
+
+        String sql =
+                "SELECT bc.id,bcmt.major_id,bc.views AS increment\n" +
+                        "FROM boe_cases bc\n" +
+                        "JOIN boe_cases_major_type bcmt ON bcmt.case_id = bc.id and bc.deleted=0 and file_path is not null and file_path!='' and bc.views !=0 and bc.views is not null";
+
+        List<Object> caseListOfObject = casesDao.sqlFindList(sql);
+
+        // 转为casesRank
+        List<CasesRank> casesRankList = caseListOfObject.stream()
+                .map(o -> {
+                    CasesRank casesRank = new CasesRank();
+                    casesRank.setCaseId(Long.valueOf(Array.get(o, 0).toString()));
+                    casesRank.setMajorId(Array.get(o, 1).toString());
+                    casesRank.setMonthlyIncrement(Integer.parseInt(Array.get(o, 2).toString()));
+                    casesRank.setRiseRankTime(lastDayOfLastMonth);
+                    return casesRank;
+                }).collect(Collectors.toList());
+        // 根据专业分类进行分组
+        Map<String, List<CasesRank>> casesRankMap = casesRankList.stream().collect(Collectors.groupingBy(CasesRank::getMajorId));
+
+        // 生成当前月不同分类的最新的浏览量排名
+        ArrayList<CasesRank> lastMonthRank = new ArrayList<>();
+        casesRankMap.forEach((majorId, caseList) -> {
+            List<CasesRank> sortedCaseList = caseList.stream()
+                    .sorted(Comparator.comparingInt(CasesRank::getMonthlyIncrement).reversed()).limit(10)
+                    .collect(Collectors.toList());
+
+            IntStream.range(0, sortedCaseList.size())
+                    .forEach(i -> sortedCaseList.get(i).setRank(i));
+            lastMonthRank.addAll(sortedCaseList);
+        });
+
+
+        casesRankDao.saveList(lastMonthRank);
+        // 重置上月观看量：last_month_views
+        int i = casesDao.sqlUpdate("update boe_cases set last_month_views=views where deleted=0");
+        log.info("每月案例浏览量相关定时任务执行完成，boe_cases更新数据量为条数为"+i);
+        log.info("每月案例浏览量相关定时任务执行完成，boe_cases_rank添加数据量为条数为"+lastMonthRank.size());
 
     }
 
 
+    @Override
+    public void refreshLastQuarterStatistics() {
+        log.info("开始执行每季案例相关定时任务");
+        int i = casesDao.sqlUpdate("update boe_cases set last_quarter_views=views,last_quarter_praise=praise where deleted=0");
+        log.info("每季案例相关定时任务执行完成，boe_cases更新数据量为条数为"+i);
+    }
+
+    @Override
+    public List<CaseRankingVo> queryRank(Integer pageSize, Integer rankType) {
+        if (pageSize == null) {
+            pageSize = 3;
+        }
+        String cacheKey = "";
+        // 获取缓存key
+        for (CasesRankEnum enumValue : CasesRankEnum.values()) {
+            if (rankType == enumValue.getType()) {
+                // 格式如：case:rank:praise:all3
+                cacheKey = enumValue.getCacheKey()+pageSize;
+            }
+        }
+        
+        List<String> caseListOfJson = stringRedisTemplate.opsForList().range(cacheKey, 0, -1);
+
+        if (CollectionUtil.isNotEmpty(caseListOfJson)) {
+            // 缓存中存在数据
+            List<CaseRankingVo> casesList = caseListOfJson.stream().map(item -> JSONUtil.toBean(item, CaseRankingVo.class)).collect(Collectors.toList());
+            return casesList;
+        }
+
+        List<CaseRankingVo> casesList = casesDao.findRank(pageSize,rankType);
+
+        if (CollectionUtil.isNotEmpty(casesList)) {
+            // 缓存不存在数据，数据库中不存在数据，重建缓存
+            List<String> serializedCases = casesList.stream().map(item -> JSONUtil.toJsonStr(item)).collect(Collectors.toList());
+            stringRedisTemplate.opsForList().rightPushAll(cacheKey, serializedCases);
+            stringRedisTemplate.expire(cacheKey, 600, TimeUnit.SECONDS);
+            return casesList;
+        }
+        return Collections.emptyList();
+
+    }
+
+
+    @Override
+    public List<Cases> queryPopularityOfMajor(Integer pageSize, String majorId, LocalDateTime month, String accountId) {
+        if (pageSize == null) {
+            pageSize = 10;
+        }
+
+        LocalDateTime startTime = month.withDayOfMonth(1);
+        LocalDateTime endTime = month.plusMonths(1).withDayOfMonth(1).withMinute(0);
+
+        List<HashMap<String, Object>> popularityOfMajor = casesRankDao.findPopularityOfMajor(pageSize, startTime, endTime, majorId);
+        List<String> caseIdList = popularityOfMajor.stream().map(map -> map.get("caseId").toString()).collect(Collectors.toList());
+
+        Map<Object, Integer> collect = popularityOfMajor.stream().collect(Collectors.toMap(map -> map.get("caseId").toString(), map -> Integer.valueOf(map.get("rank").toString())));
+
+        QueryBuilder query = QueryBuilder.from(Cases.class);
+        query.addFilter(FieldFilters.in("id",caseIdList));
+        query.addFilter(FieldFilters.eq("deleted",false));
+
+        List<Cases> casesList = casesDao.findList(query.builder());
+        casesList = caseListCommonHandle(casesList, accountId);
+
+        Collections.sort(casesList, new Comparator<Cases>() {
+            @Override
+            public int compare(Cases c1, Cases c2) {
+                Integer order1 = collect.get(c1.getId());
+                Integer order2 = collect.get(c2.getId());
+                return Integer.compare(order1, order2);
+            }
+        });
+        return casesList;
+    }
+
+
+
+    @Override
+    public List<CasesQueryRecommendRankVo> queryRecommendRank(Integer pageSize) {
+        QueryBuilder queryBuilder = QueryBuilder.from(Cases.class);
+        queryBuilder.setPageSize(pageSize);
+        queryBuilder.addFilter(FieldFilters.eq("deleted",false));
+        queryBuilder.addFilter(FieldFilters.isNotNull("recommend_rank"));
+        queryBuilder.addOrder(OrderCondition.asc("recommend_rank"));
+
+        List<Cases> recommendRank = casesDao.findList(queryBuilder.builder());
+
+        List<CasesQueryRecommendRankVo> collect = recommendRank.stream().map(e -> {
+            CasesQueryRecommendRankVo casesQueryRecommendRankVo = new CasesQueryRecommendRankVo();
+            casesQueryRecommendRankVo.setCaseId(e.getId());
+            casesQueryRecommendRankVo.setCaseTitle(e.getTitle());
+            casesQueryRecommendRankVo.setCaseAuthor(e.getAuthorName());
+            casesQueryRecommendRankVo.setRecommendRankPushUserName(e.getRecommendRankPushUserName());
+            casesQueryRecommendRankVo.setRecommendRankPusTime(e.getRecommendRankPushTime());
+            return casesQueryRecommendRankVo;
+        }).collect(Collectors.toList());
+        return collect;
+    }
+
+    @Override
+    public void riseIntoRank(Long caseId, CurrentUser currentUser) {
+        Cases caseOfNewRise = casesDao.findOne(FieldFilters.eq("id", String.valueOf(caseId)),FieldFilters.isNull("recommend_rank"),FieldFilters.eq("deleted",false));
+        if (caseOfNewRise == null) {
+            log.error("案例不存在或已经在榜,不可上榜", caseId);
+            return;
+        }
+
+        int count = casesDao.sqlCount("select count(1) from boe_cases where deleted=0 and recommend_rank is not null order by recommend_rank asc limit 10");
+
+        if (count == 10){
+            log.error("已满10条，无法添加");
+            throw new RuntimeException("已满10条，无法添加");
+        }
+
+        caseOfNewRise.setRecommendRank(count);
+        caseOfNewRise.setRecommendRankPushUserName(currentUser.getLoginName());
+        caseOfNewRise.setRecommendRankPushTime(LocalDateTime.now());
+
+        casesDao.update(caseOfNewRise);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelRiseIntoRank(Long caseId) {
+        Cases caseOfCancelRise = casesDao.findOne(FieldFilters.eq("id", String.valueOf(caseId)),FieldFilters.isNotNull("recommend_rank"),FieldFilters.eq("deleted",false));
+        if (caseOfCancelRise == null) {
+            log.error("案例不存在或已经在榜,不可下榜", caseId);
+            return;
+        }
+        QueryBuilder queryBuilder = QueryBuilder.from(Cases.class);
+        queryBuilder.setPageSize(10);
+        queryBuilder.addFilter(FieldFilters.eq("deleted",false));
+        queryBuilder.addOrder(OrderCondition.asc("recommend_rank"));
+        queryBuilder.addFilter(FieldFilters.gt("recommend_rank",caseOfCancelRise.getRecommendRank()));
+        List<Cases> recommendRank = casesDao.findList(queryBuilder.builder());
+
+        if (CollectionUtils.isEmpty(recommendRank)){
+            // 更新排序
+            for (int i = 0; i < recommendRank.size(); i++){
+                Integer currentSort = recommendRank.get(i).getRecommendRank();
+                recommendRank.get(i).setRecommendRank(currentSort - 1);
+                casesDao.update(recommendRank.get(i));
+            }
+        }
+
+        // 取消排序
+        caseOfCancelRise.setRecommendRank(null);
+        caseOfCancelRise.setRecommendRankPushTime(null);
+        caseOfCancelRise.setRecommendRankPushUserName(null);
+        casesDao.update(caseOfCancelRise);
+    }
+
+    @Override
+    public void adjustRank(List<Long> caseIdList) {
+        QueryBuilder queryBuilder = QueryBuilder.from(Cases.class);
+        queryBuilder.setPageSize(10);
+        queryBuilder.addFilter(FieldFilters.eq("deleted",false));
+        queryBuilder.addFilter(FieldFilters.isNotNull("recommend_rank"));
+        queryBuilder.addOrder(OrderCondition.asc("recommend_rank"));
+        List<Cases> recommendRank = casesDao.findList(queryBuilder.builder());
+
+        // 遍历排序后的案例列表，并根据 caseIdList 设置或重置 recommendRank
+        recommendRank.forEach(caseItem -> {
+            int index = caseIdList.indexOf(Long.valueOf(caseItem.getId()));
+            // 如果 ID 存在于 caseIdList 中，则设置推荐等级为该 ID 的索引位置，否则设置为 null
+            if (index != -1) {
+                caseItem.setRecommendRank(index);
+            } else {
+                caseItem.setRecommendRank(null);
+                caseItem.setRecommendRankPushTime(null);
+                caseItem.setRecommendRankPushUserName(null);
+            }
+        });
+
+        // 保存对案例排序的更改
+        recommendRank.forEach(casesDao::update);
+    }
+
+    @Override
+    public PageList<FavoriteCaseOfIndexVo> queryFavoriteCaseOfIndex(Integer pageIndex, Integer pageSize, String accountId) {
+        String from = Favorites.class.getSimpleName()+" f,"+ Cases.class.getSimpleName()+" c";
+        QueryBuilder builder = QueryBuilder.from(from);
+        builder.addFields("f.id","f.sysCreateTime","c");
+
+        builder.addFilter(FieldFilters.eqField("f.objId","c.id"));
+        builder.addFilter(FieldFilters.eq("f.objType", BoedxResourceType.Case.value()));
+        builder.addFilter(FieldFilters.eq("f.sysCreateAid",accountId));
+        builder.addFilter(FieldFilters.eq("c.deleted", false));
+        builder.addOrder(OrderCondition.desc("f.sysCreateTime"));
+
+        builder.setPageIndex(pageIndex);
+        builder.setPageSize(pageSize);
+
+        PageList<Object[]> pageFields=null;
+        try {
+            pageFields = casesDao.findPageFields(builder.builder());
+        } catch (Exception e) {
+            log.error("收藏案例查询错误",e);
+        }
+
+        List<Object[]> list = pageFields.getList();
+
+        // 提取出 Cases 对象,添加标签
+        List<Cases> casesList = list.stream().map(o -> {
+            Cases cases = (Cases) o[2];
+            FavoriteCaseOfIndexVo favoriteCaseOfIndexVo = new FavoriteCaseOfIndexVo();
+            BeanUtils.copyProperties(cases, favoriteCaseOfIndexVo);
+            favoriteCaseOfIndexVo.setFavoriteId(o[0].toString());
+            favoriteCaseOfIndexVo.setFavoriteTime(LocalDateTime.parse(o[1].toString()));
+            return favoriteCaseOfIndexVo;
+        }).collect(Collectors.toList());
+
+        casesList = caseListCommonHandle(casesList, accountId);
+
+        List<FavoriteCaseOfIndexVo> collect = casesList.stream().map(cases -> (FavoriteCaseOfIndexVo) cases).collect(Collectors.toList());
+
+        PageList<FavoriteCaseOfIndexVo> favoriteCaseOfIndexVoPageList = new PageList<>();
+        favoriteCaseOfIndexVoPageList.setList(collect);
+        favoriteCaseOfIndexVoPageList.setPageSize(pageSize);
+        favoriteCaseOfIndexVoPageList.setCount(pageFields.getCount());
+        
+        return favoriteCaseOfIndexVoPageList;
+
+    }
+
+    @Override
+    public PageList<CasesBrowsingHistoryVo> browsingHistory(Integer pageIndex, Integer pageSize, String accountId, HttpServletRequest request) {
+        UserdynamicParam userdynamicParam = new UserdynamicParam();
+        userdynamicParam.setPageIndex(pageIndex);
+        userdynamicParam.setPageSize(pageSize);
+        userdynamicParam.setContentType(3);
+        userdynamicParam.setAid(Long.valueOf(accountId));
+        userdynamicParam.setHidden("");
+
+        String token = request.getHeader("Xboe-Access-Token");
+        if (StringUtils.isEmpty(token)) {
+            token = request.getHeader("token");
+        }
+        // 获取案例浏览记录
+        UserDynamicResult userDynamicResult = thirdApi.getAllUserdynamicListOfCaseRead(userdynamicParam, token);
+
+        List<UserDynamic> allUserdynamicList = userDynamicResult.getList();
+        List<String> collect = allUserdynamicList.stream().map(UserDynamic::getContentId).distinct().collect(Collectors.toList());
+        // 查询案例信息
+        List<Cases> caseList = this.ids(collect, accountId);
+        Map<String, Cases> map = caseList.stream().collect(Collectors.toMap(Cases::getId, cases -> cases));
+
+        // 组合案例信息与浏览记录
+        List<CasesBrowsingHistoryVo> batchHistoryVoList = allUserdynamicList.stream().map(userDynamic -> {
+            CasesBrowsingHistoryVo browsingHistoryVo = new CasesBrowsingHistoryVo();
+            browsingHistoryVo.setBrowsingHistoryId(userDynamic.getId());
+            browsingHistoryVo.setContentInfo(userDynamic.getContentInfo());
+            browsingHistoryVo.setEventTime(userDynamic.getEventTime());
+            browsingHistoryVo.setContentId(userDynamic.getContentId());
+            if (map.containsKey(userDynamic.getContentId())){
+                // 重名属性，如ID，copy会出现覆盖。
+                BeanUtils.copyProperties(map.get(userDynamic.getContentId()),browsingHistoryVo);
+            }
+            return browsingHistoryVo;
+        }).collect(Collectors.toList());
+
+        PageList<CasesBrowsingHistoryVo> pageList = new PageList<>();
+        pageList.setList(batchHistoryVoList);
+        pageList.setCount(userDynamicResult.getCount());
+        pageList.setPageSize(userDynamicResult.getPageSize());
+
+        return pageList;
+    }
+
+    @Override
+    public Map<String, List<String>> queryAllTimePopularityOfMajor() {
+        QueryBuilder builder = QueryBuilder.from(CasesRank.class);
+        builder.addField("new CasesRank(majorId,riseRankTime)");
+        builder.addFilter(FieldFilters.eq("deleted",false));
+        builder.addGroupBy("majorId");
+        builder.addGroupBy("riseRankTime");
+        List<CasesRank> list = casesRankDao.findList(builder.builder());
+        // 定义日期时间的格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yy-MM");
+
+        Map<String, List<String>> collect = list.stream().collect(Collectors.groupingBy
+                (CasesRank::getMajorId, Collectors.mapping(casesRank -> casesRank.getRiseRankTime().format(formatter), Collectors.toList())));
+
+        return collect;
+    }
+
 }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseRankingVo.java

@@ -0,0 +1,17 @@
+package com.xboe.module.boecase.vo;
+
+import lombok.Data;
+
+@Data
+public class CaseRankingVo {
+    /**
+     * 案例id
+     */
+    private String caseId;
+
+    /**
+     * 案例标题
+     */
+    private String caseTitle;
+
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseViewRankingItemVo.java

@@ -0,0 +1,29 @@
+package com.xboe.module.boecase.vo;
+
+import lombok.Data;
+import java.time.LocalDateTime;
+
+@Data
+public class CaseViewRankingItemVo {
+
+    /**
+     * 分类id
+     */
+    private String majorId;
+
+    /**
+     * 分类名称
+     */
+    private String majorName;
+
+    /**
+     * 上榜时间，目前默认为一月中的最后一天的23:59:59
+     */
+    private LocalDateTime riseRankTime;
+
+    /**
+     * 标签名称
+     */
+    private String tagName;
+
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesBrowsingHistoryVo.java

@@ -0,0 +1,31 @@
+package com.xboe.module.boecase.vo;
+
+import com.xboe.module.boecase.entity.Cases;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class CasesBrowsingHistoryVo extends Cases{
+
+    /**
+     * 浏览记录id
+     * */
+    private String browsingHistoryId;
+
+    /**
+     * 案例标题
+     * */
+    private String contentInfo;
+
+    /**
+     * 事件时间，查看案例时，有定时接口触发，名为send，eventTime为该时间
+     * */
+    private LocalDateTime eventTime;
+
+    /**
+     * 案例ID
+     * */
+    private String contentId;
+
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesQueryRecommendRankVo.java

@@ -0,0 +1,37 @@
+package com.xboe.module.boecase.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+
+@Data
+public class CasesQueryRecommendRankVo {
+
+    /**
+     * 案例id
+     */
+    private String caseId;
+
+    /**
+     * 案例标题
+     */
+    private String caseTitle;
+
+    /**
+     * 案例作者
+     */
+    private String caseAuthor;
+
+    /**
+     * 推送用户名称
+     */
+    private String recommendRankPushUserName;
+
+    /**
+     * 推送时间
+     */
+    private LocalDateTime recommendRankPusTime;
+
+
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/FavoriteCaseOfIndexVo.java

@@ -0,0 +1,23 @@
+package com.xboe.module.boecase.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xboe.module.boecase.entity.Cases;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class FavoriteCaseOfIndexVo extends Cases{
+
+    /**
+     * 收藏id
+     */
+    private String favoriteId;
+
+    /**
+     * 收藏时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime favoriteTime;
+
+}

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

@@ -1,11 +1,7 @@
 	package com.xboe.module.course.api;
 
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -134,7 +130,6 @@ public class CourseManageApi extends ApiBaseController{
 	        }else {
 	        	dto.setIsSystemAdmin(false);
 	        }
-	        
 	        String ids="";
 	        if(userOrgIds.getIds()!=null && !userOrgIds.getIds().isEmpty())
 	        {
@@ -142,12 +137,14 @@ 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) {

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

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

servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseContentDao.java

@@ -1,10 +1,13 @@
 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> {
 	
@@ -20,4 +23,5 @@ public class CourseContentDao extends BaseDao<CourseContent> {
 		int count=count(hql, courseId);
 		return count;
     }
+
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java

@@ -2,6 +2,8 @@ package com.xboe.module.course.dto;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 课程查询的条件对象
  */
@@ -102,6 +104,9 @@ public class CourseQueryDto {
      * */
     private String orgIds;
 
+    //hrpb只读
+    private List<String> readIds;
+
     /**用户权限的查询*/
     private String orgAid;
 
@@ -110,6 +115,11 @@ public class CourseQueryDto {
      */
     private Boolean isSystemAdmin;
 
+    /**
+     * 是否是新建在线可
+     */
+    private Boolean isCreateCourse;
+
     private Boolean visible;
 
     private String refId;
@@ -129,4 +139,5 @@ public class CourseQueryDto {
      * 登录人id
      */
     private String userId;
+
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java

@@ -370,6 +370,9 @@ 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;

servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java

@@ -83,8 +83,13 @@ public class CourseContent extends BaseEntity {
      * */
     @Column(name = "duration")
     private Integer duration;
-    
-    
+
+    /**
+     * 视频播放进度
+     * */
+    @Column(name = "progress_video")
+    private Float progressVideo;
+
     /**用于学习时的状态显示，非存储字段*/
     @Transient
     private Integer status;
@@ -100,6 +105,21 @@ public class CourseContent extends BaseEntity {
     	this.contentType=contentType;
     	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 +
+                '}';
+    }
 }

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

@@ -82,4 +82,7 @@ public interface ICourseContentService{
 	 * @return
 	 */
 	CourseAssess getAssess(String ccid);
+
+	void updateProcessVideo(String contentId, String courseId, Float processVideo);
+
 }

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

@@ -214,6 +214,12 @@ 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);

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

@@ -1,5 +1,7 @@
 package com.xboe.module.course.service.impl;
 
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -141,6 +143,17 @@ 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) {

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

@@ -1,6 +1,5 @@
 package com.xboe.module.exam.api;
 
-import java.io.IOException;
 import java.io.OutputStream;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -15,12 +14,15 @@ 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;
 import org.springframework.dao.DuplicateKeyException;
-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.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -39,6 +41,9 @@ import com.xboe.core.cache.IXaskCache;
 import com.xboe.core.cache.XaskCacheProvider;
 import com.xboe.core.exception.XaskException;
 import com.xboe.module.exam.dto.AloneExamExportDto;
+import com.xboe.module.exam.entity.AloneExam;
+import com.xboe.module.exam.entity.AloneExamAnswer;
+import com.xboe.module.exam.entity.ExamTest;
 import com.xboe.module.exam.service.IAloneExamService;
 import com.xboe.module.exam.service.IExamPaperService;
 import com.xboe.module.exam.service.IExamTestService;
@@ -548,7 +553,6 @@ public class AloneExamApi extends ApiBaseController {
         	//转化成百分数
         	//answer.setScore(this.calculateScore(detail));
             service.submit(answer,scoreType);
-            service.syncExamScoreToCourseSuite(answer, request);
             return success(map);
         } catch (Exception e) {
             log.error("提交答卷错误", e);
@@ -703,19 +707,4 @@ 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("导入成功");
-    }
-
 }

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

@@ -166,118 +166,231 @@ public class ExamQuestionApi extends ApiBaseController {
                 return badRequest("请上传正确的试题文件");
             }
             //获取表头
-            Row row = sheetAt.getRow(1);
+            Row row ;
             //从第二行开始获取数据
             List<ExamQuestion> examQuestions1 = new ArrayList<>();
             QuestionDto questionDto = new QuestionDto();
+            if(sheetAt.getRow(1).getCell(0).getStringCellValue().equals("标题(*)")){
+                row = sheetAt.getRow(1);
+                for (int i = 2;i<sheetAt.getPhysicalNumberOfRows();i++) {
+                    //获取每一行
 
-            for (int i=2;i<sheetAt.getPhysicalNumberOfRows();i++) {
-                //获取每一行
-
-                Row row1 = sheetAt.getRow(i);
-                if(row1==null || row1.getCell(0)==null){
-                    break;
-                }
-                if(StringUtil.isBlank(row1.getCell(0).getStringCellValue())){
-                    break;
-                }
-                ExamQuestion examQuestion = new ExamQuestion();
-                examQuestion.setTitle(row1.getCell(0).getStringCellValue());
-                if(row1.getCell(1).getStringCellValue().equals("单选题")){
-                    examQuestion.setType(1);
-                }
-                if(row1.getCell(1).getStringCellValue().equals("多选题")){
-                    examQuestion.setType(2);
-                }
-                examQuestion.setKnowledge(row1.getCell(2).getStringCellValue());
-                if(row1.getCell(3).getStringCellValue().equals("中")){
-                    examQuestion.setDifficulty(2f);
-                }
-                if(row1.getCell(3).getStringCellValue().equals("难")){
-                    examQuestion.setDifficulty(3f);
-                }
-                if(row1.getCell(3).getStringCellValue().equals("低")){
-                    examQuestion.setDifficulty(1f);
-                }
-                Cell cell = row1.getCell(4);
-                cell.setCellType(CellType.STRING);
+                    Row row1 = sheetAt.getRow(i);
+                    if(row1==null || row1.getCell(0)==null){
+                        break;
+                    }
+                    if(StringUtil.isBlank(row1.getCell(0).getStringCellValue())){
+                        break;
+                    }
+                    ExamQuestion examQuestion = new ExamQuestion();
+                    examQuestion.setTitle(row1.getCell(0).getStringCellValue());
+                    if(row1.getCell(1).getStringCellValue().equals("单选题")){
+                        examQuestion.setType(1);
+                    }
+                    if(row1.getCell(1).getStringCellValue().equals("多选题")){
+                        examQuestion.setType(2);
+                    }
+                    examQuestion.setKnowledge(row1.getCell(2).getStringCellValue());
+                    if(row1.getCell(3).getStringCellValue().equals("中")){
+                        examQuestion.setDifficulty(2f);
+                    }
+                    if(row1.getCell(3).getStringCellValue().equals("难")){
+                        examQuestion.setDifficulty(3f);
+                    }
+                    if(row1.getCell(3).getStringCellValue().equals("低")){
+                        examQuestion.setDifficulty(1f);
+                    }
+                    Cell cell = row1.getCell(4);
+                    cell.setCellType(CellType.STRING);
 
 //                examQuestion.setDefaultScore(Float.valueOf(cell.getStringCellValue()));
 
-                //单选
-                if (!cell.getStringCellValue().contains(",")){
-                    examQuestion.setAnswer(row1.getCell(6).getStringCellValue());
-                    examQuestion.setDefaultScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
-                    Cell cell1 = row1.getCell(5, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
-                    cell1.setCellType(CellType.STRING);
-                    examQuestion.setAnalysis(cell1.getStringCellValue());
+                    //单选
+                    if (!cell.getStringCellValue().contains(",")){
+                        examQuestion.setAnswer(row1.getCell(6).getStringCellValue());
+                        examQuestion.setDefaultScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
+                        Cell cell1 = row1.getCell(5, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                        cell1.setCellType(CellType.STRING);
+                        examQuestion.setAnalysis(cell1.getStringCellValue());
 
-                    List<ExamOption> examOptions = new ArrayList<>();
-                    for (int j=7;j<=13;j++) {
+                        List<ExamOption> examOptions = new ArrayList<>();
+                        for (int j=7;j<=13;j++) {
 
-                        if(row1.getCell(j)!=null) {
-                            ExamOption examOption = new ExamOption();
+                            if(row1.getCell(j)!=null) {
+                                ExamOption examOption = new ExamOption();
 //                            截取表头
-                            String substring = row.getCell(j).getStringCellValue().substring(3, 4);
-                            if (row1.getCell(6).getStringCellValue().contains(substring)) {
+                                String substring = row.getCell(j).getStringCellValue().substring(3, 4);
+                                if (row1.getCell(6).getStringCellValue().contains(substring)) {
 
-                                examOption.setIsAnswer(true);
-                                examOption.setScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
-                            } else {
-                                examOption.setIsAnswer(false);
-                            }
-                            if (examOption.getIsAnswer()) {
-                                examOption.setScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
-                            }
+                                    examOption.setIsAnswer(true);
+                                    examOption.setScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
+                                } else {
+                                    examOption.setIsAnswer(false);
+                                }
+                                if (examOption.getIsAnswer()) {
+                                    examOption.setScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
+                                }
 
-                            examOption.setOptions(row.getCell(j).getStringCellValue());
+                                examOption.setOptions(row.getCell(j).getStringCellValue());
 
-                            Cell cell2 = row1.getCell(j);
-                            cell2.setCellType(CellType.STRING);
-                            examOption.setContent(cell2.getStringCellValue());
+                                Cell cell2 = row1.getCell(j);
+                                cell2.setCellType(CellType.STRING);
+                                examOption.setContent(cell2.getStringCellValue());
 
-                            if (examOption != null && StringUtil.isNotBlank(examOption.getContent())) {
-                                examOptions.add(examOption);
+                                if (examOption != null && StringUtil.isNotBlank(examOption.getContent())) {
+                                    examOptions.add(examOption);
+                                }
                             }
                         }
-                    }
 
-                    examQuestion.setOptionList(examOptions);
-                    examQuestions1.add(examQuestion);
-                }
-                //多选 多选的默认分存的是最大分
-                else{
-                    String stringCellValue = row1.getCell(4).getStringCellValue();
-                    String[] strings = stringCellValue.split(",");
+                        examQuestion.setOptionList(examOptions);
+                        examQuestions1.add(examQuestion);
+                    }
+                    //多选 多选的默认分存的是最大分
+                    else{
+                        String stringCellValue = row1.getCell(4).getStringCellValue();
+                        String[] strings = stringCellValue.split(",");
 //                    String[] strings = new String[stringCellValue.length()];
-                    String max=strings[0];
-                    for (int j=0;j<strings.length;j++) {
-                        if(Float.valueOf(max)<Float.valueOf(strings[j])){
-                            max=strings[j];
-                        }
-                    }
-                    examQuestion.setDefaultScore(Float.valueOf(max));
-                    Cell cell1 = row1.getCell(5, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
-                    cell1.setCellType(CellType.STRING);
-                    examQuestion.setAnalysis(cell1.getStringCellValue());
-                    examQuestion.setAnswer(row1.getCell(6).getStringCellValue());
-                    List<ExamOption> examOptions = new ArrayList<>();
-                    //A
-                    for (int j=7;j<=13;j++){
-                        if(row1.getCell(j)!=null && StringUtil.isNotBlank(row1.getCell(j).getStringCellValue())){
-                            ExamOption examOption=new ExamOption();
-                            examOption.setOptions(row.getCell(j).getStringCellValue());
-                            examOption.setContent(row1.getCell(j).getStringCellValue());
-                            examOption.setIsAnswer(true);
-                            examOption.setScore(Float.valueOf(strings[j-7]));
-                            if(examOption!=null && StringUtil.isNotBlank(examOption.getContent())){
-                                examOptions.add(examOption);
+                        String max=strings[0];
+                        for (int j=0;j<strings.length;j++) {
+                            if(Float.valueOf(max)<Float.valueOf(strings[j])){
+                                max=strings[j];
                             }
-
                         }
+                        examQuestion.setDefaultScore(Float.valueOf(max));
+                        Cell cell1 = row1.getCell(5, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                        cell1.setCellType(CellType.STRING);
+                        examQuestion.setAnalysis(cell1.getStringCellValue());
+                        examQuestion.setAnswer(row1.getCell(6).getStringCellValue());
+                        List<ExamOption> examOptions = new ArrayList<>();
+                        //A
+                        for (int j=7;j<=13;j++){
+                            if(row1.getCell(j)!=null && StringUtil.isNotBlank(row1.getCell(j).getStringCellValue())){
+                                ExamOption examOption=new ExamOption();
+                                examOption.setOptions(row.getCell(j).getStringCellValue());
+                                examOption.setContent(row1.getCell(j).getStringCellValue());
+                                examOption.setIsAnswer(true);
+                                examOption.setScore(Float.valueOf(strings[j-7]));
+                                if(examOption!=null && StringUtil.isNotBlank(examOption.getContent())){
+                                    examOptions.add(examOption);
+                                }
+
+                            }
+                        }
+                        examQuestion.setOptionList(examOptions);
+                        examQuestions1.add(examQuestion);
+                    }
+                }
+            }else {
+                row = sheetAt.getRow(2);
+                for (int i = 3;i<sheetAt.getPhysicalNumberOfRows();i++) {
+                    //获取每一行
+
+                    Row row1 = sheetAt.getRow(i);
+                    if(row1==null || row1.getCell(0)==null){
+                        break;
+                    }
+                    if(StringUtil.isBlank(row1.getCell(0).getStringCellValue())){
+                        break;
+                    }
+                    ExamQuestion examQuestion = new ExamQuestion();
+                    examQuestion.setTitle(row1.getCell(0).getStringCellValue());
+                    if(row1.getCell(1).getStringCellValue().equals("单选题")){
+                        examQuestion.setType(1);
+                    }
+                    if(row1.getCell(1).getStringCellValue().equals("多选题")){
+                        examQuestion.setType(2);
+                    }
+                    examQuestion.setKnowledge(row1.getCell(2).getStringCellValue());
+                    if(row1.getCell(3).getStringCellValue().equals("中")){
+                        examQuestion.setDifficulty(2f);
+                    }
+                    if(row1.getCell(3).getStringCellValue().equals("难")){
+                        examQuestion.setDifficulty(3f);
+                    }
+                    if(row1.getCell(3).getStringCellValue().equals("低")){
+                        examQuestion.setDifficulty(1f);
+                    }
+                    Cell cell = row1.getCell(4);
+                    cell.setCellType(CellType.STRING);
+
+//                examQuestion.setDefaultScore(Float.valueOf(cell.getStringCellValue()));
+
+                    //单选
+                    if (!cell.getStringCellValue().contains(",")){
+                        examQuestion.setAnswer(row1.getCell(6).getStringCellValue());
+                        examQuestion.setDefaultScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
+                        Cell cell1 = row1.getCell(5, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                        cell1.setCellType(CellType.STRING);
+                        examQuestion.setAnalysis(cell1.getStringCellValue());
+
+                        List<ExamOption> examOptions = new ArrayList<>();
+                        for (int j=7;j<=13;j++) {
+
+                            if(row1.getCell(j)!=null) {
+                                ExamOption examOption = new ExamOption();
+//                            截取表头
+                                String substring = row.getCell(j).getStringCellValue().substring(3, 4);
+                                if (row1.getCell(6).getStringCellValue().contains(substring)) {
+
+                                    examOption.setIsAnswer(true);
+                                    examOption.setScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
+                                } else {
+                                    examOption.setIsAnswer(false);
+                                }
+                                if (examOption.getIsAnswer()) {
+                                    examOption.setScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
+                                }
+
+                                examOption.setOptions(row.getCell(j).getStringCellValue());
+
+                                Cell cell2 = row1.getCell(j);
+                                cell2.setCellType(CellType.STRING);
+                                examOption.setContent(cell2.getStringCellValue());
+
+                                if (examOption != null && StringUtil.isNotBlank(examOption.getContent())) {
+                                    examOptions.add(examOption);
+                                }
+                            }
+                        }
+
+                        examQuestion.setOptionList(examOptions);
+                        examQuestions1.add(examQuestion);
+                    }
+                    //多选 多选的默认分存的是最大分
+                    else{
+                        String stringCellValue = row1.getCell(4).getStringCellValue();
+                        String[] strings = stringCellValue.split(",");
+//                    String[] strings = new String[stringCellValue.length()];
+                        String max=strings[0];
+                        for (int j=0;j<strings.length;j++) {
+                            if(Float.valueOf(max)<Float.valueOf(strings[j])){
+                                max=strings[j];
+                            }
+                        }
+                        examQuestion.setDefaultScore(Float.valueOf(max));
+                        Cell cell1 = row1.getCell(5, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                        cell1.setCellType(CellType.STRING);
+                        examQuestion.setAnalysis(cell1.getStringCellValue());
+                        examQuestion.setAnswer(row1.getCell(6).getStringCellValue());
+                        List<ExamOption> examOptions = new ArrayList<>();
+                        //A
+                        for (int j=7;j<=13;j++){
+                            if(row1.getCell(j)!=null && StringUtil.isNotBlank(row1.getCell(j).getStringCellValue())){
+                                ExamOption examOption=new ExamOption();
+                                examOption.setOptions(row.getCell(j).getStringCellValue());
+                                examOption.setContent(row1.getCell(j).getStringCellValue());
+                                examOption.setIsAnswer(true);
+                                examOption.setScore(Float.valueOf(strings[j-7]));
+                                if(examOption!=null && StringUtil.isNotBlank(examOption.getContent())){
+                                    examOptions.add(examOption);
+                                }
+
+                            }
+                        }
+                        examQuestion.setOptionList(examOptions);
+                        examQuestions1.add(examQuestion);
                     }
-                    examQuestion.setOptionList(examOptions);
-                    examQuestions1.add(examQuestion);
                 }
             }
             //判断题  只存在试题表中

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

@@ -3,10 +3,14 @@ package com.xboe.module.exam.api;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.xboe.api.ThirdApi;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.*;
+import org.hibernate.exception.ConstraintViolationException;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.xboe.common.PageList;
 import com.xboe.common.Pagination;
@@ -19,8 +23,6 @@ import com.xboe.module.exam.service.IExamTestService;
 
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.List;
-
 /**
  * 考试
  * */
@@ -31,10 +33,8 @@ public class ExamTestApi extends ApiBaseController {
 	
     @Resource
     private IExamTestService examTestService;
-    
     @Resource
-    private ThirdApi thirdApi;
-
+    ThirdApi thirdApi;
     /**
      *查询考试，分页，搜索,资源归属，状态
      **/
@@ -82,16 +82,33 @@ public class ExamTestApi extends ApiBaseController {
      * */
     @PostMapping("update")
     @AutoLog(module = "考试",action = "修改考试",info = "修改考试")
-    public JsonResponse<ExamTest> update(@RequestBody ExamTest examTest){
+    public JsonResponse<ExamTest> update(@RequestBody ExamTest examTest, HttpServletRequest request){
         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());
+            // 捕获其他所有异常
+            log.error("修改失败", e);
+            return error("修改失败", e.getMessage());
         }
     }
     /**、
@@ -116,16 +133,10 @@ public class ExamTestApi extends ApiBaseController {
      * */
     @GetMapping("/delete")
     @AutoLog(module = "考试",action = "删除考试",info = "删除考试")
-    public JsonResponse<Boolean> delete(String id, HttpServletRequest request){
+    public JsonResponse<Boolean> delete(String id){
         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);
@@ -172,21 +183,4 @@ public class ExamTestApi extends ApiBaseController {
             return error("上下级失败",e.getMessage());
         }
     }
-
-    /**
-     * 引用关系移除
-     * */
-    @PostMapping("/removeRel")
-    public JsonResponse<Boolean> removeRel(@RequestParam List<String> ids){
-        if(CollectionUtil.isEmpty(ids)){
-            return badRequest("参数异常");
-        }
-        try {
-            examTestService.removeRel(ids);
-            return success(true);
-        } catch (Exception e) {
-            log.error("引用关系移除异常",e);
-            return error("引用关系移除异常",e.getMessage());
-        }
-    }
 }

servers/boe-server-all/src/main/java/com/xboe/module/exam/dto/SaveExamScoreDto.java

@@ -1,122 +0,0 @@
-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;
-
-
-}

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

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

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

@@ -28,7 +28,7 @@ public class ExamTest extends BaseEntity {
     /**
     * 考试名称
      * */
-    @Column(name = "test_name",nullable = false,length = 50)
+    @Column(name = "test_name",length = 50)
     private String testName;
     
     /**
@@ -46,7 +46,7 @@ public class ExamTest extends BaseEntity {
     /**
     * 考试时长    分钟
      * */
-    @Column(name = "test_duration",nullable = false)
+    @Column(name = "test_duration")
     private Integer testDuration;
     /**
      * 显示解析
@@ -101,19 +101,19 @@ public class ExamTest extends BaseEntity {
     /**
      * 试卷的ID
      */
-    @Column(name = "paper_id",nullable = false,length=20)
+    @Column(name = "paper_id",length=20)
     private String paperId;
     
     /**
      * 考试的类型
      * */
-    @Column(name = "test_type",nullable = false)
+    @Column(name = "test_type")
     private Integer testType;
     
     /**
      * 发布状态 ，是否已发布
      */
-    @Column(name = "published",length = 1,nullable = false)
+    @Column(name = "published",length = 1)
     private Boolean published;
     /**
      * 发布时间
@@ -154,7 +154,7 @@ public class ExamTest extends BaseEntity {
     /**
      * 范围，1表独立使用，2表课程内部
      * */
-    @Column(name = "range_type",nullable = false)
+    @Column(name = "range_type")
     private Integer rangeType;
 
     /**
@@ -173,19 +173,9 @@ public class ExamTest extends BaseEntity {
 
 
     /**启用的，上架*/
-    @Column(name = "enabled", nullable = false, length = 1)
+    @Column(name = "enabled", length = 1)
     private Boolean enabled;
     
     @Transient
     private String paperName;
-
-    /** 关联类型，1、项目 2、学习路径图 3、面授课 14、成长路径图 */
-    @Column(name = "ref_type")
-    private Integer refType;
-
-    @Column(name = "ref_id")
-    private String refId;
-
-    @Column(name = "ref_status")
-    private Integer refStatus;
 }

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

@@ -5,13 +5,11 @@ 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;
 import com.xboe.module.exam.entity.AloneExamAnswer;
 import com.xboe.module.exam.vo.AloneExamQuery;
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * 独立考试的处理。此信息无删除操作，更新也只是更新answerJson字段
@@ -94,18 +92,10 @@ public interface IAloneExamService {
 
 	/**
 	 * 提交考试
-	 *
 	 * @param aea
 	 */
-	void submit(AloneExamAnswer aea, Integer scoreType);
-
-	/**
-	 * 同步考试成绩
-	 * @param aea
-	 * @param request
-	 */
-	void syncExamScoreToCourseSuite(AloneExamAnswer aea, HttpServletRequest request);
-
+	void submit(AloneExamAnswer aea,Integer scoreType);
+	
 	/**
 	 * 更新答案
 	 * @param id
@@ -166,7 +156,5 @@ public interface IAloneExamService {
 	 * @throws Exception
 	 */
 	PageList<TestUserDto> findTestUserAnswers(TestUserQuery params) throws Exception;
-
-	void examScoreBatchAdd(HttpServletRequest request, List<SaveExamScoreDto> saveExamScoreDtoList);
-
+	
 }

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

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

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

@@ -1,25 +1,15 @@
 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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 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;
@@ -30,40 +20,31 @@ 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.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.springframework.transaction.support.DefaultTransactionDefinition;
 
 @Service
 public class AloneExamServiceImpl implements IAloneExamService{
 
-	private static final Logger log = LoggerFactory.getLogger(AloneExamServiceImpl.class);
 	@Resource
 	AloneExamAnswerDao dao;
 	
 	@Resource
 	AloneExamDao aeDao;
-
-	@Autowired
-	private ExamTestDao examTestDao;
-
-	@Autowired
-	private ThirdApi thirdApi;
-
 	
 	@Override
 	@Transactional
 	public void save(AloneExamAnswer aea){
 		dao.save(aea);
-		AloneExam ae=aeDao.findOne(FieldFilters.eq("aid", aea.getAid()),FieldFilters.eq("testId", aea.getTestId()));
-		int currentTimes = ae.getTimes() != null ? ae.getTimes() : 0;
 		//更新状态
 		aeDao.update(UpdateBuilder.from(AloneExam.class)
 				.addUpdateField("status", AloneExam.STATUS_NORMAL)
-				.addUpdateField("times", currentTimes+1)
 				.addFilter(FieldFilters.eq("aid", aea.getAid()))
 				.addFilter(FieldFilters.eq("testId", aea.getTestId()))
 				.addFilter(FieldFilters.eq("status",AloneExam.STATUS_NONE))
@@ -72,8 +53,8 @@ public class AloneExamServiceImpl implements IAloneExamService{
 	}
 
 	@Override
-	@Transactional(propagation = Propagation.REQUIRES_NEW)
-	public void submit(AloneExamAnswer aea, Integer scoreType){
+	@Transactional
+	public void submit(AloneExamAnswer aea,Integer scoreType){
 		//dao.update(aea);
 		aea.setStatus(AloneExamAnswer.STATUS_FINISH);
 		LocalDateTime now=LocalDateTime.now();
@@ -121,27 +102,6 @@ public class AloneExamServiceImpl implements IAloneExamService{
 //			}
 		}
 	}
-	@Override
-	public void syncExamScoreToCourseSuite(AloneExamAnswer aea, HttpServletRequest request) {
-		String token = request.getHeader("Xboe-Access-Token");
-		if (StringUtils.isEmpty(token)) {
-			token = request.getHeader("token");
-		}
-
-		String finalToken = token;
-		CompletableFuture.supplyAsync(() -> {
-			AloneExam aloneExam = aeDao.findOne(FieldFilters.eq("aid", aea.getAid()), FieldFilters.eq("testId", aea.getTestId()));
-			if (aloneExam.getRefType().equals("14")){
-				thirdApi.syncExamScoreToCourseSuite(aloneExam, finalToken);
-			}
-			return "完成结果";
-		}).exceptionally(ex -> {
-			log.error("异步操作中发生错误: " + ex.getMessage(), ex);
-			return "发生错误";
-		}).thenAccept(result -> {
-			log.info("同步考试成绩到课程项目完成：" + result);
-		});
-	}
 
 	@Override
 	@Transactional
@@ -467,86 +427,4 @@ 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);
-			}
-		});
-	}
 }

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

@@ -70,7 +70,18 @@ public class ExamTestServiceImpl implements IExamTestService {
 
     @Override
     public void update(ExamTest examTest) {
-        examTestDao.update(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);
     }
     
     @Override
@@ -84,7 +95,7 @@ public class ExamTestServiceImpl implements IExamTestService {
 
     @Override
     public Boolean has(String paperId) {
-    	ExamTest et=examTestDao.findOne(FieldFilters.eq("paperId", paperId));
+    	ExamTest et=examTestDao.findOne(FieldFilters.eq("paperId", paperId),FieldFilters.eq("deleted", false));
     	//String etId= (String)examTestDao.findField("id", FieldFilters.eq("paperId", paperId));
         if(et==null){
             return true;
@@ -111,10 +122,4 @@ public class ExamTestServiceImpl implements IExamTestService {
 		}
 		return null;
 	}
-
-    @Override
-    public void removeRel(List<String> ids) {
-        String idsStr = String.join(",", ids);
-        examTestDao.sqlUpdate("update boe_exam_test set ref_status=0 where id in (?1)",idsStr);
-    }
 }

servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteCaseDto.java

@@ -12,6 +12,7 @@ public class FavoriteCaseDto {
 
 
     private String id;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime time;
     /**

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

@@ -3,14 +3,13 @@ package com.xboe.school.study.api;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
-import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
 import com.xboe.api.ThirdApi;
-import com.xboe.api.vo.*;
+import com.xboe.constants.CacheName;
 import com.xboe.module.course.vo.TeacherVo;
-import com.xboe.module.usergroup.entity.UserGroupItem;
 import com.xboe.module.usergroup.service.IUserGroupService;
+import com.xboe.school.study.dao.StudyCourseDao;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -324,17 +323,32 @@ public class StudyCourseApi extends ApiBaseController{
 		//检查是否已存在
 		StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId());
 		if(item!=null) {
-			//如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况
-			if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) {
-				studyService.updateProcess(item.getId(), sci.getStudyId(), sci.getCourseId(), sci.getContentTotal(), sci.getProgress(),token);
+			String studyKey = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + item.getCourseId()+":"+cuser.getAccountId()+":"+item.getContentId();
+			String studyKey2 = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + sci.getCourseId()+":"+cuser.getAccountId()+":"+sci.getContentId();
+			redisTemplate.opsForValue().set(studyKey,
+					String.valueOf(item.getProgress()), 2, TimeUnit.HOURS);
+			String progressStr = redisTemplate.opsForValue().get(studyKey2);
+			if (progressStr != null && !progressStr.isEmpty()) {
+				// 尝试将 Redis 中的字符串转换为整数
+				int redisProgress = Integer.parseInt(progressStr);
+				// 假设 item.getProgress() 返回的是 int 类型
+				int sciProgress = sci.getProgress();
+
+				if (redisProgress < sciProgress && redisProgress < 100) {
+					// 执行一些操作
+//					if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) {
+//					}
+					studyService.updateProcess(item.getId(), sci.getStudyId(), sci.getCourseId(), sci.getContentTotal(), sci.getProgress(),token);
+				}
 			}
 			//追加学习时长
 			studyService.appendStudyDuration(sci.getStudyId(),item.getId(),sci.getContentId(),sci.getDuration());
 			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token);
 			log.info("在线课学习记录"+allUserList);
 			return success(item.getId());
+			//如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况
 		}
-		
+
 		if(StringUtils.isBlank(sci.getCourseId())){
 			return error("无课程信息");
 		}
@@ -529,7 +543,7 @@ public class StudyCourseApi extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/study-video-time")
-	public JsonResponse<Boolean> study(String studyId,String itemId,Integer videoTime){
+	public JsonResponse<Boolean> study(String itemId,Integer videoTime,String contentId , String courseId,Float progressVideo){
 		
 		if(StringUtils.isBlank(itemId)){
 			return error("参数错误");
@@ -539,7 +553,10 @@ public class StudyCourseApi extends ApiBaseController{
 		}
 		//检查是否已存在
 		try {
-			studyService.updateLastTime(itemId,videoTime,getCurrent().getAccountId());
+			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);

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

@@ -7,6 +7,7 @@ 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;
@@ -32,6 +33,8 @@ import javax.servlet.http.HttpServletRequest;
 @RestController
 @RequestMapping(value="/xboe/school/study/exam")
 public class StudyExamApi extends ApiBaseController{
+	@Autowired
+	StudyCourseDao scDao;
 
 	@Autowired
 	IStudyExamService sexamService;

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

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

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

@@ -7,6 +7,7 @@ import com.xboe.common.PageList;
 import com.xboe.school.study.dto.StudyContentDto;
 import com.xboe.school.study.entity.StudyCourseItem;
 import com.xboe.school.study.entity.StudyTime;
+import com.xboe.system.user.entity.User;
 
 /**
  * 学习情况处理,比较综合一个处理类
@@ -94,5 +95,9 @@ public interface IStudyService {
 	 * @param status
 	 * @return
 	 */
-	PageList<StudyCourseItem> findItemPage(int pageIndex,int pageSize,String contentId,String courseId,String name,Integer status);
+	PageList<StudyCourseItem> findItemPage(int pageIndex, int pageSize, String contentId, String courseId, String name, Integer status);
+
+    List<StudyCourseItem> getList(String courseId, String contentId, String name, Integer status);
+
+    List<User> getUserNo(List<String> userIds);
 }

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

@@ -6,6 +6,7 @@ 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;
 
 /**
@@ -48,6 +49,13 @@ public interface IStudySignupService {
 	 * @param signup
 	 */
 	StudyCourse addSignup(StudySignup signup);
+
+
+	/**
+	 * 管理员添加报名课件
+	 * @param signup
+	 */
+	StudyCourseItem addStudyCourseItem(StudySignup signup);
 	
 	/**
 	 * 删除报名，只有未审核过的才可以删除

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(homework.getContentName());
+			sci.setContentName("评估");
 			sci.setCourseId(assess.getCourseId());
 			//sci.setCsectionId(homework.getCsectionId());
 			sci.setProgress(100);//直接设置为学习完成

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(homework.getContentName());
+			sci.setContentName("考试");
 			sci.setCourseId(exam.getCourseId());
 			//sci.setCsectionId(homework.getCsectionId());
 			sci.setProgress(prog);//直接设置为学习完成
@@ -112,29 +112,34 @@ 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(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",100.0f);
+				if(exam.getScore()>=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);
+				}
 			}
 		}
-
 		//1最高一次,用于最高一次的计算
 		if(cexam.getScoringType()==CourseExam.SCORINGTYPE_MAX) {
-			Float f=(Float)dao.findField("max(score)", FieldFilters.eq("contentId", exam.getContentId()));
+			Float f=(Float)dao.findField("max(score)", FieldFilters.eq("contentId", exam.getContentId()), FieldFilters.eq("courseId", exam.getCourseId()), FieldFilters.eq("studyId", exam.getStudyId()));
 			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",100.0f);
+				scItemDao.updateFieldById(exam.getStudyId(), "score",exam.getScore());
+				//scDao.updateFieldById(exam.getStudyId(), "last_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 "";

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.getContentName());
+			sci.setContentName(homework.getHwName());
 			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(obj.toString());
+			homework.setId(homework.getStudyItemId());
 			dao.update(homework);
 		}
 	}
@@ -89,4 +89,9 @@ public class StudyHomeWorkServiceImpl implements IStudyHomeWorkService{
 		return dao.findList(FieldFilters.eq("studyId", studyId),FieldFilters.eq("contentId", contentId));
 	}
 
+	@Override
+	public List<StudyHomeWork> getByStudnetNameAndContentId(List<String> studentName, String contentId) {
+		return dao.findList(FieldFilters.in("student_name", studentName),FieldFilters.eq("contentId", contentId));
+	}
+
 }

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

@@ -1,15 +1,18 @@
 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.api.ThirdApi;
+import com.xboe.module.article.entity.Article;
+import com.xboe.module.interaction.entity.Shares;
 import com.xboe.school.study.entity.StudyCourse;
+import com.xboe.system.user.entity.User;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -94,8 +97,12 @@ public class StudyServiceImpl implements IStudyService{
 		//sci.setProgress(100);//直接设置为学习完成
 		sci.setLastTime(ldt);
 		scItemDao.saveOrUpdate(sci);
-		
-		dto.setStudyItemId(sci.getId());
+		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);
 		
@@ -163,12 +170,10 @@ 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);
-		
+		QueryBuilder query = QueryBuilder.from(StudyCourseItem.class);
 		query.setPageIndex(pageIndex);
 		query.setPageSize(pageSize);
-		
+
 		OrderCondition	oc=OrderCondition.desc("id");
 		query.addOrder(oc);
 		if(StringUtils.isNotBlank(contentId)) {
@@ -177,20 +182,126 @@ public class StudyServiceImpl implements IStudyService{
 		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)) {
+			query.addFilter(FieldFilters.eq("contentId",contentId));
+		}
+		if(StringUtils.isNotBlank(courseId)) {
+			query.addFilter(FieldFilters.eq("courseId",courseId));
+		}
+
 		if(status!=null) {
 			if(status==1) {
 				query.addFilter(FieldFilters.eq("progress", 0));
 			}else {
 				query.addFilter(FieldFilters.eq("progress",100));
 			}
-			
+
 		}
 		if(StringUtils.isNotBlank(name)) {
 			query.addFilter(FieldFilters.eq("aname", name));
 		}
-		return scItemDao.findPage(query.builder());
-		
+		return scItemDao.findList(query.builder());
+	}
+
+	@Override
+	public List<User> getUserNo(List<String> userIds) {
+		return userDao.findList(FieldFilters.in("id", userIds));
 	}
 
 	@Override

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

@@ -4,9 +4,15 @@ 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;
@@ -39,7 +45,13 @@ public class StudySignupServiceImpl implements IStudySignupService{
 	
 	@Autowired
 	StudyCourseDao studyCourseDao;
-	
+
+	@Autowired
+	StudyCourseItemDao scItemDao;
+
+	@Autowired
+	CourseContentDao contentDao;
+
 	@Autowired(required = false)
 	ICourseStudySearch esSearch;
 	
@@ -69,7 +81,6 @@ public class StudySignupServiceImpl implements IStudySignupService{
 		signupDao.save(signup);
 		//添加到课程学习
 		LocalDateTime now=LocalDateTime.now();
-		
 		StudyCourse sc=new StudyCourse();
 		sc.setAddTime(now);
 		sc.setAid(signup.getAid());
@@ -124,11 +135,40 @@ 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);
 		}
 	}
 
@@ -136,7 +176,6 @@ 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());

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

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

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

@@ -56,7 +56,7 @@ logging.config=classpath:log/logback-@profileActive@.xml
 # config.id.generator.datacenter.num=1
 
 #boe.domain=https://pretest.zcwytd.com
-boe.domain=https://u.boe.com
+boe.domain=http://127.0.0.1
 #boe.domain=http://localhost:30001
 orgTree.orgTreeList=${boe.domain}/userbasic/org/list
 # ????id????????????
@@ -71,9 +71,7 @@ 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/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
+coursesuilt.getStudyStatus=${boe.domain}/manageApi/stu/project/completeStatus

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

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

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

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

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

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

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

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

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

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

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

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

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

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