From a86debd4945c58e7735e275f9c92ff9c5c945078 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Fri, 19 Jul 2024 14:48:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sztzjy/resource_center/controller/api/ResourceApi.java   | 5 ++---
 .../resource_center/entity/admin/AdminCaseReturnDto.java     | 3 +++
 src/main/resources/mapper/SysCaseQuestionMapper.xml          | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/sztzjy/resource_center/controller/api/ResourceApi.java b/src/main/java/com/sztzjy/resource_center/controller/api/ResourceApi.java
index 0d49cd9..0f735ad 100644
--- a/src/main/java/com/sztzjy/resource_center/controller/api/ResourceApi.java
+++ b/src/main/java/com/sztzjy/resource_center/controller/api/ResourceApi.java
@@ -144,10 +144,9 @@ public class ResourceApi {
     @ApiOperation("根据章节查看资源文件列表")
     @PostMapping("selectResourceByChapterId")
     public List<SysResourceDto> selectResourceByChapterId(@RequestParam String oneId,  //这里传的是一级的名称
-                                                          @RequestParam String threeId,
-                                                          @RequestParam String source) {
+                                                          @RequestParam String threeId) {
         SysOneCatalog sysOneCatalogs = getSysOneCatalogs(oneId);
-        return sysResourceMapper.selectResource(sysOneCatalogs.getOneId(), null, threeId, source);
+        return sysResourceMapper.selectResource(sysOneCatalogs.getOneId(), null, threeId, null);
     }
 
 
diff --git a/src/main/java/com/sztzjy/resource_center/entity/admin/AdminCaseReturnDto.java b/src/main/java/com/sztzjy/resource_center/entity/admin/AdminCaseReturnDto.java
index 9be0976..f9a1f02 100644
--- a/src/main/java/com/sztzjy/resource_center/entity/admin/AdminCaseReturnDto.java
+++ b/src/main/java/com/sztzjy/resource_center/entity/admin/AdminCaseReturnDto.java
@@ -33,6 +33,9 @@ public class AdminCaseReturnDto {
     @ApiModelProperty("目录")
     private String catalog;
 
+    @ApiModelProperty("来源")
+    private String source;
+
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
diff --git a/src/main/resources/mapper/SysCaseQuestionMapper.xml b/src/main/resources/mapper/SysCaseQuestionMapper.xml
index a62f107..2d3a50c 100644
--- a/src/main/resources/mapper/SysCaseQuestionMapper.xml
+++ b/src/main/resources/mapper/SysCaseQuestionMapper.xml
@@ -456,7 +456,7 @@
 
     <!--条件查询加绑定关系，有重复数据-->
     <select id="selectCaseByConditionsByBind" parameterType="java.lang.String" resultMap="BaseResultMap">
-        select st.*,s.case_id,s.title,s.content,s.resource_data,s.source,s.type,s.unmount_status,s.create_time,s.update_time
+        select st.one_id,st.one_name,st.two_id,st.two_name,st.three_id,st.three_name,s.case_id,s.title,s.content,s.resource_data,s.source,s.type,s.unmount_status,s.create_time,s.update_time
         from sys_case_questions s
         left join sys_topic_and_course st
         on s.case_id = st.topic_id

From 15ad17c6f7321e774787dd92d6ab5946c65bd980 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Fri, 19 Jul 2024 17:15:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/api/ObjectiveApi.java          | 15 ++++++-----
 .../new_module/admin/AdminCaseController.java | 27 ++++++++++++++++---
 .../new_module/stu/StuCaseController.java     |  8 +++---
 .../entity/SysTopicAndCourse.java             |  1 -
 .../mapper/admin/AdminCaseMapper.java         | 13 ++++-----
 src/main/resources/mapper/AdminCaseMapper.xml | 14 +++++++---
 src/main/resources/mapper/AdminDataMapper.xml |  2 +-
 7 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/sztzjy/resource_center/controller/api/ObjectiveApi.java b/src/main/java/com/sztzjy/resource_center/controller/api/ObjectiveApi.java
index 759042c..8edde9f 100644
--- a/src/main/java/com/sztzjy/resource_center/controller/api/ObjectiveApi.java
+++ b/src/main/java/com/sztzjy/resource_center/controller/api/ObjectiveApi.java
@@ -74,7 +74,7 @@ public class ObjectiveApi {
         if (StringUtils.isBlank(objectiveQuestion.getType())) {
             return false;
         }
-        if (StringUtils.isBlank(objectiveQuestion.getObjectiveId())) {  //子系统的oneName放在这个字段传过来
+        if (StringUtils.isBlank(objectiveQuestion.getOneName())) {
             return false;
         }
         if (objectiveQuestion.getType().equals("1") || objectiveQuestion.getType().equals("0")) {
@@ -87,7 +87,7 @@ public class ObjectiveApi {
                 return false;
         }
 
-        SysOneCatalog sysOneCatalogs = getSysOneCatalogs(objectiveQuestion.getObjectiveId());
+        SysOneCatalog sysOneCatalogs = getSysOneCatalogs(objectiveQuestion.getOneName());
         String oneId = sysOneCatalogs.getOneId();
         //新增题库表
         String uuid = IdUtil.randomUUID();
@@ -103,7 +103,7 @@ public class ObjectiveApi {
         sysTopicAndCourse.setTopicId(uuid);
         sysTopicAndCourse.setTopicType(objectiveQuestion.getType());
         sysTopicAndCourse.setOneId(oneId);
-        sysTopicAndCourse.setOneName(objectiveQuestion.getObjectiveId());  //子系统的oneName放在这个字段传过来
+        sysTopicAndCourse.setOneName(objectiveQuestion.getOneName());
         if (StringUtils.isNotBlank(objectiveQuestion.getTwoID())) {
             sysTopicAndCourse.setTwoId(objectiveQuestion.getTwoID());
             sysTopicAndCourse.setTwoName(objectiveQuestion.getTwoName());
@@ -126,7 +126,12 @@ public class ObjectiveApi {
         //ID不为空，修改绑定信息
         if (StringUtils.isNotBlank(dto.getTopicAndCourseId())) {
             SysTopicAndCourse sysTopicAndCourse = new SysTopicAndCourse();
-            BeanUtils.copyProperties(dto, sysTopicAndCourse);
+            sysTopicAndCourse.setId(dto.getTopicAndCourseId());
+            sysTopicAndCourse.setTopicId(dto.getObjectiveId());
+            sysTopicAndCourse.setOneId(dto.getOneID());
+            sysTopicAndCourse.setOneName(dto.getOneName());
+            sysTopicAndCourse.setTwoId(dto.getTwoID());
+            sysTopicAndCourse.setTwoName(dto.getTwoName());
             sysTopicAndCourseMapper.updateByPrimaryKeySelective(sysTopicAndCourse);
         }
         //修改题库基础信息
@@ -400,7 +405,6 @@ public class ObjectiveApi {
      * 参数：systemOwner
      * return:List<SysObjectiveQuestions>
      */
-
     @AnonymousAccess
     @ApiOperation("随机获取35道内置单选题")
     @PostMapping("selectRandomObjectiveSingle")
@@ -427,7 +431,6 @@ public class ObjectiveApi {
      * 参数：systemOwner
      * return:List<SysObjectiveQuestions>
      */
-
     @AnonymousAccess
     @ApiOperation("随机获取5道内置多选题")
     @PostMapping("selectRandomObjectiveMany")
diff --git a/src/main/java/com/sztzjy/resource_center/controller/new_module/admin/AdminCaseController.java b/src/main/java/com/sztzjy/resource_center/controller/new_module/admin/AdminCaseController.java
index d06ad4a..9711638 100644
--- a/src/main/java/com/sztzjy/resource_center/controller/new_module/admin/AdminCaseController.java
+++ b/src/main/java/com/sztzjy/resource_center/controller/new_module/admin/AdminCaseController.java
@@ -11,6 +11,7 @@ import com.sztzjy.resource_center.entity.admin.*;
 import com.sztzjy.resource_center.mapper.admin.AdminCaseMapper;
 import com.sztzjy.resource_center.mapper.admin.AdminDataLabelMapper;
 import com.sztzjy.resource_center.mapper.admin.AdminFileMapper;
+import com.sztzjy.resource_center.util.PageUtil;
 import com.sztzjy.resource_center.util.ResultEntity;
 import com.sztzjy.resource_center.util.file.IFileUtil;
 import io.swagger.annotations.Api;
@@ -230,10 +231,9 @@ public class AdminCaseController {
                                                            @RequestParam Integer size,
                                                            @RequestParam(required = false) String keyWord,
                                                            @ApiParam("精品案例不传，院校案例传'院校案例'") @RequestParam(required = false) String source,
-                                                           @RequestParam(required = false) String labelName) {
-        PageHelper.startPage(index, size);
+                                                           @RequestParam(required = false) List<String> labelName) {
         List<AdminCaseReturnDto> adminCaseReturnDtos = adminCaseMapper.selectByConditions(keyWord, source, labelName);
-        PageInfo pageInfo = new PageInfo(adminCaseReturnDtos);
+        PageInfo pageInfo = PageUtil.pageHelper(adminCaseReturnDtos, index, size);
         return new ResultEntity<>(pageInfo);
     }
 
@@ -320,4 +320,25 @@ public class AdminCaseController {
     }
 
 
+    @PostMapping("deleteCase")
+    @ApiOperation("删除案例题/管理员使用")
+    private ResultEntity<String> deleteCase(@RequestParam String caseId) {
+        try {
+            //删除案例绑定文件
+            AdminFileExample example = new AdminFileExample();
+            example.createCriteria().andDataCaseIdEqualTo(caseId);
+            adminFileMapper.deleteByExample(example);
+
+            //删除案例绑定标签
+            AdminDataLabelExample example1 = new AdminDataLabelExample();
+            example1.createCriteria().andDataCaseIdEqualTo(caseId);
+            adminDataLabelMapper.deleteByExample(example1);
+            adminCaseMapper.deleteByPrimaryKey(caseId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new ResultEntity<>(HttpStatus.INTERNAL_SERVER_ERROR, "上传失败，请联系管理员！");
+        }
+        return new ResultEntity<>(HttpStatus.OK, "删除成功！");
+    }
+
 }
diff --git a/src/main/java/com/sztzjy/resource_center/controller/new_module/stu/StuCaseController.java b/src/main/java/com/sztzjy/resource_center/controller/new_module/stu/StuCaseController.java
index d77b398..c6b8b04 100644
--- a/src/main/java/com/sztzjy/resource_center/controller/new_module/stu/StuCaseController.java
+++ b/src/main/java/com/sztzjy/resource_center/controller/new_module/stu/StuCaseController.java
@@ -10,6 +10,7 @@ import com.sztzjy.resource_center.mapper.admin.AdminCaseMapper;
 import com.sztzjy.resource_center.mapper.admin.AdminCollectCaseMapper;
 import com.sztzjy.resource_center.mapper.admin.AdminFileMapper;
 import com.sztzjy.resource_center.util.CompressUtil;
+import com.sztzjy.resource_center.util.PageUtil;
 import com.sztzjy.resource_center.util.ResultEntity;
 import com.sztzjy.resource_center.util.file.IFileUtil;
 import io.swagger.annotations.Api;
@@ -73,11 +74,9 @@ public class StuCaseController {
                                                            @RequestParam(required = false) String keyWord,
                                                            @ApiParam("精品案例传管理员，院校案例传学校ID") @RequestParam(required = false) String source,
                                                            @ApiParam("收藏案例页面传") @RequestParam(required = false) String userId,
-                                                           @RequestParam(required = false) String labelName) {
-
-        PageHelper.startPage(index, size);
+                                                           @RequestParam(required = false) List<String> labelName) {
         List<AdminCaseReturnDto> adminCaseReturnDtos = adminCaseMapper.selectByConditionsByStu(keyWord, source, userId, labelName);
-        PageInfo pageInfo = new PageInfo(adminCaseReturnDtos);
+        PageInfo pageInfo = PageUtil.pageHelper(adminCaseReturnDtos, index, size);
         return new ResultEntity<>(pageInfo);
     }
 
@@ -105,4 +104,5 @@ public class StuCaseController {
             CompressUtil.downloadZip(response, zipName, pocZipFile);
         }
     }
+
 }
diff --git a/src/main/java/com/sztzjy/resource_center/entity/SysTopicAndCourse.java b/src/main/java/com/sztzjy/resource_center/entity/SysTopicAndCourse.java
index afc7967..36532e9 100644
--- a/src/main/java/com/sztzjy/resource_center/entity/SysTopicAndCourse.java
+++ b/src/main/java/com/sztzjy/resource_center/entity/SysTopicAndCourse.java
@@ -8,7 +8,6 @@ import lombok.Data;
  * @author xcj
  * sys_topic_and_course
  */
-@Data
 public class SysTopicAndCourse {
     private String id;
 
diff --git a/src/main/java/com/sztzjy/resource_center/mapper/admin/AdminCaseMapper.java b/src/main/java/com/sztzjy/resource_center/mapper/admin/AdminCaseMapper.java
index 42687e0..28db229 100644
--- a/src/main/java/com/sztzjy/resource_center/mapper/admin/AdminCaseMapper.java
+++ b/src/main/java/com/sztzjy/resource_center/mapper/admin/AdminCaseMapper.java
@@ -4,10 +4,11 @@ import com.sztzjy.resource_center.entity.admin.AdminCase;
 import com.sztzjy.resource_center.entity.admin.AdminCaseExample;
 import com.sztzjy.resource_center.entity.admin.AdminCaseReturnDto;
 import com.sztzjy.resource_center.entity.admin.AdminCaseWithBLOBs;
-import java.util.List;
-
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 @Mapper
 public interface AdminCaseMapper {
     long countByExample(AdminCaseExample example);
@@ -39,12 +40,12 @@ public interface AdminCaseMapper {
     int updateByPrimaryKey(AdminCase record);
 
     List<AdminCaseReturnDto> selectByConditionsByStu(@Param("keyWord") String keyWord,
-                                                @Param("source") String source,
-                                                @Param("userId") String userId,
-                                                @Param("labelName") String labelName);
+                                                     @Param("source") String source,
+                                                     @Param("userId") String userId,
+                                                     @Param("labelName") List<String> labelName);
 
     List<AdminCaseReturnDto> selectByConditions(@Param("keyWord") String keyWord,
                                                 @Param("source") String source,
-                                                @Param("labelName") String labelName);
+                                                @Param("labelName") List<String> labelName);
 
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/AdminCaseMapper.xml b/src/main/resources/mapper/AdminCaseMapper.xml
index fc74d2e..0ebcb46 100644
--- a/src/main/resources/mapper/AdminCaseMapper.xml
+++ b/src/main/resources/mapper/AdminCaseMapper.xml
@@ -359,8 +359,11 @@
       <if test="keyWord !=null and keyWord !=''">
         and a.name like CONCAT('%', #{keyWord}, '%')
       </if>
-      <if test="labelName !=null and labelName !=''">
-        and ad.name = #{labelName}
+      <if test="labelName !=null and labelName.size() > 0">
+        and ad.name in
+        <foreach collection="labelName" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
       </if>
       <if test="source !=null and source !=''">
         and a.source !='管理员'
@@ -383,8 +386,11 @@
       <if test="keyWord !=null and keyWord !=''">
         and a.name like CONCAT('%', #{keyWord}, '%')
       </if>
-      <if test="labelName !=null and labelName !=''">
-        and ad.name = #{labelName}
+      <if test="labelName != null and labelName.size() > 0">
+        AND ad.name IN
+        <foreach collection="labelName" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
       </if>
       <if test="source !=null and source !='管理员'">
         and a.source = #{source}
diff --git a/src/main/resources/mapper/AdminDataMapper.xml b/src/main/resources/mapper/AdminDataMapper.xml
index bd5b258..32fbb32 100644
--- a/src/main/resources/mapper/AdminDataMapper.xml
+++ b/src/main/resources/mapper/AdminDataMapper.xml
@@ -348,7 +348,7 @@
                 and a.name like CONCAT('%', #{keyWord}, '%')
             </if>
             <if test="labelName !=null and labelName !=''">
-                and ad.name = #{labelName}
+                and ad.name in (#{labelName})
             </if>
             <if test="type !=null and type !=''">
                 and a.source != '管理员'