浏览代码

fix:Command命令使用占位符

Roc 4 月之前
父节点
当前提交
623dbfdd7d
共有 4 个文件被更改,包括 2 次插入77 次删除
  1. 1 1
      models/admin.go
  2. 0 67
      models/wx_template_msg.go
  3. 0 8
      services/save_log.go
  4. 1 1
      utils/common.go

+ 1 - 1
models/admin.go

@@ -25,7 +25,7 @@ func GetAdminByAdminId(adminId int) (item *Admin, err error) {
 	//err = orm.NewOrm().Raw(sql, adminId).QueryRow(&item)
 
 	sql := `SELECT * FROM admin WHERE admin_id=? `
-	err = global.DEFAULT_DmSQL.Raw(sql, adminId).Find(&item).Error
+	err = global.DmSQL["eta"].Raw(sql, adminId).Find(&item).Error
 	return
 }
 

+ 0 - 67
models/wx_template_msg.go

@@ -1,9 +1,5 @@
 package models
 
-import (
-	"eta_gn/eta_task/global"
-)
-
 type SendTemplateResponse struct {
 	Errcode int    `json:"errcode"`
 	Errmsg  string `json:"errmsg"`
@@ -14,69 +10,6 @@ type OpenIdList struct {
 	OpenId string
 }
 
-func DeleteTemplateRecordByDate(date string) (err error) {
-	//sql := `DELETE FROM user_template_record WHERE create_time<? `
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, date).Exec()
-
-	sql := `DELETE FROM user_template_record WHERE create_time<? `
-	err = global.DEFAULT_DmSQL.Exec(sql, date).Error
-	return
-}
-
-//// GetOpenIdListV2 2022-08-18从hongze_admin复制过来的最新的代码
-//func GetOpenIdListV2() (items []*OpenIdList, err error) {
-//	sql := `SELECT DISTINCT
-//				ur.open_id,
-//				wu.user_id
-//			FROM
-//				wx_user AS wu
-//			INNER JOIN company AS c ON c.company_id = wu.company_id
-//			INNER JOIN company_product AS d ON c.company_id = d.company_id
-//			INNER JOIN user_record AS ur ON wu.user_id = ur.user_id
-//			WHERE
-//				ur.open_id != "" AND ur.subscribe = 1 AND ur.create_platform = 1 AND d. STATUS IN ('正式', '试用', '永续') `
-//	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
-//	return
-//}
-
-func GetOpenIdArr() (items []string, err error) {
-	//sql := ` SELECT DISTINCT ur.open_id FROM wx_user AS wu
-	//      INNER JOIN company AS c ON c.company_id = wu.company_id
-	//      INNER JOIN company_product AS d ON c.company_id=d.company_id
-	//	INNER JOIN user_record  AS ur ON wu.user_id=ur.user_id
-	//      WHERE ur.open_id != "" AND ur.subscribe=1 AND ur.create_platform=1 AND  d.status IN('正式','试用','永续')
-	//     ORDER BY FIELD(c.company_id, 16) desc, ur.user_record_id asc`
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql).QueryRows(&items)
-
-	sql := ` SELECT DISTINCT ur.open_id FROM wx_user AS wu
-	     INNER JOIN company AS c ON c.company_id = wu.company_id
-	     INNER JOIN company_product AS d ON c.company_id=d.company_id
-		INNER JOIN user_record  AS ur ON wu.user_id=ur.user_id
-	     WHERE ur.open_id != '' AND ur.subscribe=1 AND ur.create_platform=1 AND  d.status IN('正式','试用','永续')
-	    ORDER BY FIELD(c.company_id, 16) desc, ur.user_record_id asc`
-	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
-	return
-}
-
-//func GetOpenIdArrByClassifyNameSecond(classifyNameSecond string) (items []string, err error) {
-//	sql := ` SELECT DISTINCT ur.open_id FROM wx_user AS wu
-//			INNER JOIN company AS c ON c.company_id = wu.company_id
-//			INNER JOIN company_product AS d ON c.company_id=d.company_id
-//			INNER JOIN user_record  AS ur ON wu.user_id=ur.user_id
-//			INNER JOIN company_report_permission AS e ON d.company_id=e.company_id
-//			INNER JOIN chart_permission AS f ON e.chart_permission_id=f.chart_permission_id
-//			INNER JOIN chart_permission_search_key_word_mapping AS g ON f.chart_permission_id=g.chart_permission_id
-//			WHERE ur.open_id != "" AND ur.subscribe=1 AND ur.create_platform=1 AND  d.status IN('正式','试用','永续') AND  e.status IN('正式','试用','永续')
-//			AND g.from='rddp'
-//			AND g.key_word=?
-//			ORDER BY FIELD(c.company_id, 16) DESC, ur.user_record_id ASC  `
-//	o := orm.NewOrm()
-//	_, err = o.Raw(sql, classifyNameSecond).QueryRows(&items)
-//	return
-//}
-
 // GetOpenIdArrByClassifyId
 // @Description: 根据分类id获取关联的用户微信openid
 // @author: Roc

+ 0 - 8
services/save_log.go

@@ -2,7 +2,6 @@ package services
 
 import (
 	"context"
-	"eta_gn/eta_task/models"
 	"eta_gn/eta_task/models/data_manage"
 	"eta_gn/eta_task/services/alarm_msg"
 	"eta_gn/eta_task/utils"
@@ -25,12 +24,5 @@ func DeleteLog(cont context.Context) (err error) {
 		}
 	}()
 
-	go func() {
-		err = models.DeleteTemplateRecordByDate(date)
-		if err != nil {
-			alarm_msg.SendAlarmMsg("DeleteTemplateRecordByDate ErrMsg:"+err.Error(), 3)
-		}
-	}()
-
 	return
 }

+ 1 - 1
utils/common.go

@@ -821,7 +821,7 @@ func SubFloatToFloatStr(f float64, m int) string {
 }
 
 func GetVideoPlaySeconds(videoPath string) (playSeconds float64, err error) {
-	cmd := `ffmpeg -i ` + videoPath + `  2>&1 | grep 'Duration' | cut -d ' ' -f 4 | sed s/,//`
+	cmd := fmt.Sprintf(`ffmpeg -i %s  2>&1 | grep 'Duration' | cut -d ' ' -f 4 | sed s/,//`, videoPath)
 	out, err := exec.Command("bash", "-c", cmd).Output()
 	if err != nil {
 		return