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

controllers/js/jsyb_controller.go

@@ -11,7 +11,10 @@ import (
 	"github.com/astaxie/beego"
 	"github.com/axgle/mahonia"
 	"io/ioutil"
+	"net"
+	"net/http"
 	"os"
+	"os/exec"
 	"regexp"
 	"strconv"
 	"strings"
@@ -37,11 +40,15 @@ func JSybRegistRouters() {
 	beego.Router("/jsyb/5203", &JSybController{}, "get:PostTen")
 	beego.Router("/jsyb/5301", &JSybController{}, "get:Get5301")
 	beego.Router("/jsyb/3201", &JSybController{}, "get:Get3201")
+	beego.Router("/jsyb/9001", &JSybController{}, "get:Get9001")
 
 	//beego.Router("/jsyb/2503", &JSybController{}, "get:Get2503")
 
 	beego.Router("/jsyb/readcard", &JSybController{}, "get:ReadCard")
 
+}
+func (c *JSybController) Get9001() {
+
 }
 func (c *JSybController) Get5301() {
 	psn_no := c.GetString("psn_no")
@@ -615,6 +622,10 @@ func (c *JSybController) ReadCard() {
 	url := c.GetString("url")
 	cainfo := c.GetString("cainfo")
 
+	result, request := service.Jsyb9001(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, url, cainfo, ak)
+	fmt.Println(request)
+	fmt.Println(result)
+
 	c.TestGetBasBaseInit(fixmedins_code, secret_key, ak)
 	pCardInfo, pBusiCardInfo := c.GetBasBaseInfo()
 	pBusiCardInfo = Remove0000(pBusiCardInfo)
@@ -627,6 +638,7 @@ func (c *JSybController) ReadCard() {
 	basNumber := bas[2]
 	id_card_no := bas[1]
 	card_sn := bas[3]
+
 	if len(pCardInfo) > 0 && len(pBusiCardInfo) > 0 {
 		result, _ := service.Jsyb1101A(basNumber, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, card_sn, "1", url, ak, pBusiCardInfo, id_card_no, cainfo)
 		var dat map[string]interface{}

main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	"gdyb/service"
+	//"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -15,12 +15,12 @@ import (
 )
 
 func init() {
-	service.ConnectDB()
-	org_id, _ := beego.AppConfig.Int64("org_id")
-
-	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	CreateLog(miConfig)
-	UploadLog(miConfig)
+	//service.ConnectDB()
+	//org_id, _ := beego.AppConfig.Int64("org_id")
+	//
+	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	//CreateLog(miConfig)
+	//UploadLog(miConfig)
 
 	//UploadSettleList(org_id)
 }

service/jsyb_service.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	"gdyb/utils/csbhttp"
+	"net"
 	"strconv"
 	"time"
 )
@@ -939,3 +940,62 @@ func Jsyb3201(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float6
 	request_url = request_url + "3201"
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
+
+func Jsyb9001(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, admin_user_id int64, request_url string, cainfo string, access_key string) (string, string) {
+
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "9001" // 交易编码
+	inputData["opter_no"] = admin_user_id
+	inputData["mac"] = GetMacTwo() // 开始时间
+	inputData["ip"] = GetLocalIpTwo()
+	input["signIn"] = inputData
+
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "9001"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
+
+}
+
+//获取本机ip
+func GetLocalIpTwo() string {
+	addrs, err := net.InterfaceAddrs()
+	if err != nil {
+		fmt.Println("get local ip failed")
+	}
+	for _, address := range addrs {
+		if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
+			if ipnet.IP.To4() != nil {
+				return ipnet.IP.String()
+			}
+		}
+	}
+	return ""
+}
+
+//获取本机Mac
+func GetMacTwo() string {
+	interfaces, err := net.Interfaces()
+	if err != nil {
+		fmt.Println("Get loacl Mac failed")
+	}
+	for _, inter := range interfaces {
+		mac := inter.HardwareAddr
+		fmt.Println("+======" + mac.String())
+		if mac.String() != "" {
+			return mac.String()
+		}
+
+	}
+	return ""
+}