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

xiangpei

2024-07-11 5073a245f53fd5ca936e779be8c6b9b19d42f67d

 src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java

@@ -4,21 +4,24 @@
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.base.SystemCode;
import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
import com.ycl.jxkg.domain.question.QuestionObject;
import com.ycl.jxkg.domain.vo.admin.question.QuestionEditRequestVO;
import com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO;
import com.ycl.jxkg.domain.vo.admin.question.QuestionResponseVO;
import com.ycl.jxkg.enums.QuestionTypeEnum;
import com.ycl.jxkg.service.QuestionService;
import com.ycl.jxkg.utils.*;
import com.ycl.jxkg.utils.ErrorUtil;
import com.ycl.jxkg.utils.HtmlUtil;
import com.ycl.jxkg.utils.JsonUtil;
import com.ycl.jxkg.utils.PageInfoHelper;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.Objects;

@RequiredArgsConstructor
@RestController("AdminQuestionController")
@@ -81,4 +84,21 @@
        }
        return Result.ok();
    }

    @PostMapping(value = "/status")
    public Result<String> status(@RequestBody QuestionResponseVO question) {
        questionService.updateStatus(question);
        return Result.ok("操作成功");
    }

    @GetMapping("/download/importTemplate")
    public void importTemplate(HttpServletResponse response) {
        questionService.importTemplate(response);
    }

    @PostMapping("/import")
    public Result<Boolean> importPaper(MultipartFile file) {
        return questionService.importQuestion(file);
    }

}