Merge branch 'develop' of http://code.dashoo.cn/chengjian/opms_backend into develop

opms_admin/app/handler/auth.go

@@ -2,20 +2,17 @@ package handler
 
 import (
 	"context"
-	"dashoo.cn/opms_libary/myerrors"
-
 	"dashoo.cn/common_definition/admin/user_def"
+	"dashoo.cn/common_definition/auth"
 	"dashoo.cn/common_definition/comm_def"
+	"dashoo.cn/micro/app/service"
 	"dashoo.cn/opms_libary/gtoken"
 	"dashoo.cn/opms_libary/micro_srv"
+	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/encoding/gjson"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/glog"
 	"github.com/gogf/gf/util/gconv"
-
-	"dashoo.cn/micro/app/service"
-
-	"dashoo.cn/common_definition/auth"
 )
 
 type AuthHandler struct{}
@@ -72,7 +69,7 @@ func (h *AuthHandler) LogOut(ctx context.Context, req interface{}, rsp *comm_def
 	return nil
 }
 
-func (h *AuthHandler) GetToken(ctx context.Context, req *auth.Request, rsp *auth.Response) (err error) {
+func (h *AuthHandler) GetToken(ctx context.Context, req *auth.Request, rsp *comm_def.CommonMsg) (err error) {
 	glog.Info("Received AuthHandler.GetToken request, UserKey:", req.UserKey, " @ ", req.Tenant)
 	// 获取Data，换成对象
 	var json interface{}
@@ -90,7 +87,7 @@ func (h *AuthHandler) GetToken(ctx context.Context, req *auth.Request, rsp *auth
 	return nil
 }
 
-func (h *AuthHandler) RemoveToken(ctx context.Context, reqToken string, rsp *auth.Response) error {
+func (h *AuthHandler) RemoveToken(ctx context.Context, reqToken string, rsp *comm_def.CommonMsg) error {
 	glog.Info("Received AuthHandler.RemoveToken request, token:", reqToken)
 	tokenResp := gtoken.GFToken.RemoveToken(reqToken)
 	if err := gconv.Struct(tokenResp, rsp); err != nil {
@@ -99,7 +96,7 @@ func (h *AuthHandler) RemoveToken(ctx context.Context, reqToken string, rsp *aut
 	return nil
 }
 
-func (h *AuthHandler) ValidToken(ctx context.Context, reqToken string, rsp *auth.Response) error {
+func (h *AuthHandler) ValidToken(ctx context.Context, reqToken string, rsp *comm_def.CommonMsg) error {
 	glog.Info("Received AuthHandler.ValidToken request, token:", reqToken)
 	tokenResp := gtoken.GFToken.ValidToken(reqToken)
 	if err := gconv.Struct(tokenResp, rsp); err != nil {

opms_libary/micro_srv/micro_srv.go

@@ -2,6 +2,7 @@ package micro_srv
 
 import (
 	"context"
+	"dashoo.cn/common_definition/comm_def"
 	"dashoo.cn/opms_libary/dynamic"
 	"dashoo.cn/opms_libary/gtoken"
 	"dashoo.cn/opms_libary/mutipart"
@@ -30,8 +31,6 @@ import (
 	"github.com/smallnest/rpcx/server"
 	"github.com/smallnest/rpcx/serverplugin"
 	"github.com/smallnest/rpcx/share"
-
-	"dashoo.cn/common_definition/auth"
 )
 
 // InitMicroSrvClient 获取微服务客户端，arg为可选参数，若有必须是两个，分别是:reg string, serverAddr string
@@ -198,7 +197,7 @@ func HandleAuth(ctx context.Context, req *protocol.Message, token string, authEx
 		}
 
 		//return errors.New("InvalidToken")
-		if rsp.Code != 0 {
+		if rsp.Code != 0 && rsp.Code != 200 {
 			return myerrors.AuthError()
 		}
 
@@ -259,7 +258,7 @@ func validToken(token string) gtoken.Resp {
 
 	authService := InitMicroSrvClient("Auth", "micro_srv.auth")
 	defer authService.Close()
-	rsp := &auth.Response{}
+	rsp := &comm_def.CommonMsg{}
 	err := authService.Call(context.TODO(), "ValidToken", token, rsp)
 	if err != nil {
 		g.Log().Error(err)

opms_libary/myerrors/error.go

@@ -2,27 +2,28 @@ package myerrors
 
 import (
 	"context"
+	"dashoo.cn/common_definition/comm_def"
 	"github.com/gogf/gf/errors/gcode"
 	"github.com/gogf/gf/errors/gerror"
 	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/util/gconv"
+	"github.com/smallnest/rpcx/codec"
 	"github.com/smallnest/rpcx/protocol"
 	"strings"
 )
 
 var (
-	CodeTipsErr      = gcode.New(1001, "错误提示", nil)
-	CodeValidErr     = gcode.New(1002, "数据校验失败", nil)
-	CodeQueryErr     = gcode.New(1003, "%s查询失败", nil)
-	CodeCreateErr    = gcode.New(1004, "%s创建失败", nil)
-	CodeUpdateErr    = gcode.New(1005, "%s更新失败", nil)
-	CodeDeleteErr    = gcode.New(1006, "%s删除失败", nil)
-	CodeAuthErr      = gcode.New(1010, "登录失效或认证失败，请重新尝试", nil)
-	CodePermErr      = gcode.New(1011, "权限验证失败，请重新尝试", nil)
-	CodeMicroCallErr = gcode.New(1100, "微服务调用失败，请重新尝试", nil)
-	CodeConvErr      = gcode.New(1200, "数据转换异常，请重新尝试", nil)
-	CodeDbErr        = gcode.New(1201, "数据库操作异常，请重新尝试", nil)
-	CodeSysErr       = gcode.New(500, "系统异常，请重新尝试", nil)
+	codeTipsErr      = gcode.New(1001, "错误提示", nil)
+	codeValidErr     = gcode.New(1002, "数据校验失败", nil)
+	codeQueryErr     = gcode.New(1003, "%s查询失败", nil)
+	codeCreateErr    = gcode.New(1004, "%s创建失败", nil)
+	codeUpdateErr    = gcode.New(1005, "%s更新失败", nil)
+	codeDeleteErr    = gcode.New(1006, "%s删除失败", nil)
+	codeAuthErr      = gcode.New(1010, "登录失效或认证失败，请重新尝试", nil)
+	codePermErr      = gcode.New(1011, "权限验证失败，请重新尝试", nil)
+	codeMicroCallErr = gcode.New(1100, "微服务调用失败，请重新尝试", nil)
+	codeConvErr      = gcode.New(1200, "数据转换异常，请重新尝试", nil)
+	codeDbErr        = gcode.New(1201, "数据库操作异常，请重新尝试", nil)
+	codeSysErr       = gcode.New(500, "系统异常，请重新尝试", nil)
 )
 
 //	func New(errCode int, err error, errMsg ...string) error {
@@ -32,40 +33,40 @@ var (
 //		return gerror.WrapCode(errCode, err, handleErrMsg(ConvErr, errMsg...))
 //	}
 func TipsError(errMsg string) error {
-	return gerror.NewCode(CodeTipsErr, errMsg)
+	return gerror.NewCode(codeTipsErr, errMsg)
 }
 func ValidError(errMsg ...string) error {
-	return gerror.NewCode(CodeValidErr, handleErrMsg(CodeValidErr, errMsg...))
+	return gerror.NewCode(codeValidErr, handleErrMsg(codeValidErr, errMsg...))
 }
 func QueryError(err error, module string) error {
-	return gerror.WrapCodef(CodeQueryErr, err, CodeQueryErr.Message(), module)
+	return gerror.WrapCodef(codeQueryErr, err, codeQueryErr.Message(), module)
 }
 func CreateError(err error, module string) error {
-	return gerror.WrapCodef(CodeCreateErr, err, CodeCreateErr.Message(), module)
+	return gerror.WrapCodef(codeCreateErr, err, codeCreateErr.Message(), module)
 }
 func UpdateError(err error, module string) error {
-	return gerror.WrapCodef(CodeUpdateErr, err, CodeUpdateErr.Message(), module)
+	return gerror.WrapCodef(codeUpdateErr, err, codeUpdateErr.Message(), module)
 }
 func DeleteError(err error, module string) error {
-	return gerror.WrapCodef(CodeDeleteErr, err, CodeDeleteErr.Message(), module)
+	return gerror.WrapCodef(codeDeleteErr, err, codeDeleteErr.Message(), module)
 }
 func AuthError(errMsg ...string) error {
-	return gerror.NewCode(CodeAuthErr, handleErrMsg(CodeAuthErr, errMsg...))
+	return gerror.NewCode(codeAuthErr, handleErrMsg(codeAuthErr, errMsg...))
 }
 func PermError(errMsg ...string) error {
-	return gerror.NewCode(CodePermErr, handleErrMsg(CodePermErr, errMsg...))
+	return gerror.NewCode(codePermErr, handleErrMsg(codePermErr, errMsg...))
 }
 func MicroCallError(errMsg ...string) error {
-	return gerror.NewCode(CodeMicroCallErr, handleErrMsg(CodeMicroCallErr, errMsg...))
+	return gerror.NewCode(codeMicroCallErr, handleErrMsg(codeMicroCallErr, errMsg...))
 }
 func ConvError(errMsg ...string) error {
-	return gerror.NewCode(CodeConvErr, handleErrMsg(CodeConvErr, errMsg...))
+	return gerror.NewCode(codeConvErr, handleErrMsg(codeConvErr, errMsg...))
 }
 func DbError(errMsg ...string) error {
-	return gerror.NewCode(CodeDbErr, handleErrMsg(CodeDbErr, errMsg...))
+	return gerror.NewCode(codeDbErr, handleErrMsg(codeDbErr, errMsg...))
 }
 func SysError() error {
-	return gerror.NewCode(CodeSysErr, CodeSysErr.Message())
+	return gerror.NewCode(codeSysErr, codeSysErr.Message())
 }
 
 func handleErrMsg(errCode gcode.Code, errMsg ...string) string {
@@ -78,59 +79,76 @@ func handleErrMsg(errCode gcode.Code, errMsg ...string) string {
 
 type HandleErrorPlugin struct{}
 
+func (p HandleErrorPlugin) getSerializeType(mes *protocol.Message) codec.Codec {
+	var serializer codec.Codec
+	switch mes.SerializeType() {
+	case protocol.SerializeNone:
+		return nil
+	case protocol.JSON:
+		serializer = codec.JSONCodec{}
+	case protocol.ProtoBuffer:
+		serializer = codec.PBCodec{}
+	case protocol.MsgPack:
+		serializer = codec.MsgpackCodec{}
+	case protocol.Thrift:
+		serializer = codec.ThriftCodec{}
+	}
+	return serializer
+}
+
 func (p HandleErrorPlugin) PreWriteResponse(ctx context.Context, req *protocol.Message, res *protocol.Message, err error) error {
+	resData := new(comm_def.CommonMsg)
+	serializer := p.getSerializeType(res)
 	if err == nil {
 		// todo 正常数据处理
-		resData := gconv.Map(res.Payload)
-		resData["code"] = 200
-		if val, ok := resData["msg"]; !ok || val == "" {
-			resData["msg"] = "操作成功"
+		if serializerErr := serializer.Decode(res.Payload, resData); serializerErr != nil {
+			return serializerErr
 		}
-		res.Payload = gconv.Bytes(gconv.String(resData))
+
+		if resData.Code == 0 {
+			resData.Code = 200
+		}
+		if resData.Msg == "" {
+			resData.Msg = "操作成功"
+		}
+		res.Payload, _ = serializer.Encode(resData)
 		return nil
 	}
 	// error 堆栈信息输出
 	g.Log().Error(gerror.Stack(err))
 	topCode := gerror.Code(err).Code()
-	if topCode > 0 {
-		// 默认返回系统级异常处理
-		var resData = g.Map{
-			"code": CodeSysErr.Code(),
-			"msg":  CodeSysErr.Message(),
-		}
-		// 检查是否存在二级错误，如存在取底层错误信息
-		gNextError := gerror.Next(err)
-		nextErrCode := topCode
-		if gNextError != nil {
-			nextErrCode = gerror.Code(gNextError).Code()
-		}
-		switch true {
-		case nextErrCode > 1000:
-			// 业务级异常处理
-			resData = g.Map{
-				"code": topCode,
-				"msg":  err,
-			}
-		case nextErrCode > 0 && topCode > 1000:
-			// 检查是否存在业务信息，添加显示
-			resData = g.Map{
-				"code": topCode,
-				"msg":  splitErrorStr(err.Error()),
-			}
-		case nextErrCode == 51:
-			// 检查是否存在业务信息，添加显示
-			resData = g.Map{
-				"code": CodeValidErr.Code(),
-				"msg":  CodeValidErr.Message() + ": " + err.Error(),
-			}
-		default:
+	// 检查是否存在二级错误，如存在取底层错误信息
+	gNextError := gerror.Next(err)
+	nextErrCode := topCode
+	if gNextError != nil {
+		nextErrCode = gerror.Code(gNextError).Code()
+	}
+	switch true {
+	case nextErrCode > 1000:
+		// 业务级异常处理
+		resData.Code = int32(topCode)
+		resData.Msg = err.Error()
 
-		}
-		res.Payload = gconv.Bytes(gconv.String(resData))
-		res.SetMessageStatusType(protocol.Normal)
-		if res.Metadata != nil {
-			delete(res.Metadata, protocol.ServiceError)
-		}
+	case nextErrCode == gcode.CodeValidationFailed.Code():
+		// goframe 数据校验
+		// 检查是否存在业务信息，添加显示
+		resData.Code = int32(codeValidErr.Code())
+		resData.Msg = codeValidErr.Message() + ": " + err.Error()
+
+	case nextErrCode > 0 && topCode > 1000:
+		// 检查是否存在业务信息，添加显示
+		resData.Code = int32(topCode)
+		resData.Msg = splitErrorStr(err.Error())
+
+	default:
+		// 默认返回系统级异常处理
+		resData.Code = int32(codeSysErr.Code())
+		resData.Msg = codeSysErr.Message()
+	}
+	res.Payload, _ = serializer.Encode(resData)
+	res.SetMessageStatusType(protocol.Normal)
+	if res.Metadata != nil {
+		delete(res.Metadata, protocol.ServiceError)
 	}
 
 	return nil
@@ -138,5 +156,5 @@ func (p HandleErrorPlugin) PreWriteResponse(ctx context.Context, req *protocol.M
 
 func splitErrorStr(errMsg string) string {
 	errStrIndex := strings.Index(errMsg, ": ")
-	return errMsg[:errStrIndex] + ": " + CodeSysErr.Message()
+	return errMsg[:errStrIndex] + ": " + codeSysErr.Message()
 }

opms_parent/app/handler/cust/customer.go

@@ -17,7 +17,7 @@ type CustomerHeader struct{}
 var isPublic, noPublic = "10", "20" // 公海,非公海
 var noCustomer = true               // 区分公海列表 和 客户列表 true  公海
 
-//GetList 客户列表
+//Swagger:Customer 客户,测试tag 客户列表
 func (c *CustomerHeader) GetList(ctx context.Context, req *model.CustCustomerSearchReq, rsp *comm_def.CommonMsg) error {
 	customerServer, err := server.NewCustomerService(ctx)
 	if err != nil {
@@ -32,7 +32,7 @@ func (c *CustomerHeader) GetList(ctx context.Context, req *model.CustCustomerSea
 
 }
 
-//PublicGetList 公海列表
+//Swagger:Customer 客户,测试tag 公海列表
 func (c *CustomerHeader) PublicGetList(ctx context.Context, req *model.CustCustomerSearchReq, rsp *comm_def.CommonMsg) error {
 	customerServer, err := server.NewCustomerService(ctx)
 	if err != nil {
@@ -51,8 +51,7 @@ func (c *CustomerHeader) PublicGetList(ctx context.Context, req *model.CustCusto
 	return nil
 
 }
-
-//Create 创建客户
+//Swagger:Customer 客户,测试tag 创建客户
 func (c *CustomerHeader) Create(ctx context.Context, req *model.CustomerAddSeq, rsp *comm_def.CommonMsg) error {
 	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
 		return err
@@ -73,7 +72,7 @@ func (c *CustomerHeader) Create(ctx context.Context, req *model.CustomerAddSeq,
 	return nil
 }
 
-//UpdateById 修改客户
+//Swagger:Customer 客户,测试tag 修改客户
 func (c *CustomerHeader) UpdateById(ctx context.Context, req *model.UpdateCustomer, rsp *comm_def.CommonMsg) error {
 	s, err := server.NewCustomerService(ctx)
 	if err != nil {
@@ -89,7 +88,7 @@ func (c *CustomerHeader) UpdateById(ctx context.Context, req *model.UpdateCustom
 	return nil
 }
 
-//GetEntityById  客户详情
+//Swagger:Customer 客户,测试tag 客户详情
 func (c *CustomerHeader) GetEntityById(ctx context.Context, req *comm_def.IdsReq, rsp *comm_def.CommonMsg) error {
 	if len(req.Ids) == 0 {
 		return myerrors.ValidError("参数有误")
@@ -107,7 +106,7 @@ func (c *CustomerHeader) GetEntityById(ctx context.Context, req *comm_def.IdsReq
 	return nil
 }
 
-//DeleteById 删除客户
+//Swagger:Customer 客户,测试tag 删除客户
 func (c *CustomerHeader) DeleteById(ctx context.Context, req *model.DelCustomer, rsp *comm_def.CommonMsg) error {
 	if len(req.Ids) == 0 {
 		return myerrors.ValidError("参数有误")
@@ -125,7 +124,7 @@ func (c *CustomerHeader) DeleteById(ctx context.Context, req *model.DelCustomer,
 	return nil
 }
 
-//GetCustNameIsExist 判断客户名称是否存在  bool
+//Swagger:Customer 客户,测试tag 判断客户名称是否存在
 func (c *CustomerHeader) GetCustNameIsExist(ctx context.Context, req *model.IsExistsCustName, rsp *comm_def.CommonMsg) error {
 	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
 		return err
@@ -142,7 +141,7 @@ func (c *CustomerHeader) GetCustNameIsExist(ctx context.Context, req *model.IsEx
 	return nil
 }
 
-//TransCustomer 转移客户
+// 客户,测试tag  转移客户
 func (c *CustomerHeader) TransCustomer(ctx context.Context, req *model.AssignCustomerReq, rsp *comm_def.CommonMsg) error {
 	if len(req.Ids) == 0 || req.SalesId == 0 {
 		return myerrors.ValidError("参数有误")
@@ -161,7 +160,7 @@ func (c *CustomerHeader) TransCustomer(ctx context.Context, req *model.AssignCus
 	return nil
 }
 
-//AssignCustomer 分配,领取客户
+// 客户,测试tag  分配 领取客户
 func (c *CustomerHeader) AssignCustomer(ctx context.Context, req *model.AssignCustomerReq, rsp *comm_def.CommonMsg) error {
 	if len(req.Ids) == 0 || req.SalesId == 0 {
 		return myerrors.ValidError("参数有误")
@@ -185,7 +184,7 @@ func (c *CustomerHeader) AssignCustomer(ctx context.Context, req *model.AssignCu
 
 }
 
-//MoveToPubic 移入公海
+// 客户,测试tag  移入公海
 func (c *CustomerHeader) MoveToPubic(ctx context.Context, req *model.MoveToPubicRep, rsp *comm_def.CommonMsg) error {
 	if len(req.Ids) == 0 {
 		return myerrors.ValidError("参数有误")
@@ -206,7 +205,7 @@ func (c *CustomerHeader) MoveToPubic(ctx context.Context, req *model.MoveToPubic
 	return nil
 }
 
-//GetDynamicsList 客户动态
+// 客户,测试tag  客户动态
 func (c *CustomerHeader) GetDynamicsList(ctx context.Context, req *model.CustomerDynameicsReq, rsp *comm_def.CommonMsg) error {
 	customerServer, err := server.NewCustomerService(ctx)
 	if err != nil {
@@ -220,7 +219,7 @@ func (c *CustomerHeader) GetDynamicsList(ctx context.Context, req *model.Custome
 	return nil
 }
 
-//MergeCustomer 合并客户
+// 客户,测试tag  合并客户
 func (c *CustomerHeader) MergeCustomer(ctx context.Context, req *model.MergeCustomerRep, rsp *comm_def.CommonMsg) error {
 	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
 		return err
@@ -238,7 +237,7 @@ func (c *CustomerHeader) MergeCustomer(ctx context.Context, req *model.MergeCust
 	return nil
 }
 
-//GetCustAbstract 客户摘要
+// 客户,测试tag  客户摘要
 func (c *CustomerHeader) GetCustAbstract(ctx context.Context, req *comm_def.IdReq, rsp *comm_def.CommonMsg) error {
 	if req.Id == 0 {
 		return myerrors.ValidError("参数有误")

opms_parent/app/handler/plat/followup.go

@@ -14,6 +14,7 @@ import (
 type FollowUpHandler struct{}
 
 // GetList 获取列表
+// Swagger:FollowUp 跟进 列表
 func (h *FollowUpHandler) GetList(ctx context.Context, req *model.SearchPlatFollowupReq, rsp *comm_def.CommonMsg) error {
 	followupService, err := server.NewFollowupService(ctx)
 	if err != nil {
@@ -30,6 +31,7 @@ func (h *FollowUpHandler) GetList(ctx context.Context, req *model.SearchPlatFoll
 }
 
 // GetListByDay 获取列表
+// Swagger:FollowUp 跟进 跟进记录按天详情
 func (h *FollowUpHandler) GetListByDay(ctx context.Context, req *model.SearchPlatFollowupReq, rsp *comm_def.CommonMsg) error {
 	followupService, err := server.NewFollowupService(ctx)
 	if err != nil {
@@ -44,6 +46,7 @@ func (h *FollowUpHandler) GetListByDay(ctx context.Context, req *model.SearchPla
 }
 
 // Create 添加跟进记录
+// Swagger:FollowUp 跟进 添加
 func (h *FollowUpHandler) Create(ctx context.Context, req *model.AddPlatFollowupReq, rsp *comm_def.CommonMsg) error {
 	// 参数校验
 	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {

opms_parent/app/handler/plat/followup_comment.go

@@ -14,16 +14,16 @@ import (
 type FollowUpCommentHandler struct{}
 
 // GetList 获取列表
+// Swagger:FollowUpComment 跟进 评论列表
 func (h *FollowUpCommentHandler) GetList(ctx context.Context, req *model.SearchPlatFollowupCommentReq, rsp *comm_def.CommonMsg) error {
 	followupCommentService, err := server.NewFollowupCommentService(ctx)
 	if err != nil {
-	
+
 		return err
 	}
 	g.Log().Info("搜索值", req)
 	total, list, err := followupCommentService.GetList(req)
 	if err != nil {
-
 		return err
 	}
 	rsp.Data = g.Map{"list": list, "total": total}
@@ -31,6 +31,7 @@ func (h *FollowUpCommentHandler) GetList(ctx context.Context, req *model.SearchP
 }
 
 // Create 添加跟进评论
+// Swagger:FollowUpComment 跟进 评论添加
 func (h *FollowUpCommentHandler) Create(ctx context.Context, req *model.AddPlatFollowupCommentReq, rsp *comm_def.CommonMsg) error {
 	// 参数校验
 	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {

opms_parent/app/handler/plat/followup_file.go

@@ -13,6 +13,7 @@ import (
 type FollowUpFileHandler struct{}
 
 // GetList 获取列表
+// Swagger:FollowUpFile 跟进 附件列表
 func (h *FollowUpFileHandler) GetList(ctx context.Context, req *model.SearchPlatFollowupFileReq, rsp *comm_def.CommonMsg) error {
 	followupFileService, err := server.NewFollowupFileService(ctx)
 	if err != nil {

opms_parent/app/handler/plat/schedule.go

@@ -20,7 +20,7 @@ func (h *ScheduleHeader) GetList(ctx context.Context, req *model.ScheduleSearchR
 		return err
 	}
 	total, list, err := s.GetList(req)
-	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+
 	if err != nil {
 		return err
 	}
@@ -39,7 +39,7 @@ func (h *ScheduleHeader) Create(ctx context.Context, req *model.AddScheduleSeq,
 		return err
 	}
 	id, err := s.Create(req)
-//	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+
 	if err != nil {
 
 		return err

opms_parent/app/handler/work/workorder.go → opms_parent/app/handler/work/work_order.go

@@ -12,17 +12,15 @@ import (
 
 type WorkOrderHandler struct{}
 
-//工单列表
+// Swagger:WorkOrder 工单,测试tag 工单列表
 func (w *WorkOrderHandler) GetList(ctx context.Context, req *model.WorkOrderSearchReq, rsp *comm_def.CommonMsg) error {
 
 	orderServer, err := server.NewOrderService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	total, list, err := orderServer.GetList(req)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	rsp.Data = g.Map{"list": list, "total": total}
@@ -34,12 +32,10 @@ func (w *WorkOrderHandler) GetList(ctx context.Context, req *model.WorkOrderSear
 func (w *WorkOrderHandler) DeriveList(ctx context.Context, req *model.WorkOrderExport, rsp *comm_def.CommonMsg) error {
 	orderServer, err := server.NewOrderService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	con, err := orderServer.DeriveList(req)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	rsp.Data = g.Map{"list": con}
@@ -51,12 +47,10 @@ func (w *WorkOrderHandler) DeriveList(ctx context.Context, req *model.WorkOrderE
 func (w *WorkOrderHandler) GetEntityById(ctx context.Context, req *comm_def.IdReq, rsp *comm_def.CommonMsg) error {
 	orderServer, err := server.NewOrderService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	detail, err := orderServer.GetEntityById(req)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	rsp.Data = g.Map{"list": detail}

opms_parent/app/model/cust/cust_customer.go

@@ -46,18 +46,18 @@ type CustExport struct {
 
 //CustomerAddSeq 单表添加客户信息表
 type CustomerAddSeq struct {
-	CustName     string      `p:"custName"        json:"custName"      v:"required#客户名称不能为空"`
+	CustName     string      `p:"custName"        json:"custName"      v:"required#客户名称不能为空"` // 客户名称
 	AbbrName     string      `p:"abbrName"        json:"abbrName"   `                         // 助计名
 	CustLocation string      `p:"custLocation"    json:"custLocation"    `                    // 所在地区
 	CustAddress  string      `p:"custAddress"     json:"custAddress"   `                      // 详细地址
 	FollowUpDate *gtime.Time `p:"followUpDate"    json:"followUpDate"   `                     //跟进时间
 	CustIndustry string      `p:"custIndustry"    json:"custIndustry"  v:"required#客户行业不能为空"` //客户行业
 	CustLevel    string      `p:"custLevel"       json:"custLevel"     v:"required#客户级别不能为空"` //客户级别
-	CustSource   string      `p:"custSource"      json:"source"        v:"required#客户来源不能为空"`
+	CustSource   string      `p:"custSource"      json:"source"        v:"required#客户来源不能为空"` //客户来源
 	CustDistCode int         `p:"custDistCode"    json:"custDistCode"  v:"required#省份不能为空" ` // 省份Id
 	Remark       string      `p:"remark"          json:"remark""`                            //备注
-	SalesName    string      `p:"salesName"       json:"salesName"   `                       //
-	SalesId      int         `p:"salesId"         json:"salesId"   `                         //
+	SalesName    string      `p:"salesName"       json:"salesName"   `                       // 销售名称
+	SalesId      int         `p:"salesId"         json:"salesId"   `                         // 销售id
 }
 
 // 客户联系人信息

opms_parent/app/model/work/work_order.go

@@ -8,11 +8,11 @@ import (
 	"dashoo.cn/opms_libary/request"
 	"github.com/gogf/gf/os/gtime"
 
-	internal2 "dashoo.cn/micro/app/model/work/internal"
+	 "dashoo.cn/micro/app/model/work/internal"
 )
 
 // WorkOrder is the golang structure for table work_order.
-type WorkOrder internal2.WorkOrder
+type WorkOrder internal.WorkOrder
 
 // Fill with you ideas below.
 

opms_parent/app/service/plat/plat_schedule.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"strings"
 
+	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gconv"
 
@@ -39,9 +40,8 @@ func (s *scheduleService) GetList(req *model.ScheduleSearchReq) (total int, sche
 	}
 	total, err = Model.Count()
 	if err != nil {
-
 		g.Log().Error(err)
-		//err = myerrors.DbError("获取总行数失败。")
+		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
 	err = Model.Page(req.GetPage()).Order("id desc").Scan(&scheduleList)

opms_parent/app/service/work/work_order.go

@@ -6,9 +6,8 @@ import (
 	"strconv"
 
 	"dashoo.cn/common_definition/comm_def"
+	"dashoo.cn/opms_libary/myerrors"
 	"github.com/360EntSecGroup-Skylar/excelize"
-	"github.com/gogf/gf/errors/gerror"
-	"github.com/gogf/gf/frame/g"
 
 	"dashoo.cn/micro/app/dao/work"
 	model "dashoo.cn/micro/app/model/work"
@@ -34,21 +33,19 @@ func NewOrderService(ctx context.Context) (svc *OrderService, err error) {
 }
 
 //列表
-func (w *OrderService) GetList(req *model.WorkOrderSearchReq) (total int, OrderList []*model.WorkOrderList, err error) {
-	Model := w.Dao.M
-	Model.Where(w.Dao.Columns.DeletedTime + " is null ")
+func (s *OrderService) GetList(req *model.WorkOrderSearchReq) (total int, OrderList []*model.WorkOrderList, err error) {
+	Model := s.Dao
 	//工单类型
 	if req.OrderTypeId != 0 {
-		Model.Where(w.Dao.Columns.OrderTypeId, req.OrderTypeId)
+		Model.Where(s.Dao.Columns.OrderTypeId, req.OrderTypeId)
 	}
 	//工单状态
 	if req.OrderStatus != "" {
-		Model.Where(w.Dao.Columns.OrderStatus, req.OrderStatus)
+		Model.Where(s.Dao.Columns.OrderStatus, req.OrderStatus)
 	}
 	total, err = Model.Fields().Count()
 	if err != nil {
-		g.Log().Error(err)
-		err = gerror.New("获取总行数失败")
+		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
 	if req.PageNum == 0 {
@@ -62,10 +59,10 @@ func (w *OrderService) GetList(req *model.WorkOrderSearchReq) (total int, OrderL
 }
 
 // 导出
-func (w *OrderService) DeriveList(req *model.WorkOrderExport) (content *model.WorkByteExport, err error) {
+func (s *OrderService) DeriveList(req *model.WorkOrderExport) (content *model.WorkByteExport, err error) {
 	var con model.WorkByteExport
 	req.WorkOrderSearchReq.PageSize = 10
-	total, data, err := w.GetList(&req.WorkOrderSearchReq)
+	total, data, err := s.GetList(&req.WorkOrderSearchReq)
 	if err != nil {
 		return
 	}
@@ -110,12 +107,11 @@ func (w *OrderService) DeriveList(req *model.WorkOrderExport) (content *model.Wo
 }
 
 //详情
-func (w *OrderService) GetEntityById(req *comm_def.IdReq) (detail *model.WorkDetail, err error) {
-	Model := w.Dao.M
-	err = Model.Where(w.Dao.Columns.DeletedTime+" is null ").Where(w.Dao.Columns.Id, req.Id).Scan(&detail)
+func (s *OrderService) GetEntityById(req *comm_def.IdReq) (detail *model.WorkDetail, err error) {
+	Model := s.Dao
+	err = Model.Where(s.Dao.Columns.Id, req.Id).Scan(&detail)
 	if err != nil {
-		g.Log().Error(err)
-		gerror.New("获取详情失败")
+		err = myerrors.DbError("获取详情失败。")
 		return
 	}
 	return

opms_parent/config/config.toml

@@ -6,6 +6,7 @@
     need-advertise-addr = false
     srv-name = "dashoo.opms.parent-0.0.1"
     env = "dev"
+    swagger = true
 
 # 微服务注册中心配置
 [service_registry]

opms_parent/main.go

@@ -2,9 +2,10 @@ package main
 
 import (
 	"context"
-	"dashoo.cn/opms_libary/myerrors"
 	"net/http"
 
+	"dashoo.cn/opms_libary/myerrors"
+
 	"dashoo.cn/opms_libary/micro_srv"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/glog"
@@ -15,6 +16,7 @@ import (
 	"dashoo.cn/micro/app/handler/cust"
 	"dashoo.cn/micro/app/handler/plat"
 	projHandler "dashoo.cn/micro/app/handler/proj"
+	"dashoo.cn/micro/app/handler/work"
 )
 
 func main() {
@@ -48,7 +50,7 @@ func main() {
 	s.RegisterName("CtrContractCollection", new(contract.CtrContractCollection), "")
 	s.RegisterName("CtrContractAppend", new(contract.CtrContractAppend), "")
 	s.RegisterName("CtrContractInvoice", new(contract.CtrContractInvoice), "")
-
+	s.RegisterName("WorkOrder", new(work.WorkOrderHandler), "")
 	s.RegisterName("Schedule", new(plat.ScheduleHeader), "")
 
 	// 注册服务对象

opms_parent/swaggerui/index.html

@@ -57,7 +57,7 @@
           }
           console.log(req)
           // let serviceUrl = "http://192.168.0.105:9981/dashoo.dev.lims.micro_learning-1.0"
-          let serviceUrl = "http://192.168.0.252:8100/dashoo.dev.opms.parent-0.0.1"
+          let serviceUrl = "http://192.168.0.83:9981/dashoo.opms.parent-0.0.1"
           let reqUrl = new URL(req.url)
           let urlInfo = reqUrl.pathname.substring(1).split('.')
           if (urlInfo.length < 2) {
@@ -68,7 +68,7 @@
           let token = req.headers.Authorization
           if (!token) {
             // token = "Bearer ajg7o1Dts1JrKCm6VtgyuuaYbUIiirXxI5+6WzYnC7gWl+43NdKq6LbWxU1zWhsBaL0A/CIkBoefM0vuu6h4ZA=="
-            token = "Bearer 5a9R22RiKGsqBigUbLyd6xpdKYbMJdTw9Aowx8cmbm2qH1V5W3xxR4gNAic8PuG/"
+            token = "Bearer zJi/xqrZflnSrapwY+wSWPJ3eWbfKWl4YSeZAGpxTXQn+Q00mDJXwfBawghR97AM"
             // token = "Bearer EyQWHd05nop+PL71oABt/1i0zoXd7bym1bFMWMXorORLmyDuyowEDoiKq8DhP2lbZo9XTSMe31d0Q7RRnkDNLA=="
             // token = "Bearer 7XrzVhU+ibTV/77q7h0ETY+bEWy4r4g9wteUr/43vNadbuWG5y8wucSmeU0BRd/1"
           }