Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

doc/sql/mysql/2.tianze-pro-update.sql

@@ -584,4 +584,6 @@ CREATE TABLE `student_teacher_system_use_log_analysis` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='学生教师行为分析';
 
 
-alter table teacher_open_course_merge_course_info add column system_course_info_id bigint(20) comment '关联系统课程ID' after teacher_open_course_id;
+alter table teacher_open_course_merge_course_info add column system_course_info_id bigint(20) comment '关联系统课程ID' after teacher_open_course_id;
+
+alter table teacher_open_course_hands_on add column hands_on_status int comment '案例状态 （1上架 2下架 0删除）' default 1 after user_id;

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOn.java

@@ -58,6 +58,9 @@ public class TeacherOpenCourseHandsOn extends BaseEntity{
     //后台用户ID
 
     private Long userId ;
+
+    // 案例状态
+    private Integer handsOnStatus;
 	
     //数据集（多个地址，逗号隔开）
 

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -20,6 +21,7 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseKnowledgePointDao;
 import com.ibeetl.jlw.entity.*;
 import com.ibeetl.jlw.entity.vo.StudentHandsOnVO;
 import com.ibeetl.jlw.enums.CopyFromEnum;
+import com.ibeetl.jlw.enums.GlobalUpStatusEnum;
 import com.ibeetl.jlw.enums.HandsOnTaskEnum;
 import com.ibeetl.jlw.web.query.*;
 import lombok.extern.slf4j.Slf4j;
@@ -41,6 +43,7 @@ import java.util.stream.Collectors;
 
 import static cn.hutool.core.util.ArrayUtil.join;
 import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
+import static com.ibeetl.jlw.enums.GlobalUpStatusEnum.UP;
 import static java.util.stream.Collectors.toSet;
 
 /**
@@ -152,6 +155,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
                 TeacherOpenCourseHandsOn teacherOpenCourseHandsOn = teacherOpenCourseHandsOnList.get(i);
                 teacherOpenCourseHandsOn.setUserId(teacherOpenCourseHandsOnQuery.getUserId());
                 teacherOpenCourseHandsOn.setOrgId(teacherOpenCourseHandsOnQuery.getOrgId());
+                teacherOpenCourseHandsOn.setHandsOnStatus(UP.getCode());
             }
             insertBatch(teacherOpenCourseHandsOnList);
         }
@@ -164,6 +168,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
         teacherOpenCourseHandsOn.setAddTime(new Date());
         teacherOpenCourseHandsOn.setFromType(CopyFromEnum.FROM_OPEN_COURSE);
         teacherOpenCourseHandsOn.setSourceFromId(-1L);
+        teacherOpenCourseHandsOn.setHandsOnStatus(UP.getCode());
         teacherOpenCourseHandsOnDao.insert(teacherOpenCourseHandsOn);
         teacherOpenCourseHandsOnQuery.setHandsOnId(teacherOpenCourseHandsOn.getHandsOnId());
         if (isBindingKnowledgePoint){
@@ -879,4 +884,17 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
 
 
     }
+
+    /**
+     * 批量修改 状态
+     * 1 上架 2下架  0删除
+     * @param ids
+     * @param status
+     */
+    public void batchEditUpDownStatus(String ids, Integer status) {
+        HandsOnQuery handsOnQuery = new HandsOnQuery();
+        handsOnQuery.setHandsOnIdPlural(ids);
+        handsOnQuery.setHandsOnStatus(EnumUtil.likeValueOf(GlobalUpStatusEnum.class, status).getCode());
+        handsOnService.updateGivenByIds(handsOnQuery);
+    }
 }

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

@@ -40,6 +40,10 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -47,6 +51,7 @@ import java.util.Map;
 
 import static com.ibeetl.admin.core.util.ExcelUtil.convertData;
 import static com.ibeetl.admin.core.util.ExcelUtil.write;
+import static com.ibeetl.jlw.enums.GlobalUpStatusEnum.UP;
 
 /**
  * 教师开课-课程实操 教师开课-课程实操 接口
@@ -76,6 +81,7 @@ public class TeacherOpenCourseHandsOnController{
             return JsonResult.failMessage("请登录后再操作");
         }else{
             PageQuery page = condition.getPageQuery();
+            condition.setHandsOnStatus(UP.getCode());
             teacherOpenCourseHandsOnService.queryByConditionQuery(page);
             return JsonResult.success(page);
         }
@@ -94,6 +100,7 @@ public class TeacherOpenCourseHandsOnController{
 
     @GetMapping(API + "/getALLInfo.do")
     public JsonResult<List<TeacherOpenCourseHandsOn>>getALLInfo(TeacherOpenCourseHandsOnQuery param) {
+        param.setHandsOnStatus(UP.getCode());
         List<TeacherOpenCourseHandsOn>list = teacherOpenCourseHandsOnService.getValuesByQuery(param);
         return  JsonResult.success(list);
     }
@@ -103,6 +110,7 @@ public class TeacherOpenCourseHandsOnController{
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
+            param.setHandsOnStatus(UP.getCode());
             List<TeacherOpenCourseHandsOn>list = teacherOpenCourseHandsOnService.getValuesByQuery(param);
             return  JsonResult.success(list);
         }
@@ -279,6 +287,20 @@ public class TeacherOpenCourseHandsOnController{
         }
     }
 
+    /**
+     * 批量处理状态
+     * 1 上架 2下架  0删除
+     * @param ids
+     * @param status
+     * @return
+     */
+    @PostMapping(MODEL + "/editStatus.json")
+    @ResponseBody
+    public JsonResult batchEditUpDownStatus(@NotBlank(message = "案例ID[ids] 不能为空") String ids, @Min(value=0L) @Max(value=2L) @NotNull Integer status) {
+        teacherOpenCourseHandsOnService.batchEditUpDownStatus(ids, status);
+        return JsonResult.success();
+    }
+
 
     @GetMapping(MODEL + "/view.json")
     @Function("teacherOpenCourseHandsOn.query")

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

@@ -2,28 +2,20 @@ package com.ibeetl.jlw.web;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import cn.jlw.Interceptor.GetFile;
 import cn.jlw.Interceptor.RFile;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.util.ToolUtils;
-import cn.jlw.util.excel.ExcelUtil;
-import cn.jlw.util.excel.listener.MyValidateExcelCellDataListener;
 import cn.jlw.validate.ValidateConfig;
 import com.ibeetl.admin.core.annotation.Function;
 import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.file.FileService;
-import com.ibeetl.admin.core.util.BeanUtil;
 import com.ibeetl.admin.core.util.TimeTool;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.jlw.entity.FileEntity;
 import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion;
-import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestionImport;
 import com.ibeetl.jlw.service.TeacherOpenCourseMergeResourcesQuestionService;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeResourcesQuestionQuery;
-import com.ibeetl.jlw.web.query.TeacherOpenCourseQuery;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -40,7 +32,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -51,12 +42,13 @@ import javax.validation.constraints.NotNull;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
-import java.util.stream.Collectors;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static cn.jlw.util.CacheUserUtil.getStudent;
 import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
-import static com.ibeetl.admin.core.web.JsonReturnCode.DIY_ERROR;
 
 /**
  * 开课题目拉取 开课-题库管理-离线 接口
@@ -218,14 +210,14 @@ public class TeacherOpenCourseMergeResourcesQuestionController extends BaseContr
         return  JsonResult.success(list);
     }
 
-
+//
-    @PostMapping(MODEL + "/delete.json")
+//    @PostMapping(MODEL + "/delete.json")
-    @Function("teacherOpenCourseMergeResourcesQuestion.delete")
+//    @Function("teacherOpenCourseMergeResourcesQuestion.delete")
-    @ResponseBody
+//    @ResponseBody
-    public JsonResult delete(String ids) {
+//    public JsonResult delete(String ids) {
-        teacherOpenCourseMergeResourcesQuestionService.deleteTeacherOpenCourseMergeResourcesQuestion(ids);
+//        teacherOpenCourseMergeResourcesQuestionService.deleteTeacherOpenCourseMergeResourcesQuestion(ids);
-        return JsonResult.success();
+//        return JsonResult.success();
-    }
+//    }
 
 
     /**

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHandsOnQuery.java

@@ -1,15 +1,11 @@
 package com.ibeetl.jlw.web.query;
 
 import cn.jlw.validate.ValidateConfig;
-import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOn;
-import org.apache.commons.lang3.StringUtils;
 import com.ibeetl.admin.core.annotation.Query;
-import com.ibeetl.admin.core.util.Tool;
-import com.ibeetl.admin.core.util.enums.CoreDictType;
 import com.ibeetl.admin.core.web.query.PageParam;
+import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOn;
 
 import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -35,6 +31,8 @@ public class TeacherOpenCourseHandsOnQuery extends PageParam {
     private Long orgId;
     @Query(name = "后台用户ID", display = false)
     private Long userId;
+    @Query(name = "案例状态", display = false)
+    private Integer handsOnStatus;
     @Query(name = "数据集（多个地址，逗号隔开）", display = false)
     private String trainingData;
 
@@ -178,4 +176,12 @@ public class TeacherOpenCourseHandsOnQuery extends PageParam {
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
+
+    public Integer getHandsOnStatus() {
+        return handsOnStatus;
+    }
+
+    public void setHandsOnStatus(Integer handsOnStatus) {
+        this.handsOnStatus = handsOnStatus;
+    }
 }

web/src/main/resources/application-local.properties

@@ -24,7 +24,7 @@ spring.datasource.dynamic.hikari.connection-test-query=SELECT 1
 spring.datasource.dynamic.datasource.master.driverClassName=com.mysql.cj.jdbc.Driver
 spring.datasource.dynamic.datasource.master.url=jdbc:mysql://localhost:3306/tzcj?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
 spring.datasource.dynamic.datasource.master.username=root
-spring.datasource.dynamic.datasource.master.password=shuchuang123@.
+spring.datasource.dynamic.datasource.master.password=root
 spring.datasource.dynamic.datasource.master.hikari.max-lifetime=60000
 
 # ds2

web/src/main/resources/sql/jlw/teacherOpenCourseHandsOn.md

@@ -49,6 +49,10 @@ queryByCondition
   @if(!isEmpty(trainingData)){
   and t.training_data =#trainingData#
   @}
+  @if(!isEmpty(handsOnStatus)){
+  and t.hands_on_status =#handsOnStatus#
+  @}
+
 
 
 queryByConditionQuery
@@ -100,6 +104,9 @@ queryByConditionQuery
   @if(!isEmpty(trainingData)){
   and t.training_data =#trainingData#
   @}
+  @if(!isEmpty(handsOnStatus)){
+  and t.hands_on_status =#handsOnStatus#
+  @}
 
 
 
@@ -235,6 +242,10 @@ getTeacherOpenCourseHandsOnValues
   @if(!isEmpty(startTime) && !isEmpty(endTime)){
   and t.add_time BETWEEN #startTime# AND date_add(#endTime#,interval 1 day)
   @}
+  @if(!isEmpty(handsOnStatus)){
+  and t.hands_on_status =#handsOnStatus#
+  @}
+
 
 
 getValuesByQuery
@@ -284,6 +295,10 @@ getValuesByQuery
   @if(!isEmpty(trainingData)){
   and t.training_data =#trainingData#
   @}
+  @if(!isEmpty(handsOnStatus)){
+  and t.hands_on_status =#handsOnStatus#
+  @}
+
 
 
 getValuesByQueryNotWithPermission
@@ -333,6 +348,10 @@ getValuesByQueryNotWithPermission
   @if(!isEmpty(trainingData)){
   and t.training_data =#trainingData#
   @}
+  @if(!isEmpty(handsOnStatus)){
+  and t.hands_on_status =#handsOnStatus#
+  @}
+
 
 
 getHandsOnList
@@ -410,6 +429,10 @@ getExcelValues
   @if(!isEmpty(trainingData)){
   and t.training_data =#trainingData#
   @}
+  @if(!isEmpty(handsOnStatus)){
+  and t.hands_on_status =#handsOnStatus#
+  @}
+
   )
   UNION ALL
   (
@@ -462,6 +485,10 @@ getExcelValues
   @if(!isEmpty(trainingData)){
   and t.training_data =#trainingData#
   @}
+  @if(!isEmpty(handsOnStatus)){
+  and t.hands_on_status =#handsOnStatus#
+  @}
+
   )
   )t