浦东接口调整：船舶基础信息接口支持船名和mmsi批量查询；污染物历史预警接口查询去掉船名和mmsi必填限制；

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

@@ -119,10 +119,10 @@ public class PollutantAcceptController extends CommonController {
     String paramJsonData = getParamJsonData(vo.getData());
     PollutantWarningInfoReq pollutantWarningInfoReq = JSONObject.parseObject(paramJsonData,
         PollutantWarningInfoReq.class);
-    if (StringUtils.isBlank(pollutantWarningInfoReq.getBoatName()) && StringUtils.isBlank(
-        pollutantWarningInfoReq.getMmsi())) {
-      throw new EnumException("船名/MMSI 请至少输入一个查询参数");
-    }
+//    if (StringUtils.isBlank(pollutantWarningInfoReq.getBoatName()) && StringUtils.isBlank(
+//        pollutantWarningInfoReq.getMmsi())) {
+//      throw new EnumException("船名/MMSI 请至少输入一个查询参数");
+//    }
     List<PollutanWarningInfoVo> voList = boatWaterPollutantAcceptFService.selectWarningHisInfoList(
         pollutantWarningInfoReq);
     ResultRes resultRes = ResultRes.encapsulationResult(pollutantWarningInfoReq.getPageIndex(),

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.shanghaichengdi.ghjgitem.enums.SupervisionAreaCode;
+import com.shanghaichengdi.ghjgitem.exception.EnumException;
 import com.shanghaichengdi.ghjgitem.mapper.CommonMapper;
 import com.shanghaichengdi.ghjgitem.service.CommonService;
 import com.shanghaichengdi.ghjgitem.util.PrintLogUtils;
@@ -99,6 +100,36 @@ public class CommonServiceImpl implements CommonService {
 
     @Override
     public List<ShipDataVo> selectBoatInfoList(ShipDataRequest param) {
+        // 批量查询判断
+        String mmsi = param.getMmsi();
+        if (mmsi.split(",").length > 1){
+            if(mmsi.split(",").length > 100){
+                throw new EnumException("mmsi批量查询不得超过100条");
+            }
+            List<ShipDataVo> list = new ArrayList<>();
+            List<String> mmsiList = Arrays.asList(mmsi.split(","));
+            for(int i=0; i<mmsiList.size();i++){
+                mmsiList.set(i, "'" + mmsiList.get(i) + "'");
+                System.out.println(mmsiList.get(i));
+            }
+            param.setMmsiList(mmsiList);
+            param.setMmsi("");
+        }
+
+        String shipNameCn = param.getShipNameCn();
+        if (shipNameCn.split(",").length > 1){
+            if(shipNameCn.split(",").length > 100){
+                throw new EnumException("shipNameCn批量查询不得超过100条");
+            }
+            List<ShipDataVo> list = new ArrayList<>();
+            List<String> shipNameCnList = Arrays.asList(shipNameCn.split(","));
+            for(int i=0; i<shipNameCnList.size();i++){
+                shipNameCnList.set(i, "'" + shipNameCnList.get(i) + "'");
+                System.out.println(shipNameCnList.get(i));
+            }
+            param.setShipNameCnList(shipNameCnList);
+            param.setShipNameCn("");
+        }
         PageHelper.startPage(param.getPageIndex(), param.getPageSize());
         return mapper.selectBoatInfoList(param);
     }

ghjg-item-datashare-server/src/main/java/com/shanghaichengdi/ghjgitem/vo/request/ShipDataRequest.java

@@ -4,6 +4,8 @@ import com.shanghaichengdi.ghjgitem.vo.PageVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class ShipDataRequest extends PageVo {
@@ -11,6 +13,8 @@ public class ShipDataRequest extends PageVo {
   String shipId;
   String shipNameCn;
   String mmsi;
+  List<String> mmsiList;
+  List<String> shipNameCnList;
   String shipTypeName;
   String keyWord;
 }

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

@@ -149,6 +149,34 @@
       <if test="shipNameCn != null and shipNameCn != ''">
         and T.SHIP_NAME_CN = #{shipNameCn}
       </if>
+        <choose>
+            <when test="mmsiList != null and shipNameCnList != null">
+                and (T.SHIP_NAME_CN in
+                <foreach collection="shipNameCnList" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+                or T.MMSI in
+                <foreach collection="mmsiList" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>)
+            </when>
+            <when test="mmsiList != null and shipNameCnList = null">
+                and T.MMSI in
+                <foreach collection="mmsiList" index="index" item="item" open="(" close=")" separator=",">
+                    ${item}
+                </foreach>
+            </when>
+            <when test="mmsiList = null and shipNameCnList != null">
+                and T.SHIP_NAME_CN in
+                <foreach collection="shipNameCnList" index="index" item="item" open="(" close=")" separator=",">
+                    ${item}
+                </foreach>
+            </when>
+            <otherwise>
+
+            </otherwise>
+        </choose>
+
     </where>
   </select>