气体检测

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

@@ -68,7 +68,6 @@ public class EnvDeviceController {
     public Result listDeviceCount(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return envDeviceService.listDeviceCount(httpServletRequest,paramsMap);
     }
-
     @RequestMapping("/bandingUnitId")
     public Result bandingUnitId(HttpServletRequest httpServletRequest, @RequestBody EnvDevice envDevice) {
         return envDeviceService.bandingUnitId(httpServletRequest,envDevice);

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+@RestController
+@RequestMapping("/gas-data")
+public class GasDataController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 气体阈值 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+@RestController
+@RequestMapping("/gas-threshold")
+public class GasThresholdController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+@RestController
+@RequestMapping("/gas-warning-info")
+public class GasWarningInfoController {
+
+}

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

@@ -0,0 +1,95 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("gas_data")
+public class GasData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 1屋顶 2厂界上 3厂界下 4厂界居民
+     */
+    private Integer loctionType;
+
+    /**
+     * NH3-N
+     */
+    private String nh3N;
+
+    /**
+     * 甲硫醚
+     */
+    private String jlm;
+
+    /**
+     * 二硫化碳
+     */
+    private String elht;
+
+    /**
+     * 二甲二硫
+     */
+    private String ejel;
+
+    /**
+     * H2S
+     */
+    private String h2s;
+
+    /**
+     * 苯乙烯
+     */
+    private String byx;
+
+    /**
+     * CH3SH
+     */
+    private byte[] ch3sh;
+
+    /**
+     * 三甲胺
+     */
+    private String sja;
+
+    /**
+     * 臭气
+     */
+    private String cq;
+
+    /**
+     * 记录原始值
+     */
+    private String originalData;
+
+    private LocalDateTime createTime;
+
+    private String other1;
+
+    private String other2;
+
+    private String other3;
+
+
+}

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

@@ -0,0 +1,89 @@
+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.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 气体阈值
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("gas_threshold")
+public class GasThreshold implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 1屋顶 2厂界上 3厂界下 4厂界居民
+     */
+    private Integer gasType;
+
+    /**
+     * NH3-N
+     */
+    private String nh3N;
+
+    /**
+     * 甲硫醚
+     */
+    private String jlm;
+
+    /**
+     * 二硫化碳
+     */
+    private String elht;
+
+    /**
+     * 二甲二硫
+     */
+    private String ejel;
+
+    /**
+     * H2S
+     */
+    private String h2s;
+
+    /**
+     * 苯乙烯
+     */
+    private String byx;
+
+    /**
+     * CH3SH
+     */
+    private String ch3sh;
+
+    /**
+     * 三甲胺
+     */
+    private String sja;
+
+    /**
+     * 臭气
+     */
+    private String cq;
+
+    private String userIds;
+
+    private Integer farmId;
+
+    private String other2;
+
+    private String other3;
+
+
+}

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

@@ -0,0 +1,75 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("gas_warning_info")
+public class GasWarningInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 气体
+     */
+    private Integer warningType;
+
+    /**
+     * 报警内容
+     */
+    private String warningContent;
+
+    /**
+     * 位置
+     */
+    private String buildLocation;
+
+    /**
+     * 位置名字
+     */
+    private String unitName;
+
+    /**
+     * 日期
+     */
+    private LocalDateTime date;
+
+    /**
+     * 人员id
+     */
+    private String userIds;
+
+    /**
+     * 人员名字
+     */
+    private String userNames;
+
+    private Integer farmId;
+
+    private String other1;
+
+    private String other2;
+
+    private String other3;
+
+
+}

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

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

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

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.GasThreshold;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 气体阈值 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+public interface GasThresholdMapper extends BaseMapper<GasThreshold> {
+
+}

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

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

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

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

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

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.GasThreshold;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 气体阈值 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+public interface IGasThresholdService extends IService<GasThreshold> {
+
+}

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

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

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

@@ -1,6 +1,7 @@
 package com.huimv.admin.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,7 +11,9 @@ import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.CameraArea;
 import com.huimv.admin.entity.CameraBase;
+import com.huimv.admin.entity.EnvDevice;
 import com.huimv.admin.entity.hkwsdto.UnitDto1;
+import com.huimv.admin.entity.zengxindto.DataShacks;
 import com.huimv.admin.mapper.CameraAreaMapper;
 import com.huimv.admin.mapper.CameraBaseMapper;
 import com.huimv.admin.service.ICameraAreaService;
@@ -22,6 +25,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -82,22 +87,40 @@ public class CameraAreaServiceImpl extends ServiceImpl<CameraAreaMapper, CameraA
     }
 
     @Override
-    public void sync(Map<String, Integer> params,List<UnitDto1> list) {
+    public void sync(Map<String, Integer> params,List<UnitDto1> unitDto1) {
         Integer farmId = params.get("farmId");
         //同步，先删除
         QueryWrapper<CameraArea> wrapper = new QueryWrapper<>();
         //TODO 正康猪业 先这样做
         wrapper.eq("farm_id",farmId);
-        this.remove(wrapper);
-        for (UnitDto1 unitDto1 : list) {
-            CameraArea cameraArea  = new CameraArea();
-            BeanUtil.copyProperties(unitDto1,cameraArea);
-            cameraArea.setAreaName(unitDto1.getName());
-            cameraArea.setFarmId(farmId);
-            cameraArea.setPublicUrl("61.153.248.106:6713");
-            this.save(cameraArea);
-        }
+        List<CameraArea> huatong = this.list(wrapper);
+        List<String> haikangAreaId = unitDto1.stream().map(UnitDto1::getRegionUuid).collect(Collectors.toList());
+        List<String> huatongAreaId = huatong.stream().map(CameraArea::getRegionUuid).collect(Collectors.toList());
+        CopyOnWriteArrayList<String> haikangDeviceIdCopy = ListUtil.toCopyOnWriteArrayList(haikangAreaId);
+        CopyOnWriteArrayList<String> huatongDeviceIdCopy = ListUtil.toCopyOnWriteArrayList(huatongAreaId);
+        //新增的设备
+        haikangDeviceIdCopy.removeAll(huatongAreaId);
+        //TODO 新增 先循环，想不出来
+        if (haikangDeviceIdCopy.size() >0){
+            for (String s : haikangDeviceIdCopy) {
+                for (UnitDto1 dto1 : unitDto1) {
+                    if (s.equals(dto1.getRegionUuid())){
+                        CameraArea cameraArea  = new CameraArea();
+                        BeanUtil.copyProperties(dto1,cameraArea);
+                        cameraArea.setAreaName(dto1.getName());
+                        cameraArea.setFarmId(farmId);
+                        cameraArea.setPublicUrl("61.153.248.106:6713");
+                        this.save(cameraArea);
+                    }
+                }
 
+            }
+        }
+        //需要删除的设备
+        huatongDeviceIdCopy.removeAll(haikangDeviceIdCopy);
+        if (huatongDeviceIdCopy.size() >0){
+            this.remove(new QueryWrapper<CameraArea>().in("region_uuid",huatongDeviceIdCopy));
+        }
     }
 
 }

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

@@ -132,8 +132,5 @@ public class CameraBaseServiceImpl extends ServiceImpl<CameraBaseMapper, CameraB
             CameraBase one = this.getOne(new QueryWrapper<CameraBase>().eq("camera_uuid", cameraUuid));
             one.setOnLineStatus(1 ==cameraDto1.getOnLineStatus());
         }
-
     }
-
-
 }

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.GasData;
+import com.huimv.admin.mapper.GasDataMapper;
+import com.huimv.admin.service.IGasDataService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+@Service
+public class GasDataServiceImpl extends ServiceImpl<GasDataMapper, GasData> implements IGasDataService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.GasThreshold;
+import com.huimv.admin.mapper.GasThresholdMapper;
+import com.huimv.admin.service.IGasThresholdService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 气体阈值 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+@Service
+public class GasThresholdServiceImpl extends ServiceImpl<GasThresholdMapper, GasThreshold> implements IGasThresholdService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.GasWarningInfo;
+import com.huimv.admin.mapper.GasWarningInfoMapper;
+import com.huimv.admin.service.IGasWarningInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+@Service
+public class GasWarningInfoServiceImpl extends ServiceImpl<GasWarningInfoMapper, GasWarningInfo> implements IGasWarningInfoService {
+
+}

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

@@ -119,9 +119,15 @@ public class CarmeraTimer {
         for (EnvDevice envDevice : list) {
             if (ObjectUtil.isNotEmpty(envDevice) && StringUtils.isNotBlank(envDevice.getDeviceCode())){
                 System.out.println(envDevice.getDeviceCode());
-                ResponseEntity<String> exchange = restTemplate.exchange("https://yzwlw.loongk.com/mobile/loadShackDatas/" + envDevice.getDeviceCode(), HttpMethod.GET, requestEntity, String.class);
-                String shishiBody = exchange.getBody();
-                if (ObjectUtil.isEmpty(shishiBody)){
+                String shishiBody = "";
+                try {
+                    ResponseEntity<String> exchange = restTemplate.exchange("https://yzwlw.loongk.com/mobile/loadShackDatas/" + envDevice.getDeviceCode(), HttpMethod.GET, requestEntity, String.class);
+                     shishiBody =   exchange.getBody();
+                }catch (Exception e){
+                    System.out.println(e);
+                }
+
+                if (StringUtils.isBlank(shishiBody)){
                     System.out.println(new Date() +"实时数据"+ shishiBody);
                     return;
                 }

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

@@ -0,0 +1,25 @@
+<?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.GasDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.GasData">
+        <id column="id" property="id" />
+        <result column="loction_type" property="loctionType" />
+        <result column="NH3_N" property="nh3N" />
+        <result column="JLM" property="jlm" />
+        <result column="ELHT" property="elht" />
+        <result column="EJEL" property="ejel" />
+        <result column="H2S" property="h2s" />
+        <result column="BYX" property="byx" />
+        <result column="CH3SH" property="ch3sh" />
+        <result column="SJA" property="sja" />
+        <result column="CQ" property="cq" />
+        <result column="original_data" property="originalData" />
+        <result column="create_time" property="createTime" />
+        <result column="other1" property="other1" />
+        <result column="other2" property="other2" />
+        <result column="other3" property="other3" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,24 @@
+<?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.GasThresholdMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.GasThreshold">
+        <id column="id" property="id" />
+        <result column="gas_type" property="gasType" />
+        <result column="NH3_N" property="nh3N" />
+        <result column="JLM" property="jlm" />
+        <result column="ELHT" property="elht" />
+        <result column="EJEL" property="ejel" />
+        <result column="H2S" property="h2s" />
+        <result column="BYX" property="byx" />
+        <result column="CH3SH" property="ch3sh" />
+        <result column="SJA" property="sja" />
+        <result column="CQ" property="cq" />
+        <result column="user_ids" property="userIds" />
+        <result column="farm_id" property="farmId" />
+        <result column="other2" property="other2" />
+        <result column="other3" property="other3" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,21 @@
+<?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.GasWarningInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.GasWarningInfo">
+        <id column="id" property="id" />
+        <result column="warning_type" property="warningType" />
+        <result column="warning_content" property="warningContent" />
+        <result column="build_location" property="buildLocation" />
+        <result column="unit_name" property="unitName" />
+        <result column="date" property="date" />
+        <result column="user_ids" property="userIds" />
+        <result column="user_names" property="userNames" />
+        <result column="farm_id" property="farmId" />
+        <result column="other1" property="other1" />
+        <result column="other2" property="other2" />
+        <result column="other3" property="other3" />
+    </resultMap>
+
+</mapper>