能耗阈值修改

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

@@ -48,11 +48,11 @@ public class EnergyWarningThresholdController {
         EnergyWarningThreshold energyWarningThreshold4 = thresholdVo.getHouBei().setFarmId(Integer.parseInt(farmId));
         EnergyWarningThreshold energyWarningThreshold5 = thresholdVo.getGeLi().setFarmId(Integer.parseInt(farmId));
         energyWarningThreshold.setOther1("1");
-        energyWarningThreshold.setOther1("2");
-        energyWarningThreshold.setOther1("3");
-        energyWarningThreshold.setOther1("4");
-        energyWarningThreshold.setOther1("5");
-        energyWarningThreshold.setOther1("6");
+        energyWarningThreshold1.setOther1("2");
+        energyWarningThreshold2.setOther1("3");
+        energyWarningThreshold3.setOther1("4");
+        energyWarningThreshold4.setOther1("5");
+        energyWarningThreshold5.setOther1("6");
         List<EnergyWarningThreshold> energyWarningThresholdList = new ArrayList<>();
         energyWarningThresholdList.add(energyWarningThreshold);
         energyWarningThresholdList.add(energyWarningThreshold1);

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

@@ -90,7 +90,7 @@ public class EnergyWarningThresholdServiceImpl extends ServiceImpl<EnergyWarning
                 Integer farmId = energyWarningThreshold.getFarmId();
                 String userIds = energyWarningThreshold.getUserIds();
                 QueryWrapper<EnergyWarningThreshold> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("farmId", farmId).eq("other1", energyWarningThreshold.getOther1());
+                queryWrapper.eq("farm_id", farmId).eq("other1", energyWarningThreshold.getOther1());
                 EnergyWarningThreshold energyWarningThreshold1 = warningThresholdMapper.selectOne(queryWrapper);
 
                 //去掉属于该人物的id