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

controllers/sg/his_api_controller.go

@@ -305,21 +305,21 @@ func (c *HisApiController) TestGetBasBaseInit() {
 	return
 }
 
-//func (c *HisApiController) GetSFZBaseInfo() string {
-//	DllDef := syscall.MustLoadDLL("SSCard.dll")
-//	readCard := DllDef.MustFindProc("ReadSFZ")
-//	if readCard == nil {
-//		fmt.Println("readcard is nil")
-//		readCard = DllDef.MustFindProc("ReadSFZ")
-//	}
-//
-//	str := make([]byte, 256)
-//	str1 := make([]byte, 256)
-//	r, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), IntPtr(1024), (uintptr)(unsafe.Pointer(&str1[0])), IntPtr(1024))
-//
-//	fmt.Println(r)
-//	return string(str)
-//}
+func (c *HisApiController) GetSFZBaseInfo() string {
+	DllDef := syscall.MustLoadDLL("SSCard.dll")
+	readCard := DllDef.MustFindProc("ReadSFZ")
+	if readCard == nil {
+		fmt.Println("readcard is nil")
+		readCard = DllDef.MustFindProc("ReadSFZ")
+	}
+
+	str := make([]byte, 256)
+	str1 := make([]byte, 256)
+	r, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), IntPtr(1024), (uintptr)(unsafe.Pointer(&str1[0])), IntPtr(1024))
+
+	fmt.Println(r)
+	return string(str)
+}
 
 func (c *HisApiController) GetBasBaseInfo() string {
 	DllDef := syscall.MustLoadDLL("SSCard.dll")