任务 14551

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/IotFeign.java

@@ -47,7 +47,7 @@ public interface IotFeign {
             @RequestHeader("token") String token,
             @RequestParam(value = "top") String top,
             @RequestParam(value = "productKey") String productKey,
-            @RequestParam(value = "deviceName") String deviceName,
+            @RequestParam( required = false, value = "deviceName") String deviceName,
             @RequestParam("FHS_PressurePump_Start") String key,
             @RequestParam(required = false, value = "fieldKey") String fieldKey);
 

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -886,7 +886,7 @@
 		LEFT JOIN p_point_inputitem ppi ON ppi.id = prpi.point_input_item_id
 		LEFT JOIN p_input_item pii ON pii.id = ppi.input_item_id
 		 <where>
-			 !FIND_IN_SET(pii.id, IFNULL(prp.exclude_items,0))
+			 !FIND_IN_SET(ppi.id, IFNULL(prp.exclude_items,0))
 			 <if test="routeId != null">and prp.route_id = #{routeId}</if>
             <if test="pointId != null">and prp.point_id = #{pointId}</if>
         </where>