|
|
@@ -1,43 +1,43 @@
|
|
|
package com.xjrsoft.module.base.controller;
|
|
|
|
|
|
+import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
-import cn.hutool.core.util.ObjectUtil;
|
|
|
-import cn.hutool.core.util.StrUtil;
|
|
|
+import com.alibaba.excel.EasyExcel;
|
|
|
+import com.alibaba.excel.support.ExcelTypeEnum;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
-import com.xjrsoft.common.constant.GlobalConstant;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
|
|
|
+import com.xjrsoft.common.annotation.XjrLog;
|
|
|
+import com.xjrsoft.common.model.result.RT;
|
|
|
import com.xjrsoft.common.page.ConventPage;
|
|
|
import com.xjrsoft.common.page.PageOutput;
|
|
|
-import com.xjrsoft.common.model.result.RT;
|
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
|
import com.xjrsoft.module.base.dto.AddBaseCourseSubjectDto;
|
|
|
-import com.xjrsoft.module.base.dto.UpdateBaseCourseSubjectDto;
|
|
|
-import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
-import com.xjrsoft.common.annotation.XjrLog;
|
|
|
-import com.alibaba.excel.EasyExcel;
|
|
|
-import com.xjrsoft.module.base.entity.CourseSubjectDetail;
|
|
|
-import org.springframework.web.multipart.MultipartFile;
|
|
|
-import java.io.IOException;
|
|
|
-import com.alibaba.excel.support.ExcelTypeEnum;
|
|
|
-import org.springframework.http.ResponseEntity;
|
|
|
-import java.io.ByteArrayOutputStream;
|
|
|
-import java.util.ArrayList;
|
|
|
-
|
|
|
import com.xjrsoft.module.base.dto.BaseCourseSubjectPageDto;
|
|
|
+import com.xjrsoft.module.base.dto.UpdateBaseCourseSubjectDto;
|
|
|
import com.xjrsoft.module.base.entity.BaseCourseSubject;
|
|
|
+import com.xjrsoft.module.base.entity.CourseSubjectDetail;
|
|
|
import com.xjrsoft.module.base.service.IBaseCourseSubjectService;
|
|
|
import com.xjrsoft.module.base.vo.BaseCourseSubjectPageVo;
|
|
|
-
|
|
|
import com.xjrsoft.module.base.vo.BaseCourseSubjectVo;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
-import org.springframework.web.bind.annotation.*;
|
|
|
+import org.springframework.http.ResponseEntity;
|
|
|
+import org.springframework.web.bind.annotation.DeleteMapping;
|
|
|
+import org.springframework.web.bind.annotation.GetMapping;
|
|
|
+import org.springframework.web.bind.annotation.PostMapping;
|
|
|
+import org.springframework.web.bind.annotation.PutMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestParam;
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.validation.Valid;
|
|
|
+import java.io.ByteArrayOutputStream;
|
|
|
+import java.io.IOException;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
|
|
