修改温湿度查询接口

logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java

@@ -36,6 +36,8 @@ public class MbpsDto {
     @Data
     @ApiModel(value = "查看温度和湿度")
     public static class SelTeamAndHumidity{
+        @ApiModelProperty("园区id")
+        private Long parkId;
         @NotNull(message = "请选择要查询的仓库")
         @ApiModelProperty("仓库id")
         private Long warehouseId;

logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsEnvironmentRecordDao.java

@@ -20,7 +20,7 @@ public interface LogisticsEnvironmentRecordDao extends LogisticsEnvironmentRecor
      * @param nowDate 现在的时间
      * @return  温度列表
      */
-    List<MbpsVo.Temps> selTempByTime(@Param("warehouseId") Long warehouseId,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate);
+    List<MbpsVo.Temps> selTempByTime(@Param("parkId") Long parkId,@Param("warehouseId") Long warehouseId,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate);
 
     /**
      * 查询湿度变化
@@ -29,7 +29,7 @@ public interface LogisticsEnvironmentRecordDao extends LogisticsEnvironmentRecor
      * @param nowDate 现在的时间
      * @return  湿度列表
      */
-    List<MbpsVo.Humiditys> selHumidityByTime(@Param("warehouseId") Long warehouseId,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate);
+    List<MbpsVo.Humiditys> selHumidityByTime(@Param("parkId") Long parkId,@Param("warehouseId") Long warehouseId,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate);
 
     /**
      * 是否有火灾

logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java

@@ -101,7 +101,7 @@ public class MbpsService implements IMbpsService {
         String nowDate = format.format(date);
 
         //查询温度
-        List<MbpsVo.Temps> tempsList = environmentRecordDao.selTempByTime(param.getWarehouseId(),countArr,nowDate);
+        List<MbpsVo.Temps> tempsList = environmentRecordDao.selTempByTime(param.getParkId(),param.getWarehouseId(),countArr,nowDate);
         if (CollectionUtil.isNotEmpty(tempsList)){
             for (MbpsVo.Temps temps : tempsList) {
                 if (ObjectUtil.isNull(temps.getTemp())){
@@ -112,7 +112,7 @@ public class MbpsService implements IMbpsService {
         tempAndHumidity.getTemps().addAll(tempsList);
 
         //查询湿度
-        List<MbpsVo.Humiditys> humidityList = environmentRecordDao.selHumidityByTime(param.getWarehouseId(),countArr,nowDate);
+        List<MbpsVo.Humiditys> humidityList = environmentRecordDao.selHumidityByTime(param.getParkId(),param.getWarehouseId(),countArr,nowDate);
         if (CollectionUtil.isNotEmpty(humidityList)){
             for (MbpsVo.Humiditys humidity : humidityList) {
                 if (ObjectUtil.isNull(humidity.getHumidity())){

logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml

@@ -24,7 +24,7 @@
                     t_logistics_environment_record AS er
                 LEFT JOIN t_logistics_equipment AS e ON er.equipment_num = e.equipment_number
                 LEFT JOIN t_logistics_warehouse AS w ON w.id = e.warehouse_id
-                WHERE er.rec_status = 0 AND e.rec_status = 0 AND w.rec_status = 0 AND er.num_type = 1 AND e.warehouse_id = #{warehouseId} AND w.park_id = 1
+                WHERE er.rec_status = 0 AND e.rec_status = 0 AND w.rec_status = 0 AND er.num_type = 1 AND e.warehouse_id = #{warehouseId} AND w.park_id = #{parkId}
             ) AS newEr ON newEr.recordTime = s.date
         group by s.date ORDER BY s.date
     </select>
@@ -51,7 +51,7 @@
             t_logistics_environment_record AS er
             LEFT JOIN t_logistics_equipment AS e ON er.equipment_num = e.equipment_number
             LEFT JOIN t_logistics_warehouse AS w ON w.id = e.warehouse_id
-            WHERE er.rec_status = 0 AND e.rec_status = 0 AND w.rec_status = 0 AND er.num_type = 0 AND e.warehouse_id = #{warehouseId} AND w.park_id = 1
+            WHERE er.rec_status = 0 AND e.rec_status = 0 AND w.rec_status = 0 AND er.num_type = 0 AND e.warehouse_id = #{warehouseId} AND w.park_id = #{parkId}
             ) AS newEr ON newEr.recordTime = s.date
         group by s.date ORDER BY s.date
     </select>