|
@@ -44,7 +44,7 @@ func (r *MQTTReporter) takePhotoAndUploadToImagServers() bool {
|
|
|
return false
|
|
return false
|
|
|
}
|
|
}
|
|
|
elapsed := time.Since(start).Milliseconds()
|
|
elapsed := time.Since(start).Milliseconds()
|
|
|
- baseapp.Logger.Infof("[%s] 拍照完成, 输出到本地文件: %q, 用时: %d毫秒", MODULE_NAME, imgFile, elapsed)
|
|
|
|
|
|
|
+ baseapp.Logger.Infof("[%s] 拍照完成, 输出到本地文件: %s, 用时: %d毫秒", MODULE_NAME, imgFile, elapsed)
|
|
|
|
|
|
|
|
r.uploadPhotoToImagServers(imgFile)
|
|
r.uploadPhotoToImagServers(imgFile)
|
|
|
|
|
|
|
@@ -57,33 +57,36 @@ func (r *MQTTReporter) uploadPhotoToImagServers(imgFile string) {
|
|
|
|
|
|
|
|
ftpclient.FileUpFolder = r.deviceID
|
|
ftpclient.FileUpFolder = r.deviceID
|
|
|
|
|
|
|
|
- uploaded := false
|
|
|
|
|
|
|
+ needImagBackfill := false
|
|
|
|
|
+
|
|
|
for _, server := range r.config.GetImagServers() {
|
|
for _, server := range r.config.GetImagServers() {
|
|
|
if !server.Enable {
|
|
if !server.Enable {
|
|
|
continue
|
|
continue
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- baseapp.Logger.Infof("[%s] 开始上传照片文件: %q -> %s", MODULE_NAME, imgFile, server.Name)
|
|
|
|
|
|
|
+ baseapp.Logger.Infof("[%s] 开始上传照片文件: %s -> %s", MODULE_NAME, imgFile, server.Name)
|
|
|
|
|
|
|
|
serverInfo, err := utils.ParseURL(server.PutURL)
|
|
serverInfo, err := utils.ParseURL(server.PutURL)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
- baseapp.Logger.Errorf("[%s] 照片文件上传失败: %q -> %s, 原因: %v!!", MODULE_NAME, imgFile, server.Name, err)
|
|
|
|
|
|
|
+ baseapp.Logger.Errorf("[%s] 照片文件上传失败: %s -> %s, 原因: %v!!", MODULE_NAME, imgFile, server.Name, err)
|
|
|
continue
|
|
continue
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
start := time.Now()
|
|
start := time.Now()
|
|
|
if _, err := ftpclient.UploadFileToFtp(r.ctx, imgFile,
|
|
if _, err := ftpclient.UploadFileToFtp(r.ctx, imgFile,
|
|
|
serverInfo.Host, serverInfo.User, serverInfo.Pass, ftpclient.DefaultUploadTimeout); err != nil {
|
|
serverInfo.Host, serverInfo.User, serverInfo.Pass, ftpclient.DefaultUploadTimeout); err != nil {
|
|
|
- baseapp.Logger.Errorf("[%s] 照片文件上传失败: %q -> %s, 原因: %v!!", MODULE_NAME, imgFile, server.Name, err)
|
|
|
|
|
|
|
+ baseapp.Logger.Errorf("[%s] 照片文件上传失败: %s -> %s, 原因: %v!!", MODULE_NAME, imgFile, server.Name, err)
|
|
|
|
|
+ if server.ImagBackfill {
|
|
|
|
|
+ needImagBackfill = true
|
|
|
|
|
+ }
|
|
|
continue
|
|
continue
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- uploaded = true
|
|
|
|
|
elapsed := time.Since(start).Milliseconds()
|
|
elapsed := time.Since(start).Milliseconds()
|
|
|
- baseapp.Logger.Infof("[%s] 照片文件上传成功: %q -> %s, 耗时 %dms", MODULE_NAME, imgFile, server.Name, elapsed)
|
|
|
|
|
|
|
+ baseapp.Logger.Infof("[%s] 照片文件上传成功: %s -> %s, 耗时 %dms", MODULE_NAME, imgFile, server.Name, elapsed)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if uploaded { // 只要有一个服务器上传成功, 就说明联网是正常的, 就可以删除本地刚拍摄的照片文件, 不用留做以后进行数据补录
|
|
|
|
|
|
|
+ if !needImagBackfill { // 无需补录,删除本地照片
|
|
|
os.Remove(imgFile)
|
|
os.Remove(imgFile)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|