天气接口

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

@@ -59,6 +59,7 @@ public class CameraHKVSSync {
         return new Result(10000,"同步成功",false);
     }
 
+
     /**
      * APPKEY需要到部署的平台服务器上生成。
      * <p>
@@ -155,15 +156,15 @@ public class CameraHKVSSync {
         //获取部门
 //        System.out.println(testGetDeptInfos());
         //获取网域
-//        System.out.println(testGetNetZones());
+        System.out.println(testGetNetZones());
         //获取子系统
-//        System.out.println(testGetPlatSubsytem());
+        System.out.println(testGetPlatSubsytem());
         //获取默认控制中心
-//        System.out.println(testGetDefaultUnit());
+        System.out.println(testGetDefaultUnit());
         //根据中心UUID分页获取下级区
 //        System.out.println(testGetRegionsByUnitUuid(1048576));
         //获取监控点
-        System.out.println(testGetCameras());
+//        System.out.println(testGetCameras());
 //        /***https方式调用***/
 //        System.out.println(testGetDefaultUserUUID_Https());
 //        System.out.println(testGetCameras_Https());

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

@@ -66,6 +66,11 @@ public class ProdAnalysis implements Serializable {
 
     private Integer farmId;
 
+    private String feedCost;
+    private String energyCost;
+    private String vaccineCost;
+    private String otherCost;
+
     private String othre1;
 
     private String othre2;

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

@@ -370,6 +370,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
 
     @Override
     public Result listPigpenAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        //TODO 优化一下
         String farmId = paramsMap.get("farmId");
         List objects = new ArrayList<>();
         List<BasePigpen> basePigpens = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().eq("farm_id", farmId).eq("f_type",3));

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

@@ -76,6 +76,10 @@ public class ProdAnalysisServiceImpl extends ServiceImpl<ProdAnalysisMapper, Pro
             prodAnalysis3.setType(3);
             prodAnalysis3.setYfzq("0");
             prodAnalysis3.setCreatTime(new Date());
+            prodAnalysis3.setFeedCost("57");
+            prodAnalysis3.setEnergyCost("18");
+            prodAnalysis3.setVaccineCost("7");
+            prodAnalysis3.setOtherCost("18");
             proAnalysisVo.setShare(prodAnalysis3);
             count1 = 0;
         } else {

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

@@ -1,5 +1,6 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.admin.common.utils.DataUill;
@@ -143,9 +144,11 @@ public class ProdSaleServiceImpl extends ServiceImpl<ProdSaleMapper, ProdSale> i
         }
 
         if ("1".equals(type)) {
+            queryWrapper.ge("creat_time", DateUtil.offsetMonth(DateUtil.beginOfMonth(new Date()),-6));
             List<ProdSale> prodSales = saleMapper.listMonth(queryWrapper);
             return new Result(ResultCode.SUCCESS,prodSales);
         } else {
+            queryWrapper.ge("creat_time", DateUtil.offsetMonth(DateUtil.beginOfMonth(new Date()),-60));
             List<ProdSale> prodSales = saleMapper.listYear(queryWrapper);
             return new Result(ResultCode.SUCCESS,prodSales);
         }

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

@@ -45,7 +45,7 @@ public class EnergyTimer {
             String water = NumberUtils.getNumFloat2(0.08,0.15);
 //            String gas = NumberUtils.getNum(200, 280, 1);
             String gas = "0";
-            String electricity = NumberUtils.getNum(70, 90, 1);
+            String electricity = NumberUtils.getNumFloat2(1.0, 1.45 );
 
             EnergyData energyData = new EnergyData();
             energyData.setCreateDate(new Date());