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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/common/account/PatientService.java

@@ -14,6 +14,7 @@ import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.doctor.DoctorPatientDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.task.SignSsGetTask;
import com.yihu.wlyy.util.EncodesUtil;
import com.yihu.wlyy.util.IdcardInfoExtractor;
import org.apache.commons.lang3.StringUtils;
@@ -138,6 +139,7 @@ public class PatientService extends TokenService {
				json.put("token", token.getToken());
				json.put("name", temp.getName());
				json.put("photo", temp.getPhoto());
				new Thread(new SignSsGetTask(patient.getIdcard())).start();
				return json;
			}
		}

patient-co-wlyy/src/main/java/com/yihu/wlyy/task/SignSsGetTask.java

@@ -0,0 +1,38 @@
package com.yihu.wlyy.task;
import com.yihu.wlyy.util.HttpUtil;
import com.yihu.wlyy.util.SystemConf;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
 * Created by lyr-pc on 2016/10/20.
 */
public class SignSsGetTask implements Runnable {
    private static Logger logger = LoggerFactory.getLogger(SignUploadTask.class);
    String idcard = "";
    public SignSsGetTask(String idcard) {
        this.idcard = idcard;
    }
    @Override
    public void run() {
        try {
            Thread.sleep(3000);
            String url = SystemConf.getInstance().getSystemProperties().getProperty("sign_check_upload");
            String resultStr = HttpUtil.sendPost(url + "/third/sign/LoadSanshiSignFamily?idcard=" + idcard, "");
            JSONObject json = new JSONObject(resultStr);
            if (json.getInt("status") == 200) {
                logger.info("sign_ss_get_success:" + idcard);
            } else {
                logger.error("sign_ss_get_failed:" + idcard);
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/util/HttpUtil.java

@@ -82,6 +82,7 @@ public class HttpUtil {
			// 打开和URL之间的连接
			conn = (HttpURLConnection) realUrl.openConnection();
			conn.setRequestMethod("POST");
			conn.setConnectTimeout(5000);
			conn.setDoOutput(true);
			conn.setDoInput(true);
			conn.setUseCaches(false);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -516,6 +516,14 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                        }
                    }
                }
                String resultStr = HttpUtil.sendPost(checkUrl + "/third/sign/LoadSanshiSignFamily?idcard=" + idCard, "");
                if (!StringUtils.isEmpty(resultStr)) {
                    JSONObject checkJson = new JSONObject(resultStr);
                    if (checkJson.getInt("status") != 200) {
                        throw new Exception("sanshi sign get from jw failed");
                    }
                }
            } catch (Exception e) {
                e.printStackTrace();
            }