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

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/synergy/customer/CustomerSynergyManageController.java

@@ -505,8 +505,8 @@ public class CustomerSynergyManageController extends BaseController {
    public String uploadAccessory(@ApiParam(name="workorderCode",value="协同服务工单code",required = true)
                                  @RequestParam(required = true)String workorderCode,HttpServletRequest request){
        try{
            ManageSynergyAccessoryDO manageSynergyAccessoryDO = synergyManageService.uploadAccessory(workorderCode,request);
            return write(200,"获取成功！","data",manageSynergyAccessoryDO);
            Map<String,Object> map = synergyManageService.uploadAccessory(workorderCode,request);
            return write(200,"获取成功！","data",map);
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"获取失败！");

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java

@@ -1470,22 +1470,38 @@ public class SynergyManageService extends BaseJpaService {
//    }
    @Transactional
    public ManageSynergyAccessoryDO uploadAccessory(String workorderCode, HttpServletRequest request) throws Exception{
    public Map<String,Object> uploadAccessory(String workorderCode, HttpServletRequest request) throws Exception{
        Map<String,Object> map = new HashMap<>();
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        MultipartFile multipartFile = multipartRequest.getFile("file");
        long size = multipartFile.getSize();
        if(size<=0){
            map.put("uploadStatus",1);//size小于0
            map.put("accessory",null);//
            return map;
        }
        String fileName = multipartFile.getOriginalFilename();
        String type = fileName.split(".")[1];
        if(!("doc".equals(type)||"docx".equals(type)||"xls".equals(type)||"xlsx".equals(type))){
            map.put("uploadStatus",2);//文件类型不对
            map.put("accessory",null);//
            return map;
        }
        String response = request(wlyyUrl + "/upload/chat", multipartFile, null);
        JSONObject rs = new JSONObject(response);
        Integer status =(Integer)rs.get("status");
        if(status==200){
            String url = rs.get("urls")+"";
            String fileName = multipartFile.getOriginalFilename();
            ManageSynergyAccessoryDO manageSynergyAccessoryDO = new ManageSynergyAccessoryDO();
            manageSynergyAccessoryDO.setCode(getCode());
            manageSynergyAccessoryDO.setDel(0);
            manageSynergyAccessoryDO.setName(fileName);
            manageSynergyAccessoryDO.setUrl(url);
            manageSynergyAccessoryDO.setWorkorderCode(workorderCode);
            return manageSynergyAccessoryDao.save(manageSynergyAccessoryDO);
            ManageSynergyAccessoryDO accessoryDO = manageSynergyAccessoryDao.save(manageSynergyAccessoryDO);
            map.put("uploadStatus",0);//文件类型正确
            map.put("accessory",accessoryDO);//
            return map;
        }
        throw new Exception();
    }