Merge branch 'cygx_12.0' into debug

controllers/yanxuan_special.go

@@ -228,22 +228,18 @@ func (this *YanxuanSpecialController) Save() {
 		return
 	}
 
-	if req.UserId <= 0 {
-		br.Msg = "请输入内容"
-		return
-	}
 	if req.Content == "" {
 		br.Msg = "请输入内容"
 		return
 	}
 	if req.Tags == "" {
-		br.Msg = "请输入内容"
+		br.Msg = "请至少输入一个标签"
 		return
 	}
 
 	item := models.CygxYanxuanSpecial{
 		Id:          req.Id,
-		UserId:      req.UserId,
+		UserId:      sysUser.UserId,
 		CreateTime:  time.Now(),
 		ModifyTime:  time.Now(),
 		PublishTime: time.Now(),
@@ -659,12 +655,6 @@ func (this *YanxuanSpecialController) IndustrySearch() {
 
 	keyword := this.GetString("Keyword")
 
-	if keyword == "" {
-		br.Ret = 200
-		return
-	}
-
-
 	list, tmpErr := models.GetYanxuanSpecialIndustry(keyword)
 	if tmpErr != nil {
 		br.Msg = "获取失败"

models/cygx_yanxuan_special.go

@@ -92,7 +92,6 @@ JOIN cygx_yanxuan_special_author AS b ON a.user_id = b.user_id
 
 type CygxYanxuanSpecialReq struct {
 	Id      int    `orm:"column(id);pk"`
-	UserId  int    // 用户ID
 	Content string // 内容
 	Tags    string // 标签
 	DoType  int    // 1保存 2发布
@@ -122,15 +121,11 @@ func UpdateYanxuanSpecial(item *CygxYanxuanSpecial) (err error) {
 func GetYanxuanSpecialIndustry(keyword string) (IndustryNames []string, err error) {
 	o := orm.NewOrm()
 	sql := ``
-	sql = `SELECT industry_name FROM cygx_yanxuan_special_industry WHERE industry_name LIKE '%`+keyword+`%' `
+	if keyword == ""{
+		sql = `SELECT industry_name FROM cygx_yanxuan_special_industry `
+	} else {
+		sql = `SELECT industry_name FROM cygx_yanxuan_special_industry WHERE industry_name LIKE '%`+keyword+`%' `
+	}
 	_, err = o.Raw(sql).QueryRows(&IndustryNames)
 	return
 }
-
-func GetYanxuanSpecialCompany(keyword string) (IndustryNames []string, err error) {
-	o := orm.NewOrm()
-	sql := ``
-	sql = `SELECT sec_name FROM cygx_yanxuan_special_company WHERE sec_name LIKE '%`+keyword+`%' `
-	_, err = o.Raw(sql).QueryRows(&IndustryNames)
-	return
-}

models/cygx_yanxuan_special_company.go

@@ -0,0 +1,36 @@
+package models
+
+import "github.com/beego/beego/v2/client/orm"
+
+type CygxYanxuanSpecialCompany struct {
+	Id        int     `orm:"column(id);pk"`
+	TradeCode string  // 交易代码
+	SecName   string  // 公司名
+	PyName    string  // 拼音名
+	Region    string  // 地区
+}
+
+type VmpStocks struct {
+	Code int
+	Msg string
+	Data []CygxYanxuanSpecialCompany
+}
+
+// 批量添加
+func AddCygxYanxuanSpecialCompanyMulti(items []*CygxYanxuanSpecialCompany) (err error) {
+	o := orm.NewOrm()
+	if len(items) > 0 {
+		//批量添加
+		_, err = o.InsertMulti(len(items), items)
+	}
+	return
+}
+
+
+func GetYanxuanSpecialCompany(keyword string) (IndustryNames []string, err error) {
+	o := orm.NewOrm()
+	sql := ``
+	sql = `SELECT sec_name FROM cygx_yanxuan_special_company WHERE sec_name LIKE '%`+keyword+`%' `
+	_, err = o.Raw(sql).QueryRows(&IndustryNames)
+	return
+}

models/db.go

@@ -166,6 +166,7 @@ func init() {
 		new(CygxYanxuanSpecialCollect),
 		new(CygxYanxuanSpecial),
 		new(CygxYanxuanSpecialFollow),
+		new(CygxYanxuanSpecialCompany),
 	)
 	// 记录ORM查询日志
 	orm.Debug = true

services/cygx_yanxuan_special_company.go

@@ -0,0 +1,41 @@
+package services
+
+import (
+	"encoding/json"
+	"fmt"
+	"hongze/hongze_cygx/models"
+	"io/ioutil"
+	"net/http"
+)
+
+func GetCom()  {
+	getUrl := "https://vmp.hzinsights.com/v2api/articles/stock"
+	result, err := http.Get(getUrl)
+	if err != nil {
+		return
+	}
+	defer result.Body.Close()
+	body, err := ioutil.ReadAll(result.Body)
+	if err != nil {
+		fmt.Println("err:" + err.Error())
+		return
+	}
+	fmt.Println(body)
+	var resp models.VmpStocks
+	err = json.Unmarshal(body, &resp)
+	if err != nil {
+		fmt.Println("获取上市公司信息失败 Err:%s", err.Error())
+		return
+	}
+
+	items := make([]*models.CygxYanxuanSpecialCompany, 0)
+	for _, v := range resp.Data {
+		items = append(items, &v)
+	}
+
+	err  = models.AddCygxYanxuanSpecialCompanyMulti(items)
+	if err != nil {
+		fmt.Println("AddCygxYanxuanSpecialCompanyMulti Err:%s", err.Error())
+		return
+	}
+}