添加设备在线率统计

huimv-admin/src/main/java/com/huimv/admin/entity/ProdStock.java

@@ -75,26 +75,25 @@ public class ProdStock implements Serializable {
      */
     private Integer khzcl;
 
-    /**
-     * 公猪存栏
-     */
-    private Integer spzcl;
 
     /**
      * 商品猪存栏
      */
+    private Integer spzcl;
 
-    private Integer zzcl;
 
     /**
      * 仔猪存栏
      */
 
-    private Integer zcl;
+    private Integer zzcl;
 
     /**
      * 总存栏
      */
+
+    private Integer zcl;
+
     @JsonFormat(pattern = "yyyy-MM",timezone = "GMT+8")
     private LocalDateTime creatTime;
 

huimv-admin/src/main/java/com/huimv/admin/entity/vo/ProdStockVo.java

@@ -18,6 +18,8 @@ public class ProdStockVo {
     private String brmzclRate;
     private String khzclRate;
     private String spzclRate;
+    private String zzclRate;
+    private String zclRate;
     private List<ProdStock> prodStocks;
     private ProdStock prodStock;
 

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

@@ -86,10 +86,12 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         prodStockVo.setBrmzclRate("0");
         prodStockVo.setKhzclRate("0");
         prodStockVo.setSpzclRate("0");
+        prodStockVo.setZclRate("0");
+        prodStockVo.setZzclRate("0");
         Integer count = 0;
         if (ObjectUtil.isNotEmpty(prodStock)){
             count =prodStock.getMzcl() + prodStock.getGzcl() + prodStock.getBrzcl() + prodStock.getByzcl() + prodStock.getYfzcl() +
-                    prodStock.getHbzcl() + prodStock.getRszcl() + prodStock.getBrmzcl() + prodStock.getKhzcl() + prodStock.getSpzcl();
+                    prodStock.getHbzcl() + prodStock.getRszcl() + prodStock.getBrmzcl() + prodStock.getKhzcl() + prodStock.getSpzcl()+prodStock.getZzcl();
             NumberFormat nt = NumberFormat.getPercentInstance();
             nt.setMinimumFractionDigits(2);
             prodStockVo.setCount(count);
@@ -105,6 +107,9 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
             prodStockVo.setBrmzclRate(nt.format((double) prodStock.getBrmzcl() / count));
             prodStockVo.setKhzclRate(nt.format((double) prodStock.getKhzcl() / count));
             prodStockVo.setSpzclRate(nt.format((double) prodStock.getSpzcl() / count));
+
+            prodStockVo.setZclRate(nt.format((double) prodStock.getZcl() / count));
+            prodStockVo.setZzclRate(nt.format((double) prodStock.getZzcl() / count));
         }
 
         return new Result(ResultCode.SUCCESS,prodStockVo);

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

@@ -26,8 +26,6 @@ public class EnergyTimer {
 //    能耗数据
     @Scheduled(cron = "0 0 */1 * * ? ")
     private void getShenChan() throws Exception {
-
-
         List<EnergyEnvDevice> energyEnvDevices = deviceMapper.selectList(null);
         for (EnergyEnvDevice energyEnvDevice : energyEnvDevices) {
             EnergyData energyData = new EnergyData();

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

@@ -18,7 +18,7 @@ import java.util.Date;
 
 @Configuration
 @EnableScheduling
-public class GasTimer {
+public class  GasTimer {
 
     @Autowired
     private GasDataMapper gasDataMapper;
@@ -31,13 +31,6 @@ public class GasTimer {
     private void getShenChan() throws Exception {
 
         String type = NumberUtils.getNum(1, 5, 0);//loc_type
-
-
-
-
-
-
-
         for (int i = 1; i < 5; i++) {
 
             String nh3n = NumberUtils.getNum(10, 20, 1);//NH3N
@@ -50,7 +43,6 @@ public class GasTimer {
             String sja = NumberUtils.getNum(10, 20, 1);//sja
             String cq = NumberUtils.getNum(10, 20, 1);//cq
 
-
             GasData gasData = new GasData();
             gasData.setLoctionType(i);
             gasData.setNh3N(nh3n);

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

@@ -36,12 +36,8 @@ public class ProtTimer {
 
         String num6 = NumberUtils.getNum(1, 4, 0);//loc_type
 
-
-
-
         for (int i = 1; i < 4; i++) {
 
-
             //假设已经拿到了数据
             String num = NumberUtils.getNum(1, 14, 1);//ph
             String num1 = NumberUtils.getNum(30, 60, 1);//cod