Browse Source

修改导出pdf t_id1为空判断

huangyan 4 months ago
parent
commit
3afe947381
2 changed files with 8 additions and 17 deletions
  1. 3 2
      app/admin/controller/waybill.go
  2. 5 15
      conf/settings.yml

+ 3 - 2
app/admin/controller/waybill.go

@@ -2008,8 +2008,9 @@ func DeviceDataTemperatureJPG(startTime, endTime string, waybillPDF []service.Wa
 	for i := 0; i < len(deviceDataPdfList); i++ {
 		t, _ := lib.TimeStrToTime(deviceDataPdfList[i].T_time)
 		xValues1[i] = t
-		yValues1[i] = float64(*deviceDataPdfList[i].T_id1)
-
+		if deviceDataPdfList[i].T_id1 != nil {
+			yValues1[i] = float64(*deviceDataPdfList[i].T_id1)
+		}
 		if deviceDataPdfList[i].T_id2 != nil {
 			xValues2 = append(xValues2, t)
 			yValues2[i] = float64(*deviceDataPdfList[i].T_id2)

+ 5 - 15
conf/settings.yml

@@ -16,7 +16,7 @@ settings:
     # 日志存放路径
     path: temp/logs
     # 日志输出,file:文件,default:命令行,其他:命令行
-    stdout: 'default' #控制台日志,启用后,不输出到文件
+    stdout: '' #控制台日志,启用后,不输出到文件
     # 日志等级, trace, debug, info, warn, error, fatal
     level: trace
     # 数据库日志开关
@@ -31,10 +31,10 @@ settings:
     driver: mysql
     # 数据库连接字符串 mysql 缺省信息 charset=utf8&parseTime=True&loc=Local&timeout=1000ms
     source: cold_logistic:A8XQfpezANM3pqD@tcp(127.0.0.1:40306)/cold_logistic?charset=utf8&parseTime=True&loc=Local&timeout=1000ms
-  #    host: localhost:8080
-  #    host: 192.168.31.163:8080
+    host: localhost:6400
   cache:
     redis:
+#      addr: 192.168.0.33:6379
       addr: 127.0.0.1:43379
       password:
       db: 11
@@ -45,17 +45,7 @@ settings:
       appid: "97173"
       signature: "f639a60e41ee0554921d89884f5ff87e"
     qiniu:
-      endpoint: "https://coldoss.coldbaozhida.com/"
+      endpoint: "https://bzdcdn.baozhida.cn/"
       accessKeyID: "-8ezB_d-8-eUFTMvhOGbGzgeQRPeKQnaQ3DBcUxo"
       accessKeySecret: "KFhkYxTAJ2ZPN3ZS3euTsfWk8-C92rKgkhAMkDRN"
-      bucketName: "coldoss"
-    applet:
-      appid: "wx7d2f59a537c6ffdd"
-      appSecret: "b6ae826c8c64dd246e8bd8c281c33bde"
-      tokenExpire: 30
-    nats:
-      url: "127.0.0.1:43422"
-    amap:
-      key: "c3dbf424f12240b2de8ace32893c1aa2"
-    apk:
-      path: "/Users/zoie/work/bzd_project/cold-logistics/ofile"
+      bucketName: "bzdcdn"