新任务管理

src/main/java/com/izouma/nineth/domain/MetaTask.java

@@ -71,12 +71,12 @@ public class MetaTask extends BaseEntity {
     @ExcelProperty("是否自动领取")
     private boolean autoReceive;
 
-    @ApiModelProperty("频道id")
-    @ExcelProperty("频道id")
+    @ApiModelProperty("道具id")
+    @ExcelProperty("道具id")
     private Long metaPropId;
 
-    @ApiModelProperty("通道id")
-    @ExcelProperty("通道id")
+    @ApiModelProperty("频道id")
+    @ExcelProperty("频道id")
     @Searchable
     private Long channelId;
 }

src/main/java/com/izouma/nineth/domain/MetaTaskCopy.java → src/main/java/com/izouma/nineth/domain/MetaTaskNew.java

@@ -9,17 +9,15 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
+import javax.persistence.*;
+import java.util.List;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
 @ApiModel("元宇宙任务")
-public class MetaTaskCopy extends BaseEntity {
+public class MetaTaskNew extends BaseEntity {
 
     @ApiModelProperty("任务名称")
     @Searchable
@@ -45,11 +43,21 @@ public class MetaTaskCopy extends BaseEntity {
     private boolean autoReceive;
 
     @Searchable
-    @ApiModelProperty("通道id")
-    @ExcelProperty("通道id")
+    @ApiModelProperty("频道id")
+    @ExcelProperty("频道id")
     private Long channelId;
 
     @ApiModelProperty("是否结束")
     @ExcelProperty("是否结束")
     private boolean finish;
+
+    @Transient
+    private List<MetaTaskBind> metaNodeTask;
+
+    @Transient
+    private List<MetaTaskBind> metaBranchLineTask;
+
+    @Transient
+    private List<MetaTaskBind> metaDailyTask;
+
 }

src/main/java/com/izouma/nineth/domain/MetaTaskToUser.java

@@ -64,6 +64,14 @@ public class MetaTaskToUser extends BaseEntity {
     @ExcelProperty("奖励图片地址")
     private String awardPic;
 
+    @ApiModelProperty("金币奖励数量")
+    @ExcelProperty("金币奖励数量")
+    private int goldNum;
+
+    @ApiModelProperty("道具id")
+    @ExcelProperty("道具id")
+    private Long metaPropId;
+
     @ApiModelProperty("当前状态")
     @ExcelProperty("当前状态")
     @Enumerated(EnumType.STRING)

src/main/java/com/izouma/nineth/enums/MetaTaskType.java

@@ -4,6 +4,7 @@ public enum MetaTaskType {
 
     MAIN_LINE("主线任务"),
 
+    NODE("节点任务"),
     BRANCH_LINE("支线任务"),
 
     DAILY("日常任务");

src/main/java/com/izouma/nineth/repo/MetaAtomTaskRepo.java

@@ -7,10 +7,13 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 public interface MetaAtomTaskRepo extends JpaRepository<MetaAtomTask, Long>, JpaSpecificationExecutor<MetaAtomTask> {
     @Query("update MetaAtomTask t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);
+
+    List<MetaAtomTask> findAllByDel(boolean del);
 }

src/main/java/com/izouma/nineth/repo/MetaTaskBindRepo.java

@@ -0,0 +1,13 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaTaskBind;
+import com.izouma.nineth.enums.MetaTaskType;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface MetaTaskBindRepo extends JpaRepository<MetaTaskBind, Long>, JpaSpecificationExecutor<MetaTaskBind> {
+
+    List<MetaTaskBind> findByTaskIdAndTypeAndDel(Long taskId, MetaTaskType type, boolean del);
+}

src/main/java/com/izouma/nineth/repo/MetaTaskNewRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaTaskNew;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface MetaTaskNewRepo extends JpaRepository<MetaTaskNew, Long>, JpaSpecificationExecutor<MetaTaskNew> {
+    @Query("update MetaTaskNew t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/nineth/service/MetaTaskNewService.java

@@ -0,0 +1,20 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.MetaTaskNew;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.MetaTaskNewRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class MetaTaskNewService {
+
+    private MetaTaskNewRepo metaTaskNewRepo;
+
+    public Page<MetaTaskNew> all(PageQuery pageQuery) {
+        return metaTaskNewRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaTaskNew.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/nineth/service/MetaTaskToUserService.java

@@ -80,6 +80,12 @@ public class MetaTaskToUserService {
         if (Objects.nonNull(metaTask.getAwardPic())) {
             metaTaskToUser.setAwardPic(metaTask.getAwardPic());
         }
+        if (metaTask.getGoldNum() > 0) {
+            metaTaskToUser.setGoldNum(metaTask.getGoldNum());
+        }
+        if (Objects.nonNull(metaTask.getMetaPropId())) {
+            metaTaskToUser.setMetaPropId(metaTask.getMetaPropId());
+        }
         metaTaskToUser.setTaskName(metaTask.getName());
         metaTaskToUser.setTaskType(metaTask.getType());
         metaTaskToUser.setDetail(metaTask.getDetail());

src/main/java/com/izouma/nineth/web/MetaAtomTaskController.java

@@ -56,5 +56,10 @@ public class MetaAtomTaskController extends BaseController {
         List<MetaAtomTask> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
+
+    @GetMapping("/findAll")
+    public List<MetaAtomTask> findAll() {
+        return metaAtomTaskRepo.findAllByDel(false);
+    }
 }
 

src/main/java/com/izouma/nineth/web/MetaTaskNewController.java

@@ -0,0 +1,109 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaTaskBind;
+import com.izouma.nineth.domain.MetaTaskNew;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.enums.MetaTaskType;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaTaskBindRepo;
+import com.izouma.nineth.repo.MetaTaskNewRepo;
+import com.izouma.nineth.service.MetaTaskNewService;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/metaTaskNew")
+@AllArgsConstructor
+public class MetaTaskNewController extends BaseController {
+    private MetaTaskNewService metaTaskNewService;
+    private MetaTaskNewRepo metaTaskNewRepo;
+
+    private MetaTaskBindRepo metaTaskBindRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public MetaTaskNew save(@RequestBody MetaTaskNew record) {
+        if (record.getId() != null) {
+            MetaTaskNew orig = metaTaskNewRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            MetaTaskNew save = metaTaskNewRepo.save(orig);
+            saveMetaTaskBind(save.getId(), record);
+            return save;
+        }
+        MetaTaskNew save = metaTaskNewRepo.save(record);
+        saveMetaTaskBind(save.getId(), record);
+        return save;
+    }
+
+    private void saveMetaTaskBind(Long taskId, MetaTaskNew record) {
+        // 节点任务
+        if (CollectionUtils.isNotEmpty(record.getMetaNodeTask())) {
+            record.getMetaNodeTask().forEach(metaTaskBind -> {
+                metaTaskBind.setTaskId(taskId);
+                metaTaskBind.setType(MetaTaskType.NODE);
+            });
+            metaTaskBindRepo.saveAll(record.getMetaNodeTask());
+        }
+        // 支线任务
+        if (CollectionUtils.isNotEmpty(record.getMetaBranchLineTask())) {
+            record.getMetaBranchLineTask().forEach(metaTaskBind -> {
+                metaTaskBind.setTaskId(taskId);
+                metaTaskBind.setType(MetaTaskType.BRANCH_LINE);
+            });
+            metaTaskBindRepo.saveAll(record.getMetaBranchLineTask());
+        }
+        // 日常任务
+        if (CollectionUtils.isNotEmpty(record.getMetaDailyTask())) {
+            record.getMetaDailyTask().forEach(metaTaskBind -> {
+                metaTaskBind.setTaskId(taskId);
+                metaTaskBind.setType(MetaTaskType.DAILY);
+            });
+            metaTaskBindRepo.saveAll(record.getMetaDailyTask());
+        }
+    }
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MetaTaskNew> all(@RequestBody PageQuery pageQuery) {
+        return metaTaskNewService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public MetaTaskNew get(@PathVariable Long id) {
+        MetaTaskNew metaTaskNew = metaTaskNewRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        List<MetaTaskBind> metaNodeTask = metaTaskBindRepo.findByTaskIdAndTypeAndDel(metaTaskNew.getId(), MetaTaskType.NODE, false);
+        if (CollectionUtils.isNotEmpty(metaNodeTask)) {
+            metaTaskNew.setMetaNodeTask(metaNodeTask);
+        }
+        List<MetaTaskBind> metaBranchLineTask = metaTaskBindRepo.findByTaskIdAndTypeAndDel(metaTaskNew.getId(), MetaTaskType.BRANCH_LINE, false);
+        if (CollectionUtils.isNotEmpty(metaBranchLineTask)) {
+            metaTaskNew.setMetaBranchLineTask(metaBranchLineTask);
+        }
+        List<MetaTaskBind> metaDailyTask = metaTaskBindRepo.findByTaskIdAndTypeAndDel(metaTaskNew.getId(), MetaTaskType.DAILY, false);
+        if (CollectionUtils.isNotEmpty(metaDailyTask)) {
+            metaTaskNew.setMetaDailyTask(metaDailyTask);
+        }
+        return metaTaskNew;
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        metaTaskNewRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaTaskNew> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/MetaTaskNew.json

@@ -0,0 +1 @@
+{"tableName":"MetaTaskNew","className":"MetaTaskNew","remark":"新任务管理","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/xiaohuoban/IdeaProjects/raex_back/src/main/java/com/izouma/nineth","viewPath":"/Users/xiaohuoban/IdeaProjects/raex_back/src/main/vue/src/views","routerPath":"/Users/xiaohuoban/IdeaProjects/raex_back/src/main/vue/src","resourcesPath":"/Users/xiaohuoban/IdeaProjects/raex_back/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"name","modelName":"name","remark":"任务名称","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"detail","modelName":"detail","remark":"任务详情","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"type","modelName":"type","remark":"任务分类","showInList":true,"showInForm":true,"formType":"select","apiFlag":"1","optionsValue":"[{\"label\":\"主线任务\",\"value\":\"MAIN_LINE\"},{\"label\":\"支线任务\",\"value\":\"BRANCH_LINE\"},{\"label\":\"日常任务\",\"value\":\"DAILY\"}]"},{"name":"publish","modelName":"publish","remark":"是否发布","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"autoReceive","modelName":"autoReceive","remark":"自动领取","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"channelId","modelName":"channelId","remark":"频道id","showInList":true,"showInForm":true,"formType":"number"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.MetaTaskNew"}

src/main/vue/src/router.js

@@ -1877,6 +1877,22 @@ const router = new Router({
                     meta: {
                        title: '基础任务',
                     },
+               },
+                {
+                    path: '/metaTaskNewEdit',
+                    name: 'MetaTaskNewEdit',
+                    component: () => import(/* webpackChunkName: "metaTaskNewEdit" */ '@/views/MetaTaskNewEdit.vue'),
+                    meta: {
+                       title: '新任务管理编辑',
+                    },
+                },
+                {
+                    path: '/metaTaskNewList',
+                    name: 'MetaTaskNewList',
+                    component: () => import(/* webpackChunkName: "metaTaskNewList" */ '@/views/MetaTaskNewList.vue'),
+                    meta: {
+                       title: '新任务管理',
+                    },
                }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/MetaTaskEdit.vue

@@ -184,7 +184,7 @@ export default {
 				channelId: [
 					{
 						required: true,
-						message: '请选择所属通道',
+						message: '请选择所属频道',
 						trigger: 'blur'
 					}
 				],

src/main/vue/src/views/MetaTaskNewEdit.vue

@@ -0,0 +1,355 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                删除
+            </el-button>
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form :model="formData" :rules="rules" ref="form" label-width="120px" label-position="right" size="small"
+                    style="max-width: 500px;">
+                    <el-form-item prop="name" label="任务名称">
+                        <el-input v-model="formData.name"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="detail" label="任务详情">
+                        <el-input v-model="formData.detail" type="textarea" :autosize="{ minRows: 3, maxRows: 20 }"
+                            placeholder="请输入任务详情">
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item prop="type" label="任务分类">
+                        <el-select v-model="formData.type" clearable filterable placeholder="请选择" :disabled="!canEdit"
+                            @change="changeTaskType">
+                            <el-option v-for="item in typeOptions" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <template v-if="formData && formData.type == 'MAIN_LINE'">
+                        <el-form-item prop="metaNodeTask" label="节点任务配置" style="width: calc(100vw - 1550px)" size="mini">
+                            <el-table :data="formData.metaNodeTask">
+                                <el-table-column prop="atomTaskIndex" label="索引" align="center" width="50">
+                                    <template v-slot="{ row, $index }">
+                                        {{ $index }}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="atomTaskId" label="任务" align="center">
+                                    <template v-slot="{ row }">
+                                        <el-select v-model="row.atomTaskId" clearable filterable placeholder="请选择"
+                                            :disabled="!canEdit" style="width: 150px">
+                                            <el-option v-for="item in atomTasks" :key="item.id" :label="item.name"
+                                                :value="item.id">
+                                            </el-option>
+                                        </el-select>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column width="100" label="操作" align="center">
+                                    <template v-slot="{ row, $index }">
+                                        <el-button type="danger" plain size="mini" @click="delNodeTask($index)"
+                                            :disabled="!canEdit">
+                                            删除
+                                        </el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button size="mini" @click="addNodeTask" :disabled="!canEdit"> 添加节点任务 </el-button>
+                        </el-form-item>
+                        <el-form-item prop="metaBranchLineTask" label="支线任务配置" style="width: calc(100vw - 1550px)"
+                            size="mini">
+                            <el-table :data="formData.metaBranchLineTask">
+                                <el-table-column prop="atomTaskIndex" label="索引" align="center" width="50">
+                                    <template v-slot="{ row, $index }">
+                                        {{ $index }}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="atomTaskId" label="任务" align="center">
+                                    <template v-slot="{ row }">
+                                        <el-select v-model="row.atomTaskId" clearable filterable placeholder="请选择"
+                                            :disabled="!canEdit" style="width: 150px">
+                                            <el-option v-for="item in atomTasks" :key="item.id" :label="item.name"
+                                                :value="item.id">
+                                            </el-option>
+                                        </el-select>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column width="100" label="操作" align="center">
+                                    <template v-slot="{ row, $index }">
+                                        <el-button type="danger" plain size="mini" @click="delBranchLineTask($index)"
+                                            :disabled="!canEdit">
+                                            删除
+                                        </el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button size="mini" @click="addBranchLineTask" :disabled="!canEdit"> 添加支线任务 </el-button>
+                        </el-form-item>
+                    </template>
+                    <template v-if="formData && formData.type == 'BRANCH_LINE'">
+                        <el-form-item prop="metaBranchLineTask" label="支线任务配置" style="width: calc(100vw - 1550px)"
+                            size="mini">
+                            <el-table :data="formData.metaBranchLineTask">
+                                <el-table-column prop="atomTaskIndex" label="索引" align="center" width="50">
+                                    <template v-slot="{ row, $index }">
+                                        {{ $index }}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="atomTaskId" label="任务" align="center">
+                                    <template v-slot="{ row }">
+                                        <el-select v-model="row.atomTaskId" clearable filterable placeholder="请选择"
+                                            :disabled="!canEdit" style="width: 150px">
+                                            <el-option v-for="item in atomTasks" :key="item.id" :label="item.name"
+                                                :value="item.id">
+                                            </el-option>
+                                        </el-select>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column width="100" label="操作" align="center">
+                                    <template v-slot="{ row, $index }">
+                                        <el-button type="danger" plain size="mini" @click="delBranchLineTask($index)"
+                                            :disabled="!canEdit">
+                                            删除
+                                        </el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button size="mini" @click="addBranchLineTask" :disabled="!canEdit"> 添加支线任务 </el-button>
+                        </el-form-item>
+                    </template>
+                    <template v-if="formData && formData.type == 'DAILY'">
+                        <el-form-item prop="metaDailyTask" label="日常任务配置" style="width: calc(100vw - 1550px)" size="mini">
+                            <el-table :data="formData.metaDailyTask">
+                                <el-table-column prop="atomTaskIndex" label="索引" align="center" width="50">
+                                    <template v-slot="{ row, $index }">
+                                        {{ $index }}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="atomTaskId" label="任务" align="center">
+                                    <template v-slot="{ row }">
+                                        <el-select v-model="row.atomTaskId" clearable filterable placeholder="请选择"
+                                            :disabled="!canEdit" style="width: 150px">
+                                            <el-option v-for="item in atomTasks" :key="item.id" :label="item.name"
+                                                :value="item.id">
+                                            </el-option>
+                                        </el-select>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column width="100" label="操作" align="center">
+                                    <template v-slot="{ row, $index }">
+                                        <el-button type="danger" plain size="mini" @click="delDailyTask($index)"
+                                            :disabled="!canEdit">
+                                            删除
+                                        </el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button size="mini" @click="addDailyTask" :disabled="!canEdit"> 添加日常任务 </el-button>
+                        </el-form-item>
+                    </template>
+                    <el-form-item label="所属频道" prop="channelId">
+                        <el-select v-model="formData.channelId" placeholder="请选择" style="width: 100%" :disabled="!canEdit">
+                            <el-option v-for="item in channels" :key="item.id" :label="item.name" :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="autoReceive" label="是否自动领取">
+                        <el-switch v-model="formData.autoReceive"> </el-switch>
+                    </el-form-item>
+                    <el-form-item prop="publish" label="是否发布">
+                        <el-switch v-model="formData.publish"> </el-switch>
+                    </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary">
+                            保存
+                        </el-button>
+                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+	name: 'MetaTaskNewEdit',
+	created() {
+		if (this.$route.query.id) {
+			this.$http
+				.get('metaTaskNew/get/' + this.$route.query.id)
+				.then(res => {
+					this.formData = res;
+				})
+				.catch(e => {
+					console.log(e);
+					this.$message.error(e.error);
+				});
+		}
+		this.$http.get('/metaChannel/findAll').then(res => {
+			this.channels = res;
+		});
+		this.$http.get('/metaAtomTask/findAll').then(res => {
+			this.atomTasks = res;
+		});
+	},
+	computed: {
+		canEdit() {
+			return !!!this.$route.query.id;
+		}
+	},
+	data() {
+		return {
+			atomTasks: [],
+			channels: [],
+			saving: false,
+			formData: {
+				metaNodeTask: [],
+				metaBranchLineTask: [],
+				metaDailyTask: []
+			},
+			rules: {
+				name: [
+					{
+						required: true,
+						message: '请输入任务名称',
+						trigger: 'blur'
+					}
+				],
+				detail: [
+					{
+						required: true,
+						message: '请输入任务详情',
+						trigger: 'blur'
+					}
+				],
+				type: [
+					{
+						required: true,
+						message: '请输入任务类型',
+						trigger: 'blur'
+					}
+				],
+				channelId: [
+					{
+						required: true,
+						message: '请选择所属频道',
+						trigger: 'blur'
+					}
+				]
+			},
+			typeOptions: [
+				{ label: '主线任务', value: 'MAIN_LINE' },
+				{ label: '支线任务', value: 'BRANCH_LINE' },
+				{ label: '日常任务', value: 'DAILY' }
+			]
+		};
+	},
+	methods: {
+		changeTaskType() {
+			this.formData.metaNodeTask = [];
+			this.formData.metaBranchLineTask = [];
+			this.formData.metaDailyTask = [];
+		},
+		addDailyTask() {
+			this.formData.metaDailyTask.push({
+				atomTaskId: ''
+			});
+		},
+		addBranchLineTask() {
+			this.formData.metaBranchLineTask.push({
+				atomTaskId: ''
+			});
+		},
+		addNodeTask() {
+			this.formData.metaNodeTask.push({
+				atomTaskId: ''
+			});
+		},
+		delDailyTask(i) {
+			this.formData.metaDailyTask.splice(i, 1);
+		},
+		delBranchLineTask(i) {
+			this.formData.metaBranchLineTask.splice(i, 1);
+		},
+		delNodeTask(i) {
+			this.formData.metaNodeTask.splice(i, 1);
+		},
+		onSave() {
+			this.$refs.form.validate(valid => {
+				if (valid) {
+					this.submit();
+				} else {
+					return false;
+				}
+			});
+		},
+		submit() {
+			let data = { ...this.formData };
+			if (data.metaNodeTask) {
+				for (var i = 0; i < data.metaNodeTask.length; i++) {
+					data.metaNodeTask[i].atomTaskIndex = i;
+				}
+			}
+			if (data.metaBranchLineTask) {
+				for (var i = 0; i < data.metaBranchLineTask.length; i++) {
+					data.metaBranchLineTask[i].atomTaskIndex = i;
+				}
+			}
+			if (data.metaDailyTask) {
+				for (var i = 0; i < data.metaDailyTask.length; i++) {
+					data.metaDailyTask[i].atomTaskIndex = i;
+				}
+			}
+			if (data.type === 'MAIN_LINE' && data.metaNodeTask.length <= 0 && data.metaBranchLineTask.length <= 0) {
+				this.$message.error('至少添加一种节点任务或者支线任务');
+			} else if (data.type === 'BRANCH_LINE' && data.metaBranchLineTask.length <= 0) {
+				this.$message.error('至少添加一种支线任务');
+			} else if (data.type === 'DAILY' && data.metaDailyTask.length <= 0) {
+				this.$message.error('至少添加一种日常任务');
+			} else {
+				this.saving = true;
+				this.$http
+					.post('/metaTaskNew/save', data, { body: 'json' })
+					.then(res => {
+						this.saving = false;
+						this.$message.success('成功');
+						this.$router.go(-1);
+					})
+					.catch(e => {
+						console.log(e);
+						this.saving = false;
+						this.$message.error(e.error);
+					});
+			}
+		},
+		onDelete() {
+			this.$confirm('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+				.then(() => {
+					return this.$http.post(`/metaTaskNew/del/${this.formData.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.$router.go(-1);
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						console.log(e);
+						this.$message.error((e || {}).error || '删除失败');
+					}
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/MetaTaskNewList.vue

@@ -0,0 +1,168 @@
+<template>
+	<div class="list-view">
+		<page-title>
+			<el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading"
+				class="filter-item">
+				新增
+			</el-button>
+			<el-button @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData"
+				class="filter-item">
+				导出
+			</el-button>
+		</page-title>
+		<div class="filters-container">
+			<el-input placeholder="搜索..." v-model="search" clearable class="filter-item search"
+				@keyup.enter.native="getData">
+				<el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+			</el-input>
+		</div>
+		<el-table :data="tableData" row-key="id" ref="table" header-row-class-name="table-header-row"
+			header-cell-class-name="table-header-cell" row-class-name="table-row" cell-class-name="table-cell"
+			:height="tableHeight" v-loading="fetchingData">
+			<el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+			</el-table-column>
+			<el-table-column prop="id" align="center" label="ID" width="100">
+			</el-table-column>
+			<el-table-column prop="name" align="center" label="任务名称" width="300">
+			</el-table-column>
+			<el-table-column prop="detail" align="center" label="任务详情">
+			</el-table-column>
+			<el-table-column prop="type" align="center" label="任务分类" :formatter="typeFormatter" width="100">
+			</el-table-column>
+			<el-table-column prop="channelId" align="center" label="所属频道" width="100"></el-table-column>
+			<el-table-column prop="autoReceive" align="center" label="自动领取" width="100">
+				<template slot-scope="{ row }">
+					<el-tag :type="row.autoReceive ? '' : 'info'"> {{ row.autoReceive }} </el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column prop="publish" align="center" label="是否发布" width="100">
+				<template slot-scope="{ row }">
+					<el-tag :type="row.publish ? '' : 'info'"> {{ row.publish }} </el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="操作" align="center" fixed="right" width="250">
+				<template slot-scope="{row}">
+					<el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+					<el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<div class="pagination-wrapper">
+			<el-pagination background @size-change="onSizeChange" @current-change="onCurrentChange" :current-page="page"
+				:page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+				:total="totalElements">
+			</el-pagination>
+		</div>
+
+	</div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'MetaTaskNewList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/metaTaskNew/all',
+            downloading: false,
+            typeOptions: [
+                { label: '主线任务', value: 'MAIN_LINE' },
+                { label: '支线任务', value: 'BRANCH_LINE' },
+                { label: '日常任务', value: 'DAILY' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        typeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search, query: { del: false } };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/metaTaskNewEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/metaTaskNewEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/metaTaskNew/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/metaTaskNew/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>