init

src/api/cai/sysPush.js

@@ -42,3 +42,23 @@ export function delSysPush(id) {
     method: 'delete'
   })
 }
+
+export function runSysPush(id) {
+  return request({
+    url: '/cai/sysPush/run',
+    method: 'post',
+    data: {
+      id
+    }
+  })
+}
+
+export function closeSysPush(id) {
+  return request({
+    url: '/cai/sysPush/close',
+    method: 'post',
+    data: {
+      id
+    }
+  })
+}

src/constant/statusMap.js

@@ -272,26 +272,28 @@ export const systemPushGroupIdList = [
 ]
 
 export const systemPushLogStatus = [
-  { value: 0, label: '未推送'},
+  { value: 0, label: '未推送',listClass: listClass.info},
-  { value: 1, label: '推送中'},
+  { value: 1, label: '推送中',listClass: listClass.primary},
-  { value: 2, label: '推送失败'},
+  { value: 2, label: '推送失败',listClass: listClass.danger},
-  { value: 3, label: '推送成功'},
+  { value: 3, label: '推送成功',listClass: listClass.success},
 ]
 
 export const systemPushSendTimeTypeList = [
-  { value: 0, label: '手动发送'},
+  { value: 0, label: '手动发送',listClass: listClass.primary},
-  { value: 1, label: '定时发送'},
+  { value: 1, label: '定时发送',listClass: listClass.danger},
 ]
 export const systemPushStatusList = [
-  { value: 0, label: '未执行'},
+  { value: 0, label: '未执行',listClass: listClass.info},
-  { value: 1, label: '执行中'},
+  { value: 1, label: '执行中',listClass: listClass.warning},
-  { value: 2, label: '队列执行中'},
+  { value: 2, label: '队列执行中',listClass: listClass.primary},
-  { value: 3, label: '已完成'},
+  { value: 3, label: '已完成',listClass: listClass.success},
+  { value: 4, label: '已取消',listClass: listClass.info},
+  { value: 10, label: '执行失败',listClass: listClass.danger}
 ]
 export const systemPushTypeList = [
-  { value: 0, label: '纯文字消息'},
+  { value: 0, label: '纯文字消息',listClass: listClass.info},
-  { value: 1, label: '文本消息'},
+  { value: 1, label: '文本消息',listClass: listClass.primary},
-  { value: 2, label: '单图文消息'},
+  { value: 2, label: '单图文消息',listClass: listClass.success},
-  { value: 3, label: '多图文消息'},
+  { value: 3, label: '多图文消息',listClass: listClass.warning},
-  { value: 4, label: '纯图文消息'},
+  { value: 4, label: '纯图文消息',listClass: listClass.warning},
 ]

src/views/cai/sysPush/add-sys-push-dialog.vue

@@ -39,6 +39,15 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="发送时间" prop="sendTime" v-if="form.sendTimeType === 1">
+            <el-date-picker
+                :picker-options="pickerAfterOptions"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                v-model="form.sendTime"
+                type="datetime"
+                placeholder="选择发送时间">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item label="标题" prop="title">
             <el-input v-model="form.title" placeholder="请输入标题"/>
           </el-form-item>
@@ -234,6 +243,7 @@ export default {
         onlyImage:undefined,
 
         sendTimeType: 0,
+        sendTime: undefined,
         title: undefined,
         type: 0,
         remark: undefined
@@ -257,6 +267,9 @@ export default {
         sendTimeType: [
           { required: true, message: '发送类型不能为空', trigger: 'blur' }
         ],
+        sendTime: [
+          { required: true, message: '发送时间不能为空', trigger: 'blur' }
+        ],
         title: [
           { required: true, message: '标题不能为空', trigger: 'blur' }
         ],
@@ -290,7 +303,12 @@ export default {
           { required: true, message: '链接不能为空', trigger: 'blur' }
         ],
       },
-      buttonLoading: false
+      buttonLoading: false,
+      pickerAfterOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
+        },
+      },
     }
   },
   mounted() {

src/views/cai/sysPush/index.vue

@@ -41,7 +41,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="sysPushList" @selection-change="handleSelectionChange">
-      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="id" align="center" prop="id" width="50"/>
       <el-table-column label="群体类型" align="center" prop="groupId" >
         <template v-slot="scope">
           <cai-dict-tag :options="systemPushGroupIdList" :value="scope.row.groupId"/>
@@ -52,35 +52,48 @@
           <cai-dict-tag :options="systemPushTypeList" :value="scope.row.type"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="用户id,仅在group_id=单个用户时生效" align="center" prop="userId" />-->
+      <el-table-column label="用户" align="center" prop="usercode" />
       <el-table-column label="标题" align="center" prop="title" />
 <!--      <el-table-column label="内容" align="center" prop="content" />-->
 <!--      <el-table-column label="前端参数" align="center" prop="params" />-->
-      <el-table-column label="备注说明" align="center" prop="remark" />
+      <el-table-column label="备注说明" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="发送类型" align="center" prop="sendTimeType" >
         <template v-slot="scope">
           <cai-dict-tag :options="systemPushSendTimeTypeList" :value="scope.row.sendTimeType"/>
         </template>
       </el-table-column>
       <el-table-column label="发送时间" align="center" prop="sendTime" width="180" />
-      <el-table-column label="已推送人数" align="center" prop="num" />
+<!--      <el-table-column label="已推送人数" align="center" prop="num" />-->
       <el-table-column label="状态" align="center" prop="status">
         <template v-slot="scope">
           <cai-dict-tag :options="systemPushStatusList" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="完成时间" align="center" prop="endtime" width="180" />
+<!--      <el-table-column label="完成时间" align="center" prop="endtime" width="180" />-->
-      <el-table-column label="创建时间" align="center" prop="createtime" width="180" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
-<!--      <el-table-column label="更新时间" align="center" prop="updatetime" width="180" />-->
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="160" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
               size="mini"
               type="text"
-            icon="el-icon-info"
+              v-if="scope.row.status === 0"
+              @click="handleRun(scope.row)"
+              v-hasPermi="['cai:sysPush:run']"
+          >执行</el-button>
+          <el-button
+            size="mini"
+            type="text"
             @click="handleInfo(scope.row)"
             v-hasPermi="['cai:sysPush:edit']"
           >预览</el-button>
+          <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status === 0 && scope.row.sendTimeType === 1"
+              @click="handleClose(scope.row)"
+              v-hasPermi="['cai:sysPush:close']"
+          >取消</el-button>
           <el-button
             size="mini"
             type="text"
@@ -112,7 +125,7 @@
 </template>
 
 <script>
-import {delSysPush, listSysPush} from '@/api/cai/sysPush'
+import { closeSysPush, delSysPush, listSysPush, runSysPush } from '@/api/cai/sysPush'
 import {
   systemPushGroupIdList,
   systemPushLogStatus,
@@ -212,6 +225,32 @@ export default {
         this.$refs.addSysPushDialog.init()
       })
     },
+    handleClose(row){
+      this.$modal.confirm('是否确定取消定时推送系统【"' + row.title + '"】的数据项？').then(() => {
+        this.loading = true;
+        return closeSysPush(row.id);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("取消成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    handleRun(row){
+      this.$modal.confirm('是否确认执行推送系统【"' + row.title + '"】的数据项？').then(() => {
+        this.loading = true;
+        return runSysPush(row.id);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("执行成功，请等待执行结果");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;

src/views/cai/sysPushLog/index.vue

@@ -1,171 +1,36 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="系统推送id" prop="sysPushId">
+      <el-form-item label="系统推送ID" prop="sysPushId" label-width="100px">
         <el-input
             v-model="queryParams.sysPushId"
-          placeholder="请输入系统推送id"
+            placeholder="请输入系统推送ID"
             clearable
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="推送人数" prop="num">
-        <el-input
-          v-model="queryParams.num"
-          placeholder="请输入推送人数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="推送返回的结果" prop="result">
-        <el-input
-          v-model="queryParams.result"
-          placeholder="请输入推送返回的结果"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="重试次数" prop="retry">
-        <el-input
-          v-model="queryParams.retry"
-          placeholder="请输入重试次数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始发送时间" prop="beginTime">
-        <el-date-picker clearable
-          v-model="queryParams.beginTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择开始发送时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="完成时间" prop="endTime">
-        <el-date-picker clearable
-          v-model="queryParams.endTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择完成时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createtime">
-        <el-date-picker clearable
-          v-model="queryParams.createtime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updatetime">
-        <el-date-picker clearable
-          v-model="queryParams.updatetime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择更新时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['cai:sysPushLog:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['cai:sysPushLog:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['cai:sysPushLog:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['cai:sysPushLog:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
     <el-table v-loading="loading" :data="sysPushLogList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" v-if="true"/>
       <el-table-column label="系统推送id" align="center" prop="sysPushId" />
-      <el-table-column label="推送到的用户id" align="center" prop="userJson" />
+      <el-table-column label="推送到的用户id" align="center" prop="userJson" >
+        <template v-slot="scope">
+          <el-button size="mini" type="text" @click="handleShowUser(scope.row)">查看</el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="推送人数" align="center" prop="num" />
-      <el-table-column label="推送状态:0=未推送,1=推送中,2=推送失败,3=推送成功" align="center" prop="status" />
+      <el-table-column label="推送状态" align="center" prop="status">
+        <template v-slot="scope">
+          <cai-dict-tag :options="systemPushLogStatus" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column label="推送返回的结果" align="center" prop="result" />
-      <el-table-column label="重试次数" align="center" prop="retry" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
-      <el-table-column label="开始发送时间" align="center" prop="beginTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="完成时间" align="center" prop="endTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createtime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createtime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updatetime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updatetime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['cai:sysPushLog:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['cai:sysPushLog:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
     </el-table>
-
     <pagination
       v-show="total>0"
       :total="total"
@@ -173,72 +38,24 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改推送系统消息记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="系统推送id" prop="sysPushId">
-          <el-input v-model="form.sysPushId" placeholder="请输入系统推送id" />
-        </el-form-item>
-        <el-form-item label="推送人数" prop="num">
-          <el-input v-model="form.num" placeholder="请输入推送人数" />
-        </el-form-item>
-        <el-form-item label="推送返回的结果" prop="result">
-          <el-input v-model="form.result" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="重试次数" prop="retry">
-          <el-input v-model="form.retry" placeholder="请输入重试次数" />
-        </el-form-item>
-        <el-form-item label="开始发送时间" prop="beginTime">
-          <el-date-picker clearable
-            v-model="form.beginTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择开始发送时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="完成时间" prop="endTime">
-          <el-date-picker clearable
-            v-model="form.endTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择完成时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createtime">
-          <el-date-picker clearable
-            v-model="form.createtime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="更新时间" prop="updatetime">
-          <el-date-picker clearable
-            v-model="form.updatetime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择更新时间">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listSysPushLog, getSysPushLog, delSysPushLog, addSysPushLog, updateSysPushLog } from "@/api/cai/sysPushLog";
+import { listSysPushLog } from '@/api/cai/sysPushLog'
+import {
+  systemPushGroupIdList,
+  systemPushLogStatus,
+  systemPushSendTimeTypeList,
+  systemPushStatusList,
+  systemPushTypeList
+} from '@/constant/statusMap'
 
 export default {
   name: "SysPushLog",
   data() {
     return {
-      // 按钮loading
+      systemPushGroupIdList,systemPushLogStatus,systemPushSendTimeTypeList,systemPushStatusList,systemPushTypeList,
-      buttonLoading: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -253,63 +70,13 @@ export default {
       total: 0,
       // 推送系统消息记录表格数据
       sysPushLogList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         sysPushId: undefined,
-        userJson: undefined,
-        num: undefined,
         status: undefined,
-        result: undefined,
-        retry: undefined,
-        beginTime: undefined,
-        endTime: undefined,
-        createtime: undefined,
-        updatetime: undefined
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        sysPushId: [
-          { required: true, message: "系统推送id不能为空", trigger: "blur" }
-        ],
-        userJson: [
-          { required: true, message: "推送到的用户id不能为空", trigger: "blur" }
-        ],
-        num: [
-          { required: true, message: "推送人数不能为空", trigger: "blur" }
-        ],
-        status: [
-          { required: true, message: "推送状态:0=未推送,1=推送中,2=推送失败,3=推送成功不能为空", trigger: "change" }
-        ],
-        result: [
-          { required: true, message: "推送返回的结果不能为空", trigger: "blur" }
-        ],
-        retry: [
-          { required: true, message: "重试次数不能为空", trigger: "blur" }
-        ],
-        beginTime: [
-          { required: true, message: "开始发送时间不能为空", trigger: "blur" }
-        ],
-        endTime: [
-          { required: true, message: "完成时间不能为空", trigger: "blur" }
-        ],
-        createtime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
-        ],
-        updatetime: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ]
-      }
     };
   },
   created() {
@@ -325,27 +92,8 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
+    handleShowUser(row){
-    cancel() {
+
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        sysPushId: undefined,
-        userJson: undefined,
-        num: undefined,
-        status: undefined,
-        result: undefined,
-        retry: undefined,
-        beginTime: undefined,
-        endTime: undefined,
-        createtime: undefined,
-        updatetime: undefined
-      };
-      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -363,70 +111,6 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加推送系统消息记录";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getSysPushLog(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改推送系统消息记录";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateSysPushLog(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addSysPushLog(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除推送系统消息记录编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
-        return delSysPushLog(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('cai/sysPushLog/export', {
-        ...this.queryParams
-      }, `sysPushLog_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>