修改12

huimv-admin/src/main/java/com/huimv/admin/config/InterceptorConfig.java

@@ -37,6 +37,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
                         ,"/huatongApi/energy-data/getData20"
                         ,"/huatongApi/energy-data/getData21"
                         ,"/huatongApi/energy-data/getData22"
+                        ,"/huatongApi/energy-data/getData30"
                         ,"/huatongApi/test/test3"
                         ,"/huatongApi/energy-data/getDeviceStatus");
     }

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

@@ -13,6 +13,7 @@ import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.BaseFarm;
 import com.huimv.admin.entity.EnergyData;
 import com.huimv.admin.entity.EnergyEnvDevice;
+import com.huimv.admin.entity.vo.NewWater;
 import com.huimv.admin.entity.vo.WaterAndElectricity;
 import com.huimv.admin.service.IBaseFarmService;
 import com.huimv.admin.service.IEnergyDataService;
@@ -584,6 +585,41 @@ public class EnergyDataController {
             iEnergyDataService.save(energyData);
         }
     }
+
+    @RequestMapping("/getData30")
+    public void getData30(@RequestBody Map<String, List<NewWater>> paramsMap) {
+        List<NewWater> result = (List) paramsMap.get("result");
+        System.out.println("接受到的数据格式:" + result);
+        for (NewWater jsonObject : result) {
+            EnergyData energyData = new EnergyData();
+            energyData.setFeedValue("0.00");
+            energyData.setWaterValue(jsonObject.getWaterValue());
+            energyData.setElectricityValue("0.00");
+            energyData.setGasValue("0.00");
+            energyData.setCreateDate(jsonObject.getCreateDate());
+            QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+            if (jsonObject.getFarmId() == 41) {
+                queryWrapper.eq("farm_id", 28);
+                energyData.setFarmId(28);
+            } else if (jsonObject.getFarmId() == 42) {
+                queryWrapper.eq("farm_id", 29);
+                energyData.setFarmId(29);
+            } else if (jsonObject.getFarmId() == 43) {
+                queryWrapper.eq("farm_id", 30);
+                energyData.setFarmId(30);
+            } else if (jsonObject.getFarmId() == 44) {
+                queryWrapper.eq("farm_id", 31);
+                energyData.setFarmId(31);
+            }
+            queryWrapper.eq("device_code", jsonObject.getChipCode());
+            EnergyEnvDevice device = deviceService.getOne(queryWrapper);
+            if (ObjectUtil.isNotEmpty(device)) {
+                energyData.setUnitId(device.getUnitId());
+                energyData.setUnitName(device.getUnitName());
+            }
+            iEnergyDataService.save(energyData);
+        }
+    }
     @PostMapping("/add")
     public Result add(@RequestBody EnergyData energyData) {
         iEnergyDataService.save(energyData);

huimv-admin/src/main/java/com/huimv/admin/entity/vo/NewWater.java

@@ -0,0 +1,51 @@
+package com.huimv.admin.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class NewWater {
+    private Integer id;
+
+    /**
+     * 计录值
+     */
+    private String waterValue;
+
+    /**
+     * 原始值
+     */
+    private String originalValue;
+
+    /**
+     * 原始数据
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String originalDate;
+
+    /**
+     * 房舍id
+     */
+    private Integer unitId;
+
+    private Integer farmId;
+
+    private String other1;
+
+    private String other2;
+    private Integer deviceType;
+
+    private String other3;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createDate;
+    private String voltage;
+    private String chipCode;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date uploadDate;
+}