新建项目

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

@@ -12,6 +12,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.text.ParseException;
 import java.util.Map;
 
 @Component
@@ -24,9 +25,9 @@ public class DeviceListener {
 
     @RabbitListener(queues = Const.QUEUE_ENV_SHUI_HUIMV_DATA)
     @RabbitHandler
-    public void processReceive(Map<String,String> rawMap)   {
+    public void processReceive(Map<String,String> rawMap) throws ParseException {
 //        System.out.println(">>>>>>>>>>>>>> 11 接收数据 RawMap>>" + rawMap.toString());
-        try {
+//        try {
             String askText = rawMap.get("askText");
             AllData allData = JSONUtil.toBean(askText, AllData.class);
             String event = allData.getEvent();
@@ -42,9 +43,9 @@ public class DeviceListener {
             }
 
             System.out.println("数据开始--->"+allData.toString());
-        }catch (Exception e){
-            System.out.println("数据异常"+e);
-        }
+//        }catch (Exception e){
+//            System.out.println("数据异常"+e);
+//        }
     }
 
 }

huimv-env-device/src/main/java/com/huimv/env/device/service/impl/DataServiceImpl.java

@@ -19,6 +19,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 @Service
 public class DataServiceImpl implements DataService {
@@ -61,10 +62,10 @@ public class DataServiceImpl implements DataService {
 
     private void saveDian(String devType ,String voltage, Integer originalData, String timestamp, String nodeEui,String payload
             ,Integer farmId,Integer unitId,String unitName,String farmName,int transformer,int difference) throws ParseException {
-        EnergyElectricity one = energyElectricityService.getOne(new QueryWrapper<EnergyElectricity>().eq("chip_code", nodeEui).orderByDesc("id").last("limit 1"));
+        List<EnergyElectricity> one = energyElectricityService.list(new QueryWrapper<EnergyElectricity>().eq("chip_code", nodeEui).orderByDesc("id").last("limit 1"));
         String lastData ="0";
         if (ObjectUtil.isNotEmpty(one)){
-            lastData =  one.getOriginalValue();
+            lastData =  one.get(0).getOriginalValue();
         }
         //差值
         Integer str =   (originalData - Integer.parseInt(lastData));
@@ -102,10 +103,10 @@ public class DataServiceImpl implements DataService {
 
     private void saveShui(String devType ,String voltage, Integer originalData, String timestamp, String nodeEui
             ,String payload,Integer farmId,Integer unitId,String unitName,String farmName,int transformer,int difference) throws ParseException {
-        EnergyWater one = energyWaterService.getOne(new QueryWrapper<EnergyWater>().eq("chip_code", nodeEui).orderByDesc("id").last("limit 1"));
+        List<EnergyWater> one = energyWaterService.list(new QueryWrapper<EnergyWater>().eq("chip_code", nodeEui).orderByDesc("id").last("limit 1"));
         String lastData ="0";
         if (ObjectUtil.isNotEmpty(one)){
-            lastData =  one.getOriginalValue();
+            lastData =  one.get(0).getOriginalValue();
         }
         //差值
        Integer str =   (originalData - Integer.parseInt(lastData) -difference);