设备

huimv-admin/src/main/java/com/huimv/guowei/admin/AdminApplication.java

@@ -3,9 +3,11 @@ package com.huimv.guowei.admin;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @MapperScan("com.huimv.guowei.admin.mapper")
+//@EnableScheduling
 public class AdminApplication {
 
     public static void main(String[] args) {

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BaseDuckInfoController.java

@@ -4,16 +4,14 @@ package com.huimv.guowei.admin.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
+import com.huimv.guowei.admin.common.utils.UploadImage;
 import com.huimv.guowei.admin.entity.BaseDuckInfo;
 import com.huimv.guowei.admin.service.IBaseDuckInfoService;
-import com.huimv.guowei.admin.utils.UploadImage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.Map;
 

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDeviceController.java

@@ -31,7 +31,7 @@ public class EnvDeviceController {
     public Result listDevice(@RequestBody Map<String ,String> paramsMap){
         String deviceType = paramsMap.get("deviceType");
         String farmId = paramsMap.get("farmId");
-        String pageNo = paramsMap.get("pageNo");
+        String pageNo = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         Page<EnvDevice> page = new Page(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
 

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDeviceOnlineController.java

@@ -27,7 +27,7 @@ import java.util.Map;
 public class EnvDeviceOnlineController {
     @Resource
     private IEnvDeviceOnlineService envDeviceOnlineService;
-    @PostMapping("/getDate")
+    @PostMapping("/getDeviceStatus")
     public Result getDate(@RequestBody Map<String ,String> paramsMap){
         String farmId = paramsMap.get("farmId");
         Map resultMap = new HashMap();

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

@@ -4,6 +4,7 @@ import lombok.Data;
 
 @Data
 public class EnvDataVo {
+    private Integer id;
     private String buildName;
     private String envTemp;
     private String envHum;

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BaseBuildingServiceImpl.java

@@ -121,9 +121,9 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
         String farmId = map.get("farmId");
         String stageCode = map.get("stageCode");
         String buildName = map.get("buildName");
-        String pageNo = map.get("pageNo");
+        String pageNum = map.get("pageNum");
         String pageSize = map.get("pageSize");
-        Page<BaseBuilding> page = new Page(Integer.valueOf(pageNo),Integer.valueOf(pageSize));
+        Page<BaseBuilding> page = new Page(Integer.valueOf(pageNum),Integer.valueOf(pageSize));
         Page<BaseBuilding> baseBuildingPage = this.page(page, new QueryWrapper<BaseBuilding>()
                 .eq("farm_id", farmId)
                 .eq("f_type",1)

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvWarningInfoServiceImpl.java

@@ -28,7 +28,7 @@ public class EnvWarningInfoServiceImpl extends ServiceImpl<EnvWarningInfoMapper,
     public Result listWarning(Map<String, String> paramsMap) {
         String type = paramsMap.get("type");
         String farmId = paramsMap.get("farmId");
-        String pageNo = paramsMap.get("pageNo");
+        String pageNo = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         Page<EnvWarningInfo> page = new Page(Integer.parseInt(pageNo),Integer.valueOf(pageSize));
         //温湿度

huimv-admin/src/main/java/com/huimv/guowei/admin/timer/DeviceTimer.java

@@ -27,7 +27,7 @@ public class DeviceTimer {
     @Scheduled(cron = "0 */5 * * * ?")
 //    @Scheduled(cron = "*/5 * * * * ?")
     private void saveOnlineDevice(){
-        String farmId = "25";
+        String farmId = "21";
         double rate = 0.0;
         Integer deviceOff = envDeviceService.count(new QueryWrapper<EnvDevice>().eq("farm_id", farmId).eq("device_status", 0));
         Integer deviceOn = envDeviceService.count(new QueryWrapper<EnvDevice>().eq("farm_id", farmId).eq("device_status", 1));

huimv-admin/src/main/java/com/huimv/guowei/admin/utils/Print.java

@@ -1,70 +0,0 @@
-package com.huimv.guowei.admin.utils;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import org.jxls.common.Context;
-import org.jxls.util.JxlsHelper;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class Print {
-    /**
-     * 打印方法  不插入图片
-     * @throws Exception
-     * @return
-     */
-    public  static void print() throws Exception {
-        //准备数据
-        String path ="G://egg.xls";
-        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
-        //如果为系统路径 为： InputStream is = new FileInputStream("F://student.xlsx");
-        InputStream is = new FileInputStream("G://egg.xlsx");
-//        InputStream is = Print.class.getClassLoader().getResourceAsStream("student.xlsx");
-//        InputStream is = Print.class.getClassLoader().getResourceAsStream("order_contract.xls");
-        //根据模板生成的文件保存路径  我这里保存在本地D盘
-        OutputStream os = new FileOutputStream(path);
-        //绑定数据
-        Context context = new Context();
-/*        context.putVar("duckCode", "100104010");
-        context.putVar("duckType", "北京麻鸭");
-        context.putVar("duckSex", "母");
-        context.putVar("duckDate", "2023-06-05");
-        context.putVar("address", "杭州余杭");
-        context.putVar("father", "41324546");
-        context.putVar("father2", "A");
-        context.putVar("mother", "46465416");
-        context.putVar("mother2", "B");
-        String s = "";
-        for (int i = 0; i < 3; i++) {
-            s = s.concat(i + "日龄：" + i+"，");
-        }
-        context.putVar("weight", s);
-        context.putVar("need", "wu");
-        context.putVar("env", "集中式养殖");
-        context.putVar("record", "");
-        context.putVar("record2", "111");*/
-/*        List<Abc> list = new ArrayList<>();
-        for (int i = 0; i < 3; i++) {
-            Abc abc = new Abc();
-            abc.setDuckCode(String.valueOf(i));
-            abc.setDate(String.valueOf(i + 1));
-            abc.setFeed(String.valueOf(i + 2));
-            abc.setEggNum(String.valueOf(i + 3));
-            abc.setWeight(String.valueOf(i + 5));
-            list.add(abc);
-        }
-        context.putVar("list", list);*/
-        //生成
-        JxlsHelper.getInstance().processTemplate(is, os, context);
-//        String path = String.valueOf(os);
-
-    }
-
-}

huimv-admin/src/main/java/com/huimv/guowei/admin/utils/SpringUtil.java

@@ -1,36 +0,0 @@
-package com.huimv.guowei.admin.utils;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-
-@Component
-public class SpringUtil implements ApplicationContextAware {
-    private static ApplicationContext applicationContext = null;
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        if(SpringUtil.applicationContext == null){
-            SpringUtil.applicationContext  = applicationContext;
-        }
-    }
-
-    public static ApplicationContext getApplicationContext() {
-        return applicationContext;
-    }
-
-    public static Object getBean(String name){
-        return getApplicationContext().getBean(name);
-    }
-
-    public static <T> T getBean(Class<T> clazz){
-        return getApplicationContext().getBean(clazz);
-    }
-
-    public static <T> T getBean(String name,Class<T> clazz){
-        return getApplicationContext().getBean(name, clazz);
-    }
-
-
-}

huimv-admin/src/main/java/com/huimv/guowei/admin/utils/UploadImage.java

@@ -1,182 +0,0 @@
-package com.huimv.guowei.admin.utils;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.UUID;
-import com.jcraft.jsch.*;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.util.Date;
-
-@Component
-public class UploadImage {
-
-    @Value("${img.basePath}")
-    private   String basePath="/home/huimv/img/";
-
-    @Value("${img.ip}")
-    private    String ip="139.9.167.178" ;
-//    private   String ip = "36.134.209.211";
-//    private   String ip = "192.168.0.13";
-
-    @Value("${img.user}")
-    private  String user="huimv" ;
-
-//    private   String password = "!Hm537e@1";
-
-    @Value("${img.password}")
-    private   String password ="!hm123@1";
-
-    @Value("${img.port}")
-    public   Integer port=22 ;
-
-    @Value("${img.url}")
-    public   String url ="https://img.ifarmcloud.com/images/";
-
-
-
-    /**
-     * 利用JSch包实现SFTP上传文件
-     * @param bytes  文件字节流
-     * @param fileName  文件名
-     * @throws Exception
-     */
-    public   void sshSftp(byte[] bytes,String path,String fileName) throws Exception{
-
-        // 服务器保存路径
-        String filepath = basePath +path ;
-        Session session = null;
-        Channel channel = null;
-
-        JSch jSch = new JSch();
-
-        if(port <=0){
-            //连接服务器，采用默认端口
-            session = jSch.getSession(user, ip);
-        }else{
-            //采用指定的端口连接服务器
-            session = jSch.getSession(user, ip ,port);
-        }
-
-        //如果服务器连接不上，则抛出异常
-        if (session == null) {
-            throw new Exception("session is null");
-        }
-
-        //设置登陆主机的密码
-        session.setPassword(password);//设置密码
-        //设置第一次登陆的时候提示，可选值：(ask | yes | no)
-        session.setConfig("userauth.gssapi-with-mic","no");
-        session.setConfig("StrictHostKeyChecking", "no");
-        //设置登陆超时时间
-        session.connect(30000);
-
-        OutputStream outstream = null;
-        try {
-            //创建sftp通信通道
-            channel = (Channel) session.openChannel("sftp");
-            channel.connect(1000);
-            ChannelSftp sftp = (ChannelSftp) channel;
-
-            //进入服务器指定的文件夹
-            sftp.cd(basePath);
-
-            SftpATTRS attrs = null;
-            try {
-                attrs = sftp.stat(filepath);
-            } catch (Exception e) {
-                // TODO: handle exception
-            }
-            if (attrs == null) {
-                sftp.mkdir(filepath);
-                System.out.println(("创建子目录：" + filepath));
-            }
-            sftp.cd(filepath);
-
-            //以下代码实现从本地上传一个文件到服务器，如果要实现下载，对换一下流就可以了
-            outstream = sftp.put(fileName);
-            outstream.write(bytes);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            //关流操作
-            if (outstream != null) {
-                outstream.flush();
-                outstream.close();
-            }
-            if (session != null) {
-                session.disconnect();
-            }
-            if (channel != null) {
-                channel.disconnect();
-            }
-            System.out.println("上传成功!");
-        }
-    }
-
-    //上传压缩的图片
-    public  String getImageCom(MultipartFile image) throws IOException {
-        //获取文件输入流
-        InputStream inputStream = image.getInputStream();
-        String originalFilename = image.getOriginalFilename();
-        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
-        String path = DateUtil.format(new Date(), "yyyy-MM");
-
-        try {
-            // 把图片读入到内存中
-            BufferedImage bufImg = ImageIO.read(inputStream);
-            // 压缩代码,存储图片文件byte数组
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            //防止图片变红,这一步非常重要
-            BufferedImage bufferedImage = new BufferedImage(bufImg.getWidth(), bufImg.getHeight(), BufferedImage.TYPE_INT_RGB);
-            bufferedImage.createGraphics().drawImage(bufImg,0,0, Color.WHITE,null);
-            //先转成jpg格式来压缩,然后在通过OSS来修改成源文件本来的后缀格式
-            ImageIO.write(bufferedImage,"jpg",bos);
-            byte[] bytes = bos.toByteArray();
-            String imgname = UUID.randomUUID() + "." + filenameExtension;
-            sshSftp(bytes, path, imgname);
-            return url+ path + "/" + imgname;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "上传失败";
-        } finally {
-            inputStream.close();
-        }
-    }
-
-
-    //上传原图
-    public  String uploadImg( MultipartFile image ) {
-        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 "上传失败";
-        }
-    }
-
-}
-

huimv-admin/src/main/resources/mapper/EnvDataMapper.xml

@@ -19,7 +19,7 @@
     </resultMap>
 
     <select id="getLastFlow" resultType="com.huimv.guowei.admin.entity.vo.EnvDataVo">
-        SELECT b.build_name,d.env_temp,d.env_hum FROM `env_data` d LEFT JOIN `base_building`  b
+        SELECT b.id,b.build_name,d.env_temp,d.env_hum FROM `env_data` d LEFT JOIN `base_building`  b
     ON b.id = d.unit_id
     WHERE d.id IN (
         SELECT MAX(id)
@@ -56,7 +56,7 @@
         SELECT ROUND(AVG(env_temp),2) 'envTemp',ROUND(AVG(env_hum),2) 'envHum',create_time FROM `env_data`
         WHERE unit_id = #{unitId}
         AND farm_id = #{farmId}
-        AND create_time BETWEEN '#{startDate}' AND '#{endDate}'
+        AND create_time BETWEEN '${startDate}' AND '${endDate}'
         GROUP BY DATE_FORMAT(create_time,"%Y-%m-%d")
     </select>