增加去重接口类

doc/sql/mysql/tianze-pro.sql

@@ -27084,7 +27084,7 @@ COLLATE = utf8_general_ci;
 alter table resources_application_course comment '应用管理 和 课程 关联';
 
 
-INSERT INTO `tzcj`.`resources_application_course` (`resources_application_course_id`, `resources_application_id`, `course_info_id`, `course_label_id`) VALUES (2, 2, 1, 2);
+INSERT INTO `tzcj`.`resources_application_course` (`resources_application_course_id`, `resources_application_id`, `course_info_id`, `course_label_id`) VALUES (2, 2, 3, 2);
 
 
 -- ----------------------------

web/src/main/java/com/ibeetl/jlw/service/CourseLabelService.java

@@ -45,4 +45,13 @@ public class CourseLabelService extends CoreBaseService<CourseLabel>{
     public List<CourseLabel> getValues (Object paras){
         return sqlManager.select(SqlId.of("jlw.courseLabel.getCourseLabelValues"),CourseLabel.class,paras);
     }
+
+    /**
+     * 获取course_label_type字段去重
+     * @return
+     */
+    public List<String> disLabelType() {
+        return courseLabelDao.createLambdaQuery().distinct().select(String.class, "course_label_type");
+    }
+
 }

web/src/main/java/com/ibeetl/jlw/web/CourseLabelController.java

@@ -134,6 +134,15 @@ public class CourseLabelController{
         courseLabelService.deleteCourseLabel(ids);
         return JsonResult.success();
     }
-    
 
+
+    /**
+     * 获取course_label_type字段去重
+     * @return
+     */
+    @PostMapping(MODEL + "/disLabelType.json")
+    @ResponseBody
+    public JsonResult disLabelType() {
+        return JsonResult.success(courseLabelService.disLabelType());
+    }
 }

web/src/test/java/com/ibeetl/jlw/web/CourseLabelControllerTest.java

@@ -0,0 +1,43 @@
+package com.ibeetl.jlw.web;
+
+import base.BaseTest;
+import org.junit.jupiter.api.Test;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.RequestBuilder;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+
+import java.nio.charset.Charset;
+
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author mlx
+ * @date 2022/10/17
+ * @modified
+ */
+class CourseLabelControllerTest extends BaseTest {
+
+    private static final String MODEL = "/jlw/courseLabel";
+    private static final String API = "/api/courseLabel";
+
+    @Test
+    void disLabelType() throws Exception {
+        //构造请求参数
+        RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/disLabelType.json")
+                .contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE);
+
+
+        //发送请求，验证返回结果
+        String result = mvc.perform(rb)
+                .andExpect(status().isOk())
+                .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
+                .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
+
+        System.out.println(result);
+    }
+}

web/src/test/java/com/ibeetl/jlw/web/ResourcesQuestionControllerTest.java

@@ -10,6 +10,8 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.springframework.util.MultiValueMap;
 
+import java.nio.charset.Charset;
+
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 class ResourcesQuestionControllerTest extends BaseTest {
@@ -30,7 +32,7 @@ class ResourcesQuestionControllerTest extends BaseTest {
         String result = mvc.perform(rb)
                 .andExpect(status().isOk())
                 .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
-                .andReturn().getResponse().getContentAsString();
+                .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
 
         System.out.println(result);
     }

web/src/test/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotControllerTest.java

@@ -15,6 +15,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.nio.charset.Charset;
 import java.util.List;
 
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -66,7 +67,7 @@ class ResourcesQuestionSnapshotControllerTest extends BaseTest {
             String result = mvc.perform(rb)
                     .andExpect(status().isOk())
                     .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
-                    .andReturn().getResponse().getContentAsString();
+                    .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
 
             System.out.println(result);
         }catch (Exception e) {

web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassControllerTest.java

@@ -12,6 +12,8 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.springframework.util.MultiValueMap;
 
+import java.nio.charset.Charset;
+
 import static com.ibeetl.admin.test.util.test.RandomUtils.randomPojo;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -71,7 +73,7 @@ public class TeacherOpenCourseMergeSchoolClassControllerTest extends BaseTest {
         String result = mvc.perform(rb)
                 .andExpect(status().isOk())
                 .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
-                .andReturn().getResponse().getContentAsString();
+                .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
 
         System.out.println(result);
     }

web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentControllerTest.java

@@ -71,7 +71,7 @@ class TeacherOpenCourseMergeStudentControllerTest extends BaseTest {
 //        String result = mvc.perform(rb)
 //                .andExpect(status().isOk())
 //                .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
-//                .andReturn().getResponse().getContentAsString();
+//                .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
 //
 //        System.out.println(result);
     }

web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogControllerTest.java

@@ -21,6 +21,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 
 import javax.annotation.Resource;
+import java.nio.charset.Charset;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -82,7 +83,7 @@ class TeacherOpenCourseQuestionLogControllerTest extends BaseTest {
             String result = mvc.perform(rb)
                     .andExpect(status().isOk())
                     .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
-                    .andReturn().getResponse().getContentAsString();
+                    .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
 
             System.out.println(result);
         }catch (Exception e) {
@@ -155,7 +156,7 @@ class TeacherOpenCourseQuestionLogControllerTest extends BaseTest {
             String result = mvc.perform(rb)
                     .andExpect(status().isOk())
                     .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
-                    .andReturn().getResponse().getContentAsString();
+                    .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
 
             System.out.println(result);
         }catch (Exception e) {
@@ -196,7 +197,7 @@ class TeacherOpenCourseQuestionLogControllerTest extends BaseTest {
             String result = mvc.perform(rb)
                     .andExpect(status().isOk())
                     .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
-                    .andReturn().getResponse().getContentAsString();
+                    .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
 
             System.out.println(result);
         }catch (Exception e) {
@@ -227,7 +228,7 @@ class TeacherOpenCourseQuestionLogControllerTest extends BaseTest {
             String result = mvc.perform(rb)
                     .andExpect(status().isOk())
                     .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
-                    .andReturn().getResponse().getContentAsString();
+                    .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
 
             System.out.println(result);
         }catch (Exception e) {

web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingControllerTest.java

@@ -24,6 +24,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 
 import javax.annotation.Resource;
+import java.nio.charset.Charset;
 import java.util.List;
 
 import static cn.hutool.json.JSONUtil.toJsonStr;
@@ -86,7 +87,7 @@ class TeacherOpenCourseQuestionSettingControllerTest extends BaseTest {
         String result = mvc.perform(rb)
                 .andExpect(status().isOk())
                 .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
-                .andReturn().getResponse().getContentAsString();
+                .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
 
         System.out.println(result);
     }
@@ -187,7 +188,7 @@ class TeacherOpenCourseQuestionSettingControllerTest extends BaseTest {
         String result = mvc.perform(rb)
                 .andExpect(status().isOk())
                 .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
-                .andReturn().getResponse().getContentAsString();
+                .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
 
         System.out.println(result);
     }

web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionControllerTest.java

@@ -8,6 +8,8 @@ import org.springframework.test.web.servlet.RequestBuilder;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 
+import java.nio.charset.Charset;
+
 import static com.ibeetl.admin.core.util.BeanUtil.toMultiMap;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -33,7 +35,7 @@ class TeacherOpenCourseScheduleSessionControllerTest extends BaseTest {
         String result = mvc.perform(rb)
                 .andExpect(status().isOk())
                 .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
-                .andReturn().getResponse().getContentAsString();
+                .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
 
         System.out.println(result);
 

web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogControllerTest.java

@@ -8,6 +8,8 @@ import org.springframework.test.web.servlet.RequestBuilder;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 
+import java.nio.charset.Charset;
+
 import static com.google.common.net.HttpHeaders.X_FORWARDED_FOR;
 import static com.ibeetl.admin.core.util.BeanUtil.toMultiMap;
 import static com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogSigninDTO.TeacherOpenCourseStudentSigninLogTypeEnum.*;
@@ -79,7 +81,7 @@ class TeacherOpenCourseStudentSigninLogControllerTest extends BaseTest {
         String result = mvc.perform(rb)
                 .andExpect(status().isOk())
                 .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
-                .andReturn().getResponse().getContentAsString();
+                .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
 
         System.out.println(result);
     }