Merge branch 'feature/v1.0.4' of https://jygit.jydev.jianyu360.cn/CRM/application into feature/v1.0.4

api/application.api

@@ -334,106 +334,106 @@ service crmApplication {
 	@doc "添加线索"
 	@handler clueAdd
 	post /crmApplication/clue/add (ClueAddReq) returns (Reply)
-	
+
 	@doc "创建销售机会"
 	@handler saleChanceAdd
 	post /crmApplication/saleChance/add (SaleChanceReq) returns (Reply)
-	
+
 	@doc "收录操作"
 	@handler employOperate
 	post /crmApplication/employ/operate (EmployOperateReq) returns (Reply)
-	
+
 	@doc "商业资讯的转办"
 	@handler transfer
 	post /crmApplication/information/transfer (TransferReq) returns (Reply)
-	
+
 	@doc "忽略操作"
 	@handler ignoreOperate
 	post /crmApplication/ignore/operate (IgnoreOperateReq) returns (Reply)
-	
+
 	@doc "收录情况"
 	@handler employInfo
 	post /crmApplication/employ/info (InfoEmployinfoReq) returns (InfoReply)
-	
+
 	@doc "创建客户"
 	@handler customAdd
 	post /crmApplication/custom/add (CustomAddReq) returns (Reply)
-	
+
 	@doc "文件上传"
 	@handler fileUpload
 	post /crmApplication/file/upload (FileUploadReq) returns (Reply)
-	
+
 	@doc "分发"
 	@handler employDistribute
 	post /crmApplication/employ/distribute (EmployDistributeReq) returns (Reply)
-	
+
 	@doc "企业详情"
 	@handler entinfo
 	post /crmApplication/ent/info (EntInfoReq) returns (Reply)
-	
+
 	@doc "消息推送"
 	@handler pushMsg
 	post /crmApplication/info/push (PushMsgReq) returns (Reply)
-	
+
 	@doc "是否可以创建"
 	@handler canAddReq
 	post /crmApplication/info/canAdd (CanAddReq) returns (Reply)
-	
+
 	@doc "人脉可达潜客业主列表"
 	@handler ownerList
-	post /crmApplication/owner/List (OwnerListReq) returns (Reply)
-	
+	post /crmApplication/owner/list (OwnerListReq) returns (Reply)
+
 	@doc "人脉可达商机列表"
 	@handler projectList
 	post /crmApplication/network/project/list (ProjectListReq) returns (Reply)
-	
+
 	@doc "项目公关渠道分析-项目名称联想"
 	@handler PrPnameAss
 	post /crmApplication/pr/pname/ass (PnameAssReq) returns (Reply)
-	
+
 	@doc "项目公关渠道分析-与业主合作历史"
 	@handler CoopHistoryList
 	post /crmApplication/pr/project/analyse (CoopHistoryReq) returns (Reply)
-	
+
 	@doc "人脉库-添加/修改人脉"
 	@handler addOrUpdate
 	post /crmApplication/network/addOrUpdate (AddOrUpdateReq) returns (Reply)
-	
+
 	@doc "人脉库-业主名称联想"
 	@handler associate
 	post /crmApplication/network/associate (AssociateReq) returns (Reply)
-	
+
 	@doc "人脉库-全部人脉项目"
 	@handler allProject
 	post /crmApplication/network/allProject (AllprojectReq) returns (Reply)
-	
+
 	@doc "人脉库-列表"
 	@handler networkList
 	post /crmApplication/network/networkList (NetWorkListReq) returns (Reply)
-	
+
 	@doc "忽略操作"
 	@handler ignoreAction
 	post /crmApplication/ignore/action (IgnoreReq) returns (Reply)
-	
+
 	@doc "情报详情"
 	@handler infoDetail
 	post /crmApplication/infomation/detail (InfoDetailReq) returns (Reply)
-	
+
 	@doc "人脉可达商机列表-人脉路径"
 	@handler plistPath
 	post /crmApplication/network/plist/pathway (PListPathReq) returns (Reply)
-	
+
 	@doc "人脉项目分析-业主合作历史"
 	@handler projectHistory
 	post /crmApplication/pr/project/history (PrjectHistoryReq) returns (Reply)
 	@doc "可介绍业主路径"
 	@handler ownerRoute
 	post /crmApplication/owner/route (RouteOwnerListReq) returns (Reply)
-	
+
 	@doc "可介绍业主合作次数"
 	@handler ownerCooperate
 	post /crmApplication/owner/cooperate (CooperateOwnerListReq) returns (Reply)
-	
+
 	@doc "候选渠道列表"
 	@handler candidateChannel
 	post /crmApplication/candidate/channel (ChannelListReq) returns (Reply)

api/internal/handler/routes.go

@@ -74,7 +74,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/owner/List",
+				Path:    "/crmApplication/owner/list",
 				Handler: ownerListHandler(serverCtx),
 			},
 			{
@@ -148,5 +148,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Handler: candidateChannelHandler(serverCtx),
 			},
 		},
+		rest.WithMaxBytes(104857600),
 	)
 }

api/internal/logic/ignoreactionlogic.go

@@ -45,6 +45,8 @@ func (l *IgnoreActionLogic) IgnoreAction(req *types.IgnoreReq) (resp *types.Repl
 		if !b {
 			resp.Error_code = -1
 			resp.Error_msg = "更新失败"
+		} else {
+			resp.Error_msg = "更新成功"
 		}
 
 	} else {
@@ -53,7 +55,7 @@ func (l *IgnoreActionLogic) IgnoreAction(req *types.IgnoreReq) (resp *types.Repl
 				"position_id": req.PositionId,
 				"ent_id":      req.EntId,
 				"ent_dept_id": req.EntDeptId,
-				"ent_user id": req.EntUserId,
+				"ent_user_id": req.EntUserId,
 				"relate_id":   req.RelateId,
 				"itype":       req.Source,
 				"is_handle":   1,
@@ -65,6 +67,9 @@ func (l *IgnoreActionLogic) IgnoreAction(req *types.IgnoreReq) (resp *types.Repl
 			if i <= 0 {
 				resp.Error_code = -1
 				resp.Error_msg = "更新失败"
+			} else {
+				resp.Data = i
+				resp.Error_msg = "更新成功"
 			}
 		} else {
 			resp.Error_code = -1

api/internal/logic/infodetaillogic.go

@@ -26,22 +26,22 @@ func NewInfoDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *InfoDe
 }
 
 type Infomation struct {
-	Title       string `json:"title"`
-	Summary     string `json:"summary"`
-	Content     string `json:"content"`
-	DataJsonId  string `json:"datajson_id"`
-	Area        string `json:"area"`
-	City        string `json:"city"`
-	Basis       string `json:"basis"`
-	ProjectName string `json:"project_name"`
+	Title       string `ch:"title"`
+	Summary     string `ch:"summary"`
+	Content     string `ch:"content"`
+	Basis       string `ch:"basis"`
+	Area        string `ch:"area"`
+	City        string `ch:"city"`
+	DataJsonId  string `ch:"datajson_id"`
+	ProjectName string `ch:"project_name"`
 }
 
 func (l *InfoDetailLogic) InfoDetail(req *types.InfoDetailReq) (resp *types.Reply, err error) {
 	resp = &types.Reply{}
-	sql := `SELECT title, summary, content, datajson_id, area, city, basis FROM information.information WHERE id = ?`
-	info := &Infomation{}
-	err = T.ClickhouseConn.QueryRow(context.TODO(), sql, req.InfoId).ScanStruct(info)
-	if err != nil {
+	sql := `SELECT title, summary, content, basis, area, city, datajson_id FROM information.information WHERE id = ?`
+	info := Infomation{}
+	err = T.ClickhouseConn.QueryRow(context.TODO(), sql, req.InfoId).ScanStruct(&info)
+	if err == nil {
 		binfo, b := T.MgoBidding.FindById("bidding", info.DataJsonId, map[string]interface{}{"title": 1, "projectname": 1})
 		if b && binfo != nil && len(*binfo) > 0 {
 			info.ProjectName = common.ObjToString((*binfo)["projectname"])

api/internal/service/owner.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"sort"
 	"strings"
 
 	"app.yhyue.com/moapp/jybase/common"
@@ -116,6 +117,9 @@ func (t *OwnerService) OwnerlList() map[string]interface{} {
 	}
 	startIndex := (t.PageIndex - 1) * t.PageSize
 	endIndex := t.PageIndex * t.PageSize
+	sort.Slice(returnData, func(i, j int) bool {
+		return returnData[i].Zbtime < returnData[j].Zbtime
+	})
 	if startIndex < gconv.Int64(len(returnData)) {
 		if endIndex > gconv.Int64(len(returnData)) {
 			endIndex = gconv.Int64(len(returnData))

api/logs/access.log

@@ -1,63 +0,0 @@
-{"@timestamp":"2024-04-20T16:38:51.909+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
-{"@timestamp":"2024-04-20T16:38:51.909+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
-{"@timestamp":"2024-04-20T16:38:52.092+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
-{"@timestamp":"2024-04-20T16:38:52.092+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
-{"@timestamp":"2024-04-20T16:38:52.092+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-20T16:38:52.093+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-20T16:39:14.730+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54002 - PostmanRuntime/7.37.3","duration":"9010.9ms","level":"info","span":"68d106663570d168","trace":"4896d28e6ed4aee84f8861a0d144112a"}
-{"@timestamp":"2024-04-20T16:42:48.160+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
-{"@timestamp":"2024-04-20T16:42:48.160+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
-{"@timestamp":"2024-04-20T16:42:48.339+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
-{"@timestamp":"2024-04-20T16:42:48.340+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
-{"@timestamp":"2024-04-20T16:42:48.340+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-20T16:42:48.340+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-20T16:43:02.629+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54131 - PostmanRuntime/7.37.3","duration":"9009.7ms","level":"info","span":"97e686079048374f","trace":"b7d39466bcf5743c1abc866743ce1392"}
-{"@timestamp":"2024-04-20T16:46:44.494+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
-{"@timestamp":"2024-04-20T16:46:44.494+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
-{"@timestamp":"2024-04-20T16:46:44.666+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
-{"@timestamp":"2024-04-20T16:46:44.667+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
-{"@timestamp":"2024-04-20T16:46:44.667+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-20T16:46:44.667+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-20T16:46:58.173+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54281 - PostmanRuntime/7.37.3","duration":"9005.4ms","level":"info","span":"7662394332ffa162","trace":"4e4506048182ee5cfeec7818d49380ee"}
-{"@timestamp":"2024-04-20T16:49:08.450+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
-{"@timestamp":"2024-04-20T16:49:08.450+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
-{"@timestamp":"2024-04-20T16:49:08.624+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
-{"@timestamp":"2024-04-20T16:49:08.624+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
-{"@timestamp":"2024-04-20T16:49:08.624+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-20T16:49:08.624+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-20T16:49:30.036+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54342 - PostmanRuntime/7.37.3","duration":"9007.0ms","level":"info","span":"488b40d93de93c59","trace":"814ede86df6a8da3e0f1aa0f24eb78ac"}
-{"@timestamp":"2024-04-20T16:50:34.581+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54366 - PostmanRuntime/7.37.3","duration":"9012.3ms","level":"info","span":"4de78596462a4c66","trace":"8205893c70b0c11537d3e237ba211fa1"}
-{"@timestamp":"2024-04-20T16:51:41.341+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
-{"@timestamp":"2024-04-20T16:51:41.341+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
-{"@timestamp":"2024-04-20T16:51:41.549+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
-{"@timestamp":"2024-04-20T16:51:41.550+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
-{"@timestamp":"2024-04-20T16:51:41.550+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-20T16:51:41.550+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-20T16:51:47.631+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54416 - PostmanRuntime/7.37.3","duration":"58.5ms","level":"info","span":"685ecb138491f303","trace":"0f931b71eb157b02db68c3a19f8e2fc9"}
-{"@timestamp":"2024-04-20T16:53:42.473+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
-{"@timestamp":"2024-04-20T16:53:42.473+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
-{"@timestamp":"2024-04-20T16:53:42.651+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
-{"@timestamp":"2024-04-20T16:53:42.651+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
-{"@timestamp":"2024-04-20T16:53:42.652+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-20T16:53:42.653+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-20T16:53:52.142+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54792 - PostmanRuntime/7.37.3","duration":"68.7ms","level":"info","span":"02b7fc04dadcba3a","trace":"73ef3cfc1e70978c0c7a6441123dc490"}
-{"@timestamp":"2024-04-20T17:13:13.526+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
-{"@timestamp":"2024-04-20T17:13:13.527+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
-{"@timestamp":"2024-04-20T17:13:13.723+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
-{"@timestamp":"2024-04-20T17:13:13.723+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
-{"@timestamp":"2024-04-20T17:13:13.724+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-20T17:13:13.724+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-22T09:19:05.081+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
-{"@timestamp":"2024-04-22T09:19:05.081+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
-{"@timestamp":"2024-04-22T09:19:05.481+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
-{"@timestamp":"2024-04-22T09:19:05.481+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
-{"@timestamp":"2024-04-22T09:19:05.482+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-22T09:19:05.482+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-22T09:19:16.858+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:59248 - PostmanRuntime/7.37.3","duration":"2348.5ms","level":"info","span":"6509359ada07ebaf","trace":"3239429b5336223141bdfbbb7a160a97"}
-{"@timestamp":"2024-04-22T09:21:01.787+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
-{"@timestamp":"2024-04-22T09:21:01.787+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
-{"@timestamp":"2024-04-22T09:21:01.949+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
-{"@timestamp":"2024-04-22T09:21:01.949+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
-{"@timestamp":"2024-04-22T09:21:01.950+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-22T09:21:01.950+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-22T09:21:18.476+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:59567 - PostmanRuntime/7.37.3","duration":"18.1ms","level":"info","span":"3f74d18cc81383d4","trace":"209b4579e57f68927f6a0c6e6a043e48"}

api/logs/slow.log

@@ -1,6 +0,0 @@
-{"@timestamp":"2024-04-20T16:39:14.730+08:00","caller":"handler/loghandler.go:132","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54002 - PostmanRuntime/7.37.3 - slowcall(9010.9ms)","duration":"9010.9ms","level":"slow","span":"68d106663570d168","trace":"4896d28e6ed4aee84f8861a0d144112a"}
-{"@timestamp":"2024-04-20T16:43:02.629+08:00","caller":"handler/loghandler.go:132","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54131 - PostmanRuntime/7.37.3 - slowcall(9009.7ms)","duration":"9009.7ms","level":"slow","span":"97e686079048374f","trace":"b7d39466bcf5743c1abc866743ce1392"}
-{"@timestamp":"2024-04-20T16:46:58.173+08:00","caller":"handler/loghandler.go:132","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54281 - PostmanRuntime/7.37.3 - slowcall(9005.4ms)","duration":"9005.4ms","level":"slow","span":"7662394332ffa162","trace":"4e4506048182ee5cfeec7818d49380ee"}
-{"@timestamp":"2024-04-20T16:49:30.036+08:00","caller":"handler/loghandler.go:132","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54342 - PostmanRuntime/7.37.3 - slowcall(9007.0ms)","duration":"9007.0ms","level":"slow","span":"488b40d93de93c59","trace":"814ede86df6a8da3e0f1aa0f24eb78ac"}
-{"@timestamp":"2024-04-20T16:50:34.581+08:00","caller":"handler/loghandler.go:132","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54366 - PostmanRuntime/7.37.3 - slowcall(9012.3ms)","duration":"9012.3ms","level":"slow","span":"4de78596462a4c66","trace":"8205893c70b0c11537d3e237ba211fa1"}
-{"@timestamp":"2024-04-22T09:19:16.858+08:00","caller":"handler/loghandler.go:132","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:59248 - PostmanRuntime/7.37.3 - slowcall(2348.5ms)","duration":"2348.5ms","level":"slow","span":"6509359ada07ebaf","trace":"3239429b5336223141bdfbbb7a160a97"}