schedule

src/mock/index.js

@@ -1,6 +1,6 @@
 import Mock from 'mockjs'
 import * as common from './modules/common'
-import * as jobSchedule from './modules/job-schedule'
+// import * as jobSchedule from './modules/job-schedule'
 import * as oss from './modules/oss'
 import * as sysConfig from './modules/sys-config'
 import * as sysLog from './modules/sys-log'
@@ -12,7 +12,7 @@ import * as sysUser from './modules/sys-user'
 // 1. 开启/关闭[业务模块]拦截, 通过调用fnCreate方法[isOpen参数]设置.
 // 2. 开启/关闭[业务模块中某个请求]拦截, 通过函数返回对象中的[isOpen属性]设置.
 fnCreate(common, true)
-fnCreate(jobSchedule, true)
+// fnCreate(jobSchedule, true)
 fnCreate(oss, true)
 fnCreate(sysConfig, true)
 fnCreate(sysLog, true)

src/views/modules/job/schedule-add-or-update.vue

@@ -55,16 +55,16 @@
           this.$refs['dataForm'].resetFields()
           if (this.dataForm.id) {
             this.$http({
-              url: this.$http.adornUrl(`/sys/schedule/info/${this.dataForm.id}`),
+              url: this.$http.adornUrl(`/user-service/sys/schedule/info/${this.dataForm.id}`),
               method: 'get',
               params: this.$http.adornParams()
             }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.dataForm.beanName = data.schedule.beanName
-                this.dataForm.params = data.schedule.params
-                this.dataForm.cronExpression = data.schedule.cronExpression
-                this.dataForm.remark = data.schedule.remark
-                this.dataForm.status = data.schedule.status
+              if (data && data.code === '200') {
+                this.dataForm.beanName = data.data.beanName
+                this.dataForm.params = data.data.params
+                this.dataForm.cronExpression = data.data.cronExpression
+                this.dataForm.remark = data.data.remark
+                this.dataForm.status = data.data.status
               }
             })
           }
@@ -75,8 +75,8 @@
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
             this.$http({
-              url: this.$http.adornUrl(`/sys/schedule/${!this.dataForm.id ? 'save' : 'update'}`),
-              method: 'post',
+              url: this.$http.adornUrl(`/user-service/sys/schedule/${!this.dataForm.id ? 'save' : 'update'}`),
+              method: !this.dataForm.id ? 'post' : 'put',
               data: this.$http.adornData({
                 'jobId': this.dataForm.id || undefined,
                 'beanName': this.dataForm.beanName,
@@ -86,7 +86,7 @@
                 'status': !this.dataForm.id ? undefined : this.dataForm.status
               })
             }).then(({data}) => {
-              if (data && data.code === 0) {
+              if (data && data.code === '200') {
                 this.$message({
                   message: '操作成功',
                   type: 'success',

src/views/modules/job/schedule-log.vue

@@ -104,17 +104,17 @@
       getDataList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/sys/scheduleLog/list'),
+          url: this.$http.adornUrl('/user-service/sys/scheduleLog/list'),
           method: 'get',
           params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize,
+            'current': this.pageIndex,
+            'size': this.pageSize,
             'jobId': this.dataForm.id
           })
         }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+          if (data && data.code === '200') {
+            this.dataList = data.data.records
+            this.totalPage = Number(data.data.total)
           } else {
             this.dataList = []
             this.totalPage = 0
@@ -136,12 +136,12 @@
       // 失败信息
       showErrorInfo (id) {
         this.$http({
-          url: this.$http.adornUrl(`/sys/scheduleLog/info/${id}`),
+          url: this.$http.adornUrl(`/user-service/sys/scheduleLog/info/${id}`),
           method: 'get',
           params: this.$http.adornParams()
         }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.$alert(data.log.error)
+          if (data && data.code === '200') {
+            this.$alert(data.data.error)
           } else {
             this.$message.error(data.msg)
           }

src/views/modules/job/schedule.vue

@@ -30,31 +30,40 @@
         prop="jobId"
         header-align="center"
         align="center"
-        width="80"
+        min-width="100"
+        :show-tooltip-when-overflow="true"
         label="ID">
       </el-table-column>
       <el-table-column
         prop="beanName"
         header-align="center"
         align="center"
+        min-width="120"
+        :show-tooltip-when-overflow="true"
         label="bean名称">
       </el-table-column>
       <el-table-column
         prop="params"
         header-align="center"
         align="center"
+        min-width="160"
+        :show-tooltip-when-overflow="true"
         label="参数">
       </el-table-column>
       <el-table-column
         prop="cronExpression"
         header-align="center"
         align="center"
+        min-width="100"
+        :show-tooltip-when-overflow="true"
         label="cron表达式">
       </el-table-column>
       <el-table-column
         prop="remark"
         header-align="center"
         align="center"
+        min-width="180"
+        :show-tooltip-when-overflow="true"
         label="备注">
       </el-table-column>
       <el-table-column
@@ -71,7 +80,7 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="150"
+        width="250"
         label="操作">
         <template slot-scope="scope">
           <el-button v-if="isAuth('sys:schedule:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.jobId)">修改</el-button>
@@ -129,17 +138,17 @@
       getDataList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/sys/schedule/list'),
+          url: this.$http.adornUrl(`/user-service/sys/schedule/list`),
           method: 'get',
           params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize,
-            'beanName': this.dataForm.beanName
+            'current': this.pageIndex,
+            'size': this.pageSize,
+            'beanName': this.dataForm.beanName ? this.dataForm.beanName : null
           })
         }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+          if (data && data.code === '200') {
+            this.dataList = data.data.records
+            this.totalPage = Number(data.data.total)
           } else {
             this.dataList = []
             this.totalPage = 0
@@ -171,7 +180,7 @@
       },
       // 删除
       deleteHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
+        const ids = id ? [id] : this.dataListSelections.map(item => {
           return item.jobId
         })
         this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
@@ -180,11 +189,11 @@
           type: 'warning'
         }).then(() => {
           this.$http({
-            url: this.$http.adornUrl('/sys/schedule/delete'),
-            method: 'post',
+            url: this.$http.adornUrl('/user-service/sys/schedule/delete'),
+            method: 'delete',
             data: this.$http.adornData(ids, false)
           }).then(({data}) => {
-            if (data && data.code === 0) {
+            if (data && data.code === '200') {
               this.$message({
                 message: '操作成功',
                 type: 'success',
@@ -201,7 +210,7 @@
       },
       // 暂停
       pauseHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
+        const ids = id ? [id] : this.dataListSelections.map(item => {
           return item.jobId
         })
         this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '暂停' : '批量暂停'}]操作?`, '提示', {
@@ -210,11 +219,11 @@
           type: 'warning'
         }).then(() => {
           this.$http({
-            url: this.$http.adornUrl('/sys/schedule/pause'),
+            url: this.$http.adornUrl('/user-service/sys/schedule/pause'),
             method: 'post',
             data: this.$http.adornData(ids, false)
           }).then(({data}) => {
-            if (data && data.code === 0) {
+            if (data && data.code === '200') {
               this.$message({
                 message: '操作成功',
                 type: 'success',
@@ -231,7 +240,7 @@
       },
       // 恢复
       resumeHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
+        const ids = id ? [id] : this.dataListSelections.map(item => {
           return item.jobId
         })
         this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '恢复' : '批量恢复'}]操作?`, '提示', {
@@ -240,11 +249,11 @@
           type: 'warning'
         }).then(() => {
           this.$http({
-            url: this.$http.adornUrl('/sys/schedule/resume'),
+            url: this.$http.adornUrl('/user-service/sys/schedule/resume'),
             method: 'post',
             data: this.$http.adornData(ids, false)
           }).then(({data}) => {
-            if (data && data.code === 0) {
+            if (data && data.code === '200') {
               this.$message({
                 message: '操作成功',
                 type: 'success',
@@ -261,7 +270,7 @@
       },
       // 立即执行
       runHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
+        const ids = id ? [id] : this.dataListSelections.map(item => {
           return item.jobId
         })
         this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '立即执行' : '批量立即执行'}]操作?`, '提示', {
@@ -270,11 +279,11 @@
           type: 'warning'
         }).then(() => {
           this.$http({
-            url: this.$http.adornUrl('/sys/schedule/run'),
+            url: this.$http.adornUrl('/user-service/sys/schedule/run'),
             method: 'post',
             data: this.$http.adornData(ids, false)
           }).then(({data}) => {
-            if (data && data.code === 0) {
+            if (data && data.code === '200') {
               this.$message({
                 message: '操作成功',
                 type: 'success',