首页三温图修改

src/main/java/com/chinaitop/depot/supervise/controller/GrainConditionController.java

@@ -135,7 +135,7 @@ public class GrainConditionController {
         Map<String, Object> byMonth = new HashMap<String, Object>();//基础信息
 
         byMonth.put("orgid",orgId);
-        byMonth.put("houseid", barnNumber);
+        byMonth.put("houseCode", barnNumber);
         byMonth.put("dayCount", dayCount);
         List<Map<String, Object>> SelectDay = grainConditionService.getThreeConditionForPad(byMonth);
         return SelectDay;

src/main/java/com/chinaitop/depot/supervise/mapper/TestDatasMapper.java

@@ -43,6 +43,5 @@ public interface TestDatasMapper {
     //给pad端提供的三温图的接口
     List<Map<String,Object>> getThreeConditionForPad(Map<String,Object> map);
 
-
-
+    String selectHouseMaxTime(Map<String,Object> map);
 }

src/main/java/com/chinaitop/depot/supervise/mapper/TestDatasMapper.xml

@@ -159,6 +159,18 @@
         LIMIT 13
     </select>
 
+    <select id="selectHouseMaxTime" resultType="java.lang.String" parameterType="java.util.Map" >
+        SELECT
+            DATE_SUB(DATE_FORMAT(max(time), '%Y-%m-%d'), INTERVAL ${dayNum} DAY) t_time
+        FROM
+            t_testdata
+        WHERE
+            storehouse = #{houseCode,jdbcType=VARCHAR}
+        AND iLq_yq = 0
+        AND org_id = #{orgid,jdbcType=VARCHAR}
+        LIMIT 1
+    </select>
+
     <select id="getThreeConditionForPad" resultType="java.util.Map" parameterType="java.util.Map" >
       SELECT
             DATE_FORMAT(t.time, '%Y-%m-%d') days,
@@ -166,92 +178,42 @@
             t.outTemp cwwd,
             t.inTemp cnwd
         FROM
-            t_testdata t
-        JOIN basic_storehouse t2 ON t2.storehouse_code = t.storehouse AND t2.del_flag = 1
+            (
+                SELECT
+                    avg,
+                    outTemp,
+                    inTemp,
+                    storehouse,
+                    time,
+                    iLq_yq,
+                    org_id
+                FROM
+                    t_testdata
+                WHERE
+                    time > #{houseMaxTime,jdbcType=VARCHAR}
+                AND storehouse = #{houseCode,jdbcType=VARCHAR}
+                AND iLq_yq = 0
+                AND org_id = #{orgid,jdbcType=VARCHAR}
+            ) t
         LEFT JOIN (
             SELECT
                 max(
-                    DATE_FORMAT(t2.time, '%Y-%m-%d')
+                    DATE_FORMAT(time, '%Y-%m-%d')
                 ) time,
-                t2.storehouse
+                storehouse
             FROM
-                t_testdata t2,
-                basic_storehouse bs
+                t_testdata
             WHERE
-                bs.storehouse_id = #{houseid,jdbcType=VARCHAR}
-            AND bs.storehouse_code = t2.storehouse
-            AND bs.del_flag = 1
-            AND t2.iLq_yq = 0
-            AND t2.org_id = #{orgid,jdbcType=VARCHAR}
+                time > #{houseMaxTime,jdbcType=VARCHAR}
+            AND storehouse = #{houseCode,jdbcType=VARCHAR}
+            AND iLq_yq = 0
+            AND org_id = #{orgid,jdbcType=VARCHAR}
         ) t3 ON t3.storehouse = t.storehouse
         WHERE
             DATE_SUB(date(t3.time), INTERVAL ${dayCount} DAY) &lt;= date(t.time)
-        AND t2.storehouse_id = #{houseid,jdbcType=VARCHAR}
-        AND t.iLq_yq = 0
-        AND t2.org_id = #{orgid,jdbcType=VARCHAR}
         GROUP BY
             DATE_FORMAT(t.time, '%Y-%m-%d')
         ORDER BY
             t.time DESC
-        <!--SELECT
-            t2.days,
-            wd.lswd,
-            wd.cwwd,
-            wd.cnwd
-        FROM
-            (
-                SELECT
-                    @cdate := date_add(@cdate, INTERVAL - 1 DAY) days
-                FROM
-                    (
-                        SELECT
-                            @cdate := (date(max(DATE_FORMAT(t.time, '%Y-%m-%d'))) + 1)
-                        FROM
-                            t_testdata t,
-                            basic_storehouse bs
-                        WHERE
-                            bs.storehouse_id = #{houseid,jdbcType=VARCHAR}
-                        AND bs.storehouse_code = t.storehouse
-                            UNION all SELECT NULL FROM t_testdata t3
-                            UNION all SELECT NULL FROM t_testdata t3
-                            UNION all SELECT NULL FROM t_testdata t3
-                        LIMIT ${dayCount}
-                    ) t1
-            ) t2
-        LEFT JOIN (
-            SELECT
-                t2.storehouse_id,
-                t2.org_id,
-                DATE_FORMAT(t.time, '%Y-%m-%d') jcsj,
-                max(t.avg) lswd,
-                max(t.outTemp) cwwd,
-                max(t.inTemp) cnwd
-            FROM
-                t_testdata t
-            JOIN basic_storehouse t2 ON t2.storehouse_code = t.storehouse
-            LEFT JOIN (
-                SELECT
-                    max(
-                        DATE_FORMAT(t2.time, '%Y-%m-%d')
-                    ) time,
-                    t2.storehouse
-                FROM
-                    t_testdata t2,
-                    basic_storehouse bs
-                WHERE
-                    bs.storehouse_id = #{houseid,jdbcType=VARCHAR}
-                AND bs.storehouse_code = t2.storehouse
-            ) t3 ON t3.storehouse = t.storehouse
-            WHERE
-                DATE_SUB(date(t.time), INTERVAL ${dayCount} DAY) &lt;= date(t3.time)
-            AND t2.storehouse_id = #{houseid,jdbcType=VARCHAR}
-            AND t2.org_id = #{orgid,jdbcType=VARCHAR}
-            GROUP BY
-                DATE_FORMAT(t.time, '%Y-%m-%d')
-        ) wd ON wd.jcsj = t2.days
-        WHERE
-            1 = 1
-        ORDER BY
-	        t2.days -->
     </select>
 </mapper>

src/main/java/com/chinaitop/depot/supervise/service/impl/GrainConditionServiceImpl.java

@@ -76,7 +76,10 @@ public class GrainConditionServiceImpl implements GrainConditionService {
      */
     @Override
     public List<Map<String, Object>> getThreeConditionForPad(Map<String, Object> example) {
+        example.put("dayNum",Integer.parseInt(example.get("dayCount").toString())-1);
+        String houseMaxTime = testDatasMapper.selectHouseMaxTime(example);
         int days = Integer.parseInt(example.get("dayCount").toString());
+        example.put("houseMaxTime",houseMaxTime);
         List<Map<String,Object>> three = testDatasMapper.getThreeConditionForPad(example);
         List<Map<String,Object>> threeTemperature = new ArrayList<Map<String,Object>>();
         String times;//获取最新检测时间，如果没有数据则获取当天