Merge branch 'dev' of wangjun/wlyy2.0 into dev

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1101,7 +1101,9 @@ public class BaseHospitalRequestMapping {
        public static final String setArticleCollection  = "/setArticleCollection";
        //根据医生id生成二维码
        public static final String getqrCode  = "/getqrCode";
        public static final String setQrCode  = "/setQrCode";
        //生成所有医生二维码
        public static final String setAllCode  = "/setAllCode";
    }
    /**

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -712,12 +712,18 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.getqrCode)
    @GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.setAllCode)
    @ApiOperation(value = "生成所有医生二维码")
    public Envelop setAllCode() throws Exception{
        qrcodeService.makeAllSpecialistQrcode();
       return success("操作成功");
    }
    @GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.setQrCode)
    @ApiOperation(value = "生成医生二维码")
    public Envelop getqrCode(
            @ApiParam(name = "doctor", value = "doctor", required = true)
            @RequestParam(value = "doctor", required = true)String doctor) throws Exception{
       String qrCodeUri= qrcodeService.makeSpecialistQrcode(doctor);
       return success(qrCodeUri);
    public Envelop setQrCode(@ApiParam(name = "doctor", value = "doctor", required = true)
                                 @RequestParam(value = "doctor", required = true)String doctor) throws Exception{
        String uri = qrcodeService.makeSpecialistQrcode(doctor);
        return success("操作成功",uri);
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/QrcodeService.java

@@ -21,6 +21,7 @@ import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.transaction.Transactional;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
@@ -54,6 +55,52 @@ public class QrcodeService {
    private EntranceService entranceService;
    @Autowired
    private XzzxEntranceService xzzxEntranceService;
    /**
     * 生成所有医生的二维码
     *
     * @return
     * @throws Exception
     */
    @Transactional
    public void makeAllSpecialistQrcode() throws Exception {
        String token=null;
        //中山医院互联网医院
        if("xm_zsyy_wx".equals(wxId)) {
            String response = entranceService.getAccessToken("100033");
            net.sf.json.JSONObject object1 = net.sf.json.JSONObject.fromObject(response);
            if (null != object1&&null!=object1.get("respCode") && "00".equals(object1.get("respCode"))) {
                token  = object1.getJSONObject("respEntity").getString("access_token");
            } else {
                throw new Exception("获取ACCESSTOKEN失败");
            }
        }else if("xm_xzzx_wx".equals(wxId)){
            token = xzzxEntranceService.getXzToken();
        }else{
            token = wxAccessTokenService.getWxAccessTokenById(wxId).getAccessToken();
        }
        System.out.println("token"+token);
        System.out.println("wxId"+wxId);
        Iterable<BaseDoctorDO> doctors = baseDoctorDao.findAll();
        for (BaseDoctorDO doctorDO :doctors){
            if (null==doctorDO.getQrcode()||"".equals(doctorDO.getQrcode())){
                // 二维码内容
                String content = "hlw_doctor_" + doctorDO.getId() +"_"+doctorDO.getName();
                System.out.println("content"+content);
                // 二维码图片文件名
                String fileName = doctorDO.getId()+"_"+doctorDO.getMobile()+".png";
                /*String path = QrcodeService.class.getResource("/").getPath().replace("/WEB-INF/classes/", "")
                        + File.separator + "qrcode";*/
                System.out.println("fileName"+fileName);
                // 通过微信接口生成医生二维码
                String uri = makeQrcodeFromWeiXin(content, fileName.replaceAll("\r\n", ""), token);
                System.out.println("uri"+uri);
                doctorDO.setQrcode(uri);
                baseDoctorDao.save(doctorDO);
            }
        }
    }
    /**
     * 生成某个医生的二维码
     *
@@ -63,6 +110,7 @@ public class QrcodeService {
     */
    public String makeSpecialistQrcode(String doctor) throws Exception {
        System.out.println("doctorID"+doctor);
        String token=null;
        //中山医院互联网医院
        if("xm_zsyy_wx".equals(wxId)) {