暂不巡查直接删除掉对应route_point_item表的关联关系

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/RoutePointItemMapper.java

@@ -26,4 +26,5 @@ public interface RoutePointItemMapper extends BaseMapper {
      */
     HashMap<String, String> getEquipByCode(String equipCode);
 
+    int delRoutePointItemInExclude(@Param("routePointId") Long routePointId, @Param("inputItemIds")  List<Long> inputItemIds);
 }

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/RouteServiceImpl.java

@@ -573,7 +573,11 @@ public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implement
 //                    }
 //                });
 //                List<Long> lastList = Stream.concat(otherClassify.stream(), inputItemIds.stream()).distinct().collect(Collectors.toList());
-                RoutePoint.setExcludeItems(StringUtils.join(inputItemIds, ","));
+                List<Long> itemIds = inputItemIds.stream().filter(Objects::nonNull).collect(Collectors.toList());
+                //保存到route_point的exclude_items字段
+                RoutePoint.setExcludeItems(StringUtils.join(itemIds, ","));
+                //删除route_point_item的多余关联项
+                routePointItemMapper.delRoutePointItemInExclude(RoutePoint.getId(),itemIds);
 //            }
 //            else {
 //                RoutePoint.setExcludeItems(StringUtils.join(inputItemIds.toArray(),","));

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/routePointItemMapper.xml

@@ -76,6 +76,16 @@
         delete from p_route_point WHERE point_id = #{pointId} and  route_id = #{routeId}
     </delete>
 
+
+    <delete id="delRoutePointItemInExclude">
+        delete from p_route_point_item
+        WHERE route_point_id = #{routePointId}
+        and point_input_item_id in
+        <foreach collection="inputItemIds" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </delete>
+
     <insert id="insertRoutePointItem">
         insert into p_route_point_item
         (id, route_point_id, order_no, point_input_item_id, creator_id, create_date, point_classify_id, basis_json)