修复生产数据取数。

huimv-hy-production/huimv.hy.autoGetData/src/main/java/com/huimv/production/autoGetData/service/impl/AutoGetErpDataImpl.java

@@ -464,6 +464,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
             JSONObject contentJo = outJo.getJSONObject("content");
             if (contentJo.getBoolean("success")) {
                 JSONArray dataJa = contentJo.getJSONArray("data");
+                System.out.println(""+dataJa);
                 if (dataJa.size() > 0) {
                     //获取牧场所有名称数据
                     List<ProdFarmNameEntity> farmNameEntityList = prodFarmNameRepo.findAll();
@@ -554,7 +555,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         addEntity1.setFarmId(farmId);
                         addEntity1.setStockType("grice_rate");
                         addEntity1.setStockName("产房成活率");
-                        addEntity1.setStockQuantity(mathUtil.countRate(Float.parseFloat(cfchl), 1));
+                        addEntity1.setStockQuantity(mathUtil.formatBit(Float.parseFloat(cfchl)));
                         addEntity1.setMonth(Integer.valueOf(month));
                         addEntity1.setYear(Integer.parseInt(year));
                         produceRepo.saveAndFlush(addEntity1);
@@ -568,7 +569,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         addEntity2.setFarmId(farmId);
                         addEntity2.setStockType("piglet_rate");
                         addEntity2.setStockName("保育成活率");
-                        addEntity2.setStockQuantity(mathUtil.countRate(Float.parseFloat(bychl), 1));
+                        addEntity2.setStockQuantity(mathUtil.formatBit(Float.parseFloat(bychl)));
 //                    stockEntity2.setRate();
                         addEntity2.setMonth(Integer.valueOf(month));
                         addEntity2.setYear(Integer.parseInt(year));
@@ -582,7 +583,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         addEntity3.setFarmId(farmId);
                         addEntity3.setStockType("fatpig_rate");
                         addEntity3.setStockName("肥猪成活率");
-                        addEntity3.setStockQuantity(mathUtil.countRate(Float.parseFloat(fzchl), 1));
+                        addEntity3.setStockQuantity(mathUtil.formatBit(Float.parseFloat(fzchl)));
 //                    addEntity3.setRate();
                         addEntity3.setMonth(Integer.valueOf(month));
                         addEntity3.setYear(Integer.parseInt(year));
@@ -596,7 +597,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         addEntity4.setFarmId(farmId);
                         addEntity4.setStockType("avg_farrow_1");
                         addEntity4.setStockName("平均窝产仔猪");
-                        addEntity4.setStockQuantity(mathUtil.countRate(Float.parseFloat(pjwczz), 1));
+                        addEntity4.setStockQuantity(mathUtil.formatBit(Float.parseFloat(pjwczz)));
 //                    addEntity4.setRate();
                         addEntity4.setMonth(Integer.valueOf(month));
                         addEntity4.setYear(Integer.parseInt(year));
@@ -610,7 +611,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         addEntity5.setFarmId(farmId);
                         addEntity5.setStockType("avg_farrow_2");
                         addEntity5.setStockName("平均窝产活仔数");
-                        addEntity5.setStockQuantity(mathUtil.countRate(Float.parseFloat(pjwchzs), 1));
+                        addEntity5.setStockQuantity(mathUtil.formatBit(Float.parseFloat(pjwchzs)));
 //                    addEntity5.setRate();
                         addEntity5.setMonth(Integer.valueOf(month));
                         addEntity5.setYear(Integer.parseInt(year));
@@ -624,7 +625,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         addEntity6.setFarmId(farmId);
                         addEntity6.setStockType("avg_farrow_3");
                         addEntity6.setStockName("平均窝产正常仔数");
-                        addEntity6.setStockQuantity(mathUtil.countRate(Float.parseFloat(pjwczczs), 1));
+                        addEntity6.setStockQuantity(mathUtil.formatBit(Float.parseFloat(pjwczczs)));
 //                    addEntity6.setRate();
                         addEntity6.setMonth(Integer.valueOf(month));
                         addEntity6.setYear(Integer.parseInt(year));
@@ -638,7 +639,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         addEntity7.setFarmId(farmId);
                         addEntity7.setStockType("break_grice");
                         addEntity7.setStockName("窝断奶仔猪数");
-                        addEntity7.setStockQuantity(mathUtil.countRate(Float.parseFloat(wdnzzs), 1));
+                        addEntity7.setStockQuantity(mathUtil.formatBit(Float.parseFloat(wdnzzs)));
 //                    addEntity7.setRate();
                         addEntity7.setMonth(Integer.valueOf(month));
                         addEntity7.setYear(Integer.parseInt(year));
@@ -652,7 +653,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         addEntity8.setFarmId(farmId);
                         addEntity8.setStockType("avg_weight");
                         addEntity8.setStockName("平均断奶窝重");
-                        addEntity8.setStockQuantity(mathUtil.countRate(Float.parseFloat(pjdnwz), 1));
+                        addEntity8.setStockQuantity(mathUtil.formatBit(Float.parseFloat(pjdnwz)));
 //                    addEntity8.setRate();
                         addEntity8.setMonth(Integer.valueOf(month));
                         addEntity8.setYear(Integer.parseInt(year));
@@ -666,7 +667,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         addEntity9.setFarmId(farmId);
                         addEntity9.setStockType("break_rate");
                         addEntity9.setStockName("7日断配率");
-                        addEntity9.setStockQuantity(mathUtil.countRate(Float.parseFloat(dpl7r), 1));
+                        addEntity9.setStockQuantity(mathUtil.formatBit(Float.parseFloat(dpl7r)));
 //                    addEntity9.setRate();
                         addEntity9.setMonth(Integer.valueOf(month));
                         addEntity9.setYear(Integer.parseInt(year));
@@ -680,7 +681,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         addEntity10.setFarmId(farmId);
                         addEntity10.setStockType("nest_times");
                         addEntity10.setStockName("年产窝数");
-                        addEntity10.setStockQuantity(mathUtil.countRate(Float.parseFloat(ncws), 1));
+                        addEntity10.setStockQuantity(mathUtil.formatBit(Float.parseFloat(ncws)));
 //                    addEntity10.setRate();
                         addEntity10.setMonth(Integer.valueOf(month));
                         addEntity10.setYear(Integer.parseInt(year));
@@ -1509,7 +1510,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                     JSONObject contentJo = outJo.getJSONObject("content");
                     if (contentJo.getBoolean("success")) {
                         JSONArray dataJa = contentJo.getJSONArray("data");
-                        System.out.println(""+dataJa);
+//                        System.out.println(""+dataJa);
                         if (null == dataJa || dataJa.size()==0) {
                             log.info("未取到数据 。");
                         } else {

huimv-hy-production/huimv.hy.autoGetData/src/main/java/com/huimv/production/autoGetData/utils/MathUtil.java

@@ -15,7 +15,19 @@ import java.text.NumberFormat;
 @Component
 public class MathUtil {
 
-    //计算占比
+    public String formatBit(float num, int bit) {
+        // 创建一个数值格式化对象
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        // 设置精确到小数点后2位
+        numberFormat.setMaximumFractionDigits(bit);
+        return numberFormat.format(num);
+    }
+
+    public String formatBit(float num) {
+        return String.valueOf(num);
+    }
+
+    //计算比率
     public String countRate(float num, int bit) {
         // 创建一个数值格式化对象
         NumberFormat numberFormat = NumberFormat.getInstance();