浦东接口调整：船舶基础信息接口判断港区内船舶增加船名判断条件

ghjg-item-datashare-server/src/main/java/com/shanghaichengdi/ghjgitem/controller/BoatController.java

@@ -92,7 +92,7 @@ public class BoatController extends CommonController {
       throw new EnumException("mmsi不足六位");
     }
     // 判断只能查当前在浦东范围内有AIS信号的船
-    if(!commonService.checkInportByMmsi(req.getMmsi())){
+    if(!commonService.checkInportByMmsiAndShipName(req.getMmsi(),req.getShipNameCn())){
       throw new EnumException("该船舶不在辖区内");
     }
     List<ShipDataVo> voList = commonService.selectBoatInfoList(req);

ghjg-item-datashare-server/src/main/java/com/shanghaichengdi/ghjgitem/mapper/CommonMapper.java

@@ -48,7 +48,7 @@ public interface CommonMapper {
 
   List<CargoInfoForShipLockVo> selectCargoDeclareInfoByShipId(@Param("shipId") String shipId, ArrayList<String> list);
 
-  int getPdShipCountByMmsi(@Param("mmsi") String mmsi);
+  int getPdShipCountByMmsiAndShipName(@Param("mmsi") String mmsi, @Param("shipName") String shipName);
 
   int getPdShipCountByShipId(@Param("shipId") String shipId);
 

ghjg-item-datashare-server/src/main/java/com/shanghaichengdi/ghjgitem/service/CommonService.java

@@ -39,7 +39,7 @@ public interface CommonService {
 
   CargoInfoForShipLockVo selectCargoDeclareInfoByShipId(String shipId);
 
-  boolean checkInportByMmsi(String mmsi);
+  boolean checkInportByMmsiAndShipName(String mmsi, String shipName);
 
   boolean checkInportByShipId(String shipId);
 

ghjg-item-datashare-server/src/main/java/com/shanghaichengdi/ghjgitem/service/impl/CommonServiceImpl.java

@@ -319,9 +319,9 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @Override
-    public boolean checkInportByMmsi(String mmsi){
+    public boolean checkInportByMmsiAndShipName(String mmsi, String shipName){
         boolean flag = false;
-        int count = mapper.getPdShipCountByMmsi(mmsi);
+        int count = mapper.getPdShipCountByMmsiAndShipName(mmsi,shipName);
         if(count > 0) {
           flag = true;
         }

ghjg-item-datashare-server/src/main/resources/mapper/CommonMapper.xml

@@ -397,9 +397,16 @@
         where t.reportTime >= sysdate-2 and t.reportTime <= sysdate
     </select>
 
-    <select id="getPdShipCountByMmsi" resultType="java.lang.Integer">
+    <select id="getPdShipCountByMmsiAndShipName" resultType="java.lang.Integer">
         select count(1) from ghjg_dynamic.vw_gpsinfo_realtime t
-        where t.deviceid = #{mmsi}
+        left join ghjg_basics.mvw_boat_info b on t.deviceid = b.mmsi
+        where 1=1
+            <if test="mmsi != null">
+                and t.deviceid = #{mmsi}
+            </if>
+            <if test="shipName != null">
+                and b.ship_name_cn = #{shipName}
+            </if>
           and t.GPSTIME > sysdate - 30
           and t.MAPX > -2000 and t.MAPX &lt; 48000
           and t.MAPY > -48000 and t.MAPY &lt; 18000
@@ -408,7 +415,13 @@
     <select id="getPdShipCountByShipId" resultType="java.lang.Integer">
         select count(1) from ghjg_dynamic.vw_gpsinfo_realtime t
         left join ghjg_basics.mvw_boat_info b on t.deviceid = b.mmsi
-        where b.ship_id = #{shipId}
+        where 1=1
+          <if test="shipId != null">
+              and b.ship_id = #{shipId}
+          </if>
+          <if test="shipName != null">
+              and b.ship_name_cn = #{shipName}
+          </if>
           and t.GPSTIME > sysdate - 1/24
           and t.MAPX > -2000 and t.MAPX &lt; 48000
           and t.MAPY > -48000 and t.MAPY &lt; 18000