解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/StationBasicMapper.java

@@ -39,6 +39,7 @@ public interface StationBasicMapper extends BaseMapper<StationBasic> {
 
     //获取场站列表信息
     List<StationInfoDto> getStationList(@Param("areaCode")String areaCode);
+    int deleteStationCoordinateByStationid (@Param("sequence_nbr") Long sequence_nbr );
 
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -66,7 +66,9 @@
             #{id}
         </foreach>
     </delete>
-
+    <delete id = "deleteStationCoordinateByStationid">
+        delete from station_coordinate where station_id = #{sequence_nbr}
+    </delete>
 
     <select id="getExStationBasicDto" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.ExStationBasicDto">
 

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/StationBasicServiceImpl.java

@@ -229,14 +229,12 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
 
         //场站基本信息
         stationBasicMapper.updateById(stationBasic);
-
-
+        stationBasicMapper.deleteStationCoordinateByStationid(stationBasic.getSequenceNbr());
         for (StationCoordinate stationCoordinate : list) {
             stationCoordinate.setStationId(stationBasic.getSequenceNbr());
             listdate.add(stationCoordinate);
         }
         stationCoordinateServiceImpl.saveOrUpdateBatch(listdate);
-
     }