修改bug，添加预警功能

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/entity/EnvPushMessage.java

@@ -0,0 +1,53 @@
+package com.huimv.env.common.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-11-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_push_message")
+public class EnvPushMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String deviceCode;
+
+    private Integer faultSn;
+
+    private String content;
+
+    private Integer actType;
+
+    private LocalDateTime addTime;
+
+    private LocalDate addDate;
+
+    private String farmCode;
+
+    private Integer display;
+
+    private Integer readStatus;
+
+    private String askTime;
+
+
+}

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/mapper/EnvPushMessageMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.env.common.mapper;
+
+import com.huimv.env.common.entity.EnvPushMessage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-11-01
+ */
+public interface EnvPushMessageMapper extends BaseMapper<EnvPushMessage> {
+
+}

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/mapper/xml/EnvPushMessageMapper.xml

@@ -0,0 +1,20 @@
+<?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.env.common.mapper.EnvPushMessageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.env.common.entity.EnvPushMessage">
+        <id column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="fault_sn" property="faultSn" />
+        <result column="content" property="content" />
+        <result column="act_type" property="actType" />
+        <result column="add_time" property="addTime" />
+        <result column="add_date" property="addDate" />
+        <result column="farm_code" property="farmCode" />
+        <result column="display" property="display" />
+        <result column="read_status" property="readStatus" />
+        <result column="ask_time" property="askTime" />
+    </resultMap>
+
+</mapper>

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/IBaseThresholdService.java

@@ -17,4 +17,6 @@ import java.util.Map;
 public interface IBaseThresholdService extends IService<BaseThreshold> {
 
     Result listThreshold(Map<String,String> map);
+
+
 }

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/IEnvPushMessageService.java

@@ -0,0 +1,16 @@
+package com.huimv.env.common.service;
+
+import com.huimv.env.common.entity.EnvPushMessage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-11-01
+ */
+public interface IEnvPushMessageService extends IService<EnvPushMessage> {
+
+}

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvPushMessageServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.env.common.service.impl;
+
+import com.huimv.env.common.entity.EnvPushMessage;
+import com.huimv.env.common.mapper.EnvPushMessageMapper;
+import com.huimv.env.common.service.IEnvPushMessageService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-11-01
+ */
+@Service
+public class EnvPushMessageServiceImpl extends ServiceImpl<EnvPushMessageMapper, EnvPushMessage> implements IEnvPushMessageService {
+
+}

huimv-env-platform/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -14,6 +14,8 @@ com\huimv\env\common\service\impl\EnvElectricityDayServiceImpl.class
 com\huimv\env\common\dao\entity\EnvHumiEntity.class
 com\huimv\env\common\dao\repo\EnvAlarmTypeEntityRepo.class
 com\huimv\env\common\entity\EnvWaterMonth.class
+com\huimv\env\common\mapper\EnvPushMessageMapper.class
+com\huimv\env\common\service\impl\BaseThresholdServiceImpl.class
 com\huimv\env\common\service\impl\EnvWaterMonthServiceImpl.class
 com\huimv\env\common\service\ISprayTimeService.class
 com\huimv\env\common\service\EnvWaterMonthService.class
@@ -26,6 +28,7 @@ com\huimv\env\common\dao\entity\EnvAlarmTypeEntity.class
 com\huimv\env\common\dao\repo\LampConfigEntityRepo.class
 com\huimv\env\common\service\impl\DeviceRegisterServiceImpl.class
 com\huimv\env\common\dao\repo\LampTempEntityRepo.class
+com\huimv\env\common\mapper\BaseThresholdMapper.class
 com\huimv\env\common\service\impl\SprayTimeServiceImpl.class
 com\huimv\env\common\dao\entity\EnvSprayConfigEntity.class
 com\huimv\env\common\service\impl\EnvElectricityMonthServiceImpl.class
@@ -37,6 +40,7 @@ com\huimv\env\common\dao\repo\EnvPushMessageEntityRepo.class
 com\huimv\env\common\dao\entity\BaseDeviceCofig.class
 com\huimv\env\common\utils\MathUtil.class
 com\huimv\env\common\dao\repo\EnvDeviceEqipmentRepo.class
+com\huimv\env\common\entity\BaseThreshold.class
 com\huimv\env\common\service\EnvElectricityMonthService.class
 com\huimv\env\common\dao\entity\EnvTempEntity.class
 com\huimv\env\common\dao\entity\BasePigpenEntity.class
@@ -46,11 +50,13 @@ com\huimv\env\common\dao\entity\EnvAmmoniaEntity.class
 com\huimv\env\common\service\impl\TempThresholdServiceImpl.class
 com\huimv\env\common\service\ISensorRegisterService.class
 com\huimv\env\common\entity\EnvWaterDay.class
+com\huimv\env\common\entity\EnvPushMessage.class
 com\huimv\env\common\dao\entity\EnvPh.class
 com\huimv\env\common\dao\entity\LampConfigEntity.class
 com\huimv\env\common\entity\EnvElectricityMonth.class
 com\huimv\env\common\utils\RegexUtil.class
 com\huimv\env\common\mapper\EnvWaterMonthMapper.class
+com\huimv\env\common\service\impl\EnvPushMessageServiceImpl.class
 com\huimv\env\common\entity\EnvElectricityDay.class
 com\huimv\env\common\utils\MathUtil2.class
 com\huimv\env\common\dao\entity\LampTempEntity.class
@@ -67,6 +73,7 @@ com\huimv\env\common\service\impl\SprayStatusServiceImpl.class
 com\huimv\env\common\dao\repo\EnvSprayConfigEntityRepo.class
 com\huimv\env\common\service\ILampTempService.class
 com\huimv\env\common\service\impl\SprayConfigServiceImpl.class
+com\huimv\env\common\service\IEnvPushMessageService.class
 com\huimv\env\common\dao\entity\LampConfig.class
 com\huimv\env\common\utils\DateUtil.class
 com\huimv\env\common\service\impl\LampTempServiceImpl.class
@@ -76,5 +83,6 @@ com\huimv\env\common\dao\repo\EnvSprayStatusEntityRepo.class
 com\huimv\env\common\dao\repo\EnvPhEntityRepo.class
 com\huimv\env\common\dao\entity\EnvWaterGege.class
 com\huimv\env\common\dao\repo\EnvWaterMeterRepo.class
+com\huimv\env\common\service\IBaseThresholdService.class
 com\huimv\env\common\service\impl\EnvWaterDayServiceImpl.class
 com\huimv\env\common\utils\SMSManager.class

huimv-env-platform/huimv-env-device/src/main/java/com/huimv/env/device/listener/DeviceListener.java

@@ -8,10 +8,8 @@ import com.huimv.env.common.dao.entity.EnvTempEntity;
 import com.huimv.env.common.dao.repo.EnvAmmoniaEntityRepo;
 import com.huimv.env.common.dao.repo.EnvHumiEntityRepo;
 import com.huimv.env.common.dao.repo.EnvTempEntityRepo;
-import com.huimv.env.common.service.IDeviceRegisterService;
-import com.huimv.env.common.service.IPushMessageService;
-import com.huimv.env.common.service.ISensorRegisterService;
-import com.huimv.env.common.service.ISprayStatusService;
+import com.huimv.env.common.entity.BaseThreshold;
+import com.huimv.env.common.service.*;
 import com.huimv.env.common.utils.Const;
 import com.huimv.env.common.utils.DateUtil;
 import com.huimv.env.common.utils.MathUtil;
@@ -60,6 +58,9 @@ public class DeviceListener {
     private IPushMessageService pushMessageService;
     @Autowired
     private ISprayStatusService sprayStatusService;
+    @Autowired
+    private IEnvPushMessageService envPushMessageService;
+
 
     @Autowired
     private WebSocket webSocket;
@@ -215,7 +216,8 @@ public class DeviceListener {
         //更新传感器数据
 //        deviceService.updateSensorRegister(deviceCode, dataJo.getInteger("sensorSn"), nowTimestamp, todayDate, temp, farmCode,sensorSort);
         deviceService.sendSensorToMQ(deviceCode, dataJo.getInteger("sensorSn"), nowTimestamp, todayDate, temp, farmCode,sensorSort);
-
+        //报警 TODO
+//        envPushMessageService.saveTemp();
         //保存温度流水数据
         deviceService.saveTempFlow(dataJo, envDeviceRegisterEntity, nowTimestamp, todayDate, farmCode);
     }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvPushMessgeController.java

@@ -32,6 +32,13 @@ public class EnvPushMessgeController {
         return  envPushMessgeService.listMessge(paramMap);
 
     }
+
+
+    @PostMapping("/countMessgeAndDevice")
+    public Result countMessgeAndDevice(@RequestBody Map<String,String> paramMap){
+        return  envPushMessgeService.countMessgeAndDevice(paramMap);
+
+    }
     @GetMapping("/getById")
     public Result listMessge(@RequestParam(name = "id")Integer id){
         return  new Result(ResultCode.SUCCESS,envPushMessgeService.getById(id));

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/IEnvPushMessgeService.java

@@ -19,4 +19,6 @@ public interface IEnvPushMessgeService extends IService<EnvPushMessage> {
     Result listMessge(Map<String, String> paramMap);
 
     Result countRead(Integer farmCode);
+
+    Result countMessgeAndDevice(Map<String, String> paramMap);
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/impl/EnvPushMessgeServiceImpl.java

@@ -3,12 +3,16 @@ package com.huimv.env.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.env.manage.entity.EnvDeviceRegister;
 import com.huimv.env.manage.entity.EnvPushMessage;
+import com.huimv.env.manage.mapper.EnvDeviceRegisterMapper;
 import com.huimv.env.manage.mapper.EnvPushMessgeMapper;
 import com.huimv.env.manage.service.IEnvPushMessgeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.env.manage.utils.Result;
 import com.huimv.env.manage.utils.ResultCode;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -24,6 +28,8 @@ import java.util.Map;
  */
 @Service
 public class EnvPushMessgeServiceImpl extends ServiceImpl<EnvPushMessgeMapper, EnvPushMessage> implements IEnvPushMessgeService {
+    @Autowired
+    private EnvDeviceRegisterMapper envDeviceRegisterMapper;
 
     @Override
     public Result listMessge(Map<String, String> paramMap) {
@@ -31,6 +37,12 @@ public class EnvPushMessgeServiceImpl extends ServiceImpl<EnvPushMessgeMapper, E
         String pageSize = paramMap.get("pageSize");
         String pageNum = paramMap.get("pageNum");
         QueryWrapper<EnvPushMessage> wrapper = new QueryWrapper<>();
+        if (StringUtils.isBlank(pageNum)){
+            pageNum = "1";
+        }
+        if (StringUtils.isBlank(pageSize)){
+            pageSize = "10";
+        }
 
         wrapper.eq("farm_code",farmCode);
         wrapper.eq("display",1);
@@ -54,4 +66,16 @@ public class EnvPushMessgeServiceImpl extends ServiceImpl<EnvPushMessgeMapper, E
         map.put("noRead",count1);
         return new Result(ResultCode.SUCCESS,map);
     }
+
+    @Override
+    public Result countMessgeAndDevice(Map<String, String> paramMap) {
+        String farmCode = paramMap.get("farmCode");
+        Map map = new HashMap();
+        Long deviceCount = envDeviceRegisterMapper.selectCount(new QueryWrapper<EnvDeviceRegister>().eq("farm_code", farmCode));
+        long messgeCount = this.count(new QueryWrapper<EnvPushMessage>().eq("farm_code", farmCode));
+
+        map.put("deviceCount",deviceCount);
+        map.put("messgeCount",messgeCount);
+        return new Result(ResultCode.SUCCESS,map);
+    }
 }