Merge branch 'master' of D:\huimv.farm.datacenter with conflicts.

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

@@ -25,41 +25,15 @@
     </sql>
 
 
-<!--    <select id="getLastFlow" resultType="com.huimv.environ.eco.entity.dto.LastFlowDto">-->
-<!--       SELECT CONCAT(b.pigpen_name,a.pigpen_name) room,df.id1_value 'tem',df.id2_value 'hum'-->
-<!--        FROM `base_pigpen` a INNER JOIN `base_pigpen` b ON a.parent_id =b.id AND a.farm_code = #{farmId}-->
-<!--        LEFT JOIN `eco_device` d ON d.unit_id = a.id AND d.device_type ='1'-->
-<!--        LEFT JOIN `eco_device_flow` df ON d.device_code = df.device_code-->
-<!--        AND df.id IN (SELECT MAX(df.id) FROM `eco_device_flow` df GROUP BY device_code)-->
-<!--        ORDER BY a.id DESC,a.parent_id DESC-->
-<!--    </select>-->
-
     <select id="getLastFlow" resultType="com.huimv.environ.eco.entity.dto.LastFlowDto">
-       SELECT CONCAT(b.pigpen_name,a.pigpen_name) room,a.id unit_id,df.id1_value 'tem',df.id2_value 'hum'
+       SELECT CONCAT(b.pigpen_name,a.pigpen_name) room,df.id1_value 'tem',df.id2_value 'hum'
         FROM `base_pigpen` a INNER JOIN `base_pigpen` b ON a.parent_id =b.id AND a.farm_code = #{farmId}
-        INNER JOIN `eco_device` d ON d.unit_id = a.id AND d.device_type ='1'
+        LEFT JOIN `eco_device` d ON d.unit_id = a.id AND d.device_type ='1'
         LEFT JOIN `eco_device_flow` df ON d.device_code = df.device_code
         AND df.id IN (SELECT MAX(df.id) FROM `eco_device_flow` df GROUP BY device_code)
         ORDER BY a.id DESC,a.parent_id DESC
     </select>
 
-    <select id="getUnitLastFlow" resultType="com.huimv.environ.eco.entity.dto.LastFlowDto">
-        SELECT df.id1_value AS 'tem',df.id2_value AS 'hum' FROM `eco_device_flow` df
-        WHERE df.device_code = #{deviceCode}
-        ORDER BY df.id DESC
-        LIMIT 0,1
-    </select>
-
-    <select id="getLastFlowByPigpenId" resultType="com.huimv.environ.eco.entity.dto.LastFlowDto">
-     SELECT CONCAT(b.pigpen_name,a.pigpen_name) room,a.id unit_id,df.id1_value 'tem',df.id2_value 'hum'
-    FROM `base_pigpen` a INNER JOIN `base_pigpen` b ON a.parent_id =b.id AND a.farm_code = #{farmId}
-    LEFT JOIN `eco_device` d ON d.unit_id = a.id AND d.device_type ='1'
-    LEFT JOIN `eco_device_flow` df ON d.device_code = df.device_code
-    AND df.id IN (SELECT MAX(df.id) FROM `eco_device_flow` df GROUP BY device_code)
-    WHERE a.parent_id=#{pigpenId}
-    ORDER BY a.id DESC,a.parent_id DESC
-    </select>
-
     <select id="listDevice" resultType="com.huimv.environ.eco.entity.dto.EcoDeviceDto">
        SELECT d.location 'roomName',ROUND(AVG(df.id1_value),2) 'tem',ROUND(AVG(df.id2_value),2) 'hum',DATE_FORMAT(df.add_time,'%Y-%m-%d') 'addTime' FROM `eco_device` d
 LEFT JOIN `eco_device_flow` df ON df.device_code = d.device_code
@@ -99,4 +73,12 @@ AND d.device_type = 1
 WHERE d.unit_id = #{unitId}
     </select>
 
-</mapper>
+
+    <select id="listData" resultType="com.huimv.environ.eco.entity.dto.LastFlowDto">
+        SELECT  d.location 'room',df.id1_value 'tem',df.id2_value 'hum' FROM `eco_device` d
+LEFT JOIN `eco_device_flow` df ON d.device_code = df.device_code
+AND df.id IN (SELECT MAX(df.id) FROM `eco_device_flow` df GROUP BY device_code)
+AND d.device_type = 1
+WHERE d.unit_id = #{unitId}
+    </select>
+</mapper>

huimv-farm-produce/src/main/java/com/huimv/produce/HuimvProduceApplication.java

@@ -18,7 +18,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  **/
 @SpringBootApplication
 @MapperScan("com.huimv.produce.*.mapper")
-@Import(InterceptorConfig.class)
+//@Import(InterceptorConfig.class)
 @EnableScheduling
 public class HuimvProduceApplication {
     public static void main(String[] args) {