修改3

huimv-admin/src/main/java/com/huimv/admin/config/InterceptorConfig.java

@@ -21,7 +21,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/huatongApi/admin/my/*")
-                .excludePathPatterns("/huatongApi/receive/feed");
+                excludePathPatterns("/huatongApi/admin/my/*","/huatongApi/env-nh3-n/send")
+                .excludePathPatterns("/huatongApi/receive/feed","/huatongApi/energy-data/getData");
     }
 }

huimv-admin/src/main/java/com/huimv/admin/controller/EnergyDataController.java

@@ -1,8 +1,15 @@
 package com.huimv.admin.controller;
 
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.EnergyData;
+import com.huimv.admin.entity.EnergyEnvDevice;
+import com.huimv.admin.entity.vo.WaterAndElectricity;
 import com.huimv.admin.service.IEnergyDataService;
+import com.huimv.admin.service.IEnergyEnvDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,6 +38,8 @@ public class EnergyDataController {
 
     @Autowired
     private IEnergyDataService iEnergyDataService;
+    @Autowired
+    private IEnergyEnvDeviceService deviceService;
 
     @RequestMapping("/listCount")
     public Result listCount(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
@@ -54,4 +66,25 @@ public class EnergyDataController {
     public Result listRankScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
         return iEnergyDataService.listRankScreen(httpServletRequest, paramsMap);
     }
+
+
+    @RequestMapping("/getData")
+    public void getData( @RequestBody List<WaterAndElectricity> result) {
+//        List<WaterAndElectricity> result = (List) paramsMap.get("result");
+        System.out.println("接受到的数据格式:"+result);
+        for (WaterAndElectricity jsonObject : result) {
+            EnergyData energyData = new EnergyData();
+            energyData.setFeedValue("0.00");
+            energyData.setWaterValue(jsonObject.getWater());
+            energyData.setElectricityValue(jsonObject.getElectricity());
+            energyData.setGasValue("0.00");
+            energyData.setFarmId(26);
+            energyData.setCreateDate(new Date());
+            QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", 26).eq("device_code", jsonObject.getDeviceCode());
+            EnergyEnvDevice device = deviceService.getOne(queryWrapper);
+            energyData.setUnitId(device.getUnitId());
+            iEnergyDataService.save(energyData);
+        }
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/controller/EnvNh3nController.java

@@ -0,0 +1,62 @@
+package com.huimv.admin.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.admin.entity.EnvDevice;
+import com.huimv.admin.entity.EnvNh3n;
+import com.huimv.admin.service.IEnvDeviceService;
+import com.huimv.admin.service.IEnvNh3nService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-27
+ */
+@RestController
+@RequestMapping("/env-nh3-n")
+@CrossOrigin
+public class EnvNh3nController {
+
+    @Autowired
+    private IEnvNh3nService nh3nService;
+    @Autowired
+    private IEnvDeviceService deviceService;
+    @RequestMapping("/send")
+    public void getNh3n(@RequestBody Map<String,String> paramsMap) {
+        String result = paramsMap.get("result");
+        String[] split = result.split(",");
+        String nh3n = split[0];
+        String deviceCode = split[1];
+        QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("remark", deviceCode.substring(4)).eq("farm_id", 26);
+        EnvDevice device = deviceService.getOne(queryWrapper);
+        if (ObjectUtil.isNotEmpty(device)) {
+            EnvNh3n envNh3n = new EnvNh3n();
+            envNh3n.setFarmId(26);
+            envNh3n.setCreateDate(new Date());
+            envNh3n.setUnitId(device.getUnitId());
+            envNh3n.setDeviceCode(device.getDeviceCode());
+            envNh3n.setNh3N(nh3n.substring(4));
+            nh3nService.save(envNh3n);
+        }
+    }
+
+//    public static void main(String[] args) {
+//        String s = "0*001.7,9:0*980700100005,9:1*0000E";
+//        String[] split = s.split(",");
+//        String s1 = split[0];
+//        System.out.println(s1.substring(4));
+//        String s2 = split[1];
+//        System.out.println(s2.substring(4));
+//
+//    }
+}

huimv-admin/src/main/java/com/huimv/admin/entity/EnvNh3n.java

@@ -0,0 +1,50 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_nh3n")
+public class EnvNh3n implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 牧场
+     */
+    private Integer farmId;
+
+    private String nh3N;
+
+    private Integer unitId;
+
+    private String deviceCode;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createDate;
+
+
+
+}

huimv-admin/src/main/java/com/huimv/admin/entity/vo/WaterAndElectricity.java

@@ -0,0 +1,11 @@
+package com.huimv.admin.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class WaterAndElectricity {
+
+    private String water;
+    private String electricity;
+    private String deviceCode;
+}

huimv-admin/src/main/java/com/huimv/admin/mapper/EnvNh3nMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.EnvNh3n;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-27
+ */
+public interface EnvNh3nMapper extends BaseMapper<EnvNh3n> {
+
+}

huimv-admin/src/main/java/com/huimv/admin/service/IEnvNh3nService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.EnvNh3n;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-27
+ */
+public interface IEnvNh3nService extends IService<EnvNh3n> {
+
+}

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

@@ -16,10 +16,7 @@ import com.hikvision.cms.api.common.util.HttpClientSSLUtils;
 import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
-import com.huimv.admin.entity.BasePigpen;
-import com.huimv.admin.entity.EnvData;
-import com.huimv.admin.entity.EnvDevice;
-import com.huimv.admin.entity.EnvWarningInfo;
+import com.huimv.admin.entity.*;
 import com.huimv.admin.entity.dto.DeviceDto;
 import com.huimv.admin.entity.vo.EnvDataVo;
 import com.huimv.admin.entity.zengxindto.*;
@@ -63,6 +60,8 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
     private RestTemplate restTemplate;
     @Autowired
     private EnvWarningInfoMapper warningInfoMapper;
+    @Autowired
+    private EnvNh3nMapper nh3nMapper;
 
     @Override
     public Result count(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -403,8 +402,16 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
                 jsonObject.put("temp", envData.getEnvTemp());//温度
                 jsonObject.put("hum", envData.getEnvHum());//湿度
                 jsonObject.put("location", envData.getBuildName());
+                QueryWrapper<EnvNh3n> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("farm_id", farmId).eq("unit_id", envData.getUnitId())
+                        .orderByDesc("id").last(" limit 1");
+                EnvNh3n envNh3n = nh3nMapper.selectOne(queryWrapper);
+                if (ObjectUtil.isNotEmpty(envNh3n)) {
+                    jsonObject.put("aq", envNh3n.getNh3N());//单元id
+                }else {
+                    jsonObject.put("aq", 0);//单元id
+                }
                 jsonObject.put("unit_id", envData.getId());//单元id
-                jsonObject.put("aq", 0);//单元id
             }else {
                 jsonObject.put("temp", 0);//温度
                 jsonObject.put("hum", 0);//湿度

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnvNh3nServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.EnvNh3n;
+import com.huimv.admin.mapper.EnvNh3nMapper;
+import com.huimv.admin.service.IEnvNh3nService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-27
+ */
+@Service
+public class EnvNh3nServiceImpl extends ServiceImpl<EnvNh3nMapper, EnvNh3n> implements IEnvNh3nService {
+
+}

huimv-admin/src/main/java/com/huimv/admin/timer/EnergyTimer.java

@@ -35,7 +35,7 @@ public class EnergyTimer {
     @Scheduled(cron = "0 0 */1 * * ? ")
 //    @Scheduled(cron = "0 */1 * * * ? ")
     private void getShenChan() throws Exception {
-        List<EnergyEnvDevice> energyEnvDevices = deviceMapper.selectList(null);
+        List<EnergyEnvDevice> energyEnvDevices = deviceMapper.selectList(new QueryWrapper<EnergyEnvDevice>().ne("farm_id",26));
 
         for (EnergyEnvDevice energyEnvDevice : energyEnvDevices) {
             QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();

huimv-admin/src/main/java/com/huimv/admin/timer/EnvTimer.java

@@ -226,34 +226,34 @@ public class EnvTimer {
             envDataService.save(envData);
         }
 
-        Integer farmId3 = 26;
-        List<BasePigpen> list3 = basePigpenService.list(new QueryWrapper<BasePigpen>().eq("farm_id", farmId3).eq("f_type", 3));
-//        String url="https://restapi.amap.com/v3/weather/weatherInfo?parameters&key=c1d8179ed2dda7ed48c56bed06c0c86e&city=330782&extensions=base&output=JSON";
-//        String result = HttpUtil.get(url);
-//        WeatherDto weatherDto = JSONUtil.toBean(result, WeatherDto.class);
-//        List<WeatherLives> lives = weatherDto.getLives();
-//        WeatherLives weatherLives = lives.get(0);
-//        int humidity = Integer.parseInt(weatherLives.getHumidity());
-//        int temperature = Integer.parseInt(weatherLives.getTemperature());
-
-        for (BasePigpen basePigpen : list3) {
-            EnvData envData = new EnvData();
-            envData.setCreateTime(new Date());
-            envData.setFarmId(farmId3);
-            envData.setUnitId(basePigpen.getId());
-            EnvDevice envDevice = new EnvDevice();
-            envDevice.setUnitName(basePigpen.getBuildName());
-            envDevice.setUnitId(basePigpen.getId());
-            envDevice.setFarmId(farmId3);
-
-            String tem = NumberUtils.getNum(17, 23, 1);
-            String hum = NumberUtils.getNum(65, 80, 0);
-            saveTemWarning(tem, envWarningThreshold2, envDevice, farmId3);
-            envData.setEnvTemp(tem);
-            saveHumWarning(hum, envWarningThreshold2, envDevice, farmId3);
-            envData.setEnvHum(hum);
-            envDataService.save(envData);
-        }
+//        Integer farmId3 = 26;
+//        List<BasePigpen> list3 = basePigpenService.list(new QueryWrapper<BasePigpen>().eq("farm_id", farmId3).eq("f_type", 3));
+////        String url="https://restapi.amap.com/v3/weather/weatherInfo?parameters&key=c1d8179ed2dda7ed48c56bed06c0c86e&city=330782&extensions=base&output=JSON";
+////        String result = HttpUtil.get(url);
+////        WeatherDto weatherDto = JSONUtil.toBean(result, WeatherDto.class);
+////        List<WeatherLives> lives = weatherDto.getLives();
+////        WeatherLives weatherLives = lives.get(0);
+////        int humidity = Integer.parseInt(weatherLives.getHumidity());
+////        int temperature = Integer.parseInt(weatherLives.getTemperature());
+//
+//        for (BasePigpen basePigpen : list3) {
+//            EnvData envData = new EnvData();
+//            envData.setCreateTime(new Date());
+//            envData.setFarmId(farmId3);
+//            envData.setUnitId(basePigpen.getId());
+//            EnvDevice envDevice = new EnvDevice();
+//            envDevice.setUnitName(basePigpen.getBuildName());
+//            envDevice.setUnitId(basePigpen.getId());
+//            envDevice.setFarmId(farmId3);
+//
+//            String tem = NumberUtils.getNum(17, 23, 1);
+//            String hum = NumberUtils.getNum(65, 80, 0);
+//            saveTemWarning(tem, envWarningThreshold2, envDevice, farmId3);
+//            envData.setEnvTemp(tem);
+//            saveHumWarning(hum, envWarningThreshold2, envDevice, farmId3);
+//            envData.setEnvHum(hum);
+//            envDataService.save(envData);
+//        }
 
         Integer farmId4 = 27;
         List<BasePigpen> list4 = basePigpenService.list(new QueryWrapper<BasePigpen>().eq("farm_id", farmId4).eq("f_type", 3));

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.mapper.EnvNh3nMapper">
+
+</mapper>