From 7daf07f983850f965bc274949dd6ac5fe456c149 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 10 Sep 2024 09:25:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA=E5=88=97=E8=A1=A8=E4=B8=8D=E9=AA=8C=E8=AF=81=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore               |  3 +-
 api/controller/public.go | 14 +++++++++
 api/router/router.go     | 36 ++++++++++++++++-------
 api/service/order.go     | 63 ++++++++++++++++++++++------------------
 config.yaml              |  8 +++++
 5 files changed, 85 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index 09c66d6..f0f8579 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,5 @@
 # vendor/
 .idea/
 .git/
-.DS_Store/
\ No newline at end of file
+.DS_Store/
+data/
\ No newline at end of file
diff --git a/api/controller/public.go b/api/controller/public.go
index 8627851..0f7d660 100644
--- a/api/controller/public.go
+++ b/api/controller/public.go
@@ -27,6 +27,20 @@ func (b *Public) GetCaptcha(c *gin.Context) {
 
 // Login 登陆
 func (b *Public) Login(c *gin.Context) {
+	//orderService := service.OrderService{}
+	//res, err := orderService.PdfToImg()
+	//if err != nil {
+	//	responses.FailWithMessage(err.Error(), c)
+	//	return
+	//}
+	//
+	//if res != true {
+	//	responses.FailWithMessage("错误", c)
+	//	return
+	//}
+	//responses.Ok(c)
+	//return
+
 	var adminRequest requests.AdminRequest
 
 	if err := c.ShouldBind(&adminRequest.Login); err != nil {
diff --git a/api/router/router.go b/api/router/router.go
index 9967888..4438bcd 100644
--- a/api/router/router.go
+++ b/api/router/router.go
@@ -78,6 +78,22 @@ func publicRouter(r *gin.Engine, api controller.Api) {
 
 	// 登陆
 	adminGroup.POST("/login", api.Public.Login)
+
+	// 基础数据
+	basicGroup := adminGroup.Group("/basic")
+	{
+		// 地区管理-基础数据
+		areaGroup := basicGroup.Group("/area")
+		{
+			// 获取地区列表
+			areaGroup.GET("/list", api.Basic.Area.GetAreaList)
+
+			// 修改地区
+
+			// 新增地区
+		}
+	}
+
 }
 
 // adminRouter 公共路由-验证权限
@@ -161,16 +177,16 @@ func basicRouter(r *gin.Engine, api controller.Api) {
 		// 新增银行
 	}
 
-	// 地区管理-基础数据
-	areaGroup := basicGroup.Group("/area")
-	{
-		// 获取地区列表
-		areaGroup.GET("/list", api.Basic.Area.GetAreaList)
-
-		// 修改地区
-
-		// 新增地区
-	}
+	//// 地区管理-基础数据
+	//areaGroup := basicGroup.Group("/area")
+	//{
+	//	// 获取地区列表
+	//	areaGroup.GET("/list", api.Basic.Area.GetAreaList)
+	//
+	//	// 修改地区
+	//
+	//	// 新增地区
+	//}
 }
 
 // privateRouter 私有路由-验证权限
diff --git a/api/service/order.go b/api/service/order.go
index b865205..81d39fc 100644
--- a/api/service/order.go
+++ b/api/service/order.go
@@ -363,7 +363,7 @@ func (r *OrderService) PdfToImg() (bool, error) {
 			continue
 		}
 
-		if orderPrescriptionFile.IsConvertedPdf != 1 {
+		if orderPrescriptionFile.IsConvertedPdf == 1 {
 			continue
 		}
 
@@ -371,38 +371,45 @@ func (r *OrderService) PdfToImg() (bool, error) {
 
 		PrescriptionImgOssPath := strings.TrimLeft(orderPrescriptionFile.PrescriptionImgOssPath, "/")
 
-		// 下载处方pdf到本地
+		// 下载处方图片到本地
 		local, err := aliyun.GetObjectToLocal(PrescriptionImgOssPath,
-			"/Users/wucongxing/Desktop/work/go/hospital-admin-api/data/bak/"+OrderPrescriptionId+".jpg")
+			"/Users/wucongxing/Desktop/work/go/hospital-admin-api/data/bak/img/"+OrderPrescriptionId+".jpg")
 		if err != nil || !local {
 			return false, err
 		}
 
-		//pdfPath := "/Users/wucongxing/Desktop/work/go/hospital-admin-api/data/" + OrderPrescriptionId + ".pdf"
-		//outputDir := "/Users/wucongxing/Desktop/work/go/hospital-admin-api/data/img"
-		//
-		//if err := utils.ConvertPDFToImages(pdfPath, outputDir, OrderPrescriptionId+".jpg"); err != nil {
-		//	return false, err
-		//}
-		//
-		//// 修改为已转换
-		//// 开始事务
-		//tx := global.Db.Begin()
-		//defer func() {
-		//	if r := recover(); r != nil {
-		//		tx.Rollback()
-		//	}
-		//}()
-		//
-		//data := make(map[string]interface{})
-		//data["is_converted_pdf"] = 1
-		//err = orderPrescriptionFileDao.EditOrderPrescriptionFileById(tx, orderPrescriptionFile.PrescriptionFileId, data)
-		//if err != nil {
-		//	tx.Rollback()
-		//	return false, err
-		//}
-		//
-		//tx.Commit()
+		// 下载处方pdf到本地
+		local, err = aliyun.GetObjectToLocal(orderPrescriptionFile.PrescriptionPdfOssPath,
+			"/Users/wucongxing/Desktop/work/go/hospital-admin-api/data/bak/pdf/"+OrderPrescriptionId+".pdf")
+		if err != nil || !local {
+			return false, err
+		}
+
+		pdfPath := "/Users/wucongxing/Desktop/work/go/hospital-admin-api/data/bak/pdf/" + OrderPrescriptionId + ".pdf"
+		outputDir := "/Users/wucongxing/Desktop/work/go/hospital-admin-api/data/img"
+
+		if err := utils.ConvertPDFToImages(pdfPath, outputDir, OrderPrescriptionId+".jpg"); err != nil {
+			return false, err
+		}
+
+		// 修改为已转换
+		// 开始事务
+		tx := global.Db.Begin()
+		defer func() {
+			if r := recover(); r != nil {
+				tx.Rollback()
+			}
+		}()
+
+		data := make(map[string]interface{})
+		data["is_converted_pdf"] = 1
+		err = orderPrescriptionFileDao.EditOrderPrescriptionFileById(tx, orderPrescriptionFile.PrescriptionFileId, data)
+		if err != nil {
+			tx.Rollback()
+			return false, err
+		}
+
+		tx.Commit()
 	}
 
 	return true, nil
diff --git a/config.yaml b/config.yaml
index 96ea071..f9cbbbd 100644
--- a/config.yaml
+++ b/config.yaml
@@ -14,6 +14,14 @@ mysql:
   max-idle-cons: 5
   max-open-cons: 20
   debug: true
+#  host: 'cd-cdb-evnp3feu.sql.tencentcdb.com'
+#  username: root
+#  password: 'sKptsVOiTf6m3lt_'
+#  port: 63976
+#  db-name: export
+#  max-idle-cons: 5
+#  max-open-cons: 20
+#  debug: true
 
 log:
   file-path: "./log/"