lxw
2022-09-08 ce09cf1034ce441f599959777e7aab0f39dcf52d
src/main/java/com/whyc/controller/SoftwareController.java
@@ -43,15 +43,19 @@
    @ApiOperation("软件上传")
    @PostMapping("upload")
    public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String softwareStr){
    public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String softwareStr) throws IOException {
        List<Software> softwareList = ActionUtil.getGson().fromJson(softwareStr,new TypeToken<List<Software>>(){}.getType());
        return service.upload(file1,file2,softwareList);
    }
    @ApiOperation(value = "查询软件列表的信息")
    @GetMapping("getAllSoftware")
    public Response getAllSoftware(@RequestParam(required = false) String fileName,@RequestParam int pageCurr,@RequestParam int pageSize ){
        return service.getAllSoftware(fileName,pageCurr,pageSize);
    public Response getAllSoftware(@RequestParam(required = false) String fileName,
                                   @RequestParam(required = false) String applyMaterialCode,
                                   @RequestParam(required = false) String applyModel,
                                   @RequestParam(required = false) String owner,
                                   @RequestParam int pageCurr,@RequestParam int pageSize ){
        return service.getAllSoftware(fileName,applyMaterialCode,applyModel,owner,pageCurr,pageSize);
    }
    @ApiOperation(value = "根据subcode查询软件列表")