添加设备在线率统计

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

@@ -58,6 +58,10 @@ public class EnvDeviceController {
     public Result listPigpen(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return envDeviceService.listPigpen(httpServletRequest,paramsMap);
     }
+    @RequestMapping("/listPigpenAll")
+    public Result listPigpenAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return envDeviceService.listPigpenAll(httpServletRequest,paramsMap);
+    }
 
     @RequestMapping("/listEnv")
     public Result listEnv(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {

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

@@ -38,4 +38,9 @@ public class EnvWarningInfoController {
     public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
         return envWarningInfoService.list(httpServletRequest,paramsMap);
     }
+
+    @RequestMapping("/listTop")
+    public Result listTop(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return envWarningInfoService.listTop(httpServletRequest,paramsMap);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/entity/dto/EnvWarningDto.java

@@ -0,0 +1,10 @@
+package com.huimv.admin.entity.dto;
+
+import lombok.Data;
+
+@Data
+public class EnvWarningDto {
+    private Integer id;
+    private String buildName;
+    private Integer coutnTop;
+}

huimv-admin/src/main/java/com/huimv/admin/mapper/EnvWarningInfoMapper.java

@@ -2,6 +2,10 @@ package com.huimv.admin.mapper;
 
 import com.huimv.admin.entity.EnvWarningInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.entity.dto.EnvWarningDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EnvWarningInfoMapper extends BaseMapper<EnvWarningInfo> {
 
+    List<EnvWarningDto> listTop(@Param("farmId") String farmId);
 }

huimv-admin/src/main/java/com/huimv/admin/service/IEnvDeviceService.java

@@ -35,4 +35,6 @@ public interface IEnvDeviceService extends IService<EnvDevice> {
     Result sync(Map<String, String> params) throws Exception;
 
     Result bandingUnitId(HttpServletRequest httpServletRequest, EnvDevice envDevice);
+
+    Result listPigpenAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/admin/service/IEnvWarningInfoService.java

@@ -17,4 +17,6 @@ import java.util.Map;
  */
 public interface IEnvWarningInfoService extends IService<EnvWarningInfo> {
     Result list(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+
+    Result listTop(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -56,8 +56,6 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
     @Autowired
     private EnvDeviceMapper envDeviceMapper;
     @Autowired
-    private EnvDeviceMaintainMapper envDeviceMaintainMapper;
-    @Autowired
     private BasePigpenMapper basePigpenMapper;
     @Autowired
     private EnvDataMapper dataMapper;
@@ -366,6 +364,32 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         this.updateById(envDevice);
         return new Result(10000,"绑定成功",true);
     }
+
+    @Override
+    public Result listPigpenAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        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));
+        for (BasePigpen basePigpen : basePigpens) {
+            Integer id = basePigpen.getId();
+            EnvData envData = dataMapper.selectOne(new QueryWrapper<EnvData>().eq("unit_id", id).orderByDesc("id").last("limit 1"));
+            JSONObject jsonObject = new JSONObject();
+            if (ObjectUtil.isNotEmpty(envData)){
+                jsonObject.put("temp", envData.getEnvTemp());//温度
+                jsonObject.put("hum", envData.getEnvHum());//湿度
+                jsonObject.put("location", basePigpen.getBuildName());
+                jsonObject.put("unit_id", basePigpen.getId());//单元id
+            }else {
+                jsonObject.put("temp", 0);//温度
+                jsonObject.put("hum", 0);//湿度
+                jsonObject.put("location", basePigpen.getBuildName());
+                jsonObject.put("unit_id", basePigpen.getId());//单元id
+            }
+            objects.add(jsonObject);
+        }
+        return new Result(ResultCode.SUCCESS,objects);
+    }
+
     //添加新的设备
     private void syncConfig(String shackId,HttpEntity httpEntity,String farmId) {
         try {

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.EnvWarningInfo;
+import com.huimv.admin.entity.dto.EnvWarningDto;
 import com.huimv.admin.mapper.EnvWarningInfoMapper;
 import com.huimv.admin.service.IEnvWarningInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -45,4 +47,11 @@ public class EnvWarningInfoServiceImpl extends ServiceImpl<EnvWarningInfoMapper,
         Page<EnvWarningInfo> warningInfoPage = envWarningInfoMapper.selectPage(page, queryWrapper);
         return new Result(ResultCode.SUCCESS,warningInfoPage);
     }
+
+    @Override
+    public Result listTop(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        List<EnvWarningDto> envWarningDtoList = envWarningInfoMapper.listTop(farmId);
+        return new Result(ResultCode.SUCCESS,envWarningDtoList);
+    }
 }

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

@@ -237,7 +237,7 @@ public class EnvTimer {
             NumberFormat numberFormat = NumberFormat.getInstance();
             //设置精确到小数点后两位
             numberFormat.setMaximumFractionDigits(2);
-            String onDeviceRate = numberFormat.format((float)count1 / (float) count* 100) + "%";
+            String onDeviceRate = numberFormat.format((float)count1 / (float) count* 100);
 
             EnvDeviceOnline envDeviceOnline = envDeviceOnlineService.getOne(new QueryWrapper<EnvDeviceOnline>().eq("farm_id", farmId).ge("creat_time", beginOfMonth));
             if (ObjectUtil.isEmpty(envDeviceOnline)){

huimv-admin/src/main/resources/com/huimv/admin/mapper/EnvWarningInfoMapper.xml

@@ -8,7 +8,6 @@
         <result column="warning_type" property="warningType" />
         <result column="warning_content" property="warningContent" />
         <result column="build_location" property="buildLocation" />
-        <result column="build_id" property="buildId" />
         <result column="unit_id" property="unitId" />
         <result column="device_id" property="deviceId" />
         <result column="date" property="date" />
@@ -19,5 +18,12 @@
         <result column="other2" property="other2" />
         <result column="other3" property="other3" />
     </resultMap>
+    <select id="listTop" resultType="com.huimv.admin.entity.dto.EnvWarningDto">
+
+    SELECT bp.id,bp.build_name ,
+    (SELECT  COUNT(ewi.id) FROM  `env_warning_info` ewi WHERE bp.`id`=ewi.unit_id ) coutn_top
+    FROM  `base_pigpen` bp WHERE bp.f_type =3 AND bp.farm_id = #{farmId} ORDER BY coutn_top DESC LIMIT 5
+
+    </select>
 
 </mapper>