refactor: 机器计划任务与流程定义关联至标签

server/internal/machine/api/form/form.go

@@ -41,8 +41,8 @@ type MachineCronJobForm struct {
 	Script          string   `json:"script" binding:"required"`
 	Status          int      `json:"status" binding:"required"`
 	SaveExecResType int      `json:"saveExecResType" binding:"required"`
-	MachineIds      []uint64 `json:"machineIds"`
 	Remark          string   `json:"remark"`
+	CodePaths       []string `json:"codePaths"`
 }
 
 type MachineCmdConfForm struct {

server/internal/machine/api/machine.go

@@ -152,7 +152,7 @@ func (m *Machine) GetProcess(rc *req.Ctx) {
 
 	cli, err := m.MachineApp.GetCli(GetMachineId(rc))
 	biz.ErrIsNilAppendErr(err, "获取客户端连接失败: %s")
-	biz.ErrIsNilAppendErr(m.TagApp.CanAccess(rc.GetLoginAccount().Id, cli.Info.TagPath...), "%s")
+	biz.ErrIsNilAppendErr(m.TagApp.CanAccess(rc.GetLoginAccount().Id, cli.Info.CodePath...), "%s")
 
 	res, err := cli.Run(cmd)
 	biz.ErrIsNilAppendErr(err, "获取进程信息失败: %s")
@@ -166,7 +166,7 @@ func (m *Machine) KillProcess(rc *req.Ctx) {
 
 	cli, err := m.MachineApp.GetCli(GetMachineId(rc))
 	biz.ErrIsNilAppendErr(err, "获取客户端连接失败: %s")
-	biz.ErrIsNilAppendErr(m.TagApp.CanAccess(rc.GetLoginAccount().Id, cli.Info.TagPath...), "%s")
+	biz.ErrIsNilAppendErr(m.TagApp.CanAccess(rc.GetLoginAccount().Id, cli.Info.CodePath...), "%s")
 
 	res, err := cli.Run("sudo kill -9 " + pid)
 	biz.ErrIsNil(err, "终止进程失败: %s", res)
@@ -194,9 +194,9 @@ func (m *Machine) WsSSH(g *gin.Context) {
 	cli, err := m.MachineApp.NewCli(GetMachineAc(rc))
 	biz.ErrIsNilAppendErr(err, mcm.GetErrorContentRn("获取客户端连接失败: %s"))
 	defer cli.Close()
-	biz.ErrIsNilAppendErr(m.TagApp.CanAccess(rc.GetLoginAccount().Id, cli.Info.TagPath...), mcm.GetErrorContentRn("%s"))
+	biz.ErrIsNilAppendErr(m.TagApp.CanAccess(rc.GetLoginAccount().Id, cli.Info.CodePath...), mcm.GetErrorContentRn("%s"))
 
-	global.EventBus.Publish(rc.MetaCtx, event.EventTopicResourceOp, cli.Info.TagPath[0])
+	global.EventBus.Publish(rc.MetaCtx, event.EventTopicResourceOp, cli.Info.CodePath[0])
 
 	cols := rc.QueryIntDefault("cols", 80)
 	rows := rc.QueryIntDefault("rows", 32)

server/internal/machine/api/machine_cronjob.go

@@ -5,28 +5,37 @@ import (
 	"mayfly-go/internal/machine/api/vo"
 	"mayfly-go/internal/machine/application"
 	"mayfly-go/internal/machine/domain/entity"
+	tagapp "mayfly-go/internal/tag/application"
+	tagentity "mayfly-go/internal/tag/domain/entity"
 	"strconv"
 	"strings"
 
 	"mayfly-go/pkg/biz"
 	"mayfly-go/pkg/req"
 	"mayfly-go/pkg/scheduler"
+	"mayfly-go/pkg/utils/collx"
 )
 
 type MachineCronJob struct {
 	MachineCronJobApp application.MachineCronJob `inject:""`
+	TagTreeRelateApp  tagapp.TagTreeRelate       `inject:"TagTreeRelateApp"`
 }
 
 func (m *MachineCronJob) MachineCronJobs(rc *req.Ctx) {
 	cond, pageParam := req.BindQueryAndPage(rc, new(entity.MachineCronJob))
 
-	vos := new([]*vo.MachineCronJobVO)
-	pageRes, err := m.MachineCronJobApp.GetPageList(cond, pageParam, vos)
+	var vos []*vo.MachineCronJobVO
+	pageRes, err := m.MachineCronJobApp.GetPageList(cond, pageParam, &vos)
 	biz.ErrIsNil(err)
-	for _, mcj := range *vos {
+
+	for _, mcj := range vos {
 		mcj.Running = scheduler.ExistKey(mcj.Key)
 	}
 
+	m.TagTreeRelateApp.FillTagInfo(tagentity.TagRelateTypeMachineCronJob, collx.ArrayMap(vos, func(mvo *vo.MachineCronJobVO) tagentity.IRelateTag {
+		return mvo
+	})...)
+
 	rc.ResData = pageRes
 }
 
@@ -35,11 +44,11 @@ func (m *MachineCronJob) Save(rc *req.Ctx) {
 	mcj := req.BindJsonAndCopyTo[*entity.MachineCronJob](rc, jobForm, new(entity.MachineCronJob))
 	rc.ReqParam = jobForm
 
-	cronJobId, err := m.MachineCronJobApp.SaveMachineCronJob(rc.MetaCtx, mcj)
+	err := m.MachineCronJobApp.SaveMachineCronJob(rc.MetaCtx, &application.SaveMachineCronJobParam{
+		CronJob:   mcj,
+		CodePaths: jobForm.CodePaths,
+	})
 	biz.ErrIsNil(err)
-
-	// 关联机器
-	m.MachineCronJobApp.CronJobRelateMachines(rc.MetaCtx, cronJobId, jobForm.MachineIds)
 }
 
 func (m *MachineCronJob) Delete(rc *req.Ctx) {
@@ -54,14 +63,6 @@ func (m *MachineCronJob) Delete(rc *req.Ctx) {
 	}
 }
 
-func (m *MachineCronJob) GetRelateMachineIds(rc *req.Ctx) {
-	rc.ResData = m.MachineCronJobApp.GetRelateMachineIds(uint64(rc.QueryIntDefault("cronJobId", -1)))
-}
-
-func (m *MachineCronJob) GetRelateCronJobIds(rc *req.Ctx) {
-	rc.ResData = m.MachineCronJobApp.GetRelateMachineIds(uint64(rc.QueryIntDefault("machineId", -1)))
-}
-
 func (m *MachineCronJob) RunCronJob(rc *req.Ctx) {
 	cronJobKey := rc.PathParam("key")
 	biz.NotEmpty(cronJobKey, "cronJob key不能为空")

server/internal/machine/api/machine_script.go

@@ -62,7 +62,7 @@ func (m *MachineScript) RunMachineScript(rc *req.Ctx) {
 	}
 	cli, err := m.MachineApp.GetCliByAc(ac)
 	biz.ErrIsNilAppendErr(err, "获取客户端连接失败: %s")
-	biz.ErrIsNilAppendErr(m.TagApp.CanAccess(rc.GetLoginAccount().Id, cli.Info.TagPath...), "%s")
+	biz.ErrIsNilAppendErr(m.TagApp.CanAccess(rc.GetLoginAccount().Id, cli.Info.CodePath...), "%s")
 
 	res, err := cli.Run(script)
 	// 记录请求参数

server/internal/machine/api/vo/vo.go

@@ -46,6 +46,8 @@ type MachineScriptVO struct {
 
 // 机器记录任务
 type MachineCronJobVO struct {
+	tagentity.RelateTags // 标签信息
+
 	Id              uint64 `json:"id"`
 	Key             string `json:"key"`
 	Name            string `json:"name"`
@@ -57,6 +59,10 @@ type MachineCronJobVO struct {
 	Running         bool   `json:"running" gorm:"-"` // 是否运行中
 }
 
+func (mcj *MachineCronJobVO) GetRelateId() uint64 {
+	return mcj.Id
+}
+
 type MachineFileVO struct {
 	Id        *int64  `json:"id"`
 	Name      *string `json:"name"`