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

controllers/sg/gdyb_controller.go

@@ -145,7 +145,7 @@ func (c *GdybController) PostThree() {
 	secret_key := c.GetString("secret_key")
 	fixmedins_code := c.GetString("fixmedins_code")
 	result, requestLog := service.Gdyb2202(psnNo, mdtrtId, iptOtpNo, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
-	saveLog(result, requestLog, "2202")
+	saveLog(result, requestLog, "2202", "退号")
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 	} else {

controllers/sg/his_api_controller.go

@@ -1846,7 +1846,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 		} else {
 			result, requestLog := service.Gdyb1101C(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates)
-			saveLog(result, requestLog, "1101")
+			saveLog(result, requestLog, "1101", "人员基本信息获取")
 			if err := json.Unmarshal([]byte(result), &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1985,7 +1985,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 			} else {
 				result, requestLog := service.Gdyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type)
-				saveLog(result, requestLog, "2201")
+				saveLog(result, requestLog, "2201", "挂号")
 				if err := json.Unmarshal([]byte(result), &res); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -2211,7 +2211,7 @@ func (c *HisApiController) GetUploadInfo() {
 			} else {
 				result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 			}
-			saveLog(result, requestLog, "2203")
+			saveLog(result, requestLog, "2203", "上传就诊信息")
 			var respJSON2 map[string]interface{}
 			if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
 				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
@@ -2363,7 +2363,7 @@ func (c *HisApiController) GetUploadInfo() {
 					} else {
 						fmt.Println(err)
 					}
-					saveLog(result, request_log, "2204")
+					saveLog(result, request_log, "2204", "上传费用明细")
 					userJSONBytes, _ := json.Marshal(dat)
 
 					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
@@ -2596,7 +2596,7 @@ func (c *HisApiController) GetUploadInfo() {
 								fmt.Println(err)
 							}
 
-							saveLog(result2, src_resquest, "2207")
+							saveLog(result2, src_resquest, "2207", "结算")
 
 							userJSONBytes, _ := json.Marshal(dat)
 
@@ -2835,7 +2835,7 @@ func (c *HisApiController) GetUploadInfo() {
 					fmt.Println(err)
 				}
 
-				saveLog(result2, src_resquest, "2207")
+				saveLog(result2, src_resquest, "2207", "结算")
 
 				userJSONBytes, _ := json.Marshal(dat)
 
@@ -3573,7 +3573,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 			result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 		} else {
 			result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
-			saveLog(result, requestLog, "2203")
+			saveLog(result, requestLog, "2203", "上传就诊信息")
 			var respJSON2 map[string]interface{}
 			if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
 				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
@@ -3714,7 +3714,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 				} else {
 					fmt.Println(err)
 				}
-				saveLog(result, request_log, "2204")
+				saveLog(result, request_log, "2204", "上传费用明细")
 				userJSONBytes, _ := json.Marshal(dat)
 				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
@@ -3933,7 +3933,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 						} else {
 							fmt.Println(err)
 						}
-						saveLog(result, request_log, "2206")
+						saveLog(result, request_log, "2206", "预结算")
 						userJSONBytes, _ := json.Marshal(dat)
 
 						if err := json.Unmarshal(userJSONBytes, &res); err != nil {
@@ -4337,7 +4337,7 @@ func (c *HisApiController) Refund() {
 			} else {
 				fmt.Println(err)
 			}
-			saveLog(result, src_resquest, "2208")
+			saveLog(result, src_resquest, "2208", "退费")
 			userJSONBytes, _ := json.Marshal(dat)
 			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
@@ -4391,7 +4391,7 @@ func (c *HisApiController) Refund() {
 					fmt.Println(err)
 				}
 
-				saveLog(result2, src_request, "2205")
+				saveLog(result2, src_request, "2205", "撤销明细")
 
 				userJSONBytes, _ := json.Marshal(dat)
 
@@ -6623,7 +6623,7 @@ func saveRegisterLog(result string) {
 
 }
 
-func saveLog(result string, request string, infno string) {
+func saveLog(result string, request string, infno string, desc string) {
 
 	org_id, _ := beego.AppConfig.Int64("org_id")
 	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
@@ -6633,6 +6633,12 @@ func saveLog(result string, request string, infno string) {
 	year := time.Now().Format("2006")
 	month = time.Now().Format("01")
 	day := time.Now().Format("02")
+	hour := time.Now().Format("15")
+	min := time.Now().Format("04")
+	sec := time.Now().Format("05")
+
+	result_time := year + "-" + month + "-" + day + " " + hour + ":" + min + ":" + sec
+
 	file := strconv.FormatInt(org_id, 10) + "_" + year + month + day + "_log"
 	file_name := file + ".txt"
 	file_path := miConfig.OrgName + "日志" + "/" + file_name
@@ -6643,7 +6649,7 @@ func saveLog(result string, request string, infno string) {
 		if err != nil {
 			fmt.Println("read fail")
 		}
-		content := infno + "\r\n" + "\r\n" + "\r\n" + "\r\n" + request + "\r\n" + "\r\n" + "\r\n" + "\r\n" + result
+		content := "\r\n" + "\r\n" + "\r\n" + result_time + " " + "【 " + desc + infno + "入参" + " 】：" + "\r\n" + request + "\r\n" + result_time + " " + "【 " + desc + infno + "出参" + " 】：" + "\r\n" + result
 		n, _ := f.Seek(0, 2)
 		_, err = f.WriteAt([]byte(content), n)
 

main.go

@@ -3,93 +3,47 @@ package main
 import (
 	"context"
 	"fmt"
+	"gdyb/models"
 	_ "gdyb/routers"
 	"gdyb/service"
-	"gdyb/utils"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
 	"os"
-	"os/exec"
 	"strconv"
 	"time"
 )
 
 func init() {
 	service.ConnectDB()
-
-}
-
-//var (
-//	astr_jyhb string = "3046022100E4C617A5626E408938EEAC33D7BC0ACD645D8FF0B9A29FE55EC3F9BAB01A07C9022100D0F9E8A545E997F3E431C5E3DADA0EC5F53ACE6A7E9598FD6F3B85BE055D3E10"
-//	astr_jysr string = "bqh"
-//	astr_jysc string = ""
-//)
-var json1 = ""
-var json2 = ""
-
-func call_yh_hb_call() {
-	//json1 = `{
-	//	"TOKEN": "",
-	//		"cainfo": "",
-	//		"fixmedins_code": "000002",
-	//		"fixmedins_name": "六盘水市第二人民医院",
-	//		"inf_time": "2021-03-01 00:35:39",
-	//		"infno": "1201",
-	//		"infver": "1",
-	//		"input": {
-	//		"medinsinfo":{
-	//			"mdtrt_cert_type":"02",
-	//				"mdtrt_cert_no":"52020020210315000001",
-	//				"fixmedins_type":"1",
-	//				"fixmedins_name":"六盘水市第二人民医院",
-	//				"fixmedins_code":"000002"
-	//		}
-	//	},
-	//	"oinfno": "",
-	//		"msgid": "100000202010100035390000000442",
-	//		"opter": "1",
-	//		"opter_name": "测试用户",
-	//		"pay_loc": "1",
-	//		"recer_admvs": "520200",
-	//		"sender_admdvs": "520200",
-	//		"insuplc_admdvs":"520200",
-	//		"mdtrtarea_admvs":"520200",
-	//		"recer_sys_code":"1",
-	//		"opter_type":"1"
-	//}`
-	//service.Gdyb1201( )
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1201", json1, 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)
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	CreateLog(miConfig)
+	UploadLog(miConfig)
 }
 
 func main() {
-	//call_yh_hb_call()
+	beego.Run()
+}
 
-	org_id, _ := beego.AppConfig.Int64("org_id")
-	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	dir := miConfig.OrgName + "日志"
-	utils.Mkdir(dir)
+func CreateLog(miConfig models.MedicalInsuranceOrgConfig) {
+	Mkdir(miConfig.OrgName + "日志")
+	//org_id,_ := beego.AppConfig.Int("org_id")
 	month := time.Unix(1557042972, 0).Format("1")
 	year := time.Now().Format("2006")
 	month = time.Now().Format("01")
 	day := time.Now().Format("02")
-	file := strconv.FormatInt(org_id, 10) + "_" + year + month + day + "_log"
+	file := strconv.FormatInt(miConfig.UserOrgId, 10) + "_" + year + month + day + "_log"
 	file_name := file + ".txt"
 	file_path := miConfig.OrgName + "日志" + "/" + file_name
-	exist, _ := utils.PathExists(file_path)
+	exist, _ := PathExists(file_path)
 	if exist { //存在
 		fmt.Println("存在")
 		f, err := os.OpenFile(file_path, os.O_WRONLY, 0644)
 		if err != nil {
 			fmt.Println("read fail")
 		}
-		content := "\r\n"
+		content := "\r\r\r"
 		n, _ := f.Seek(0, 2)
 		_, err = f.WriteAt([]byte(content), n)
 
@@ -102,12 +56,75 @@ func main() {
 			_, err = f.Write([]byte("记录日志"))
 		}
 	}
-	//upload_qiniu(file_path,miConfig.OrgName+"_"+year+month+day)
-	beego.Run()
+
 }
+func UploadLog(miConfig models.MedicalInsuranceOrgConfig) {
+	//获取七牛云上的文件信息，不存在则表示没上传到七牛云，上传昨天日志信息
+	nTime := time.Now()
+	yesTime := nTime.AddDate(0, 0, -1)
+	file_key := strconv.FormatInt(miConfig.UserOrgId, 10) + "_" + yesTime.Format("20060102") + "_log.txt"
+	mac := qbox.NewMac(beego.AppConfig.String("qiniu_accesskey"), beego.AppConfig.String("qiniu_secretkey"))
+	cfg := storage.Config{
+		// 是否使用https域名进行资源管理
+		UseHTTPS: true,
+	}
+	// 指定空间所在的区域，如果不指定将自动探测
+	// 如果没有特殊需求，默认不需要指定
+	//cfg.Zone=&storage.ZoneHuabei
+	bucketManager := storage.NewBucketManager(mac, &cfg)
+	bucket := beego.AppConfig.String("qiniu_bucket")
+	key := file_key
+	file, sErr := bucketManager.Stat(bucket, key)
+	fmt.Println(file)
+	fmt.Println(sErr)
+	fmt.Println(miConfig.OrgName + "日志" + "/" + file_key)
 
-func upload_qiniu(filePath string, temp_key string) {
-	key := temp_key
+	if sErr != nil {
+		fmt.Println("七牛云上文件不存在，上传到七牛云")
+		//判断本地文件是否存在，存在则执行上传操作
+		exist, _ := PathExists(miConfig.OrgName + "日志" + "/" + file_key)
+		if exist {
+			upload_qiniu(miConfig.OrgName+"日志"+"/"+file_key, file_key)
+		} else {
+			fmt.Println("本地文件不存在")
+
+		}
+	} else {
+		fmt.Println("七牛云文件存在")
+	}
+
+}
+func Mkdir(dir string) {
+	// 创建文件夹
+	exist, err := PathExists(dir)
+	if err != nil {
+		fmt.Println(err.Error())
+	} else {
+		if exist {
+			fmt.Println(dir + "文件夹已存在！")
+		} else {
+			// 文件夹名称，权限
+			err := os.Mkdir(dir, os.ModePerm)
+			if err != nil {
+				fmt.Println(dir+"文件夹创建失败：", err.Error())
+			} else {
+				fmt.Println(dir + "文件夹创建成功！")
+			}
+		}
+	}
+}
+func PathExists(path string) (bool, error) {
+	_, err := os.Stat(path)
+	if err == nil {
+		return true, nil
+	}
+	if os.IsNotExist(err) {
+		return false, nil
+	}
+	return false, err
+}
+func upload_qiniu(filePath string, keys string) {
+	key := keys
 	//上传凭证,关于凭证这块大家可以去看看官方文档
 	putPolicy := storage.PutPolicy{
 		Scope: beego.AppConfig.String("qiniu_bucket"),
@@ -140,5 +157,5 @@ func upload_qiniu(filePath string, temp_key string) {
 		fmt.Println(err)
 		return
 	}
-
+	fmt.Println(ret.Key, ret.Hash)
 }