From 9cd06ce62b6d1d1df216d207c968660e5ad2ce5c Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Tue, 28 Dec 2021 22:01:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=9A1=E3=80=81=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E7=AE=A1=E7=90=86=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=EF=BC=8C=E6=AD=A3=E5=B8=B8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=20=20=20=20=20=202=E3=80=81=E6=96=B0=E5=A2=9ETianXingConst?=
 =?UTF-8?q?=E5=B8=B8=E9=87=8F=E7=B1=BB=EF=BC=8C=E5=88=A0=E9=99=A4=E6=9E=9A?=
 =?UTF-8?q?=E4=B8=BE=E7=9B=B8=E5=85=B3=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/business/english/copywriting.js   |  30 +--
 .../business/english/copywriting/index.vue    | 184 ++++++++++++------
 .../com/xjs/common/consts/TianXingConst.java  |  12 ++
 .../java/com/xjs/common/enums/StatusEnum.java |   4 +-
 .../xjs/copywriting/domain/CopyWriting.java   |   9 +-
 .../impl/TianXingPYQCopyWritingFactory.java   |   4 +-
 .../impl/TianXingWYYCopyWritingFactory.java   |   4 +-
 .../main/java/com/xjs/log/domain/ApiLog.java  |   2 +-
 .../resources/mapper/english/ApiLogMapper.xml |   2 +-
 .../mapper/english/CopyWritingMapper.xml      |   6 +-
 10 files changed, 157 insertions(+), 100 deletions(-)
 create mode 100644 xjs-business/xjs-business-english/src/main/java/com/xjs/common/consts/TianXingConst.java

diff --git a/ruoyi-ui/src/api/business/english/copywriting.js b/ruoyi-ui/src/api/business/english/copywriting.js
index 5a5c1ba4..95060adc 100644
--- a/ruoyi-ui/src/api/business/english/copywriting.js
+++ b/ruoyi-ui/src/api/business/english/copywriting.js
@@ -1,44 +1,26 @@
 import request from '@/utils/request'
 
 // 查询文案api，通过api获取文案信息列表
-export function listCopywriting(query) {
+export function listCopyWriting(query) {
   return request({
-    url: '/english/copywriting/list',
+    url: '/english/copyWriting/list',
     method: 'get',
     params: query
   })
 }
 
 // 查询文案api，通过api获取文案信息详细
-export function getCopywriting(id) {
+export function getCopyWriting(id) {
   return request({
-    url: '/english/copywriting/' + id,
+    url: '/english/copyWriting/' + id,
     method: 'get'
   })
 }
 
-// 新增文案api，通过api获取文案信息
-export function addCopywriting(data) {
-  return request({
-    url: '/english/copywriting',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改文案api，通过api获取文案信息
-export function updateCopywriting(data) {
-  return request({
-    url: '/english/copywriting',
-    method: 'put',
-    data: data
-  })
-}
-
 // 删除文案api，通过api获取文案信息
-export function delCopywriting(id) {
+export function delCopyWriting(id) {
   return request({
-    url: '/english/copywriting/' + id,
+    url: '/english/copyWriting/' + id,
     method: 'delete'
   })
 }
diff --git a/ruoyi-ui/src/views/business/english/copywriting/index.vue b/ruoyi-ui/src/views/business/english/copywriting/index.vue
index 9f0884a2..aa287cea 100644
--- a/ruoyi-ui/src/views/business/english/copywriting/index.vue
+++ b/ruoyi-ui/src/views/business/english/copywriting/index.vue
@@ -1,16 +1,46 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="接口名称" prop="apiName">
+      <el-form-item label="文案内容" prop="content">
         <el-input
-          v-model="queryParams.apiName"
-          placeholder="请输入接口名称"
+          v-model="queryParams.content"
+          placeholder="请输入文案内容"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item label="文案来源" prop="source">
+        <el-input
+          v-model="queryParams.source"
+          placeholder="请输入文案来源"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="文案类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择文案类型" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.copywriting_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-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>
@@ -18,6 +48,10 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+      </el-col>
+      <el-col :span="1.5">
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -26,9 +60,8 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['english:log:remove']"
-        >删除
-        </el-button>
+          v-hasPermi="['english:copywriting:remove']"
+        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -37,26 +70,23 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['english:log:export']"
-        >导出
-        </el-button>
+          v-hasPermi="['english:copywriting:export']"
+        >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="接口名称" align="center" prop="apiName" :show-overflow-tooltip="true"/>
-      <el-table-column label="请求URL" align="center" prop="url" :show-overflow-tooltip="true"/>
-      <el-table-column label="请求方法" align="center" prop="method" :show-overflow-tooltip="true"/>
-      <el-table-column label="请求参数" align="center" prop="request" :show-overflow-tooltip="true"/>
-      <el-table-column label="响应参数" align="center" prop="response" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
-        <el-table-column label="是否请求成功" align="center" prop="isSuccess" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <el-tag :type="scope.row.isSuccess==='成功'?'success':'danger'" size="small">{{ scope.row.isSuccess }}</el-tag>
-          </template>
-        </el-table-column>
+    <el-table v-loading="loading" :data="copyWritingList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="文案内容" align="center" prop="content" />
+      <el-table-column label="文案来源" align="center" prop="source" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      </el-table-column>
+      <el-table-column label="文案类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.copywriting_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -64,9 +94,8 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['english:log:remove']"
-          >删除
-          </el-button>
+            v-hasPermi="['english:copywriting:remove']"
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -78,14 +107,25 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+
+    <!-- 添加或修改文案api，通过api获取文案信息对话框 -->
+    <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>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {listLog, getLog, delLog} from "@/api/business/english/log";
+import { listCopyWriting, getCopyWriting, delCopyWriting } from "@/api/business/english/copywriting";
 
 export default {
-  name: "Log",
+  name: "CopyWriting",
+  dicts: ['copywriting_type'],
   data() {
     return {
       // 遮罩层
@@ -100,33 +140,50 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 日志表格数据
-      logList: [],
+      // 文案api，通过api获取文案信息表格数据
+      copyWritingList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      // 文案类型时间范围
+      daterangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        apiName: null
+        content: null,
+        source: null,
+        createTime: null,
+        type: null
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {
+        content: [
+          { required: true, message: "文案内容不能为空", trigger: "blur" }
+        ],
+        source: [
+          { required: true, message: "文案来源不能为空", trigger: "blur" }
+        ]
+      }
     };
   },
   created() {
     this.getList();
   },
   methods: {
-    /** 查询日志列表 */
+    /** 查询文案api，通过api获取文案信息列表 */
     getList() {
       this.loading = true;
-      listLog(this.queryParams).then(response => {
-        this.logList = response.rows;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.createTime = this.daterangeCreateTime[0];
+        this.queryParams.endCreateTime = this.daterangeCreateTime[1];
+      }
+      listCopyWriting(this.queryParams).then(response => {
+        this.copyWritingList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -140,13 +197,10 @@ export default {
     reset() {
       this.form = {
         id: null,
-        apiName: null,
-        url: null,
-        method: null,
-        request: null,
-        response: null,
-        isSuccess: null,
-        createTime:null
+        content: null,
+        source: null,
+        createTime: null,
+        type: null
       };
       this.resetForm("form");
     },
@@ -157,47 +211,51 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.daterangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
+      this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加日志";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getLog(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改日志";
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCopyWriting(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCopyWriting(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
       });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除日志编号为"' + ids + '"的数据项？').then(function () {
-        return delLog(ids);
+      this.$modal.confirm('是否确认删除文案api，通过api获取文案信息编号为"' + ids + '"的数据项？').then(function() {
+        return delCopyWriting(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('english/log/export', {
+      this.download('english/copyWriting/export', {
         ...this.queryParams
-      }, `log_${new Date().getTime()}.xlsx`)
+      }, `copyWriting_${new Date().getTime()}.xlsx`)
     }
   }
 };
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/common/consts/TianXingConst.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/consts/TianXingConst.java
new file mode 100644
index 00000000..15c6693b
--- /dev/null
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/consts/TianXingConst.java
@@ -0,0 +1,12 @@
+package com.xjs.common.consts;
+
+/**
+ * @author xiejs
+ * @desc  天行数据平台常量类
+ * @create 2021-12-28
+ */
+public class TianXingConst {
+
+    public static final Integer PYQ= 1;
+    public static final Integer WYY= 2;
+}
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/common/enums/StatusEnum.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/enums/StatusEnum.java
index 697948b9..dd94fd7c 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/common/enums/StatusEnum.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/enums/StatusEnum.java
@@ -11,9 +11,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 public enum StatusEnum {
 
     SUCCESS(1,"成功"),
-    ERROR(2,"失败"),
-    PYQ(1,"朋友圈文案"),
-    WYY(2,"网易云热评");
+    ERROR(2,"失败");
 
 
     private String desc;
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/domain/CopyWriting.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/domain/CopyWriting.java
index 24a5113c..ddff51b6 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/domain/CopyWriting.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/domain/CopyWriting.java
@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
-import com.xjs.common.enums.StatusEnum;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -35,8 +35,13 @@ public class CopyWriting implements Serializable {
 
     @Excel(name = "创建时间")
     @TableField(fill = FieldFill.INSERT)
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+    @TableField(exist = false)
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date endCreateTime;
+
     @Excel(name = "文案类型" ,readConverterExp = "1=、朋友圈文案2、网易云热评")
-    private StatusEnum type;
+    private Integer type;
 }
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactory.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactory.java
index bf570953..0602a15b 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactory.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactory.java
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.xjs.common.client.TianXingPYQFeignClient;
 import com.xjs.common.config.TianXingProperties;
-import com.xjs.common.enums.StatusEnum;
+import com.xjs.common.consts.TianXingConst;
 import com.xjs.common.exception.ApiException;
 import com.xjs.copywriting.domain.CopyWriting;
 import com.xjs.copywriting.domain.RequestBody;
@@ -46,7 +46,7 @@ public class TianXingPYQCopyWritingFactory implements CopyWritingFactory {
             CopyWriting copyWriting = new CopyWriting();
             copyWriting.setContent(content);
             copyWriting.setSource(source);
-            copyWriting.setType(StatusEnum.PYQ);
+            copyWriting.setType(TianXingConst.PYQ);
             copyWritingMapper.insert(copyWriting);
             return copyWriting;
         }else {
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/factory/impl/TianXingWYYCopyWritingFactory.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/factory/impl/TianXingWYYCopyWritingFactory.java
index 361761c4..21c190de 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/factory/impl/TianXingWYYCopyWritingFactory.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/factory/impl/TianXingWYYCopyWritingFactory.java
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.xjs.common.client.TianXingWYYFeignClient;
 import com.xjs.common.config.TianXingProperties;
-import com.xjs.common.enums.StatusEnum;
+import com.xjs.common.consts.TianXingConst;
 import com.xjs.common.exception.ApiException;
 import com.xjs.copywriting.domain.CopyWriting;
 import com.xjs.copywriting.domain.RequestBody;
@@ -46,7 +46,7 @@ public class TianXingWYYCopyWritingFactory implements CopyWritingFactory {
             CopyWriting copyWriting = new CopyWriting();
             copyWriting.setContent(content);
             copyWriting.setSource(source);
-            copyWriting.setType(StatusEnum.WYY);
+            copyWriting.setType(TianXingConst.WYY);
             copyWritingMapper.insert(copyWriting);
             return copyWriting;
         }else {
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/domain/ApiLog.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/log/domain/ApiLog.java
index 0bd23226..52a23f3c 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/domain/ApiLog.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/log/domain/ApiLog.java
@@ -50,7 +50,7 @@ public class ApiLog implements Serializable
     @Excel(name = "是否请求成功")
     private StatusEnum isSuccess;
 
-    @Excel(name = "创建时间" ,dateFormat = "yyyy-MM-dd")
+    @Excel(name = "创建时间" ,dateFormat = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 }
diff --git a/xjs-business/xjs-business-english/src/main/resources/mapper/english/ApiLogMapper.xml b/xjs-business/xjs-business-english/src/main/resources/mapper/english/ApiLogMapper.xml
index b24f2427..34c1aebd 100644
--- a/xjs-business/xjs-business-english/src/main/resources/mapper/english/ApiLogMapper.xml
+++ b/xjs-business/xjs-business-english/src/main/resources/mapper/english/ApiLogMapper.xml
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectApiLogList" parameterType="com.xjs.log.domain.ApiLog" resultMap="ApiLogResult">
         <include refid="selectApiLogVo"/>
-        <where>  
+        <where>
             <if test="apiName != null  and apiName != ''"> and api_name like concat('%', #{apiName}, '%')</if>
             <if test="isSuccess != null "> and is_success = #{isSuccess}</if>
         </where>
diff --git a/xjs-business/xjs-business-english/src/main/resources/mapper/english/CopyWritingMapper.xml b/xjs-business/xjs-business-english/src/main/resources/mapper/english/CopyWritingMapper.xml
index e5504c3f..4089d005 100644
--- a/xjs-business/xjs-business-english/src/main/resources/mapper/english/CopyWritingMapper.xml
+++ b/xjs-business/xjs-business-english/src/main/resources/mapper/english/CopyWritingMapper.xml
@@ -40,10 +40,12 @@
             resultMap="CopyWritingResult">
         <include refid="selectCopyWritingVo"/>
         <where>
-            <if test="content != null  and content != ''">and content = #{content}</if>
-            <if test="source != null  and source != ''">and source = #{source}</if>
+            <if test="content != null  and content != ''">and content like concat('%', #{content}, '%') </if>
+            <if test="source != null  and source != ''">and source like concat('%', #{source}, '%') </if>
             <if test="type != null ">and type = #{type}</if>
+            <if test="createTime != null and endCreateTime != null"> and create_time between #{createTime} and #{endCreateTime}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectCopyWritingById" parameterType="Long" resultMap="CopyWritingResult">