Browse Source

更新密码

523096025 1 year ago
parent
commit
df0d170fb5
1 changed files with 30 additions and 30 deletions
  1. 30 30
      input/src/main/java/com/huimv/input/server/EnvInputServerHandler.java

+ 30 - 30
input/src/main/java/com/huimv/input/server/EnvInputServerHandler.java

@@ -380,36 +380,36 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter   {
 //                lastWeight = weight;
             }
 
-            //吃料
-            EnvRegularCallFeeding envRegularCallFeeding = new EnvRegularCallFeeding();
-            envRegularCallFeeding.setBattery(batStr);
-            envRegularCallFeeding.setCallDate(new Date());
-            envRegularCallFeeding.setCallCode(decId+"");
-            envRegularCallFeeding.setCallName(envDevice.getDeviceName());
-            envRegularCallFeeding.setDuckId(baseDuckInfo.getId());
-            envRegularCallFeeding.setDuckNum(baseDuckInfo.getDuckNum());
-            envRegularCallFeeding.setFarmId(baseDuckInfo.getFarmId());
-            envRegularCallFeeding.setUnitId(baseDuckInfo.getUnitId());
-            envRegularCallFeeding.setUnitName(baseDuckInfo.getUnitName());
-            envRegularCallFeeding.setChiNum(baseDuckInfo.getChiNum());
-            envRegularCallFeeding.setJiaoNum(baseDuckInfo.getJiaoNum());
-            envRegularCallFeeding.setBatchNum(baseDuckInfo.getBatchNum());
-            if (minWeight.compareTo(bigDecimal0 )==0){
-                envRegularCallFeeding.setDuckFeedingOriginal(bigDecimal0);
-            }else {
-                envRegularCallFeeding.setDuckFeedingOriginal(minWeight.divide(bigDecimal10, 1, BigDecimal.ROUND_HALF_UP) );
-            }
-            BigDecimal subtract = lastWeight.subtract(minWeight);
-            BigDecimal divide = subtract.divide(bigDecimal10, 1, BigDecimal.ROUND_HALF_UP);
-            if (subtract.compareTo(bigDecimal0 )==0){
-                envRegularCallFeeding.setDuckWeight(bigDecimal0);
-            }else  if(divide.compareTo(new BigDecimal(500 ) )> 0 ){
-                return;
-            }else {
-                envRegularCallFeeding.setDuckWeight( divide);
-            }
-            rawData.setLastWeight(minWeight);
-            rawDataMapper.updateById(rawData);
+//            //吃料
+//            EnvRegularCallFeeding envRegularCallFeeding = new EnvRegularCallFeeding();
+//            envRegularCallFeeding.setBattery(batStr);
+//            envRegularCallFeeding.setCallDate(new Date());
+//            envRegularCallFeeding.setCallCode(decId+"");
+//            envRegularCallFeeding.setCallName(envDevice.getDeviceName());
+//            envRegularCallFeeding.setDuckId(baseDuckInfo.getId());
+//            envRegularCallFeeding.setDuckNum(baseDuckInfo.getDuckNum());
+//            envRegularCallFeeding.setFarmId(baseDuckInfo.getFarmId());
+//            envRegularCallFeeding.setUnitId(baseDuckInfo.getUnitId());
+//            envRegularCallFeeding.setUnitName(baseDuckInfo.getUnitName());
+//            envRegularCallFeeding.setChiNum(baseDuckInfo.getChiNum());
+//            envRegularCallFeeding.setJiaoNum(baseDuckInfo.getJiaoNum());
+//            envRegularCallFeeding.setBatchNum(baseDuckInfo.getBatchNum());
+//            if (minWeight.compareTo(bigDecimal0 )==0){
+//                envRegularCallFeeding.setDuckFeedingOriginal(bigDecimal0);
+//            }else {
+//                envRegularCallFeeding.setDuckFeedingOriginal(minWeight.divide(bigDecimal10, 1, BigDecimal.ROUND_HALF_UP) );
+//            }
+//            BigDecimal subtract = lastWeight.subtract(minWeight);
+//            BigDecimal divide = subtract.divide(bigDecimal10, 1, BigDecimal.ROUND_HALF_UP);
+//            if (subtract.compareTo(bigDecimal0 )==0){
+//                envRegularCallFeeding.setDuckWeight(bigDecimal0);
+//            }else  if(divide.compareTo(new BigDecimal(500 ) )> 0 ){
+//                return;
+//            }else {
+//                envRegularCallFeeding.setDuckWeight( divide);
+//            }
+//            rawData.setLastWeight(minWeight);
+//            rawDataMapper.updateById(rawData);
 
 
         }