Bladeren bron

mqtt测试11

wwh 2 jaren geleden
bovenliggende
commit
d57e473e34
56 gewijzigde bestanden met toevoegingen van 907 en 339 verwijderingen
  1. 11 0
      test02/pom.xml
  2. 20 20
      test02/src/main/java/com/huimv/controller/DeviceController.java
  3. 20 0
      test02/src/main/java/com/huimv/controller/EnvElectricityController.java
  4. 20 0
      test02/src/main/java/com/huimv/controller/EnvWaterController.java
  5. 36 31
      test02/src/main/java/com/huimv/controller/PeopleController.java
  6. 0 1
      test02/src/main/java/com/huimv/controller/PublishController.java
  7. 35 35
      test02/src/main/java/com/huimv/entity/Device.java
  8. 93 0
      test02/src/main/java/com/huimv/entity/EnvElectricity.java
  9. 93 0
      test02/src/main/java/com/huimv/entity/EnvWater.java
  10. 37 37
      test02/src/main/java/com/huimv/entity/People.java
  11. 16 16
      test02/src/main/java/com/huimv/mapper/DeviceMapper.java
  12. 16 0
      test02/src/main/java/com/huimv/mapper/EnvElectricityMapper.java
  13. 16 0
      test02/src/main/java/com/huimv/mapper/EnvWaterMapper.java
  14. 16 16
      test02/src/main/java/com/huimv/mapper/PeopleMapper.java
  15. 61 15
      test02/src/main/java/com/huimv/publish/PublishMQTT.java
  16. 16 16
      test02/src/main/java/com/huimv/service/IDeviceService.java
  17. 16 0
      test02/src/main/java/com/huimv/service/IEnvElectricityService.java
  18. 16 0
      test02/src/main/java/com/huimv/service/IEnvWaterService.java
  19. 18 16
      test02/src/main/java/com/huimv/service/IPeopleService.java
  20. 25 20
      test02/src/main/java/com/huimv/service/impl/DeviceServiceImpl.java
  21. 20 0
      test02/src/main/java/com/huimv/service/impl/EnvElectricityServiceImpl.java
  22. 20 0
      test02/src/main/java/com/huimv/service/impl/EnvWaterServiceImpl.java
  23. 42 32
      test02/src/main/java/com/huimv/service/impl/PeopleServiceImpl.java
  24. 42 8
      test02/src/main/java/com/huimv/subscribe/ConsumerMQTT.java
  25. 94 54
      test02/src/main/java/com/huimv/subscribe/ConsumerMQTT2.java
  26. 82 16
      test02/src/main/java/com/huimv/subscribe/PushCallback.java
  27. 3 3
      test02/src/main/resources/application-dev.yml
  28. 5 0
      test02/src/main/resources/mapper/EnvElectricityMapper.xml
  29. 5 0
      test02/src/main/resources/mapper/EnvWaterMapper.xml
  30. 3 3
      test02/target/classes/application-dev.yml
  31. BIN
      test02/target/classes/com/huimv/controller/DeviceController.class
  32. BIN
      test02/target/classes/com/huimv/controller/EnvElectricityController.class
  33. BIN
      test02/target/classes/com/huimv/controller/EnvWaterController.class
  34. BIN
      test02/target/classes/com/huimv/controller/PeopleController.class
  35. BIN
      test02/target/classes/com/huimv/entity/Device.class
  36. BIN
      test02/target/classes/com/huimv/entity/EnvElectricity.class
  37. BIN
      test02/target/classes/com/huimv/entity/EnvWater.class
  38. BIN
      test02/target/classes/com/huimv/entity/People.class
  39. BIN
      test02/target/classes/com/huimv/mapper/DeviceMapper.class
  40. BIN
      test02/target/classes/com/huimv/mapper/EnvElectricityMapper.class
  41. BIN
      test02/target/classes/com/huimv/mapper/EnvWaterMapper.class
  42. BIN
      test02/target/classes/com/huimv/mapper/PeopleMapper.class
  43. BIN
      test02/target/classes/com/huimv/publish/PublishMQTT.class
  44. BIN
      test02/target/classes/com/huimv/service/IDeviceService.class
  45. BIN
      test02/target/classes/com/huimv/service/IEnvElectricityService.class
  46. BIN
      test02/target/classes/com/huimv/service/IEnvWaterService.class
  47. BIN
      test02/target/classes/com/huimv/service/IPeopleService.class
  48. BIN
      test02/target/classes/com/huimv/service/impl/DeviceServiceImpl.class
  49. BIN
      test02/target/classes/com/huimv/service/impl/EnvElectricityServiceImpl.class
  50. BIN
      test02/target/classes/com/huimv/service/impl/EnvWaterServiceImpl.class
  51. BIN
      test02/target/classes/com/huimv/service/impl/PeopleServiceImpl.class
  52. BIN
      test02/target/classes/com/huimv/subscribe/ConsumerMQTT.class
  53. BIN
      test02/target/classes/com/huimv/subscribe/ConsumerMQTT2.class
  54. BIN
      test02/target/classes/com/huimv/subscribe/PushCallback.class
  55. 5 0
      test02/target/classes/mapper/EnvElectricityMapper.xml
  56. 5 0
      test02/target/classes/mapper/EnvWaterMapper.xml

+ 11 - 0
test02/pom.xml

@@ -75,5 +75,16 @@
             <artifactId>mybatis-plus-generator</artifactId>
             <version>3.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.18</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.28</version>
+        </dependency>
+
     </dependencies>
 </project>

+ 20 - 20
test02/src/main/java/com/huimv/controller/DeviceController.java

@@ -1,20 +1,20 @@
-package com.huimv.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author author
- * @since 2023-04-14
- */
-@RestController
-@RequestMapping("/device")
-public class DeviceController {
-
-}
+//package com.huimv.controller;
+//
+//
+//import org.springframework.web.bind.annotation.RequestMapping;
+//
+//import org.springframework.web.bind.annotation.RestController;
+//
+///**
+// * <p>
+// *  前端控制器
+// * </p>
+// *
+// * @author author
+// * @since 2023-04-14
+// */
+//@RestController
+//@RequestMapping("/device")
+//public class DeviceController {
+//
+//}

+ 20 - 0
test02/src/main/java/com/huimv/controller/EnvElectricityController.java

@@ -0,0 +1,20 @@
+package com.huimv.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-11
+ */
+@RestController
+@RequestMapping("/env-electricity")
+public class EnvElectricityController {
+
+}

+ 20 - 0
test02/src/main/java/com/huimv/controller/EnvWaterController.java

@@ -0,0 +1,20 @@
+package com.huimv.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-11
+ */
+@RestController
+@RequestMapping("/env-water")
+public class EnvWaterController {
+
+}

+ 36 - 31
test02/src/main/java/com/huimv/controller/PeopleController.java

@@ -1,31 +1,36 @@
-package com.huimv.controller;
-
-
-import com.huimv.entity.People;
-import com.huimv.service.IPeopleService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author author
- * @since 2023-04-12
- */
-@RestController
-@RequestMapping("/people")
-public class PeopleController {
-
-    @Autowired
-    private IPeopleService peopleService;
-
-    @RequestMapping("/test")
-    public void test(@RequestBody People people) {
-        peopleService.save(people);
-    }
-}
+//package com.huimv.controller;
+//
+//
+//import com.huimv.entity.People;
+//import com.huimv.service.IPeopleService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//
+//import org.springframework.web.bind.annotation.RestController;
+//
+///**
+// * <p>
+// *  前端控制器
+// * </p>
+// *
+// * @author author
+// * @since 2023-04-12
+// */
+//@RestController
+//@RequestMapping("/people")
+//public class PeopleController {
+//
+//    @Autowired
+//    private IPeopleService peopleService;
+//
+//    @RequestMapping("/test")
+//    public void test(@RequestBody People people) {
+//        peopleService.save(people);
+//    }
+//
+//    @RequestMapping("/test02")
+//    public void test02() {
+//        peopleService.test();
+//    }
+//}

+ 0 - 1
test02/src/main/java/com/huimv/controller/PublishController.java

@@ -17,7 +17,6 @@ public class PublishController {
         String message = paramsMap.get("message");
         PublishMQTT client = new PublishMQTT();
         client.start();
-        System.out.println("ss");
         client.pubMessage(message,"test");
     }
 }

+ 35 - 35
test02/src/main/java/com/huimv/entity/Device.java

@@ -1,35 +1,35 @@
-package com.huimv.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-04-14
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("device")
-public class Device implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    private String deviceCode;
-
-    private String message;
-
-
-}
+//package com.huimv.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-04-14
+// */
+//@Data
+//@EqualsAndHashCode(callSuper = false)
+//@Accessors(chain = true)
+//@TableName("device")
+//public class Device implements Serializable {
+//
+//    private static final long serialVersionUID = 1L;
+//
+//    @TableId(value = "id", type = IdType.AUTO)
+//    private Integer id;
+//
+//    private String deviceCode;
+//
+//    private String message;
+//
+//
+//}

+ 93 - 0
test02/src/main/java/com/huimv/entity/EnvElectricity.java

@@ -0,0 +1,93 @@
+package com.huimv.entity;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_electricity")
+public class EnvElectricity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 芯片id
+     */
+    @TableField("chip_code")
+    private String chipCode;
+
+    /**
+     * 设备id
+     */
+    @TableField("device_code")
+    private String deviceCode;
+
+    /**
+     * 栋舍id
+     */
+    @TableField("unit_id")
+    private String unitId;
+
+    /**
+     * 原始值记录
+     */
+    @TableField("original_value")
+    private BigDecimal originalValue;
+
+    /**
+     * 处理后的值
+     */
+    @TableField("handle_value")
+    private BigDecimal handleValue;
+
+    /**
+     * 应答时间
+     */
+    @TableField("ask_time")
+    private LocalDateTime askTime;
+
+    /**
+     * 入库时间
+     */
+    @TableField("update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    @TableField("farm_id")
+    private Integer farmId;
+
+    @TableField("other1")
+    private String other1;
+
+    @TableField("other2")
+    private String other2;
+
+    @TableField("other3")
+    private String other3;
+
+
+}

+ 93 - 0
test02/src/main/java/com/huimv/entity/EnvWater.java

@@ -0,0 +1,93 @@
+package com.huimv.entity;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_water")
+public class EnvWater implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 芯片id
+     */
+    @TableField("chip_code")
+    private String chipCode;
+
+    /**
+     * 设备id
+     */
+    @TableField("device_code")
+    private String deviceCode;
+
+    /**
+     * 栋舍id
+     */
+    @TableField("unit_id")
+    private String unitId;
+
+    /**
+     * 原始值记录
+     */
+    @TableField("original_value")
+    private BigDecimal originalValue;
+
+    /**
+     * 处理后的值
+     */
+    @TableField("handle_value")
+    private BigDecimal handleValue;
+
+    /**
+     * 应答时间
+     */
+    @TableField("ask_time")
+    private LocalDateTime askTime;
+
+    /**
+     * 入库时间
+     */
+    @TableField("update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    @TableField("farm_id")
+    private Integer farmId;
+
+    @TableField("other1")
+    private String other1;
+
+    @TableField("other2")
+    private String other2;
+
+    @TableField("other3")
+    private String other3;
+
+
+}

+ 37 - 37
test02/src/main/java/com/huimv/entity/People.java

@@ -1,37 +1,37 @@
-package com.huimv.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-04-12
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("people")
-public class People implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    private String name;
-
-    private Integer age;
-
-    private String sex;
-
-
-}
+//package com.huimv.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-04-12
+// */
+//@Data
+//@EqualsAndHashCode(callSuper = false)
+//@Accessors(chain = true)
+//@TableName("people")
+//public class People implements Serializable {
+//
+//    private static final long serialVersionUID = 1L;
+//
+//    @TableId(value = "id", type = IdType.AUTO)
+//    private Integer id;
+//
+//    private String name;
+//
+//    private Integer age;
+//
+//    private String sex;
+//
+//
+//}

+ 16 - 16
test02/src/main/java/com/huimv/mapper/DeviceMapper.java

@@ -1,16 +1,16 @@
-package com.huimv.mapper;
-
-import com.huimv.entity.Device;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author author
- * @since 2023-04-14
- */
-public interface DeviceMapper extends BaseMapper<Device> {
-
-}
+//package com.huimv.mapper;
+//
+//import com.huimv.entity.Device;
+//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+//
+///**
+// * <p>
+// *  Mapper 接口
+// * </p>
+// *
+// * @author author
+// * @since 2023-04-14
+// */
+//public interface DeviceMapper extends BaseMapper<Device> {
+//
+//}

+ 16 - 0
test02/src/main/java/com/huimv/mapper/EnvElectricityMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.mapper;
+
+import com.huimv.entity.EnvElectricity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-11
+ */
+public interface EnvElectricityMapper extends BaseMapper<EnvElectricity> {
+
+}

+ 16 - 0
test02/src/main/java/com/huimv/mapper/EnvWaterMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.mapper;
+
+import com.huimv.entity.EnvWater;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-11
+ */
+public interface EnvWaterMapper extends BaseMapper<EnvWater> {
+
+}

+ 16 - 16
test02/src/main/java/com/huimv/mapper/PeopleMapper.java

@@ -1,16 +1,16 @@
-package com.huimv.mapper;
-
-import com.huimv.entity.People;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author author
- * @since 2023-04-12
- */
-public interface PeopleMapper extends BaseMapper<People> {
-
-}
+//package com.huimv.mapper;
+//
+//import com.huimv.entity.People;
+//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+//
+///**
+// * <p>
+// *  Mapper 接口
+// * </p>
+// *
+// * @author author
+// * @since 2023-04-12
+// */
+//public interface PeopleMapper extends BaseMapper<People> {
+//
+//}

+ 61 - 15
test02/src/main/java/com/huimv/publish/PublishMQTT.java

@@ -1,30 +1,27 @@
 package com.huimv.publish;
 
-import com.huimv.entity.Device;
-import com.huimv.entity.People;
-import com.huimv.service.IDeviceService;
-import com.huimv.service.IPeopleService;
-import com.huimv.service.impl.DeviceServiceImpl;
+import com.alibaba.fastjson.JSONObject;
 import com.huimv.untils.SpringUtil;
+import com.mysql.cj.jdbc.MysqlDataSource;
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
 
+import java.sql.*;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Configuration
+@Component
 public class PublishMQTT {
 
-    @Autowired
-    private IPeopleService peopleService;
-    @Autowired
-    private IDeviceService deviceService;
-
     public static final String HOST = "tcp://192.168.1.68:1883";
-    private static final String clientid = "publish";
+    private static final String clientid = "FabuCeShi";
     private MqttClient client;
     private MqttConnectOptions options;
 
@@ -57,10 +54,22 @@ public class PublishMQTT {
            // options.setWill(topic, "关闭前最后的信息".getBytes(), 1, true);
             client.connect(options);
 
-            DeviceServiceImpl deviceService = SpringUtil.getBean(DeviceServiceImpl.class);
-            List<Device> list = deviceService.list();
-            System.out.println(list);
-            pubMessage("list","huimv_down_867699060002756");
+//            DeviceServiceImpl deviceService = SpringUtil.getBean(DeviceServiceImpl.class);
+//            System.out.println(deviceService);
+//            List<Device> list = deviceService.list();
+//            System.out.println(list);
+//            Class.forName("com.mysql.cj.jdbc.Driver");
+//            JSONObject jsonObject = new JSONObject();
+//            Map<String, String> map = new HashMap<>();
+//            map.put("year", "2023");
+//            map.put("mon", "4");
+//            map.put("date", "18");
+//            map.put("hour", "2023");
+//            map.put("min", "4");
+//            map.put("sec", "18");
+//            jsonObject.put("sync_time","");
+            pubMessage("123132131321","/LG210/D4AD204BAEE4/up");
+            System.out.println("发送完成!");
             //向client2发送消息
 //            pubMessage("张三,20,男","test");
 //            client.unsubscribe("/test/01");
@@ -86,8 +95,45 @@ public class PublishMQTT {
         }
     }
 
+    /*
+     * 连接数据库
+     * */
+    public void Connect() {
+        try {
+            Integer test = 2;
+            //1.加载驱动
+            Class.forName("com.mysql.cj.jdbc.Driver");
+            //2.链接数据库
+            String url = "jdbc:mysql://localhost:3306/test";
+            Connection conn = DriverManager.getConnection(url,"root","123456");
+            //3.获取statement对象
+            Statement statement = conn.createStatement();
+            String sql = "select * from device where id=".concat(String.valueOf(test));
+//            String sql =String.format( "select * from device where id= %d",test);
+            //4.获取结果集
+            ResultSet resultSet = statement.executeQuery(sql);
+            resultSet.next();
+//            Array device_code = resultSet.getArray("device_code");
+            String deviceCode = "";
+            deviceCode = resultSet.getString("device_code");
+//            //5.从结果集中获取用户名密码
+//            String username = "";
+//            String password = "";
+//            while(resultSet.next()){
+//                username = resultSet.getString("username");
+//                password = resultSet.getString("password");
+//
+//                System.out.println("username:" + username + "   " + "password:" + password);
+//            }
+            System.out.println(deviceCode);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     public static void main(String[] args) {
         PublishMQTT client1 = new PublishMQTT();
         client1.start();
+//        client1.Connect();
     }
 }

+ 16 - 16
test02/src/main/java/com/huimv/service/IDeviceService.java

@@ -1,16 +1,16 @@
-package com.huimv.service;
-
-import com.huimv.entity.Device;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author author
- * @since 2023-04-14
- */
-public interface IDeviceService extends IService<Device> {
-
-}
+//package com.huimv.service;
+//
+//import com.huimv.entity.Device;
+//import com.baomidou.mybatisplus.extension.service.IService;
+//
+///**
+// * <p>
+// *  服务类
+// * </p>
+// *
+// * @author author
+// * @since 2023-04-14
+// */
+//public interface IDeviceService extends IService<Device> {
+//
+//}

+ 16 - 0
test02/src/main/java/com/huimv/service/IEnvElectricityService.java

@@ -0,0 +1,16 @@
+package com.huimv.service;
+
+import com.huimv.entity.EnvElectricity;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-11
+ */
+public interface IEnvElectricityService extends IService<EnvElectricity> {
+
+}

+ 16 - 0
test02/src/main/java/com/huimv/service/IEnvWaterService.java

@@ -0,0 +1,16 @@
+package com.huimv.service;
+
+import com.huimv.entity.EnvWater;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-11
+ */
+public interface IEnvWaterService extends IService<EnvWater> {
+
+}

+ 18 - 16
test02/src/main/java/com/huimv/service/IPeopleService.java

@@ -1,16 +1,18 @@
-package com.huimv.service;
-
-import com.huimv.entity.People;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author author
- * @since 2023-04-12
- */
-public interface IPeopleService extends IService<People> {
-    void addPeople(String[] people);
-}
+//package com.huimv.service;
+//
+//import com.huimv.entity.People;
+//import com.baomidou.mybatisplus.extension.service.IService;
+//
+///**
+// * <p>
+// *  服务类
+// * </p>
+// *
+// * @author author
+// * @since 2023-04-12
+// */
+//public interface IPeopleService extends IService<People> {
+//    void addPeople(String[] people);
+//
+//    void test();
+//}

+ 25 - 20
test02/src/main/java/com/huimv/service/impl/DeviceServiceImpl.java

@@ -1,20 +1,25 @@
-package com.huimv.service.impl;
-
-import com.huimv.entity.Device;
-import com.huimv.mapper.DeviceMapper;
-import com.huimv.service.IDeviceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author author
- * @since 2023-04-14
- */
-@Service
-public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService {
-
-}
+//package com.huimv.service.impl;
+//
+//import com.huimv.entity.Device;
+//import com.huimv.mapper.DeviceMapper;
+//import com.huimv.service.IDeviceService;
+//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//
+///**
+// * <p>
+// *  服务实现类
+// * </p>
+// *
+// * @author author
+// * @since 2023-04-14
+// */
+//@Service
+//public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService {
+//
+//    @Autowired
+//    private IDeviceService deviceService;
+//
+//
+//}

+ 20 - 0
test02/src/main/java/com/huimv/service/impl/EnvElectricityServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.service.impl;
+
+import com.huimv.entity.EnvElectricity;
+import com.huimv.mapper.EnvElectricityMapper;
+import com.huimv.service.IEnvElectricityService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-11
+ */
+@Service
+public class EnvElectricityServiceImpl extends ServiceImpl<EnvElectricityMapper, EnvElectricity> implements IEnvElectricityService {
+
+}

+ 20 - 0
test02/src/main/java/com/huimv/service/impl/EnvWaterServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.service.impl;
+
+import com.huimv.entity.EnvWater;
+import com.huimv.mapper.EnvWaterMapper;
+import com.huimv.service.IEnvWaterService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-11
+ */
+@Service
+public class EnvWaterServiceImpl extends ServiceImpl<EnvWaterMapper, EnvWater> implements IEnvWaterService {
+
+}

+ 42 - 32
test02/src/main/java/com/huimv/service/impl/PeopleServiceImpl.java

@@ -1,32 +1,42 @@
-package com.huimv.service.impl;
-
-import com.huimv.entity.People;
-import com.huimv.mapper.PeopleMapper;
-import com.huimv.service.IPeopleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author author
- * @since 2023-04-12
- */
-@Service
-public class PeopleServiceImpl extends ServiceImpl<PeopleMapper, People> implements IPeopleService {
-
-    @Autowired
-    private PeopleMapper peopleMapper;
-
-    @Override
-    public void addPeople(String[] people) {
-        People people1 = new People();
-        people1.setName(people[0]);
-        people1.setAge(Integer.parseInt(people[1]));
-        people1.setSex(people[2]);
-        peopleMapper.insert(people1);
-    }
-}
+//package com.huimv.service.impl;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.huimv.entity.People;
+//import com.huimv.mapper.PeopleMapper;
+//import com.huimv.service.IPeopleService;
+//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//
+///**
+// * <p>
+// *  服务实现类
+// * </p>
+// *
+// * @author author
+// * @since 2023-04-12
+// */
+//@Service
+//public class PeopleServiceImpl extends ServiceImpl<PeopleMapper, People> implements IPeopleService {
+//
+//    @Autowired
+//    private PeopleMapper peopleMapper;
+//
+//    @Override
+//    public void addPeople(String[] people) {
+//        People people1 = new People();
+//        people1.setName(people[0]);
+//        people1.setAge(Integer.parseInt(people[1]));
+//        people1.setSex(people[2]);
+//        peopleMapper.insert(people1);
+//    }
+//
+//    @Override
+//    public void test() {
+//        QueryWrapper<People> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("id", 1);
+//        System.out.println(peopleMapper.selectOne(queryWrapper));
+//        queryWrapper.eq("sex", "男");
+//        System.out.println(peopleMapper.selectList(queryWrapper));
+//    }
+//}

+ 42 - 8
test02/src/main/java/com/huimv/subscribe/ConsumerMQTT.java

@@ -3,6 +3,7 @@ package com.huimv.subscribe;
 
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
+import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
 import org.springframework.context.annotation.Configuration;
 
@@ -10,12 +11,12 @@ import org.springframework.context.annotation.Configuration;
 public class ConsumerMQTT {
     public static final String HOST = "tcp://192.168.1.68:1883";
 //    public static final String TOPIC1 = "/today/#";//请阅地址
-    private static final String clientid = "subscribe";
-    private MqttClient client;
-    private MqttConnectOptions options;
+    private static final String clientid = "JieShouCeshi";
+    private static MqttClient client;
+    private static MqttConnectOptions options;
 
-    private String userName = "admin";    //非必须
-    private String passWord = "admin";  //非必须
+    private static String userName = "admin";    //非必须
+    private static String passWord = "admin";  //非必须
 
     public void start() {
         try {
@@ -47,14 +48,47 @@ public class ConsumerMQTT {
 //            int[] Qos = {1};//0:最多一次 、1:最少一次 、2:只有一次
 //            String[] topic1 = {TOPIC1};
 //            client.subscribe(topic1, Qos);
-            client.subscribe("test",1);
-
-
+            client.subscribe("/LG210/D4AD204BAEE4/down",1);
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
+    public static void test() {
+        try {
+                // host为主机名,clientid即连接MQTT的客户端ID,一般以唯一标识符表示,MemoryPersistence设置clientid的保存形式,默认为以内存保存
+                client = new MqttClient(HOST, clientid, new MemoryPersistence());
+                // MQTT的连接设置
+                options = new MqttConnectOptions();
+                // 设置是否清空session,这里如果设置为false表示服务器会保留客户端的连接记录,设置为true表示每次连接到服务器都以新的身份连接
+                options.setCleanSession(true);
+                // 设置连接的用户名
+                options.setUserName(userName);
+                // 设置连接的密码
+                options.setPassword(passWord.toCharArray());
+                // 设置超时时间 单位为秒
+                options.setConnectionTimeout(10);
+                // 设置会话心跳时间 单位为秒 服务器会每隔1.5*20秒的时间向客户端发送个消息判断客户端是否在线,但这个方法并没有重连的机制
+                options.setKeepAliveInterval(20);
+                //设置断开后重新连接
+                options.setAutomaticReconnect(false);
+                // 设置回调
+                client.setCallback(new PushCallback());
+//            MqttTopic topic = client.getTopic(TOPIC1);
+                //setWill方法,如果项目中需要知道客户端是否掉线可以调用该方法。设置最终端口的通知消息
+                //遗嘱
+                // options.setWill(topic, "关闭前最后的信息".getBytes(), 1, true);
+                client.connect(options);
+
+                //订阅消息
+//            int[] Qos = {1};//0:最多一次 、1:最少一次 、2:只有一次
+//            String[] topic1 = {TOPIC1};
+//            client.subscribe(topic1, Qos);
+                client.subscribe("/LG210/D4AD204BAEE4/down", 1);
+        } catch (MqttException e) {
+            e.printStackTrace();
+        }
+    }
     public static void main(String[] args) {
         ConsumerMQTT client2 = new ConsumerMQTT();
         client2.start();

+ 94 - 54
test02/src/main/java/com/huimv/subscribe/ConsumerMQTT2.java

@@ -1,58 +1,98 @@
-//package com.huimv.subcribe;
-//
-//import org.eclipse.paho.client.mqttv3.MqttClient;
-//import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
-//import org.eclipse.paho.client.mqttv3.MqttTopic;
-//import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-//
-//public class ConsumerMQTT2 {
-//    public static final String HOST = "tcp://192.168.1.14:1883";
-//    public static final String TOPIC1 = "today1234";//请阅地址
-//    private static final String clientid = "client22";
-//    private MqttClient client;
-//    private MqttConnectOptions options;
-//
-//    private String userName = "admin";    //非必须
-//    private String passWord = "admin";  //非必须
-//
-//    private void start() {
-//        try {
-//            // host为主机名,clientid即连接MQTT的客户端ID,一般以唯一标识符表示,MemoryPersistence设置clientid的保存形式,默认为以内存保存
-//            client = new MqttClient(HOST, clientid, new MemoryPersistence());
-//            // MQTT的连接设置
-//            options = new MqttConnectOptions();
-//            // 设置是否清空session,这里如果设置为false表示服务器会保留客户端的连接记录,设置为true表示每次连接到服务器都以新的身份连接
-//            options.setCleanSession(false);
-//            // 设置连接的用户名
-//            options.setUserName(userName);
-//            // 设置连接的密码
-//            options.setPassword(passWord.toCharArray());
-//            // 设置超时时间 单位为秒
-//            options.setConnectionTimeout(10);
-//            // 设置会话心跳时间 单位为秒 服务器会每隔1.5*20秒的时间向客户端发送个消息判断客户端是否在线,但这个方法并没有重连的机制
-//            options.setKeepAliveInterval(20);
-//            //设置断开后重新连接
-//            options.setAutomaticReconnect(true);
-//            // 设置回调
-//            client.setCallback(new PushCallback());
+package com.huimv.subscribe;
+
+
+import org.eclipse.paho.client.mqttv3.MqttClient;
+import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
+import org.eclipse.paho.client.mqttv3.MqttException;
+import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ConsumerMQTT2 {
+    public static final String HOST = "tcp://192.168.1.68:1883";
+//    public static final String TOPIC1 = "/today/#";//请阅地址
+    private static final String clientid = "KeHuDuanCeShi";
+    private static MqttClient client;
+    private static MqttConnectOptions options;
+
+    private static String userName = "admin";    //非必须
+    private static String passWord = "admin";  //非必须
+
+    public void start() {
+        try {
+            // host为主机名,clientid即连接MQTT的客户端ID,一般以唯一标识符表示,MemoryPersistence设置clientid的保存形式,默认为以内存保存
+            client = new MqttClient(HOST, clientid, new MemoryPersistence());
+            // MQTT的连接设置
+            options = new MqttConnectOptions();
+            // 设置是否清空session,这里如果设置为false表示服务器会保留客户端的连接记录,设置为true表示每次连接到服务器都以新的身份连接
+            options.setCleanSession(true);
+            // 设置连接的用户名
+            options.setUserName(userName);
+            // 设置连接的密码
+            options.setPassword(passWord.toCharArray());
+            // 设置超时时间 单位为秒
+            options.setConnectionTimeout(10);
+            // 设置会话心跳时间 单位为秒 服务器会每隔1.5*20秒的时间向客户端发送个消息判断客户端是否在线,但这个方法并没有重连的机制
+            options.setKeepAliveInterval(20);
+            //设置断开后重新连接
+            options.setAutomaticReconnect(false);
+            // 设置回调
+            client.setCallback(new PushCallback());
 //            MqttTopic topic = client.getTopic(TOPIC1);
-//            //setWill方法,如果项目中需要知道客户端是否掉线可以调用该方法。设置最终端口的通知消息
-//            //遗嘱
-//           // options.setWill(topic, "关闭前最后的信息".getBytes(), 1, true);
-//            client.connect(options);
-//            //订阅消息
+            //setWill方法,如果项目中需要知道客户端是否掉线可以调用该方法。设置最终端口的通知消息
+            //遗嘱
+           // options.setWill(topic, "关闭前最后的信息".getBytes(), 1, true);
+            client.connect(options);
+
+            //订阅消息
 //            int[] Qos = {1};//0:最多一次 、1:最少一次 、2:只有一次
 //            String[] topic1 = {TOPIC1};
 //            client.subscribe(topic1, Qos);
-//
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//
-//    public static void main(String[] args) {
-//        ConsumerMQTT2 client2 = new ConsumerMQTT2();
-//        client2.start();
-//    }
-//}
+            client.subscribe("/LG210/D4AD204BAEE4/up",1);
+//huimv_up_867699060002277
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void test() {
+        try {
+                // host为主机名,clientid即连接MQTT的客户端ID,一般以唯一标识符表示,MemoryPersistence设置clientid的保存形式,默认为以内存保存
+                client = new MqttClient(HOST, clientid, new MemoryPersistence());
+                // MQTT的连接设置
+                options = new MqttConnectOptions();
+                // 设置是否清空session,这里如果设置为false表示服务器会保留客户端的连接记录,设置为true表示每次连接到服务器都以新的身份连接
+                options.setCleanSession(true);
+                // 设置连接的用户名
+                options.setUserName(userName);
+                // 设置连接的密码
+                options.setPassword(passWord.toCharArray());
+                // 设置超时时间 单位为秒
+                options.setConnectionTimeout(10);
+                // 设置会话心跳时间 单位为秒 服务器会每隔1.5*20秒的时间向客户端发送个消息判断客户端是否在线,但这个方法并没有重连的机制
+                options.setKeepAliveInterval(20);
+                //设置断开后重新连接
+                options.setAutomaticReconnect(false);
+                // 设置回调
+                client.setCallback(new PushCallback());
+//            MqttTopic topic = client.getTopic(TOPIC1);
+                //setWill方法,如果项目中需要知道客户端是否掉线可以调用该方法。设置最终端口的通知消息
+                //遗嘱
+                // options.setWill(topic, "关闭前最后的信息".getBytes(), 1, true);
+                client.connect(options);
+
+                //订阅消息
+//            int[] Qos = {1};//0:最多一次 、1:最少一次 、2:只有一次
+//            String[] topic1 = {TOPIC1};
+//            client.subscribe(topic1, Qos);
+                client.subscribe("/LG210/D4AD204BAEE4/down", 1);
+        } catch (MqttException e) {
+            e.printStackTrace();
+        }
+    }
+    public static void main(String[] args) {
+        ConsumerMQTT2 client2 = new ConsumerMQTT2();
+        client2.start();
+    }
+}

+ 82 - 16
test02/src/main/java/com/huimv/subscribe/PushCallback.java

@@ -1,20 +1,32 @@
 package com.huimv.subscribe;
 
-import com.huimv.entity.People;
-import com.huimv.service.IPeopleService;
-import com.huimv.service.impl.PeopleServiceImpl;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.entity.EnvElectricity;
+import com.huimv.entity.EnvWater;
+import com.huimv.service.IEnvElectricityService;
+import com.huimv.service.IEnvWaterService;
 import com.huimv.untils.SpringUtil;
-import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
-import org.eclipse.paho.client.mqttv3.MqttCallback;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.eclipse.paho.client.mqttv3.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.math.BigDecimal;
+import java.sql.SQLOutput;
+import java.text.SimpleDateFormat;
+import java.time.ZonedDateTime;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Map;
+
 @Component
 //接收消息回调
 class PushCallback implements MqttCallback {
 
+    @Autowired
+    private IEnvElectricityService envElectricityService;
 
+    private MqttClient client;
     @Override
     public void connectionLost(Throwable cause) {
 
@@ -32,19 +44,73 @@ class PushCallback implements MqttCallback {
         // subscribe后得到的消息会执行到这里面
         System.out.println("接收消息主题 : " + topic);
         System.out.println("接收消息Qos : " + message.getQos());
-        System.out.println("接收消息内容 : " + new String(message.getPayload()));
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        System.out.println("接收消息的时间 :" + sdf.format(new Date()));
+//        System.out.println("siejgfskjgfsldjfhg"+message);
+//        System.out.println(message.getPayload());
+        byte[] payload = message.getPayload();
+        StringBuilder sb = new StringBuilder();
+        for (byte b : payload) {
+            sb.append(String.format("%02x", b));
+        }
+        String s = sb.toString();
+        System.out.println("接收消息内容 : " + s);
         System.out.println("开始处理当前数据...");
+        if (s.startsWith("1c04")){
+            try {
+                System.out.println("开始处理电表数据!");
+                String substring = s.substring(6, 14);
+                System.out.println("截取字符串:"+substring);
+//                IEnvElectricityService electricityService = SpringUtil.getBean(IEnvElectricityService.class);
+                System.out.println("-------->1");
+
+                EnvElectricity envElectricity = new EnvElectricity();
+                int eleOrigValue = Integer.parseInt(substring, 16);
+                System.out.println("整形:"+eleOrigValue);
+                Float f =  Float.intBitsToFloat(eleOrigValue);
+                System.out.println("浮点:"+f);
+                BigDecimal bigDecimal = new BigDecimal(f);
+                envElectricity.setOriginalValue(bigDecimal);
+                envElectricity.setUpdateTime(new Date());
+                envElectricity.setFarmId(27);
+                envElectricityService.save(envElectricity);
+            } catch (Exception e) {
+                System.out.println("sssssssss"+ e);
+            }
 
-        String messages = new String(message.getPayload());
-        String[] split = messages.split(",");
-//        PeopleServiceImpl peopleService = SpringUtil.getBean(PeopleServiceImpl.class);//创建impl实例
-//        People people = new People();
-//        people.setName(split[0]);
-//        people.setAge(Integer.parseInt(split[1]));
-//        people.setSex(split[2]);
-//        peopleService.save(people);
-//        peopleService.addPeople(split);
+        }
+        if (s.startsWith("3303")) {
+            System.out.println("开始处理水表数据!");
+            String substring = s.substring(6, 14);
+            IEnvWaterService waterService = SpringUtil.getBean(IEnvWaterService.class);
+            EnvWater water = new EnvWater();
+            int eleOrigValue = Integer.parseInt(substring, 16);
+            BigDecimal value = BigDecimal.valueOf(eleOrigValue * 0.01);
+            water.setOriginalValue(value);
+            water.setUpdateTime(new Date());
+            water.setFarmId(27);
+            waterService.save(water);
+        }
         System.out.println("数据处理完成!");
     }
 
+    public static void main(String[] args) {
+        String s = "1c0404405c0a3d2426";
+        String substring = s.substring(6, 14);
+        System.out.println(substring);
+
+//        int eleOrigValue = Integer.parseInt(substring, 16);
+//        BigDecimal value = BigDecimal.valueOf(eleOrigValue * 0.01);
+//        System.out.println(value);
+//
+    int eleOrigValue = Integer.parseInt(substring, 16);
+    Float f =  Float.intBitsToFloat(eleOrigValue);
+    BigDecimal bigDecimal = new BigDecimal(f);
+        System.out.println(bigDecimal);
+//        Float f =  Float.intBitsToFloat(1079773757);
+//        System.out.println(f);
+////                BigDecimal bigDecimal = new BigDecimal(f);
+//        // 1079773757
+    }
 }
+

+ 3 - 3
test02/src/main/resources/application-dev.yml

@@ -6,9 +6,9 @@ spring:
     name: test02
 
   datasource:
-    url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
+    url: jdbc:mysql://139.9.172.209:3309/huimv-farm-env?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: eartag
+    password: eartag@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
 
   jpa:

+ 5 - 0
test02/src/main/resources/mapper/EnvElectricityMapper.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.mapper.EnvElectricityMapper">
+
+</mapper>

+ 5 - 0
test02/src/main/resources/mapper/EnvWaterMapper.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.mapper.EnvWaterMapper">
+
+</mapper>

+ 3 - 3
test02/target/classes/application-dev.yml

@@ -6,9 +6,9 @@ spring:
     name: test02
 
   datasource:
-    url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
+    url: jdbc:mysql://139.9.172.209:3309/huimv-farm-env?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: eartag
+    password: eartag@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
 
   jpa:

BIN
test02/target/classes/com/huimv/controller/DeviceController.class


BIN
test02/target/classes/com/huimv/controller/EnvElectricityController.class


BIN
test02/target/classes/com/huimv/controller/EnvWaterController.class


BIN
test02/target/classes/com/huimv/controller/PeopleController.class


BIN
test02/target/classes/com/huimv/entity/Device.class


BIN
test02/target/classes/com/huimv/entity/EnvElectricity.class


BIN
test02/target/classes/com/huimv/entity/EnvWater.class


BIN
test02/target/classes/com/huimv/entity/People.class


BIN
test02/target/classes/com/huimv/mapper/DeviceMapper.class


BIN
test02/target/classes/com/huimv/mapper/EnvElectricityMapper.class


BIN
test02/target/classes/com/huimv/mapper/EnvWaterMapper.class


BIN
test02/target/classes/com/huimv/mapper/PeopleMapper.class


BIN
test02/target/classes/com/huimv/publish/PublishMQTT.class


BIN
test02/target/classes/com/huimv/service/IDeviceService.class


BIN
test02/target/classes/com/huimv/service/IEnvElectricityService.class


BIN
test02/target/classes/com/huimv/service/IEnvWaterService.class


BIN
test02/target/classes/com/huimv/service/IPeopleService.class


BIN
test02/target/classes/com/huimv/service/impl/DeviceServiceImpl.class


BIN
test02/target/classes/com/huimv/service/impl/EnvElectricityServiceImpl.class


BIN
test02/target/classes/com/huimv/service/impl/EnvWaterServiceImpl.class


BIN
test02/target/classes/com/huimv/service/impl/PeopleServiceImpl.class


BIN
test02/target/classes/com/huimv/subscribe/ConsumerMQTT.class


BIN
test02/target/classes/com/huimv/subscribe/ConsumerMQTT2.class


BIN
test02/target/classes/com/huimv/subscribe/PushCallback.class


+ 5 - 0
test02/target/classes/mapper/EnvElectricityMapper.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.mapper.EnvElectricityMapper">
+
+</mapper>

+ 5 - 0
test02/target/classes/mapper/EnvWaterMapper.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.mapper.EnvWaterMapper">
+
+</mapper>