新牧场添加

huimv-env-admin/src/main/java/com/huimv/env/admin/controller/EnergyWaterController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.DecimalFormat;
 import java.util.List;
 import java.util.Map;
 
@@ -65,7 +66,10 @@ public class EnergyWaterController {
                     .between("create_date", startDate, endDate);
             List<EnergyElectricity> waters = electricityService.list(queryWrapper1);
             for (EnergyElectricity water : waters) {
-                water.setOther1(energyEnvDevice.getDeviceName());
+                float v = Float.parseFloat(water.getElectricityValue());
+                DecimalFormat def = new DecimalFormat("0.0");
+                String format = def.format(v * energyEnvDevice.getTransformer());
+                water.setElectricityValue(format);
                 electricityService.updateById(water);
             }
         }

huimv-env-admin/src/main/java/com/huimv/env/admin/timer/WaterAndElectricity.java

@@ -614,4 +614,53 @@ public class WaterAndElectricity {
                 .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
         System.out.println(post);
     }
+
+    //同壮35
+    @Scheduled(cron = "0 59 * * * ? ")
+    private void sendDate12() throws Exception {
+        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", 35);
+        List<EnergyEnvDevice> devices = envDeviceMapper.selectList(queryWrapper);
+        Date date = new Date();//获取当前时间
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.HOUR, -1);// 20分钟前
+        //获取到完整的时间
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        JSONArray jsonArray = new JSONArray();
+
+        for (EnergyEnvDevice device : devices) {
+            JSONObject jsonObject = new JSONObject();
+            if (device.getDeviceType() == 3) {
+                //电
+                QueryWrapper<EnergyElectricity> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", 35).eq("chip_code", device.getDeviceCode());
+                queryWrapper1.between("upload_date", sdf.format(calendar.getTime()), sdf.format(date));
+                queryWrapper1.select(" IFNULL(SUM(electricity_value),0) electricityValue");
+                EnergyElectricity electricity = electricityMapper.selectOne(queryWrapper1);
+                jsonObject.put("electricity", electricity.getElectricityValue());
+                jsonObject.put("water", 0);
+            } else {
+                //水
+                QueryWrapper<EnergyWater> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", 35).eq("chip_code", device.getDeviceCode());
+                queryWrapper1.between("upload_date", sdf.format(calendar.getTime()), sdf.format(date));
+                queryWrapper1.select(" IFNULL(SUM(water_value),0) waterValue");
+                EnergyWater water = waterMapper.selectOne(queryWrapper1);
+                jsonObject.put("water", water.getWaterValue());
+                jsonObject.put("electricity", 0);
+            }
+            jsonObject.put("deviceCode", device.getDeviceCode());
+            jsonObject.put("time", sdf.format(date));
+            jsonArray.add(jsonObject);
+        }
+        HashMap<String, String> paramsMap = new HashMap<>();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("result", jsonArray);
+        System.out.println(jsonObject);
+        paramsMap.put("Content-Type", "application/json;charset=utf-8");
+        String post = HttpRequest.post("https://huatong.ifarmcloud.com/huatongApi/energy-data/getData12")
+                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
+        System.out.println(post);
+    }
 }

huimv-env-common/src/main/java/com/huimv/env/common/service/impl/BasePigpenServiceImpl.java

@@ -16,11 +16,13 @@ import com.huimv.env.common.service.IBasePigpenService;
 import com.huimv.env.common.utils.Result;
 import com.huimv.env.common.utils.ResultCode;
 import com.huimv.env.common.utils.ResultUtil;
+import com.huimv.env.common.utils.TreePigpenComparator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -113,11 +115,14 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         queryWrapper.like(StringUtils.isNotBlank(buildName),"build_name", buildName);
         queryWrapper.like(StringUtils.isNotBlank(stageCode),"stage_code", stageCode);
         queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_id", farmCode);
-        queryWrapper.orderByAsc("sort");
+        queryWrapper.orderByAsc("id");
         //创建排序
         List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
         //将结果List改为树
         List<TreeBasePigpen> treeBasePigpens = parseBizBaseArea(basePigpens);
+        for (TreeBasePigpen treeBasePigpen : treeBasePigpens) {
+            Collections.sort(treeBasePigpen.getChildNode(),new TreePigpenComparator());
+        }
         return new Result(ResultCode.SUCCESS,treeBasePigpens);
     }
 
@@ -142,6 +147,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         }).collect(Collectors.toMap(TreeBasePigpen::getId, b -> b,(k1, k2)->k1));
         //创建数组存父亲节点
         ArrayList<TreeBasePigpen> roots = new ArrayList<>();
+
         //构建树形
         nodeMap.values().forEach(item->{
             String parentCode = item.getParentId()+"";

huimv-env-common/src/main/java/com/huimv/env/common/utils/TreePigpenComparator.java

@@ -0,0 +1,14 @@
+package com.huimv.env.common.utils;
+
+
+import com.huimv.env.common.entity.vo.TreeBasePigpen;
+
+import java.util.Comparator;
+
+public class TreePigpenComparator implements Comparator<TreeBasePigpen> {
+
+    @Override
+    public int compare(TreeBasePigpen o1, TreeBasePigpen o2) {
+        return o1.getId().compareTo(o2.getId());
+    }
+}