#

Junjie

2023-09-08 2439c81ef23336c119eb755db0d0d1d0fff4ada5

 src/main/java/com/zy/crm/manager/controller/PlanController.java

@@ -110,7 +110,7 @@
    }

    @RequestMapping(value = "/plan/add/auth")
    @ManagerAuth
    @ManagerAuth(memo = "添加规划申请单")
    @Transactional
    public R add(@RequestParam Map<String, Object> param) {
        // pre
@@ -159,7 +159,7 @@
    }

   @RequestMapping(value = "/plan/update/auth")
   @ManagerAuth
   @ManagerAuth(memo = "更新规划申请单")
    @Transactional
    public R update(@RequestParam Map<String, Object> param){
//        String planNeed = null;
@@ -212,7 +212,7 @@
    }

    @RequestMapping(value = "/plan/delete/auth")
    @ManagerAuth
    @ManagerAuth(memo = "删除规划申请单")
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            planService.deleteById(id);
@@ -225,9 +225,11 @@
    public R insertFile(@RequestParam("planId") String planId,@RequestParam MultipartFile file){
        try{
            InputStream inputStream = file.getInputStream();
            // 获取文件的内容类型
            String contentType = file.getContentType();
            String suffix = getFileSuffix(file.getOriginalFilename());
//            String url = ossService.upload(inputStream, suffix);
            String url = "http://tjdt.oss-cn-hangzhou.aliyuncs.com/"+file.getOriginalFilename();
            String url = ossService.upload(inputStream, suffix,contentType);
//            String url = "http://tjdt.oss-cn-hangzhou.aliyuncs.com/"+file.getOriginalFilename();
            String[] names = url.split("com/");
            String name= names[1];
            String[] split = planId.split("-");
@@ -298,7 +300,7 @@

    @RequestMapping(value = "/plan/download/file/auth")
//    @ManagerAuth
    public void downloadFile(@RequestParam("downloadUrl") String downloadUrl,HttpServletResponse response){
    public R downloadFile(@RequestParam("downloadUrl") String downloadUrl,HttpServletResponse response){
//        System.out.println("---开始---");
//        MultipartFile
        try{
@@ -306,16 +308,18 @@
            String name= names[1];
//            ResponseEntity<Resource> resourceResponseEntity = FileSaveExampleUtil.downloadFile(downloadUrl, response);
//            return R.ok(resourceResponseEntity);
            ossService.download(name);
            String download = ossService.download(name);
            return R.ok().add(download);
        }catch (Exception e){

        }
        return R.error();
    }



    @PostMapping(value = "/plan/approval/auth")
    @ManagerAuth
    @ManagerAuth(memo = "审批申请单")
    public R approval(@RequestParam Long planId,
                      @RequestParam(required = false) Long plannerId){
        Plan plan = planService.selectById(planId);
@@ -571,7 +575,7 @@
        for (Plan plan : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", plan.getId());
            map.put("value", plan.getName());
            map.put("value", plan.getName()+"---"+plan.getId());
            result.add(map);
        }
        return R.ok(result);