问题列表修改

go.mod

@@ -1,4 +1,4 @@
-module bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase
+module knowledgeBase
 
 go 1.16
 

rpc/knowledge/internal/logic/findanswerlogic.go

@@ -30,9 +30,11 @@ func NewFindAnswerLogic(ctx context.Context, svcCtx *svc.ServiceContext) *FindAn
 func (l *FindAnswerLogic) FindAnswer(in *knowledgeclient.FindAnswerReq) (*knowledgeclient.FindAnswerResp, error) {
 	var question knowledgeclient.Question
 	robotEntId := SE.Decode4Hex(in.RobotEntId)
-	log.Println("机器人企业id：", robotEntId)
+	logx.Info("机器人企业id：", robotEntId)
 	//组装es query
 	query := util.DSL4SmartResponse(in.Question, robotEntId, int(in.Type))
+	log.Println("111111", query)
+	logx.Info("es查询：", query)
 	res := elastic.Get(C.Es.Index, C.Es.Type, query)
 	if res != nil && len(*res) > 0 {
 		data := (*res)[0]

rpc/knowledge/internal/logic/knowledgeaddlogic.go

@@ -55,7 +55,8 @@ func (l *KnowledgeAddLogic) KnowledgeAdd(in *knowledgeclient.AddRequest) (*knowl
 		}
 		createPerson := resp.Data.Name
 		var answerId int64
-		nowTime := time.Now().Local().Format(util.Date_Full_Layout)
+		var cstSh, _ = time.LoadLocation("Asia/Shanghai") //上海
+		nowTime := time.Now().In(cstSh).Format(util.Date_Full_Layout)
 		fool := Mysql.ExecTx("添加知识", func(tx *sql.Tx) bool {
 			//插入答案
 			answerData := map[string]interface{}{

rpc/knowledge/internal/logic/knowledgeeditlogic.go

@@ -48,9 +48,10 @@ func (l *KnowledgeEditLogic) KnowledgeEdit(in *knowledgeclient.KnowledgeEditReq)
 	}
 	createPerson := resp.Data.Name
 	fool := Mysql.ExecTx("编辑问题、答案", func(tx *sql.Tx) bool {
+		var cstSh, _ = time.LoadLocation("Asia/Shanghai") //上海
 		//修改答案
 		answerUpdate := map[string]interface{}{
-			"update_time": time.Now().Local().Format(util.Date_Full_Layout),
+			"update_time": time.Now().In(cstSh).Format(util.Date_Full_Layout),
 			"content":     in.Answer,
 		}
 		ok1 := Mysql.UpdateByTx(tx, util.ANSWER, map[string]interface{}{"id": in.AnswerId}, answerUpdate)

rpc/knowledge/internal/logic/knowledgelistlogic.go

@@ -40,7 +40,8 @@ func (l *KnowledgeListLogic) KnowledgeList(in *knowledgeclient.ListRequest) (*kn
 		//列表数据
 		sql := "SELECT b.content as answer,c.content as question,b.id,b.knowledge_id  FROM " + util.KNOWLEDGE +
 			" a LEFT JOIN " + util.ANSWER + " b ON a.id = b.knowledge_id LEFT JOIN " + util.QUESTION +
-			" c ON b.id = c.answer_id WHERE b.`status` =1 and a.ent_id=? limit ?,?"
+			" c ON b.id = c.answer_id WHERE b.`status` =1 and a.ent_id=? order by b.update_time desc limit ?,?"
+		log.Println(sql, in.EntId, (in.PageIndex-1)*in.PageSize, in.PageSize)
 		datalist := Mysql.SelectBySql(sql, in.EntId, (in.PageIndex-1)*in.PageSize, in.PageSize)
 		if datalist != nil && *datalist != nil && len(*datalist) > 0 {
 			for _, value := range *datalist {
@@ -52,7 +53,7 @@ func (l *KnowledgeListLogic) KnowledgeList(in *knowledgeclient.ListRequest) (*kn
 				data = append(data, &knowledge)
 			}
 		}
-		log.Println("数据：", data)
+		//log.Println("数据：", data)
 		knowledgeList.Total = count
 		knowledgeList.Data = data
 	}

rpc/knowledge/test/knowledge_test.go

@@ -37,9 +37,9 @@ func Test_KnowledgeList(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
 	TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
 	req := &knowledgeclient.ListRequest{}
-	req.EntId = 10000
-	req.PageSize = 10
-	req.PageIndex = 1
+	req.EntId = 14929
+	req.PageSize = 20
+	req.PageIndex = 3
 	res, err := TestSystem.KnowledgeList(ctx, req)
 	log.Println("res ", res)
 	log.Println("err ", err)
@@ -83,8 +83,8 @@ func Test_FindAnswer(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
 	TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
 	req := &knowledgeclient.FindAnswerReq{}
-	req.Question = "专注招投标大数据服务，运用AI、云计算、数据挖掘分析等先进技术"
-	req.RobotEntId = "455b415651"
+	req.Question = "在吗"
+	req.RobotEntId = "455b495c5c"
 	req.Type = 1
 	res, err := TestSystem.FindAnswer(ctx, req)
 	log.Println("res ", res)

rpc/knowledge/util/elasticsearch_dsl.go

@@ -2,6 +2,7 @@ package util
 
 import (
 	"fmt"
+	"github.com/zeromicro/go-zero/core/logx"
 	. "knowledgeBase/rpc/knowledge/init"
 	"log"
 	"strings"
@@ -23,6 +24,7 @@ func DSL4SmartResponse(question string, entId string, msgType int) string {
 	hanlpCutWords := HanlpGetNormalWords(question, C.Segment)
 	question = strings.Join(hanlpCutWords, "")
 	lenQuestion := len([]rune(question))
+	log.Println("len", lenQuestion)
 	if lenQuestion >= 2 {
 		queryPercent := "40%"
 		if lenQuestion < 5 {
@@ -45,7 +47,7 @@ func DSL4SmartResponse(question string, entId string, msgType int) string {
 		}
 		query = fmt.Sprintf(query, "", typeStr, question, queryPercent, entId)
 		queryDSL := fmt.Sprintf(totalQuery, postFilter, query, `"answer","question"`, 1)
-		log.Println("queryDSL:", queryDSL)
+		logx.Info("queryDSL:", queryDSL)
 		return queryDSL
 	}
 	return ""