Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/gdyb_controller.go

@@ -84,7 +84,9 @@ func (c *GdybController) PostOne() {
 	result, inputLog := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificates, psn_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
 	} else {
+
 	}
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -108,23 +110,19 @@ func (c *GdybController) PostTwo() {
 	ipt_otp_no := c.GetString("ipt_otp_no")
 	dept := c.GetString("dept")
 	fixmedins_code := c.GetString("fixmedins_code")
-
 	dept_code := c.GetString("dept_code")
 	doctor_id := c.GetString("doctor_id")
-
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
-
 	secret_key := c.GetString("secret_key")
-
 	id_card_type, _ := c.GetInt64("id_card_type")
-
 	result, _ := service.Gdyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, "")
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-		//fmt.Println(dat["status"])
+
 	} else {
+
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{

service/fj_service.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"gdyb/models"
 	"github.com/astaxie/beego"
+	"github.com/axgle/mahonia"
 	"io/ioutil"
 	"net/http"
 	"strconv"
@@ -81,7 +82,8 @@ func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	}
 	//fmt.Println("开始jdk")
 
-	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	enc := mahonia.NewEncoder("gbk")
+	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
 	fmt.Println("输出信息:")
 	fmt.Println(output)
 	fmt.Println("错误信息：")
@@ -2449,10 +2451,11 @@ func GetFjBusinessHandleInfo(inputStr []byte) (string, string) {
 	outputStr := make([]byte, 4096)
 	errMessageStr := make([]byte, 2048)
 	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&inputStr[0])), uintptr(20000), (uintptr)(unsafe.Pointer(&outputStr[0])), (uintptr)(unsafe.Pointer(&errMessageStr[0])))
-	fmt.Println("错误信息1:", string(errMessageStr))
+	enc := mahonia.NewEncoder("gbk")
+
+	fmt.Println("错误信息1:", enc.ConvertString(string(errMessageStr)))
+	fmt.Println("输出信息1:", enc.ConvertString(string(outputStr)))
 
-	fmt.Println("输出信息1:", ConvertToString(string(outputStr), "utf-8", "gbk"))
-	fmt.Println("错误信息1:", ConvertToString(string(errMessageStr), "utf-8", "gbk"))
 	if ret2 != 0 {
 		return "", ""
 	}

service/gdyb_service.go

@@ -12,11 +12,8 @@ import (
 
 	//"gdyb/utils"
 	"github.com/astaxie/beego"
-	"github.com/go-ole/go-ole"
-	"github.com/go-ole/go-ole/oleutil"
 	"io"
 	"io/ioutil"
-	"log"
 	"math/rand"
 	"mime/multipart"
 	"net"
@@ -40,13 +37,11 @@ func Gdyb1201(certNo string, org_name string, doctor string, fixmedins_code stri
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
-
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "1201" // 交易编码
-
 	inputData["fixmedins_type"] = "1"
 	inputData["fixmedins_name"] = org_name
 	inputData["fixmedins_code"] = fixmedins_code
@@ -62,77 +57,6 @@ func Gdyb1201(certNo string, org_name string, doctor string, fixmedins_code stri
 	gdyb_url := beego.AppConfig.String("gdyb_url")
 	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 	url := gdyb_url + "1201"
-	//var str string
-	//str1 := make([]byte, 1024)
-
-	//var x interface{}
-	//s3 := make([]byte, 256)
-	ole.CoInitialize(0)
-	unknown, err := oleutil.CreateObject("yinhai.yh_hb_sctr")
-	if err != nil {
-		log.Fatal("CreateObject: ", err)
-	}
-
-	xxxx := unknown.MustQueryInterface(ole.IID_IDispatch)
-
-	var str6 map[string]interface{}
-
-	//str6 = ""
-
-	////p := (*string)(unsafe.Pointer(str))
-	////var str6 *string
-	//var str6 *ole.VARIANT
-	////str := make([]*byte, 256)
-	//if err != nil {
-	//	log.Fatal("QueryInterface: ", err)
-	//}
-	//
-	r, err1 := xxxx.CallMethod("yh_hb_call", "1201", string(bytesData), str6)
-	////result := oleutil.MustGetProperty(xxxx, "astr_jysc")
-	//
-	if err1 != nil {
-		log.Fatal("CallMethod: ", err1, " | ", r)
-	}
-	fmt.Println("~~~~~~~")
-	//fmt.Println(str6.ToString())
-	fmt.Println(r.ToString())
-	fmt.Println("~~~~~~~")
-	//
-	//xxxx.Release()
-	//
-	//ole.CoUninitialize()
-	//
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-
-	fmt.Printf("call yh_hb_call %q\n", string(out))
-	fmt.Printf(json2)
-	//
-	//DllDef := syscall.MustLoadDLL("yh_hb_sctrl.dll")
-	//Iinit := DllDef.MustFindProc("DllGetClassObject")
-
-	//ole.CoInitialize(0)
-	//
-	//ole.CLSIDFromProgID("yinhai.yh_hb_sctr")
-	//
-	//
-	//unknown, err := CreateInstance(clsid, IID_IUnknown)
-	//if err != nil {
-	//	return
-	//}
-	//defer unknown.Release()
-	//
-	//dispatch, err := unknown.QueryInterface(IID_IDispatch)
-	//if err != nil {
-	//	return
-	//}
-	//
-	//
-	//
 
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
@@ -178,9 +102,7 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 		inputData["certno"] = certNo        // 证件号码
 		inputData["psn_cert_type"] = "99"   // 人员证件类型
-
 	} else {
-
 		if id_card_type == 1 {
 			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 			inputData["card_sn"] = card_sn      // 卡识别码
@@ -213,14 +135,6 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	gdyb_url := beego.AppConfig.String("gdyb_url")
 	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 
-	//DllDef := syscall.MustLoadDLL("yh_hb_sctrl.dll")
-	//Iinit := DllDef.MustFindProc("yh_hb_call")
-	//var str3 string
-	//ret, _, _ := Iinit.Call(StrPtr("1101"), StrPtr(string(bytesData)), StrPtr(str3))
-	//fmt.Println(ret)
-	//fmt.Println(str3)
-	//
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
 	var url string
 	if fixmedins_code == "H15049901371" {
 		url = gdyb_url
@@ -228,46 +142,33 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 		url = gdyb_url + "1101"
 	}
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-		return hex.EncodeToString(out), inputLog
-	} else {
-
-		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
-		request, err := http.NewRequest("POST", url, reader)
-		if err != nil {
-			fmt.Println(err.Error())
-			return err.Error(), ""
-		}
-
-		request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-		request.Header.Set("x-tif-paasid", gdyb_paasid)
-		request.Header.Set("x-tif-signature", signature)
-		request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
-		request.Header.Set("x-tif-nonce", nonce)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
 
-		client := http.Client{}
-		resp, err := client.Do(request)
-		if err != nil {
-			fmt.Println(err.Error())
-			return err.Error(), ""
-		}
-		respBytes, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			fmt.Println(err.Error())
-			return err.Error(), ""
-		}
-		fmt.Println(string(respBytes))
-		str := string(respBytes)
-		return str, inputLog
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
 
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
 	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, inputLog
 
 }
 
@@ -347,9 +248,7 @@ func Gdyb1101A(certNo string, org_name string, doctor string, fixmedins_code str
 		fmt.Println(string(respBytes))
 		str := string(respBytes)
 		return str
-
 	}
-
 }
 
 // 门诊挂号