From e07a91767a5197c6801f581b2615d7a3547569f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E5=BA=8F=E6=8C=AF?= <luxuzhen@inspur.com>
Date: Tue, 11 Jun 2024 14:37:14 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B1=89=E4=B8=B0=E6=B9=96Vlog=E7=9F=AD?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=BA=94=E7=94=A8=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../godTemplateInfo/templateInfo/index.vue    | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/god-ui/src/views/godTemplateInfo/templateInfo/index.vue b/god-ui/src/views/godTemplateInfo/templateInfo/index.vue
index a79a186d..83c66453 100644
--- a/god-ui/src/views/godTemplateInfo/templateInfo/index.vue
+++ b/god-ui/src/views/godTemplateInfo/templateInfo/index.vue
@@ -135,9 +135,9 @@
     <!-- 添加或修改模板管理对话框 -->
     <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="主键" prop="id">-->
-<!--          <el-input v-model="form.id" placeholder="请输入主键"/>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="主键" prop="id">-->
+        <!--          <el-input v-model="form.id" placeholder="请输入主键"/>-->
+        <!--        </el-form-item>-->
         <el-form-item label="模板名称" prop="templateName">
           <el-input v-model="form.templateName" placeholder="请输入模板名称"/>
         </el-form-item>
@@ -164,15 +164,15 @@
             <div slot="tip" class="el-upload__tip">只能上传mp4文件，且不超过100M</div>
           </el-upload>
         </el-form-item>
-<!--        <el-form-item label="文件上传">-->
-<!--          <el-upload class="upload-demo" ref="uploadFile" action="" :on-preview="handlePreview"-->
-<!--                     :on-remove="handleRemoveFiles" :on-change="handleChangeFiles" :before-upload="beforeUploadFiles"-->
-<!--                     :file-list="fileList" :auto-upload="true" multiple-->
-<!--          >-->
-<!--            <el-button size="small" type="primary">上传视频</el-button>-->
-<!--            <div slot="tip" class="el-upload__tip">只能上传mp4文件，且不超过100M</div>-->
-<!--          </el-upload>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="文件上传">-->
+        <!--          <el-upload class="upload-demo" ref="uploadFile" action="" :on-preview="handlePreview"-->
+        <!--                     :on-remove="handleRemoveFiles" :on-change="handleChangeFiles" :before-upload="beforeUploadFiles"-->
+        <!--                     :file-list="fileList" :auto-upload="true" multiple-->
+        <!--          >-->
+        <!--            <el-button size="small" type="primary">上传视频</el-button>-->
+        <!--            <div slot="tip" class="el-upload__tip">只能上传mp4文件，且不超过100M</div>-->
+        <!--          </el-upload>-->
+        <!--        </el-form-item>-->
         <el-form-item label="时间" prop="times">
           <el-date-picker clearable
                           v-model="form.times"
@@ -248,7 +248,7 @@ export default {
         video: null,
         times: null,
         sysType: null,
-        moduleType: null,
+        moduleType: 'templateInfo',
         reserveOne: null,
         reserveTwo: null,
         reserveThree: null,
@@ -269,7 +269,7 @@ export default {
       //文件上传参数
       upload: {
         // 设置上传的请求头部
-        headers: { Authorization: 'Bearer ' + getToken() },
+        headers: {Authorization: 'Bearer ' + getToken()},
         // TODO 上传的地址
         url: '/species/video/upload/file',
         // 上传的图片地址
@@ -389,7 +389,7 @@ export default {
         times: null,
         remark: null,
         sysType: null,
-        moduleType: null,
+        moduleType: 'templateInfo',
         reserveOne: null,
         reserveTwo: null,
         reserveThree: null,

From d1d1ad80c37fc04f2ff395a9c6f2b92a856ee07e Mon Sep 17 00:00:00 2001
From: zhoumingxiu <zhoumingxiu@inspur.com>
Date: Tue, 11 Jun 2024 14:44:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E8=BF=90=E5=8A=A8=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 god-ui/src/views/vlog/video/index.vue | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/god-ui/src/views/vlog/video/index.vue b/god-ui/src/views/vlog/video/index.vue
index ee7ff926..ff896e2b 100644
--- a/god-ui/src/views/vlog/video/index.vue
+++ b/god-ui/src/views/vlog/video/index.vue
@@ -96,7 +96,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="videoList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="videoList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="设备名称" align="center" prop="equipName"/>
       <el-table-column label="设备id" align="center" prop="equipId"/>
@@ -104,7 +104,7 @@
       <el-table-column label="用户id" align="center" prop="userId"/>
       <el-table-column label="视频名称" align="center" prop="videoName"/>
       <el-table-column label="时间" align="center" prop="videoTime" width="150"/>
-      <!--      <el-table-column label="视频地址" align="center" prop="fileUrl" />-->
+      <el-table-column label="视频地址" align="center" prop="fileUrl" show-overflow-tooltip/>
       <!--      <el-table-column label="图片" align="center" prop="phoneInfo" width="100">
               <template slot-scope="scope">
                 <image-preview :src="scope.row.phoneInfo" :width="50" :height="50"/>
@@ -112,7 +112,7 @@
             </el-table-column>-->
       <!--      <el-table-column label="数据类型" align="center" prop="dataType" />-->
       <el-table-column label="备注" align="center" prop="remark"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -135,7 +135,6 @@
             type="text"
             icon="el-icon-video-camera"
             @click="playVideo(scope.row)"
-            v-hasPermi="['species:video:remove']"
           >查看视频
           </el-button>
         </template>
@@ -168,22 +167,17 @@
         <el-form-item label="视频名称" prop="videoName">
           <el-input v-model="form.videoName" placeholder="请输入视频名称"/>
         </el-form-item>
-        <el-form-item label="视频时间" prop="videoTime">
+        <el-form-item label="时间" prop="videoTime">
           <el-date-picker clearable
                           v-model="form.videoTime"
                           type="datetime"
                           value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="请选择视频时间"
+                          placeholder="请选择时间"
                           style="width: 100%">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="视频地址" prop="fileUrl">
-          <el-input v-model="form.fileUrl"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注"/>
-        </el-form-item>
-        <el-form-item label="视频上传">
+          <el-input v-model="form.fileUrl" disabled/>
           <el-upload
             class="upload-demo"
             ref="uploadFile"
@@ -194,12 +188,14 @@
             :before-upload="beforeUploadFiles"
             :file-list="fileList"
             :auto-upload="true"
-            multiple
           >
             <el-button size="small" type="primary">上传视频</el-button>
-            <div slot="tip" class="el-upload__tip">只能上传mp4文件，且不超过100M</div>
+            <div slot="tip" class="el-upload__tip">只能上传mp4文件，且不超过50M</div>
           </el-upload>
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注"/>
+        </el-form-item>
         <!--        <el-form-item label="图片" prop="phoneInfo">
                   <image-upload v-model="form.phoneInfo"/>
                 </el-form-item>-->

From 8973be17fe180ca33a8334df6c2157466ab31285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E5=BA=8F=E6=8C=AF?= <luxuzhen@inspur.com>
Date: Tue, 11 Jun 2024 14:56:46 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B1=89=E4=B8=B0=E6=B9=96Vlog=E7=9F=AD?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=BA=94=E7=94=A8=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/GodTemplateInfoServiceImpl.java      | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/God-Vue-master/god-system/src/main/java/com/god/templateInfo/service/impl/GodTemplateInfoServiceImpl.java b/God-Vue-master/god-system/src/main/java/com/god/templateInfo/service/impl/GodTemplateInfoServiceImpl.java
index 3c7b8f3c..376144f8 100644
--- a/God-Vue-master/god-system/src/main/java/com/god/templateInfo/service/impl/GodTemplateInfoServiceImpl.java
+++ b/God-Vue-master/god-system/src/main/java/com/god/templateInfo/service/impl/GodTemplateInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package com.god.templateInfo.service.impl;
 
+import com.god.common.utils.uuid.IdUtils;
 import com.god.templateInfo.domain.GodTemplateInfo;
 import com.god.templateInfo.mapper.GodTemplateInfoMapper;
 import com.god.templateInfo.service.IGodTemplateInfoService;
@@ -10,85 +11,79 @@ import java.util.List;
 
 /**
  * 模板管理Service业务层处理
- * 
+ *
  * @author Lxz
  * @date 2024-06-11
  */
 @Service
-public class GodTemplateInfoServiceImpl implements IGodTemplateInfoService 
-{
+public class GodTemplateInfoServiceImpl implements IGodTemplateInfoService {
     @Autowired
     private GodTemplateInfoMapper godTemplateInfoMapper;
 
     /**
      * 查询模板管理
-     * 
+     *
      * @param id 模板管理主键
      * @return 模板管理
      */
     @Override
-    public GodTemplateInfo selectGodTemplateInfoById(String id)
-    {
+    public GodTemplateInfo selectGodTemplateInfoById(String id) {
         return godTemplateInfoMapper.selectGodTemplateInfoById(id);
     }
 
     /**
      * 查询模板管理列表
-     * 
+     *
      * @param godTemplateInfo 模板管理
      * @return 模板管理
      */
     @Override
-    public List<GodTemplateInfo> selectGodTemplateInfoList(GodTemplateInfo godTemplateInfo)
-    {
+    public List<GodTemplateInfo> selectGodTemplateInfoList(GodTemplateInfo godTemplateInfo) {
         return godTemplateInfoMapper.selectGodTemplateInfoList(godTemplateInfo);
     }
 
     /**
      * 新增模板管理
-     * 
+     *
      * @param godTemplateInfo 模板管理
      * @return 结果
      */
     @Override
-    public int insertGodTemplateInfo(GodTemplateInfo godTemplateInfo)
-    {
+    public int insertGodTemplateInfo(GodTemplateInfo godTemplateInfo) {
+        godTemplateInfo.setId(IdUtils.fastUUID());
         return godTemplateInfoMapper.insertGodTemplateInfo(godTemplateInfo);
     }
 
     /**
      * 修改模板管理
-     * 
+     *
      * @param godTemplateInfo 模板管理
      * @return 结果
      */
     @Override
-    public int updateGodTemplateInfo(GodTemplateInfo godTemplateInfo)
-    {
+    public int updateGodTemplateInfo(GodTemplateInfo godTemplateInfo) {
         return godTemplateInfoMapper.updateGodTemplateInfo(godTemplateInfo);
     }
 
     /**
      * 批量删除模板管理
-     * 
+     *
      * @param ids 需要删除的模板管理主键
      * @return 结果
      */
     @Override
-    public int deleteGodTemplateInfoByIds(String[] ids)
-    {
+    public int deleteGodTemplateInfoByIds(String[] ids) {
         return godTemplateInfoMapper.deleteGodTemplateInfoByIds(ids);
     }
 
     /**
      * 删除模板管理信息
-     * 
+     *
      * @param id 模板管理主键
      * @return 结果
      */
     @Override
-    public int deleteGodTemplateInfoById(String id)
-    {
+    public int deleteGodTemplateInfoById(String id) {
         return godTemplateInfoMapper.deleteGodTemplateInfoById(id);
     }
 }

From 878a5ead58758f881d5edaccfbb1d8422f0d2590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E5=BA=8F=E6=8C=AF?= <luxuzhen@inspur.com>
Date: Tue, 11 Jun 2024 15:06:56 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=B1=89=E4=B8=B0=E6=B9=96Vlog=E7=9F=AD?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=BA=94=E7=94=A8=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 god-ui/src/views/godTemplateInfo/templateInfo/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/god-ui/src/views/godTemplateInfo/templateInfo/index.vue b/god-ui/src/views/godTemplateInfo/templateInfo/index.vue
index 83c66453..6eee6b21 100644
--- a/god-ui/src/views/godTemplateInfo/templateInfo/index.vue
+++ b/god-ui/src/views/godTemplateInfo/templateInfo/index.vue
@@ -90,7 +90,7 @@
           <dict-tag :options="dict.type.template_type" :value="scope.row.templateType"/>
         </template>
       </el-table-column>
-      <el-table-column label="价格" align="center" prop="price"/>
+      <el-table-column label="价格(元)" align="center" prop="price"/>
       <el-table-column label="视频" align="center" prop="video" show-overflow-tooltip/>
       <el-table-column label="时间" align="center" prop="times">
         <template slot-scope="scope">
@@ -151,8 +151,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="价格" prop="price">
-          <el-input v-model="form.price" placeholder="请输入价格"/>
+        <el-form-item label="价格(元)" prop="price">
+          <el-input v-model="form.price" placeholder="请输入价格(元)"/>
         </el-form-item>
         <el-form-item label="视频" prop="video">
           <el-input v-model="form.video" placeholder="请上传视频" disabled/>