云照护对接拱墅区统一认证

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -16737,11 +16737,16 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            outpatientDO.setDiseaseCode(diseaseCode);
            outpatientDO.setDiseaseName(diseaseName);
            outpatientDO.setMedicalState(medicalState);
            WlyyPrescriptionDO prescriptionDO = prescriptionDao.findOne(prescriptionId);
            prescriptionDO.setIsDisease(isDisease);
            prescriptionDO.setDiseaseCode(diseaseCode);
            prescriptionDO.setDiseaseName(diseaseName);
            prescriptionDao.save(prescriptionDO);
            if (StringUtils.isNoneBlank(prescriptionId)){
                WlyyPrescriptionDO prescriptionDO = prescriptionDao.findOne(prescriptionId);
                if(prescriptionDO!=null){
                    prescriptionDO.setIsDisease(isDisease);
                    prescriptionDO.setDiseaseCode(diseaseCode);
                    prescriptionDO.setDiseaseName(diseaseName);
                    prescriptionDao.save(prescriptionDO);
                }
            }
            return outpatientDao.save(outpatientDO);
    }

server/svr-authentication/src/main/java/com/yihu/jw/security/dao/doctor/BaseDoctorDao.java

@@ -39,4 +39,8 @@ public interface BaseDoctorDao extends PagingAndSortingRepository<BaseDoctorDO,
    @Query("from BaseDoctorDO d where d.mobile =?1 and d.del ='1'")
    BaseDoctorDO findByMobileOne(String mobile);
    @Query("from BaseDoctorDO d where d.yktDoctorId = ?1 AND d.del ='1'")
    BaseDoctorDO findByYktDoctorId(String yktDoctorId);
}

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -391,6 +391,23 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
                Oauth2Envelop<WlyyUserSimple> oauth2Envelop = new Oauth2Envelop<>(jsonObject.getString("message"), -1, null);
                return new ResponseEntity<>(oauth2Envelop, headers, HttpStatus.OK);
            }
        }else if("unify".equals(flag)){
            //统一认证服务
            parameters.put("grant_type", "dingTalk");
            String authCode = parameters.get("code");
            if(org.apache.commons.lang3.StringUtils.isBlank(authCode)){
                throw new InvalidRequestException("请求参数错误");
            }
           JSONObject jsonObject = getUnify(authCode);
            if (jsonObject.getInteger("status") == 200){
                parameters.put("username", jsonObject.getString("content"));
            }else{
                HttpHeaders headers = new HttpHeaders();
                headers.set("Cache-Control", "no-store");
                headers.set("Pragma", "no-cache");
                Oauth2Envelop<WlyyUserSimple> oauth2Envelop = new Oauth2Envelop<>(jsonObject.getString("errorMsg"), -1, null);
                return new ResponseEntity<>(oauth2Envelop, headers, HttpStatus.OK);
            }
        }else if("wxApplets".equals(flag)){
            //微信小程序登录
            parameters.put("grant_type", "dingTalk");
@@ -4029,4 +4046,45 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        map.put("WlyyUserSimple",wlyyUserSimple);
        return ObjEnvelop.getSuccess("success", map);
    }
    /**
     * 获取拱墅区统一认证平台
     * @return
     */
    @RequestMapping(value = "/oauth/getUserInfo", method = RequestMethod.GET)
    public JSONObject  getUnify(String code) throws Exception {
        JSONObject resObj = new JSONObject();
        String tokenUrl = "https://iam.gongshu.gov.cn/bam-protocol-service/oauth2/getToken";
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("client_id", "zhyzh"));
        params.add(new BasicNameValuePair("client_secret", "96196d0111e94f4a986fc80cb77b9d61"));
        params.add(new BasicNameValuePair("code", code));
        params.add(new BasicNameValuePair("grant_type", "authorization_code"));
        String response = httpClientUtil.post(tokenUrl, params, "UTF-8");
        System.out.println("获取token============="+response);
        JSONObject object = JSONObject.parseObject(response);
        if (StringUtils.isEmpty(object.getString("errcode"))){
            String accesstoken = object.getString("access_token");
            String userInfoUrl = "https://iam.gongshu.gov.cn/bam-protocol-service/oauth2/getUserInfo?client_id=zhyzh&access_token="+accesstoken;
            String userInfo = httpClientUtil.get(userInfoUrl, "UTF-8");
            JSONObject userObj = JSONObject.parseObject(userInfo);
            if (StringUtils.isEmpty(userObj.getString("errcode"))){
                String user_name = userObj.getString("user_name");
                BaseDoctorDO doctorDO = doctorDao.findByYktDoctorId(user_name);
                if (doctorDO!=null){
                    resObj.put("status",200);
                    resObj.put("content",doctorDO.getMobile());
                }else {
                    resObj.put("status",-1);
                    resObj.put("errorMsg","暂无该账号，请联系云照护工作人员配置");
                }
            }
            System.out.println("获取userINFO============="+userInfo);
        }else {
            resObj.put("status",-1);
            resObj.put("errorMsg",object.getString("msg"));
        }
        return resObj;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/file_upload/FileUploadEndpoint.java

@@ -17,7 +17,6 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/personal_Info/PatientService.java

@@ -227,7 +227,7 @@ public class PatientService extends BasePatientService<BasePatientDO, BasePatien
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public BasePatientDO completePatientDetails(MultipartFile headPortrait, String json) {
    public BasePatientDO completePatientDetails(MultipartFile headPortrait, String json) throws Exception {
        BasePatientDO patientDetail = JSONObject.parseObject(json, BasePatientDO.class);
        Assert.notNull(patientDetail.getName(), "姓名不可为空！");