From d91d97bbb48416b34f27469e5f988d55c8969b97 Mon Sep 17 00:00:00 2001
From: m1991 <shenglonghua@1rock.net>
Date: Wed, 10 Mar 2021 16:52:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=AE=AF=E6=A8=A1=E5=9D=97=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E2=80=94=E2=80=94=E8=A7=86=E9=A2=91=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wisenergy/common/utils/FrameGrabberKit.java |  5 ++---
 .../java/cn/wisenergy/mapper/ShopZxMapper.java  |  3 ++-
 .../src/main/resources/mapper/ShopZxMapper.xml  |  4 ++--
 .../java/cn/wisenergy/model/app/shopZx.java     |  2 +-
 .../service/app/impl/UploadServiceImpl.java     | 17 ++++++-----------
 5 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/wisenergy-common/src/main/java/cn/wisenergy/common/utils/FrameGrabberKit.java b/wisenergy-common/src/main/java/cn/wisenergy/common/utils/FrameGrabberKit.java
index 457c0d2..9497a89 100644
--- a/wisenergy-common/src/main/java/cn/wisenergy/common/utils/FrameGrabberKit.java
+++ b/wisenergy-common/src/main/java/cn/wisenergy/common/utils/FrameGrabberKit.java
@@ -6,7 +6,7 @@ import java.awt.image.BufferedImage;
 import java.io.File;
 import javax.imageio.ImageIO;
 
-
+import org.bytedeco.javacpp.opencv_core;
 import org.bytedeco.javacv.FFmpegFrameGrabber;
 import org.bytedeco.javacv.Frame;
 import org.bytedeco.javacv.Java2DFrameConverter;
@@ -44,7 +44,7 @@ public class FrameGrabberKit {
      * 获取指定视频的帧并保存为图片至指定目录
      *
      * @param videofile 源视频文件路径
-     * @param framefile 截取帧的图片存放路径 例：F:/hfkjrecorder/target/4.jpg
+     * @param framefile 截取帧的图片存放路径 例：F:\hfkjrecorder\target\4.jpg
      * @throws Exception
      */
     public static void fetchFrame(String videofile, String framefile) throws Exception {
@@ -82,5 +82,4 @@ public class FrameGrabberKit {
         //ff.flush();
         ff.stop();
     }
-
 }
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java
index 74e950f..471965d 100644
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java
+++ b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigInteger;
 import java.util.List;
 
 
@@ -20,7 +21,7 @@ public interface ShopZxMapper extends BaseMapper<shopZx> {
      * @param
      * @return 1
      */
-    int zxadd(@Param("zxUrl") String zxUrl,@Param("zxField") String zxField,@Param("zxAddress") String zxAddress,@Param("inviteCode") String inviteCode,@Param("zxDate") String zxDate);
+    int zxadd(@Param("zxUrl") String zxUrl,@Param("zxField") String zxField,@Param("zxAddress") String zxAddress,@Param("inviteCode") String inviteCode,@Param("zxDate") Long zxDate);
 
     /**
      * 查询资讯数据
diff --git a/wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml b/wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
index a1e52a9..2abecac 100644
--- a/wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
+++ b/wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
@@ -16,12 +16,12 @@
     </sql>
 
     <sql id="cols_all">
-        zxid,
+        zx_id as zxid,
         <include refid="cols_exclude_id"/>
     </sql>
 
     <sql id="cols_exclude_id">
-        zxUrl,zxField,zxAddress,inviteCode,zxDate
+        zx_url,zx_field,zx_address,invite_code,zx_date
     </sql>
 
     <sql id="vals">
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/shopZx.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/shopZx.java
index 551dd95..106b640 100644
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/shopZx.java
+++ b/wisenergy-model/src/main/java/cn/wisenergy/model/app/shopZx.java
@@ -65,7 +65,7 @@ public class shopZx extends Model<shopZx> implements Serializable {
      * 资讯数据创建时间
      */
     @ApiModelProperty(name = "zx_date", value = "资讯数据创建时间")
-    private BigInteger zxDate;
+    private Long zxDate;
 
 
 
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
index 46e6748..8a4ce87 100644
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
+++ b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
@@ -12,7 +12,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -20,16 +19,12 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import cn.wisenergy.service.app.UploadService;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 import cn.wisenergy.mapper.ShopZxMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ClassUtils;
 
 
 /**
@@ -93,8 +88,8 @@ public class UploadServiceImpl implements UploadService {
         /**
          * 生成当前时间戳
          */
-        BigInteger zxDate= BigInteger.valueOf(System.currentTimeMillis());
-        shopZxMapper.zxadd(zxUrl,zxField,zxAddress,inviteCode, String.valueOf(zxDate));
+        Long zxDate= System.currentTimeMillis();
+        shopZxMapper.zxadd(zxUrl,zxField,zxAddress,inviteCode, zxDate);
         return resultMap;
     }
 
@@ -108,7 +103,7 @@ public class UploadServiceImpl implements UploadService {
             /**
              * 生成当前时间戳
              */
-            BigInteger zxDate= BigInteger.valueOf(System.currentTimeMillis());
+            Long zxDate= Long.valueOf(System.currentTimeMillis());
 
             String basePath = request.getScheme() + "://" + request.getServerName()
                     + ":" + request.getServerPort()+"/mimi/upload/images/";
@@ -136,7 +131,7 @@ public class UploadServiceImpl implements UploadService {
 
             resultMap.put("zxUrl", zxUrl);
             resultMap.put("returnCode", 0);
-            shopZxMapper.zxadd(zxUrl,zxField,zxAddress,inviteCode, String.valueOf(zxDate));
+            shopZxMapper.zxadd(zxUrl,zxField,zxAddress,inviteCode, zxDate);
             return resultMap;
         }
 
@@ -146,7 +141,7 @@ public class UploadServiceImpl implements UploadService {
         /**
          * 生成当前时间戳
          */
-        BigInteger zxDate= BigInteger.valueOf(System.currentTimeMillis());
+        Long zxDate= Long.valueOf(System.currentTimeMillis());
         //获取上传图片数量，打印在控制台
         System.out.println("上传图片数量" + files.length);
         //创建集合
@@ -199,7 +194,7 @@ public class UploadServiceImpl implements UploadService {
         String root_json = JSON.toJSONString(root);
         System.out.println(root_json);
         result.put("returnCode", 0);
-        shopZxMapper.zxadd(zxUrl,zxField,zxAddress,inviteCode, String.valueOf(zxDate));
+        shopZxMapper.zxadd(zxUrl,zxField,zxAddress,inviteCode, zxDate);
         return root;
     }
 
-- 
2.18.1