查询

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDataController.java

@@ -32,6 +32,12 @@ public class EnvDataController {
     public Result listByBuild(@RequestBody Map<String ,String> paramsMap){
         return envDataService.listByBuild(paramsMap);
     }
+
+    @PostMapping("/listTodayByBuild")
+    public Result listTodayByBuild(@RequestBody Map<String ,String> paramsMap){
+        return envDataService.listTodayByBuild(paramsMap);
+    }
+
     @PostMapping("/getOneData")
     public Result getOneData(@RequestBody Map<String ,String> paramsMap){
         return envDataService.getOneData(paramsMap);

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnvDataService.java

@@ -23,4 +23,6 @@ public interface IEnvDataService extends IService<EnvData> {
     Result getOneData(Map<String, String> paramsMap);
 
     Result listDetail(Map<String, String> paramsMap);
+
+    Result listTodayByBuild(Map<String, String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvDataServiceImpl.java

@@ -74,12 +74,7 @@ public class EnvDataServiceImpl extends ServiceImpl<EnvDataMapper, EnvData> impl
 
         //今日查询
         if ("1".equals(type)){
-            if (unitId.equals("95")){
-                envDataList = envDataMapper.listDetail(farmId,unitId);
-                Collections.reverse(envDataList);
-            }else {
-                envDataList = envDataMapper.listDayDetail(farmId,unitId);
-            }
+            envDataList = envDataMapper.listDayDetail(farmId,unitId);
         }
         //本周查询
         if ("2".equals(type)){
@@ -145,4 +140,18 @@ public class EnvDataServiceImpl extends ServiceImpl<EnvDataMapper, EnvData> impl
         return new Result(ResultCode.SUCCESS, dataList);
     }
 
+    @Override
+    public Result listTodayByBuild(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String unitId = paramsMap.get("unitId");
+        List<EnvData> envDataList = null;
+        if (unitId.equals("95")){
+            envDataList = envDataMapper.listDetail(farmId,unitId);
+            Collections.reverse(envDataList);
+        }else {
+            envDataList = envDataMapper.listDayDetail(farmId,unitId);
+        }
+        return new Result(ResultCode.SUCCESS,envDataList);
+    }
+
 }

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvDataMapper.xml

@@ -30,7 +30,7 @@
                  GROUP BY unit_id
             )
         ) d ON b.id = d.unit_id
-        WHERE b.parent_id = 0 AND b.farm_id = #{farmId}
+        WHERE b.parent_id = 0 AND b.farm_id = #{farmId} AND b.build_name <> '10号舍'
     </select>
 
     <select id="listDayDetail" resultType="com.huimv.guowei.admin.entity.EnvData">