环境监测修改

huimv-farm-environ/src/main/java/com/huimv/environ/eco/mapper/EcoDeviceFlowMapper.java

@@ -32,8 +32,7 @@ public interface EcoDeviceFlowMapper extends BaseMapper<EcoDeviceFlow> {
                                   @Param("endDate") String endDate);
 
     List<EcoDeviceDto> listDayDevice(@Param("farmId") String farmId,
-                                     @Param("unitId") String unitId,
-                                     @Param("startDate") String startDate);
+                                     @Param("unitId") String unitId);
 
 
     List<EcoDeviceDto> listWeekDevice(@Param("farmId") String farmId,

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/EcoDeviceFlowServiceImpl.java

@@ -81,7 +81,7 @@ public class EcoDeviceFlowServiceImpl extends ServiceImpl<EcoDeviceFlowMapper, E
 
     @Override
     public Result listByRoom(HttpServletRequest request, Map<String, String> paramsMap) throws ParseException {
-        String farmId = request.getHeader("farmId");
+        String farmId = paramsMap.get("farmId");
         String unitId = paramsMap.get("unitId");
         String startDate = paramsMap.get("startDate");
         String endDate = paramsMap.get("endDate");
@@ -93,7 +93,7 @@ public class EcoDeviceFlowServiceImpl extends ServiceImpl<EcoDeviceFlowMapper, E
             unitId = "77";
             DateUtil dateUtil = new DateUtil();
             startDate = dateUtil.getTodayDate().toString();
-            ecoDeviceDtos = ecoDeviceFlowMapper.listDayDevice(farmId, unitId, startDate);
+            ecoDeviceDtos = ecoDeviceFlowMapper.listDayDevice(farmId, unitId);
         } else {
 
             //自定义查询
@@ -102,7 +102,8 @@ public class EcoDeviceFlowServiceImpl extends ServiceImpl<EcoDeviceFlowMapper, E
             }
             //今日查询
             else if ("3".equals(type)) {
-                ecoDeviceDtos = ecoDeviceFlowMapper.listDayDevice(farmId, unitId, startDate);
+                ecoDeviceDtos= ecoDeviceFlowMapper.listDayDevice(farmId, unitId);
+
             }
             //本周查询
             else if ("2".equals(type)) {

huimv-farm-environ/src/main/resources/com/huimv/environ/eco/mapper/EcoDeviceFlowMapper.xml

@@ -46,7 +46,7 @@ GROUP BY DATE_FORMAT(df.add_time,"%Y-%m-%d")
    SELECT d.location 'roomName',df.id1_value 'tem',df.id2_value 'hum',df.add_time FROM `eco_device` d
 LEFT JOIN `eco_device_flow` df ON df.device_code = d.device_code
 WHERE d.farm_id = ${farmId} AND unit_id = ${unitId}
-AND add_time BETWEEN '${startDate} 00:00:00' AND NOW()
+AND TO_DAYS(add_time) = TO_DAYS(NOW());
     </select>
 
     <select id="listWeekDevice" resultType="com.huimv.environ.eco.entity.dto.EcoDeviceDto">