接口调试

pom.xml

@@ -14,7 +14,7 @@
 	<parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.0.RELEASE</version>
+        <version>2.0.4.RELEASE</version>
         <relativePath/>
     </parent>
 

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

@@ -301,16 +301,16 @@
     nvr. PORT nvrPort,
     nvr.factory nvrFactory,
     camera.channel_number channelNumber,
-    style.id,
-    style.indexid,
-    style.org_id,
-    style.styles,
-    style.imgdata
+    style1.id,
+    style1.indexid,
+    style1.org_id,
+    style1.styles,
+    style1.imgdata
     FROM
     monitor_camera camera
     LEFT JOIN monitor_nvr nvr ON nvr.id = camera.nvr_id
-    LEFT JOIN depot_style style ON style.indexid = camera.id
-    WHERE style.type = #{type} AND nvr.delete_mark='1' AND camera.isremove = '1'
+    LEFT JOIN depot_style style1 ON style1.indexid = camera.id
+    WHERE style1.type = #{type} AND nvr.delete_mark='1' AND camera.isremove = '1'
     GROUP BY
     camera.id
   </select>
@@ -320,8 +320,8 @@
     FROM
         (
             SELECT DISTINCT
-                style.styles,
-                style.imgdata,
+                style1.styles,
+                style1.imgdata,
                 t3.time TestDate,
                 house.storehouse_name barnName,
                 t3.inTemp _InT,
@@ -340,7 +340,7 @@
                 hw.record_unite
             FROM
                 basic_storehouse house
-            LEFT JOIN depot_style style ON style.indexid = house.storehouse_id
+            LEFT JOIN depot_style style1 ON style1.indexid = house.storehouse_id
             LEFT JOIN storage_foodbasicinfo hw ON house.storehouse_id = hw.house_id
             LEFT JOIN basic_keeper_house bkh ON bkh.house_Id = house.storehouse_id
             LEFT JOIN basic_keeper bk ON bk.id = bkh.keeper_Id
@@ -372,11 +372,11 @@
             ) t3 ON house.storehouse_code = t3.storehouse
             WHERE
                 1 = 1
-            AND style.type = #{type}
+            AND style1.type = #{type}
             UNION ALL
                 SELECT DISTINCT
-                    style.styles,
-                    style.imgdata,
+                    style1.styles,
+                    style1.imgdata,
                     t3.time TestDate,
                     tank.storageTank_name barnName,
                     t3.inTemp _InT,
@@ -395,7 +395,7 @@
                     hw.record_unite
                 FROM
                     basic_tank tank
-                LEFT JOIN depot_style style ON style.indexid = tank.id
+                LEFT JOIN depot_style style1 ON style1.indexid = tank.id
                 LEFT JOIN storage_foodbasicinfo hw ON tank.id = hw.house_id
                 LEFT JOIN basic_keeper_house bkh ON bkh.house_Id = tank.id
                 LEFT JOIN basic_keeper bk ON bk.id = bkh.keeper_Id
@@ -427,7 +427,7 @@
                 ) t3 ON tank.storageTank_code = t3.storehouse
                 WHERE
                     1 = 1
-                AND style.type = #{type}
+                AND style1.type = #{type}
         ) a
     GROUP BY
         house_id
@@ -454,8 +454,8 @@
   </select>
   <select id="selectLQForHouse" parameterType="java.util.Map" resultType="java.util.HashMap">
     SELECT
-    style.styles,
-    style.imgdata,
+    style1.styles,
+    style1.imgdata,
     house.storehouse_id house_id,
     house.storehouse_code barnNum,
     house.storehouse_name barnName,
@@ -464,8 +464,8 @@
     house.actual_capacity capacity,
     account.record_unite recordUnite
     FROM
-    depot_style style
-    LEFT JOIN basic_storehouse house ON style.indexid = house.storehouse_id
+    depot_style style1
+    LEFT JOIN basic_storehouse house ON style1.indexid = house.storehouse_id
     LEFT JOIN (
     SELECT
     record.house_id,
@@ -478,7 +478,7 @@
     record.rq DESC
     ) account ON account.house_id = house.storehouse_id
     WHERE
-    style.type = #{type}
+    style1.type = #{type}
     <if test="houseId != null">
       AND house.storehouse_id = #{houseId,jdbcType=VARCHAR}
     </if>
@@ -490,28 +490,28 @@
         task.org_id,
         task.task_status,
         task.house_id,
-        style.styles,
-        style.imgdata,
+        style1.styles,
+        style1.imgdata,
         storehouse.storehouse_name
     FROM
         storage_aeration_task_record task
-    LEFT JOIN depot_style style ON style.indexid = task.house_id
+    LEFT JOIN depot_style style1 ON style1.indexid = task.house_id
     LEFT JOIN basic_storehouse storehouse ON storehouse.storehouse_id = task.house_id
-    WHERE style.type = #{type}
+    WHERE style1.type = #{type}
     AND task.task_end_time IS null
   </select>
   <select id="selectCLXZ" parameterType="java.util.Map" resultType="java.util.HashMap">
     SELECT
         fum.id,
         fum.house_id,
-        style.styles,
-        style.imgdata,
+        style1.styles,
+        style1.imgdata,
         storehouse.storehouse_name
     FROM
         t_fumigation_plan fum
-    LEFT JOIN depot_style style ON style.indexid = fum.house_id
+    LEFT JOIN depot_style style1 ON style1.indexid = fum.house_id
     LEFT JOIN basic_storehouse storehouse ON storehouse.storehouse_id = fum.house_id
-    WHERE style.type = #{type}
+    WHERE style1.type = #{type}
     AND fum.state = '5'
   </select>
   <select id="selectRK" parameterType="java.util.Map" resultType="java.util.HashMap">
@@ -540,14 +540,14 @@
     </select>
   <select id="selectHouseState" parameterType="java.util.Map" resultType="java.util.HashMap">
         SELECT
-            style.*, thre.w_module AS wModule,
+            style1.*, thre.w_module AS wModule,
             thre.w_name AS wName
         FROM
-            depot_style style
-        LEFT JOIN basic_storehouse house ON house.storehouse_id = style.indexid
+            depot_style style1
+        LEFT JOIN basic_storehouse house ON house.storehouse_id = style1.indexid
         LEFT JOIN t_warning_threshold_history thre ON thre.v_cf_code = house.storehouse_code
         WHERE
-            style.type = '3.2'
+            style1.type = '3.2'
         AND thre.w_module = '6972'
         GROUP BY
             w_update_time