Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

lxw

2022-09-05 c547bc1777b566e46445b0e74325f1ec69baff94

 src/main/java/com/whyc/controller/MaterialController.java

@@ -3,6 +3,7 @@
import com.whyc.dto.Response;
import com.whyc.pojo.Material;
import com.whyc.service.MaterialService;
import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -59,4 +60,24 @@
    public Response getAttachByMaterialId(@RequestParam int materialId){
        return service.getAttachByMaterialId(materialId);
    }

    @ApiOperation(value = "根据物料型号（'-','_'之前的部分）查询物料的历史版本",notes = "9.3修改后使用")
    @GetMapping("getMaterialVersion")
    public Response getMaterialVersion(@RequestParam String subModel){
        return service.getMaterialVersion(subModel);
    }

    @ApiOperation(value = "根据物料id查询物料信息",notes = "9.3修改后使用")
    @GetMapping("getMaterialById")
    public Response getMaterialById(@RequestParam int materialId){
        return service.getMaterialById(materialId);
    }

    /**物料id-物料编码-物料型号*/
    @ApiOperation(value = "追加附件",notes = "materialStr为json字符串,包含id,subCode,subModel")
    @PostMapping("attachment")
    public Response addAttachment(@RequestParam MultipartFile multipartFile,@RequestParam String materialStr){
        Material material = ActionUtil.getGson().fromJson(materialStr, Material.class);
        return service.addAttachment(multipartFile,material);
    }
}