Bläddra i källkod

生物防控人员2

523096025 1 år sedan
förälder
incheckning
42a91e349d

+ 1 - 1
huimv-admin/src/main/java/com/huimv/admin/entity/vo/EnvDataVo.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 @Data
 public class EnvDataVo {
-    private String buildName;
+    private String location;
     private String hum;
     private String temp;
     private String aq;

+ 3 - 13
huimv-admin/src/main/java/com/huimv/admin/service/impl/EnvDeviceServiceImpl.java

@@ -480,17 +480,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         List objects = new ArrayList<>();
         if ("0".equals(displayType)) {
             List<EnvDataVo> envDataVos = dataMapper.listPigpenAll(farmId);
-            for (EnvDataVo envDataVo : envDataVos) {
-                JSONObject jsonObject = new JSONObject();
-                jsonObject.put("temp", envDataVo.getTemp());//温度
-                jsonObject.put("hum", envDataVo.getHum());//湿度
-                jsonObject.put("location", envDataVo.getBuildName());
-                jsonObject.put("aq", envDataVo.getAq());
-                jsonObject.put("unit_id", envDataVo.getUnitId());//单元id
-                objects.add(jsonObject);
-            }
-
-            return new Result(ResultCode.SUCCESS, objects);
+            return new Result(ResultCode.SUCCESS, envDataVos);
         } else {
             QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq("farm_id", farmId).eq("f_type", 3);
@@ -506,12 +496,12 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
                     jsonObject.put("hum", writeEnvData.getHum());//湿度
                     jsonObject.put("location", basePigpen.getBuildName());
                     jsonObject.put("aq", writeEnvData.getAq());
-                    jsonObject.put("unit_id", basePigpen.getId());//单元id
+                    jsonObject.put("unitId", basePigpen.getId());//单元id
                 } else {
                     jsonObject.put("temp", 0);//温度
                     jsonObject.put("hum", 0);//湿度
                     jsonObject.put("location", basePigpen.getBuildName());
-                    jsonObject.put("unit_id", basePigpen.getId());//单元id
+                    jsonObject.put("unitId", basePigpen.getId());//单元id
                     jsonObject.put("aq", 0);
                 }
                 objects.add(jsonObject);

+ 3 - 3
huimv-admin/src/main/java/com/huimv/admin/service/impl/ProtDataServiceImpl.java

@@ -1002,7 +1002,7 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             queryWrapper.eq("farm_id", farmId).eq("type", 1).orderByDesc("create_date").last(" limit 1");
             WriteProtData writeProtData = writeProtDataMapper.selectOne(queryWrapper);
             if (ObjectUtil.isEmpty(writeProtData)) {
-                jsonObject.put("in", 0);
+                jsonObject.put("in", new WriteProtData());
             } else {
                 jsonObject.put("in", writeProtData);
             }
@@ -1011,7 +1011,7 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             queryWrapper1.eq("farm_id", farmId).eq("type", 2).orderByDesc("create_date").last(" limit 1");
             WriteProtData writeProtData1 = writeProtDataMapper.selectOne(queryWrapper1);
             if (ObjectUtil.isEmpty(writeProtData1)) {
-                jsonObject.put("deal", 0);
+                jsonObject.put("deal", new WriteProtData());
             } else {
                 jsonObject.put("deal", writeProtData1);
             }
@@ -1020,7 +1020,7 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             queryWrapper2.eq("farm_id", farmId).eq("type", 3).orderByDesc("create_date").last(" limit 1");
             WriteProtData writeProtData2 = writeProtDataMapper.selectOne(queryWrapper2);
             if (ObjectUtil.isEmpty(writeProtData2)) {
-                jsonObject.put("out", 0);
+                jsonObject.put("out", new WriteProtData());
             } else {
                 jsonObject.put("out", writeProtData2);
             }

+ 1 - 1
huimv-admin/src/main/resources/com/huimv/admin/mapper/EnvDataMapper.xml

@@ -39,7 +39,7 @@
 
     <select id="listPigpenAll" resultType="com.huimv.admin.entity.vo.EnvDataVo">
  SELECT
-    bp.build_name buildName,
+    bp.build_name location,
     COALESCE(ed.env_temp,0) temp,
      COALESCE(ed.env_hum,0) hum,
      COALESCE(ed.unit_id,0) unitId,

+ 10 - 0
huimv-receive/pom.xml

@@ -119,6 +119,16 @@
             <version>0.1.54</version>
         </dependency>
         <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>javacv-platform</artifactId>
+            <version>1.5.7</version>
+        </dependency>
+        <dependency>
+            <groupId>ws.schild</groupId>
+            <artifactId>jave-nativebin-linux64</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+        <dependency>
             <groupId>org.jxls</groupId>
             <artifactId>jxls</artifactId>
             <version>2.6.0</version>

+ 106 - 0
huimv-receive/src/main/java/com/huimv/receive/common/utils/UploadImage.java

@@ -3,6 +3,10 @@ package com.huimv.receive.common.utils;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.UUID;
 import com.jcraft.jsch.*;
+import org.bytedeco.ffmpeg.avcodec.AVCodec;
+import org.bytedeco.javacv.FFmpegFrameGrabber;
+import org.bytedeco.javacv.FFmpegFrameRecorder;
+import org.bytedeco.javacv.Frame;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
@@ -12,6 +16,7 @@ import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.*;
+import java.nio.file.Files;
 import java.util.Date;
 
 @Component
@@ -178,6 +183,107 @@ public class UploadImage {
         }
     }
 
+    //上传压缩的视频
+    public  String getVideoCom(MultipartFile image) throws IOException {
+        String originalFilename = image.getOriginalFilename();
+        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
+        String path = DateUtil.format(new Date(), "yyyy-MM");
+        try {
+            InputStream inputStream = image.getInputStream();
+            BufferedInputStream in = new BufferedInputStream(inputStream);
+            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+
+            byte[] temp = new byte[1024];
+            int size = 0;
+            while ((size = in.read(temp)) != -1) {
+                out.write(temp, 0, size);
+            }
+            in.close();
+            byte[] content = out.toByteArray();
+            String imgname = UUID.randomUUID() + "." + filenameExtension;
+            sshSftp(content, path, imgname);
+            return url + path + "/" + imgname;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "上传失败";
+        }
+
+//        //获取文件输入流
+//        InputStream inputStream = image.getInputStream();
+//        String originalFilename = image.getOriginalFilename();
+//        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
+//        String path = DateUtil.format(new Date(), "yyyy-MM");
+//
+//        try {
+//
+//            File tempFile = new File("tempVideo.mp4");
+//            image.transferTo(tempFile);
+////
+////            // 使用FFmpegFrameGrabber读取视频信息
+////            FFmpegFrameGrabber grabber = new FFmpegFrameGrabber(tempFile);
+////            grabber.start();
+////
+////            // 创建输出文件
+////            File compressedFile = new File("compressedVideo.mp4");
+////
+////            // 使用FFmpegFrameRecorder进行压缩
+////            FFmpegFrameRecorder recorder = new FFmpegFrameRecorder(compressedFile, grabber.getImageWidth(), grabber.getImageHeight(), grabber.getAudioChannels());
+////            recorder.setInterleaved(true);
+////            recorder.setVideoOption("preset", "ultrafast"); // 设置压缩速度,可以根据需要调整
+////            recorder.setVideoOption("crf", "40"); // 设置视频质量,范围通常是0-51,值越大压缩率越高,质量越低
+////            recorder.setVideoCodec(findH264Encoder(recorder)); // 查找并设置H.264编解码器
+////            recorder.setFormat("mp4");
+////            recorder.setFrameRate(grabber.getFrameRate());
+////            recorder.setSampleRate(grabber.getSampleRate());
+////            recorder.setAudioBitrate(grabber.getAudioBitrate());
+////            recorder.setVideoBitrate(grabber.getVideoBitrate() / 2); // 压缩一半的视频比特率
+////
+////            // 开始录制并压缩视频
+////            recorder.start();
+////            Frame frame;
+////            while ((frame = grabber.grabFrame()) != null) {
+////                recorder.record(frame);
+////            }
+////            recorder.stop();
+////            grabber.stop();
+////
+////            // 读取压缩后的视频为字节数组
+////            byte[] compressedVideoBytes = Files.readAllBytes(compressedFile.toPath());
+////
+////            // 删除临时文件
+////            tempFile.delete();
+////            compressedFile.delete();
+////
+//            String imgname = UUID.randomUUID() + "." + filenameExtension;
+//            sshSftp(image, path, imgname);
+//            return url+ path + "/" + imgname;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return "上传失败";
+//        } finally {
+//            inputStream.close();
+//        }
+    }
+
+//    private int findH264Encoder(FFmpegFrameRecorder recorder) {
+//        AVCodec codec = null;
+//
+//        AVCodec.avcodec_register_all(); // 注册所有编解码器
+//        for (AVCodec.AVCodecDescriptor desc : AVCodec.avcodec_descriptor_get(null)) {
+//            if (desc.type() == AVCodec.AVMEDIA_TYPE_VIDEO &&
+//                    desc.id() != AVCodec.AV_CODEC_ID_NONE &&
+//                    desc.name().equals("libx264")) { // libx264是H.264的常用编码器名称
+//                codec = AVCodec.avcodec_find_encoder(desc.id());
+//                break;
+//            }
+//        }
+//        if (codec == null) {
+//            throw new RuntimeException("H.264 encoder not found");
+//        }
+//        return codec.id();
+//    }
+
+
 }
 
 

+ 6 - 0
huimv-receive/src/main/java/com/huimv/receive/controller/LoginController.java

@@ -49,6 +49,8 @@ public class LoginController {
         return iLoginService.logout();
     }
 
+
+
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
 
@@ -367,6 +369,10 @@ public class LoginController {
         System.out.println(stringResponseEntity.getBody());
         return new Result(ResultCode.SUCCESS,JSON.parseObject(stringResponseEntity.getBody()));
     }
+    @PostMapping("/register2")
+    public String register2( @RequestParam(value = "imgUrl", required = false) MultipartFile imgUrl) throws IOException {
+        return   uploadImage.getVideoCom(imgUrl);
+    }
 
 
     @PostMapping("/register")