Merge branch 'dev' of liuwenbin/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/FileUploadController.java

@@ -546,4 +546,25 @@ public class FileUploadController extends BaseController {
        }
    }
    @RequestMapping(value = "fastDFSImag", method = RequestMethod.POST)
    @ApiOperation("编辑文章上传图片")
    public String pushArticleList(@ApiParam(name = "file", value = "文件", required = true)
                                  @RequestParam(value = "file", required = true) MultipartFile file){
        try {
            InputStream inputStream  = file.getInputStream();
            String fileName = file.getOriginalFilename().substring(0,file.getOriginalFilename().lastIndexOf("."));
            ObjectNode imgNode = FastDFSUtil.upload(inputStream,"png",fileName);
            String fileUrl = imgNode.get("groupName").toString().replaceAll("\"","")
                    + "/" + imgNode.get("remoteFileName").toString().replaceAll("\"","");
            if(!isneiwang){
                fileUrl=fastdfs_file_url+fileUrl;
            }
            return write(200,"上传成功！","data",fileUrl);
        }catch (Exception e) {
            e.printStackTrace();
            return error(-1,"失败！");
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/LoginController.java

@@ -187,11 +187,11 @@ public class LoginController extends BaseController {
                    }else{
                        Map<String, String> one = new HashMap<>();
                        one.put("isManage","0");
                        map.put("code", doctor.getHospital());
                        map.put("name", doctor.getHospitalName());
                        map.put("areas", "");
                        map.put("level","4");
                        map.put("authOperate", "0");
                        one.put("code", doctor.getHospital());
                        one.put("name", doctor.getHospitalName());
                        one.put("areas", "");
                        one.put("level","4");
                        one.put("authOperate", "0");
                        map.put("currentUserRole", one);
                    }
                    if ("10" .equals(doctor.getLevel()) && roleMap.size() == 0) {
@@ -280,14 +280,14 @@ public class LoginController extends BaseController {
                            }
                        }
                    }else{
//                        Map<String, String> one = new HashMap<>();
                        map.put("isManage","0");
                        map.put("code", doctor.getHospital());
                        map.put("name", doctor.getHospitalName());
                        map.put("areas", "");
                        map.put("level","4");
                        map.put("authOperate", "0");
                        map.put("currentUserRole", map);
                        Map<String, String> one = new HashMap<>();
                         one.put("isManage","0");
                         one.put("code", doctor.getHospital());
                         one.put("name", doctor.getHospitalName());
                         one.put("areas", "");
                         one.put("level","4");
                         one.put("authOperate", "0");
                         map.put("currentUserRole", one);
                    }
                    if ("10" .equals(doctor.getLevel()) && roleMap.size() == 0) {
                        errorMessage = "改用户没有管理员权限";

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/jimeiJkEduPC/DoctorJMJkEduArticlePCController.java

@@ -39,6 +39,8 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
    private ThirdJkEduArticleService thirdJkEduArticleService;
    @Value("${fastDFS.fastdfs_file_url}")
    String fastdfs_file_url;
    @Value("${neiwang.enable}")
    private Boolean isneiwang = false;  //如果不是内网项目要转到到内网wlyy在上传
    @RequestMapping(value = "saveArticle", method = RequestMethod.POST)
    @ApiOperation("添加、编辑文章")
@@ -277,26 +279,4 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
        }
    }
    @RequestMapping(value = "uploadArticleImag", method = RequestMethod.POST)
    @ApiOperation("编辑文章上传图片")
    public String pushArticleList(@ApiParam(name = "file", value = "文件", required = true)
                                   @RequestParam(value = "file", required = true) MultipartFile file){
//        temp=new File(FileUploadUtil.getTomcatLogDir()+System.currentTimeMillis()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf('.')-1));
//        file.transferTo(temp);
        try {
            InputStream inputStream  = file.getInputStream();
            String fileName = file.getOriginalFilename().substring(0,file.getOriginalFilename().lastIndexOf("."));
            ObjectNode imgNode = FastDFSUtil.upload(inputStream,"png",fileName);
            String fileUrl = fastdfs_file_url + imgNode.get("groupName").toString().replaceAll("\"","")
                    + "/" + imgNode.get("remoteFileName").toString().replaceAll("\"","");
            return write(200,"上传成功！","data",fileUrl);
        }catch (Exception e) {
            e.printStackTrace();
            return error(-1,"失败！");
        }
    }
}

patient-co/patient-co-wlyy/src/main/resources/application-devtest.yml

@@ -129,5 +129,5 @@ activemq:
##如果是外网项目就是flase 内网是true
neiwang:
  enable: false
  enable: true
  wlyy: http://localhost:8081