附件下载2

oa-app/src/main/java/com/css/oa/exam/announce/controller/AnnounceController.java

@@ -64,15 +64,15 @@ public class AnnounceController extends BaseController {
    @ApiOperation(value = "下载公告中的文件")
    @GetMapping("/download")
    public void download(@RequestParam(value = "uuid") String uuid, HttpServletRequest request, HttpServletResponse response) {
    public void download(@RequestParam(value = "file_id") String file_id, HttpServletRequest request, HttpServletResponse response) {
        try {
            if(TextUtils.isEmpty(uuid)){
                exportPrint(response, "uuid不能为空");
            if(TextUtils.isEmpty(file_id)){
                exportPrint(response, "file_id不能为空");
                return;
            }
            String token = getToken();
            mService.setToken(token);
            mService.download(uuid, request, response);
            mService.download(file_id, request, response);
        } catch (Exception e) {
            e.printStackTrace();
            exportPrint(response, e.getMessage());

oa-app/src/main/java/com/css/oa/exam/announce/service/AnnounceService.java

@@ -74,13 +74,13 @@ public class AnnounceService extends BaseService implements IAnnounceService {
     *  @param uuid = OP_XM_ENCLOSURE表主键
     */
    @Override
    public void download(String uuid, HttpServletRequest request, HttpServletResponse response) throws Exception {
    public void download(String file_id, HttpServletRequest request, HttpServletResponse response) throws Exception {
        Admin admin = Admin.getAdminByToken(token);
        Announce announce = repository.findById(uuid).get();
        if(TextUtils.isEmpty(announce.getFile_id())){
            throw new Exception("此公告没有附件可下载");
        }
        uploadService.download(admin, announce.getFile_id(), request, response);
//        Announce announce = repository.findById(uuid).get();
//        if(TextUtils.isEmpty(announce.getFile_id())){
//            throw new Exception("此公告没有附件可下载");
//        }
        uploadService.download(admin, file_id, request, response);
    }
    @Override