精准饲喂预警

snowy-web-app/src/main/java/vip/xiaonuo/Timer/ProFeedingData.java

@@ -138,7 +138,7 @@ public class ProFeedingData implements CommonTimerTaskRunner {
                     warningInfo.setOrgId(orgId);
                     warningInfo.setUnitId(unitId);
                     warningInfo.setWarningTime(now);
-                    warningInfo.setWarningContent("耳标号" + feedingEnv.getEartagNum() + "采食" + feedValue + "Kg低于阈值");
+                    warningInfo.setWarningContent("耳标号" + feedingEnv.getEartagNum() + "采食" + feedingValue + "Kg低于阈值");
                     WarningManager warningManager = warningManagerMapper.selectOne(new QueryWrapper<WarningManager>().eq("type", 2).eq("org_id", orgId));
                     if (ObjectUtil.isNotEmpty(warningManager)) {
                         warningInfo.setWarningNotifierId(warningManager.getSecondManagerId());
@@ -152,7 +152,7 @@ public class ProFeedingData implements CommonTimerTaskRunner {
                     warningInfo.setOrgId(orgId);
                     warningInfo.setUnitId(unitId);
                     warningInfo.setWarningTime(now);
-                    warningInfo.setWarningContent("耳标号" + feedingEnv.getEartagNum() + "采食" + feedValue + "Kg高于阈值");
+                    warningInfo.setWarningContent("耳标号" + feedingEnv.getEartagNum() + "采食" + feedingValue + "Kg高于阈值");
                     WarningManager warningManager = warningManagerMapper.selectOne(new QueryWrapper<WarningManager>().eq("type", 2).eq("org_id", orgId));
                     if (ObjectUtil.isNotEmpty(warningManager)) {
                         warningInfo.setWarningNotifierId(warningManager.getSecondManagerId());
@@ -200,7 +200,7 @@ public class ProFeedingData implements CommonTimerTaskRunner {
                     warningInfo.setOrgId(orgId);
                     warningInfo.setUnitId(unitId);
                     warningInfo.setWarningTime(now);
-                    warningInfo.setWarningContent(feedingEnv.getUnitName() + "余料" + marginFeedValue + "Kg低于阈值");
+                    warningInfo.setWarningContent(feedingEnv.getUnitName() + "余料" + marginFeedValue + "吨低于阈值");
                     WarningManager warningManager = warningManagerMapper.selectOne(new QueryWrapper<WarningManager>().eq("type", 2).eq("org_id", orgId));
                     if (ObjectUtil.isNotEmpty(warningManager)) {
                         warningInfo.setWarningNotifierId(warningManager.getSecondManagerId());

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingthreshold/service/impl/FeedingThresholdServiceImpl.java

@@ -59,7 +59,14 @@ public class FeedingThresholdServiceImpl extends ServiceImpl<FeedingThresholdMap
             feedingThreshold.setCreateDate(new Date());
             thresholdMapper.insert(feedingThreshold);
         } else {
-            BeanUtil.copyProperties(feedingThreshold, feedingThreshold1);
+            feedingThreshold1.setFatFeedLower(feedingThreshold.getFatFeedLower());
+            feedingThreshold1.setFatFeedUpper(feedingThreshold.getFatFeedUpper());
+            feedingThreshold1.setFatWaterLower(feedingThreshold.getFatWaterLower());
+            feedingThreshold1.setFatWaterUpper(feedingThreshold.getFatWaterUpper());
+            feedingThreshold1.setFeedLower(feedingThreshold.getFeedLower());
+            feedingThreshold1.setFeedUpper(feedingThreshold.getFeedUpper());
+            feedingThreshold1.setWaterLower(feedingThreshold.getWaterLower());
+            feedingThreshold1.setWaterUpper(feedingThreshold.getWaterUpper());
             thresholdMapper.updateById(feedingThreshold1);
         }
     }