修改巡检点查询巡检项过滤不巡检的点信息

amos-boot-system-patrol/src/main/resources/application-dev.properties

@@ -92,4 +92,7 @@ emqx.user-name=admin
 emqx.password=public
 emqx.max-inflight=1000
 
-file.url=http://172.16.11.201:9000/
\ No newline at end of file
+file.url=http://172.16.11.201:9000/
+
+##代码中有部分逻辑冲突需要处理  为区分机场和电力逻辑 增加开关 若为true 则为机场逻辑 为false 则为电力逻辑
+logic=false
\ No newline at end of file

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

@@ -886,7 +886,8 @@
 		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>
-            <if test="routeId != null">prp.route_id = #{routeId}</if>
+			 !FIND_IN_SET(pii.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>
     	<!--

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

@@ -12,7 +12,8 @@
 		LEFT JOIN p_route_point_item prpi ON prpi.point_input_item_id = pii.id,
 		 (
 			SELECT
-				id AS route_point_id
+				id AS route_point_id,
+				exclude_items
 			FROM
 				p_route_point rp
 		        <where>
@@ -22,7 +23,8 @@
 		) prp
 		WHERE
 			prp.route_point_id = prpi.route_point_id
-    </select>
+			and !FIND_IN_SET(ii.id, ifnull(prp.exclude_items, 0))
+	</select>
     
     <resultMap id="routePointInputItemMap" type="com.yeejoin.amos.patrol.dao.entity.PointInputItem">
        <result property="id" column="id" />