修改门卫室通道

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/EggDataCotroller.java

@@ -25,6 +25,11 @@ import java.util.List;
 @RestController
 @RequestMapping("/eggData")
 public class EggDataCotroller {
+    //
+    //登录账号：zyzj
+ //   登录密码：88888888
+   // 电脑端网址：https://iot1.bigherdsman.com/#/current/chart
+
     private static  final  String BASE_URL= "https://iot1.bigherdsman.com/api/v2/";
     private static  final  String TOKEN= "72438b180e9168fe90db126e3310cd0b20a7196d";
 
@@ -57,7 +62,14 @@ public class EggDataCotroller {
 
         List<HousVo> data = forEntity.getBody().getData();
         for (HousVo datum : data) {
-            datum.setName(datum.getI()+"号舍");
+            Integer i = Integer.parseInt(datum.getI());
+            if (i < 3){
+                datum.setName("育雏"+i);
+            }else {
+                datum.setName("产蛋"+(i-2));
+            }
+
+
         }
 //        if(ObjectUtil.isEmpty(data)){
 //
@@ -66,6 +78,17 @@ public class EggDataCotroller {
         return new Result(ResultCode.SUCCESS,data);
     }
 
+    public static void main(String[] args) {
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization","Token "+TOKEN);
+        HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
+        RestTemplate restTemplate = new RestTemplate();
+        ResponseEntity<BaseResultEntity> forEntity = restTemplate.exchange(BASE_URL + CURRENT_LIST+FARM_CODE+"&position=all", HttpMethod.GET, httpEntity,BaseResultEntity.class );
+        System.out.println(forEntity);
+        List<HousVo> data = forEntity.getBody().getData();
+    }
+
     @GetMapping("history/list")
     public Result list(@RequestParam(name = "i") String i,
                        @RequestParam(name = "start",required = false) Long start,

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/entity/BaseWarningInfo.java

@@ -0,0 +1,48 @@
+package com.huimv.environ.eco.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class BaseWarningInfo extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer farmId;
+
+    private Integer level;
+
+    private String msg;
+
+    private String levelName;
+
+    private String warningName;
+
+    @JsonFormat(pattern = "MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date warningTime;
+
+    @JsonFormat(pattern = "MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date uploadTime;
+
+    private Integer alarmType;
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/entity/SysThreshold.java

@@ -0,0 +1,102 @@
+package com.huimv.environ.eco.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class SysThreshold extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "farm_id")
+    private Integer farmId;
+
+    /**
+     * 高温
+     */
+    private String maxTem;
+
+    /**
+     * 低温
+     */
+    private String minTem;
+
+    /**
+     * 高湿度
+     */
+    private String maxHum;
+
+    /**
+     * 低湿度
+     */
+    private String minHum;
+
+    /**
+     * 累计流量
+     */
+    private String totalFlow;
+
+    /**
+     * 化学需氧量
+     */
+    @TableField("COD")
+    private String COD;
+
+    /**
+     * 氨氮
+     */
+    private String ammonia;
+
+    /**
+     * 氮
+     */
+    private String nitrogen;
+
+    /**
+     * 磷
+     */
+    private String phosphorus;
+
+
+    /**
+     * ph
+     */
+    private String ph;
+
+
+     /**
+     * 瞬时流量
+     */
+    private String flow;
+
+    /**
+     * 天气高温阈值
+     */
+    private String weatherMaxTem;
+
+
+    /**
+     * 天气低温阈值
+     */
+    private String weatherMinTem;
+
+    private String benconValue;
+
+    private String benconTime;
+
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/mapper/BaseWarningInfoMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.environ.eco.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.environ.eco.entity.BaseWarningInfo;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-02
+ */
+public interface BaseWarningInfoMapper extends BaseMapper<BaseWarningInfo> {
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/mapper/SysThresholdMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.environ.eco.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.environ.eco.entity.SysThreshold;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-30
+ */
+public interface SysThresholdMapper extends BaseMapper<SysThreshold> {
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/IBaseWarningInfoService.java

@@ -0,0 +1,18 @@
+package com.huimv.environ.eco.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.environ.eco.entity.BaseWarningInfo;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-02
+ */
+public interface IBaseWarningInfoService extends IService<BaseWarningInfo> {
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/ISysThresholdService.java

@@ -0,0 +1,16 @@
+package com.huimv.environ.eco.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.environ.eco.entity.SysThreshold;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-30
+ */
+public interface ISysThresholdService extends IService<SysThreshold> {
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/BaseWarningInfoServiceImpl.java

@@ -0,0 +1,25 @@
+package com.huimv.environ.eco.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.environ.eco.entity.BaseWarningInfo;
+import com.huimv.environ.eco.mapper.BaseWarningInfoMapper;
+import com.huimv.environ.eco.service.IBaseWarningInfoService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-02
+ */
+@Service
+public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMapper, BaseWarningInfo> implements IBaseWarningInfoService {
+
+
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/EggDataServiceImpl.java

@@ -62,10 +62,10 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
            double maxWater = 0.0;
 
             for (EggVo eggVo : list) {
-//                maxFood = Math.max(eggVo.getFtDoTalTdy(), maxFood);
-//                maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
-                maxFood += eggVo.getFtDoTalTdy();
-                maxWater += eggVo.getWtrTdy();
+                maxFood = Math.max(eggVo.getFtDoTalTdy(), maxFood);
+                maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
+//                maxFood += eggVo.getFtDoTalTdy();
+//                maxWater += eggVo.getWtrTdy();
             }
 
             Map endMap = new HashMap();
@@ -188,10 +188,10 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
             double maxFood = 0.0;
             double maxWater = 0.0;
             for (EggVo eggVo : list) {
-//                maxFood = Math.max(eggVo.getFtDoTalTdy(), maxFood);
-//                maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
-                maxFood += eggVo.getFtDoTalTdy();
-                maxWater += eggVo.getWtrTdy();
+                maxFood = Math.max(eggVo.getFtDoTalTdy(), maxFood);
+                maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
+//                maxFood += eggVo.getFtDoTalTdy();
+//                maxWater += eggVo.getWtrTdy();
             }
 
             Map endMap = new HashMap();

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/SysThresholdServiceImpl.java

@@ -0,0 +1,22 @@
+package com.huimv.environ.eco.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.environ.eco.entity.SysThreshold;
+import com.huimv.environ.eco.mapper.SysThresholdMapper;
+import com.huimv.environ.eco.service.ISysThresholdService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-30
+ */
+@Service
+public class SysThresholdServiceImpl extends ServiceImpl<SysThresholdMapper, SysThreshold> implements ISysThresholdService {
+
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/timer/EggTimer.java

@@ -4,13 +4,18 @@ package com.huimv.environ.eco.timer;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.environ.eco.entity.BaseWarningInfo;
 import com.huimv.environ.eco.entity.EggData;
 import com.huimv.environ.eco.entity.EggHouse;
+import com.huimv.environ.eco.entity.SysThreshold;
 import com.huimv.environ.eco.entity.eggvo.HistoryEntity;
 import com.huimv.environ.eco.entity.eggvo.HistroyOne;
 import com.huimv.environ.eco.entity.eggvo.HistroyTwo;
+import com.huimv.environ.eco.service.IBaseWarningInfoService;
 import com.huimv.environ.eco.service.IEggDataService;
 import com.huimv.environ.eco.service.IEggHouseService;
+import com.huimv.environ.eco.service.ISysThresholdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -36,6 +41,11 @@ public class EggTimer {
     @Autowired
     private IEggHouseService eggHouseService;
 
+    @Autowired
+    private ISysThresholdService sysThresholdService;
+    @Autowired
+    private IBaseWarningInfoService baseWarningInfoService;
+
 
     @Scheduled(cron = "0 0/10 * * * ? ")
     public void saveEggData (){
@@ -50,7 +60,7 @@ public class EggTimer {
         long end = date.getTime();
         DateTime dateTime = DateUtil.offsetMinute(date, -10);
         long start = dateTime.getTime();
-
+        SysThreshold byId = sysThresholdService.getById(1);
         for (EggHouse eggHouse : list) {
             Integer i = eggHouse.getI();
             ResponseEntity<HistoryEntity> forEntity = restTemplate.exchange(BASE_URL + HISTORY_LIST+FARM_CODE+"&i="+i+"&start="+start+"&end="+end, HttpMethod.GET, httpEntity,HistoryEntity.class );
@@ -69,7 +79,6 @@ public class EggTimer {
                 eggData.setWtrTdy(data1.getWtr_tdy());
                 eggData.setUploadTime( new Date(uploadTime));
 
-
                 eggData.setFN( data1.getF_n());
                 eggData.setFLv( data1.getF_lv());
                 eggData.setFV(data1.getF_v() );
@@ -77,13 +86,55 @@ public class EggTimer {
                 eggData.setTT( data1.getT_t());
                 eggData.setHT( data1.getH_t());
                 eggData.setHtL( data1.getHt_l());
-
-
                 eggDataService.save(eggData);
+                saveWarning(eggData,byId);
             }
-
         }
+    }
 
+    private void saveWarning(EggData eggData, SysThreshold byId) {
+        String minTem = byId.getMinTem();
+        String maxTem = byId.getMaxTem();
+        String minHum = byId.getMinHum();
+        String maxHum = byId.getMaxHum();
+        Double tCur = eggData.getTCur();
+        Integer hr = eggData.getHR();
+        Integer i = eggData.getI();
+
+        BaseWarningInfo baseWarningInfo = new BaseWarningInfo();
+        baseWarningInfo.setFarmId(1);
+        baseWarningInfo.setLevel(1);
+        baseWarningInfo.setLevelName("一级报警");
+        baseWarningInfo.setUploadTime(new Date());
+        baseWarningInfo.setWarningTime(eggData.getUploadTime());
+        //高温
+        if (tCur>Double.parseDouble(maxTem)){
+            baseWarningInfo.setMsg(i+"号舍高温预警：温度为"+tCur+"℃,超过高温阈值"+maxTem+"℃");
+            baseWarningInfo.setAlarmType(7);
+            baseWarningInfo.setWarningName("高温报警");
+            baseWarningInfoService.save(baseWarningInfo);
+        }
+        //低温
+        if (tCur<Double.parseDouble(minTem)){
+            baseWarningInfo.setMsg(i+"号舍低温预警：温度为"+tCur+"℃,低于低温阈值"+minTem+"℃");
+            baseWarningInfo.setAlarmType(7);
+            baseWarningInfo.setWarningName("低温报警");
+            baseWarningInfoService.save(baseWarningInfo);
+        }
+        //高湿
+        if (hr>Integer.parseInt(maxHum)){
+            baseWarningInfo.setMsg(i+"号舍高湿度预警：温度为"+hr+",高于阈值"+maxHum);
+            baseWarningInfo.setAlarmType(7);
+            baseWarningInfo.setWarningName("高湿度报警");
+            baseWarningInfoService.save(baseWarningInfo);
+        }
+        //低湿
+        if (hr<Integer.parseInt(minHum)){
+            baseWarningInfo.setMsg(i+"号舍低湿度预警：温度为"+hr+",低于阈值"+minHum);
+            baseWarningInfo.setAlarmType(7);
+            baseWarningInfo.setWarningName("低湿度报警");
+            baseWarningInfoService.save(baseWarningInfo);
+        }
     }
 
 

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/env/service/impl/AlarmImpl.java

@@ -245,20 +245,20 @@ public class AlarmImpl implements IAlarm {
             outJa.add(dataJo1);
             dataJo1.put("name","生态监测");
             //演示
-//            dataJo1.put("value",stjcQuantity);
-            dataJo1.put("value",16);
+            dataJo1.put("value",stjcQuantity);
+//            dataJo1.put("value",16);
             //
             JSONObject dataJo2 = new JSONObject();
             outJa.add(dataJo2);
             dataJo2.put("name","环境监测");
-//            dataJo2.put("value",hjjcQuantity);
-            dataJo2.put("value",0);
+            dataJo2.put("value",hjjcQuantity);
+//            dataJo2.put("value",0);
             //
             JSONObject dataJo3 = new JSONObject();
             outJa.add(dataJo3);
             dataJo3.put("name","人员违规");
-//            dataJo3.put("value",rywgQuantity);
-            dataJo3.put("value",0);
+            dataJo3.put("value",rywgQuantity);
+//            dataJo3.put("value",0);
 //            //
 //            JSONObject dataJo4 = new JSONObject();
 //            outJa.add(dataJo4);

huimv-farm-datacenter-egg/huimv-farm-produce/src/main/java/com/huimv/produce/produce/service/impl/WeightImpl.java

@@ -600,7 +600,7 @@ public class WeightImpl implements IWeight {
         Specification<ProdWeightDetailsEntity> sf = (Specification<ProdWeightDetailsEntity>) (root, criteriaQuery, criteriaBuilder) -> {
             //
             List<Predicate> predList = new ArrayList<>();
-            if (null != poundType) {
+            if (null != poundType && !"".equals(poundType)) {
                 predList.add(criteriaBuilder.equal(root.get("poundType").as(String.class), poundType));
             }
             if (null != carNumber) {

huimv-farm-datacenter-egg/huimv-farm-produce/src/main/java/com/huimv/produce/task/MyScheduledTask.java

@@ -25,4 +25,5 @@ public class MyScheduledTask {
     public void scheduledTask1() throws ParseException {
         iWeight.autoGenerateDayWeight();
     }
+
 }

huimv-farm-datacenter-egg/huimv-farm-video/pom.xml

@@ -16,6 +16,16 @@
 	<properties>
 		<java.version>8</java.version>
 	</properties>
+	<distributionManagement>
+		<repository>
+			<id>rdc-releases</id>
+			<url>https://repo.rdc.aliyun.com/repository/136471-release-drEU5y/</url>
+		</repository>
+		<snapshotRepository>
+			<id>rdc-snapshots</id>
+			<url>https://repo.rdc.aliyun.com/repository/136471-snapshot-WhviYl/</url>
+		</snapshotRepository>
+	</distributionManagement>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -33,11 +43,7 @@
 			<version>1.0.8</version>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.huimv</groupId>
-			<artifactId>huimv-common</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-		</dependency>
+
 		<dependency>
 			<groupId>commons-httpclient</groupId>
 			<artifactId>commons-httpclient</artifactId>
@@ -60,17 +66,22 @@
 			<artifactId>commons-io</artifactId>
 			<version>2.8.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.7</version>
-		</dependency>
-		<!-- huimv.com -->
+
+<!--		 huimv.com-->
 		<dependency>
 			<groupId>com.huimv</groupId>
 			<artifactId>huimv-common</artifactId>
 			<version>0.0.1</version>
 		</dependency>
+
+
+
+		<dependency>
+			<groupId>net.sf.json-lib</groupId>
+			<artifactId>json-lib</artifactId>
+			<version>2.2.3</version>
+			<classifier>jdk15</classifier>
+		</dependency>
 		<!-- JPA -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

huimv-farm-datacenter-egg/huimv-farm-video/src/main/java/com/huimv/video/dhicc/icc/CommonConstant.java

@@ -13,7 +13,7 @@ public class CommonConstant {
     //蛋厂 死鸡通道
     public static final String[] SIZhuChannle = {"1003491$1$0$0","1003490$1$0$0"};
     //卖猪的通道1003278$1$0$0
-    public static final String[] MaiZhuChannle = {"1002873$1$0$0"};
+    public static final String[] MaiZhuChannle = {"1002873$1$0$0","1003443$1$0$10"};
 
     //熏蒸
     public static final String[] XunZhengChannle = {"1003444$1$0$0"};