料塔接收修改

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

@@ -23,6 +23,7 @@ import javax.xml.ws.Action;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -120,4 +121,17 @@ public class ReceiveController {
         System.out.println(s.substring(4, 6));
         System.out.println(s.substring(6, 8));
     }
+
+    @PostMapping("/update")
+    public Result update(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        List<EnergyData> list = dataService.list(queryWrapper);
+        for (EnergyData energyData : list) {
+            energyData.setFeedValue("0");
+            dataService.updateById(energyData);
+        }
+        return null;
+    }
 }

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

@@ -55,7 +55,12 @@ public class EnergyTimer {
             energyData.setCreateDate(new Date());
             energyData.setFarmId(energyEnvDevice.getFarmId());
             energyData.setUnitId(energyEnvDevice.getUnitId());
-            energyData.setFeedValue(feed);
+            if (energyEnvDevice.getFarmId() == 23) {
+                energyData.setFeedValue("0");
+            } else {
+                energyData.setFeedValue(feed);
+            }
+
             energyData.setWaterValue(water);
             energyData.setGasValue(gas);
             energyData.setElectricityValue(electricity);