From dbb75f9ad6d75ac9c19e5b9a1a1de13cbdff1f89 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Mon, 18 Apr 2022 20:56:22 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=AD=E5=85=B3=E6=9D=91=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E6=95=B0=E6=8D=AE=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/business/webmagic/zol/zolPhone.js |  10 +
 ruoyi-ui/src/components/Pagination/index.vue  |   7 +-
 .../src/views/business/english/word/index.vue |   2 +-
 .../business/webmagic/sina/sinaNews/index.vue |   2 +-
 .../business/webmagic/zol/phone/index.vue     | 202 ++++++++++++++++++
 .../service/impl/WeiXinLinkServiceImpl.java   |   3 +
 6 files changed, 221 insertions(+), 5 deletions(-)
 create mode 100644 ruoyi-ui/src/api/business/webmagic/zol/zolPhone.js
 create mode 100644 ruoyi-ui/src/views/business/webmagic/zol/phone/index.vue

diff --git a/ruoyi-ui/src/api/business/webmagic/zol/zolPhone.js b/ruoyi-ui/src/api/business/webmagic/zol/zolPhone.js
new file mode 100644
index 00000000..d489e649
--- /dev/null
+++ b/ruoyi-ui/src/api/business/webmagic/zol/zolPhone.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询爬虫中关村手机搜索列表
+export function listZolPhone(query) {
+  return request({
+    url: '/webmagic/zol-phone/list',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/ruoyi-ui/src/components/Pagination/index.vue
index d812cd3b..6d7a8d6c 100644
--- a/ruoyi-ui/src/components/Pagination/index.vue
+++ b/ruoyi-ui/src/components/Pagination/index.vue
@@ -36,7 +36,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [3, 10, 12, 15, 20, 30, 50, 100]
+        return [3, 10, 12, 15, 18, 20, 30, 50, 100]
       }
     },
     // 移动端页码按钮的数量端默认值5
@@ -83,13 +83,14 @@ export default {
     handleSizeChange(val) {
       this.$emit('pagination', {page: this.currentPage, limit: val})
       if (this.autoScroll) {
-        scrollTo(0, 800)
+        // scrollTo(0, 800)
       }
     },
     handleCurrentChange(val) {
       this.$emit('pagination', {page: val, limit: this.pageSize})
       if (this.autoScroll) {
-        scrollTo(0, 800)
+        //自动滚屏
+        // scrollTo(0, 800)
       }
     }
   }
diff --git a/ruoyi-ui/src/views/business/english/word/index.vue b/ruoyi-ui/src/views/business/english/word/index.vue
index 39eb34e0..b9900a46 100644
--- a/ruoyi-ui/src/views/business/english/word/index.vue
+++ b/ruoyi-ui/src/views/business/english/word/index.vue
@@ -424,7 +424,7 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.params = {};
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+      if (null != this.daterangeCreateTime && '' !== this.daterangeCreateTime) {
         this.queryParams.createTime = this.daterangeCreateTime[0];
         this.queryParams.endCreateTime = this.daterangeCreateTime[1];
       }
diff --git a/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue b/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue
index c1fc911b..bc793b10 100644
--- a/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue
+++ b/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue
@@ -166,7 +166,7 @@ export default {
 
     /** 查询新浪新闻列表 */
     getList() {
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+      if (null != this.daterangeCreateTime && '' !== this.daterangeCreateTime) {
         this.queryParams.createTime = this.daterangeCreateTime[0];
         this.queryParams.endCreateTime = this.daterangeCreateTime[1];
       }
diff --git a/ruoyi-ui/src/views/business/webmagic/zol/phone/index.vue b/ruoyi-ui/src/views/business/webmagic/zol/phone/index.vue
new file mode 100644
index 00000000..754ad741
--- /dev/null
+++ b/ruoyi-ui/src/views/business/webmagic/zol/phone/index.vue
@@ -0,0 +1,202 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px" :rules="rules">
+      <el-form-item label="查询条件" prop="condition">
+        <el-input v-model="queryParams.condition"
+                  placeholder="请输入手机名称、描述等"
+                  maxlength="21"
+                  size="small"
+        ></el-input>
+      </el-form-item>
+
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          size="small"
+          style="width: 320px"
+          value-format="yyyy-MM-dd"
+          format="yyyy 年 MM 月 dd 日"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :picker-options="pickerOptions"
+          @change="dateQuery"
+        ></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>
+
+    <div>
+      <el-row :gutter="10">
+        <el-col :span="4" v-for="(data,index) in formList" :key="data.id">
+          <div class="grid-content bg-purple">
+            <el-card class="" shadow="hover">
+              <!--图片 -->
+              <div style="width: 100%">
+                <el-image
+                  style="width: 220px; height: 165px"
+                  :src="data.pictureUrl"
+                  fit="fit"></el-image>
+              </div>
+              <el-tooltip class="item" effect="dark" :content="data.phoneName+data.description" placement="top">
+                <!--描述 -->
+                <div style="width: 100%" class="content">
+                  <a :href="data.detailPage" target="_blank">
+                    <span>{{ data.phoneName }}</span>
+                    <span style="color: red">{{ data.description }}</span>
+                  </a>
+                </div>
+              </el-tooltip>
+              <!--参考价 -->
+              <div class="content">
+                <span style="color: #999093;font-size: 13px">参考价：</span>
+                <span style="color: red;font-size: 15px">￥{{ data.price }}</span>
+              </div>
+              <!--评分 -->
+              <div style="padding-bottom: 10px">
+                <el-rate
+                  style="float: left"
+                  disabled
+                  :max="5"
+                  v-model.number="data.heat/2"> >
+                </el-rate>
+                <span style="float: left;color: red;font-size: 12px">{{ data.heat }}评分</span>
+              </div>
+
+            </el-card>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import {pickerOptions} from "@/layout/mixin/PickerOptions";
+import {listZolPhone} from "@/api/business/webmagic/zol/zolPhone";
+import {updateWord} from "@/api/business/english/word";
+
+export default {
+  name: "ZolPhone",
+  mixins: [pickerOptions],
+  data() {
+    return {
+      queryParams: {
+        pageNum: 1,
+        pageSize: 18,
+        condition: null,
+      },
+
+      //检查查询范围
+      daterangeCreateTime: [],
+
+      //表单数据
+      formList: {},
+
+      //总数
+      total: 0,
+
+      // 遮罩层
+      loading: true,
+
+      rules: {
+        condition: [
+          {min: 0, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur'}
+        ]
+      }
+    }
+  },
+
+  created() {
+    this.getList()
+  },
+
+  methods: {
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeCreateTime = [];
+      this.queryParams.createTime = null
+      this.queryParams.endCreateTime = null
+      this.resetForm("queryForm");
+      // this.queryParams.condition = ""
+      this.handleQuery();
+    },
+
+    dateQuery() {
+      //清空时间参数
+      this.queryParams.createTime = null
+      this.queryParams.endCreateTime = null
+
+      this.handleQuery();
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.$refs["queryForm"].validate(valid => {
+          if (valid) {
+            this.getList();
+          }
+        }
+      );
+    },
+
+    getList() {
+      if (null != this.daterangeCreateTime && '' !== this.daterangeCreateTime) {
+        this.queryParams.createTime = this.daterangeCreateTime[0];
+        this.queryParams.endCreateTime = this.daterangeCreateTime[1];
+      }
+
+      this.loading = true;
+      listZolPhone(this.queryParams).then(res => {
+        this.loading = false;
+        this.formList = res.data.records
+        this.total = res.data.total
+      })
+
+
+    },
+  },
+
+
+}
+</script>
+
+<style scoped>
+
+.grid-content {
+  border-radius: 4px;
+  min-height: 36px;
+}
+
+.content {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  height: 35px;
+  -webkit-line-clamp: 2; /* 限制在一个块元素显示的文本的行数 */
+  -webkit-box-orient: vertical; /* 垂直排列 */
+  word-break: break-all; /* 内容自动换行 */
+  font-size: 12px;
+}
+
+a:hover {
+  color: red;
+}
+
+</style>
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/weixin/service/impl/WeiXinLinkServiceImpl.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/weixin/service/impl/WeiXinLinkServiceImpl.java
index 484ecc46..87da1711 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/weixin/service/impl/WeiXinLinkServiceImpl.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/weixin/service/impl/WeiXinLinkServiceImpl.java
@@ -42,6 +42,9 @@ public class WeiXinLinkServiceImpl implements WeiXinLinkService {
         if (StringUtils.isBlank(link)) {
             throw new BusinessException("链接地址不能为空");
         }
+        if (link.length() > 100) {
+            throw new BusinessException("链接地址长度超过 100 字符");
+        }
 
         boolean matches = Pattern.matches(URL_REGEX, link);
         if (!matches) {