浦东接口调整：船舶基础信息在港船舶判断改成30天；污染物实时预警在线查询去掉船名和mmsi必填限制；新增污染物实时预警查询接口（增量获取东安确认的预警）

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

@@ -95,10 +95,11 @@ public class PollutantAcceptController extends CommonController {
     String paramJsonData = getParamJsonData(vo.getData());
     PollutantWarningInfoReq pollutantWarningInfoReq = JSONObject.parseObject(paramJsonData,
         PollutantWarningInfoReq.class);
-    if (StringUtils.isBlank(pollutantWarningInfoReq.getBoatName()) && StringUtils.isBlank(
+    // 根据浦东项目组业务需求，去掉船名和mmsi必传限制
+    /*if (StringUtils.isBlank(pollutantWarningInfoReq.getBoatName()) && StringUtils.isBlank(
         pollutantWarningInfoReq.getMmsi())) {
       throw new EnumException("船名/MMSI 请至少输入一个查询参数");
-    }
+    }*/
     List<PollutanWarningInfoVo> voList = boatWaterPollutantAcceptFService.selectWarningInfoList(
         pollutantWarningInfoReq);
     ResultRes resultRes = ResultRes.encapsulationResult(pollutantWarningInfoReq.getPageIndex(),
@@ -132,6 +133,37 @@ public class PollutantAcceptController extends CommonController {
     return ReturnMsg.success("获取成功", encodedData);
   }
 
+  @PostMapping("/getBoatWarnListByDate")
+  public ReturnMsg getBoatWarnListByDate(@RequestBody @Validated ObjectBodyVo vo)
+      throws ParseException {
+    if (!checkDbKey(vo.getKey())) {
+      return ReturnMsg.error(HttpStatus.BAD_REQUEST, "key值有误,请确认您输入的key值正确!");
+    }
+
+    String paramJsonData = getParamJsonData(vo.getData());
+    PollutantWarningInfoReq pollutantWarningInfoReq = JSONObject.parseObject(paramJsonData,
+            PollutantWarningInfoReq.class);
+
+    if(pollutantWarningInfoReq.getStartTime().isEmpty() || pollutantWarningInfoReq.getEndTime().isEmpty()){
+      throw new EnumException("startTime和endTime不能为空");
+    }
+
+    List<String> datesBetween = PollutantBoatWaterReq.getDatesBetween(
+            pollutantWarningInfoReq.getStartTime(),
+            pollutantWarningInfoReq.getEndTime());
+    if (datesBetween.size() > 7) {
+      return ReturnMsg.warn("开始时间和结束时间的最大间隔为七天");
+    }
+
+    List<PollutanWarningInfoVo> pollutanWarningInfoVoList = boatWaterPollutantAcceptFService.selectWarningInfoListByDate(
+            pollutantWarningInfoReq);
+    ResultRes resultRes = ResultRes.encapsulationResult(pollutantWarningInfoReq.getPageIndex(),
+            pollutantWarningInfoReq.getPageSize(),
+            CommonTools.getTotal(pollutanWarningInfoVoList), pollutanWarningInfoVoList);
+    String jsonString = JSONObject.toJSONString(resultRes);
+    String encodedData = resultEncode(jsonString);
+    return ReturnMsg.success("获取成功", encodedData);
+  }
 
   @PostMapping("/getBoatWaterListSync")
   public ReturnMsg getBoatWaterListSync(@RequestBody @Validated ObjectBodyVo vo)

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

@@ -27,6 +27,8 @@ public interface BoatWaterPollutantAcceptFMapper extends BaseMapper<BoatWaterPol
 
   List<PollutanWarningInfoVo> selectWarningHisInfoList(PollutantWarningInfoReq queryParam);
 
+  List<PollutanWarningInfoVo> selectWarningInfoListByDate(PollutantWarningInfoReq queryParam);
+
   List<BoatWaterPollutantAcceptF> selectBoatWaterListSync(
       @Param("tableNameList") List<String> tableNameList,
       @Param("boatName") String boatName,

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

@@ -9,6 +9,8 @@ import com.shanghaichengdi.ghjgitem.vo.PollutantAcceptVo;
 import com.shanghaichengdi.ghjgitem.vo.request.BoatReportByWarningCodeVo;
 import com.shanghaichengdi.ghjgitem.vo.request.PollutantBoatWaterReq;
 import com.shanghaichengdi.ghjgitem.vo.request.PollutantWarningInfoReq;
+import org.apache.ibatis.annotations.Param;
+
 import java.text.ParseException;
 import java.util.List;
 
@@ -28,6 +30,9 @@ public interface BoatWaterPollutantAcceptFService extends IService<BoatWaterPoll
   List<PollutanWarningInfoVo> selectWarningHisInfoList(
       PollutantWarningInfoReq pollutantWarningInfoReq);
 
+  List<PollutanWarningInfoVo> selectWarningInfoListByDate(
+          PollutantWarningInfoReq pollutantWarningInfoReq);
+
   List<BoatWaterPollutantAcceptF> selectBoatWaterListSync(
       PollutantBoatWaterReq pollutantBoatWaterReq,
       List<String> datesBetween);

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

@@ -77,6 +77,14 @@ public class BoatWaterPollutantAcceptFServiceImpl extends
     return voList;
   }
 
+  @Override
+  public List<PollutanWarningInfoVo> selectWarningInfoListByDate(PollutantWarningInfoReq queryParam){
+    PageHelper.startPage(queryParam.getPageIndex(),
+            queryParam.getPageSize());
+    List<PollutanWarningInfoVo> voList = mapper.selectWarningInfoListByDate(queryParam);
+    return voList;
+  }
+
   @Override
   public List<BoatWaterPollutantAcceptF> selectBoatWaterListSync(
       PollutantBoatWaterReq pollutantBoatWaterReq, List<String> datesBetween) {

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

@@ -249,6 +249,41 @@
     order by tt.relievetime desc,tt.CODE desc
   </select>
 
+  <select id="selectWarningInfoListByDate" resultType="com.shanghaichengdi.ghjgitem.vo.PollutanWarningInfoVo">
+    select * from (
+      select g.code,
+      g.BOATNAME,
+      g.mmsi,
+      g.WARNINGTIME,
+      g.DISTRICT,
+      g.type,
+      g.REPORTCODE,
+      g.STARTTIME,
+      g.filterdes,
+      g.FILTERTIME,
+      g.berthname,
+      decode(k.SHIP_ID,null,kk.ship_id,k.ship_id) ship_id,
+      decode(k.SHIP_REG_NO,null,kk.ship_reg_no,k.ship_reg_no) ship_reg_no,
+      b.BID_NAME,b.MOBILE_PHONE
+      from (select * from GHJG_BUSSINESS.BOAT_WATER_POLLUTANT_WARNING_S
+      where (FILTERSTATE = 1 or warncount >= 3) and deleteflag = 0 and RELIEVETYPE = 0) g
+      left join ghjg_basics.boat_short_barge b on b.mmsi = g.mmsi
+      left join ghjg_basics.mvw_boat_info k on k.mmsi = g.mmsi
+      left join ghjg_basics.mvw_boat_info kk on kk.ship_name_cn = g.boatname
+      where g.relievetype = 0 and g.deleteflag = 0
+    ) tt
+    where 1=1
+    <if test="jurisdiction != null and jurisdiction != ''">
+      and tt.district like #{jurisdiction} || '%'
+    </if>
+    <if test="startTime != null and startTime != ''">
+      and tt.FILTERTIME >= to_date(#{startTime},'yyyy-mm-dd hh24:mi:ss')
+    </if>
+    <if test="endTime != null and endTime != ''">
+      and tt.FILTERTIME &lt;= to_date(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </if>
+    order by tt.WARNINGTIME, tt.CODE desc
+  </select>
 
   <select id="selectBoatWaterListSync" resultType="com.shanghaichengdi.ghjgitem.domain.BoatWaterPollutantAcceptF">
     select a.*

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

@@ -372,7 +372,7 @@
     <select id="getPdShipCountByMmsi" resultType="java.lang.Integer">
         select count(1) from ghjg_dynamic.vw_gpsinfo_realtime t
         where t.deviceid = #{mmsi}
-          and t.GPSTIME > sysdate - 1/24
+          and t.GPSTIME > sysdate - 30
           and t.MAPX > -2000 and t.MAPX &lt; 48000
           and t.MAPY > -48000 and t.MAPY &lt; 18000
     </select>

ghjg-item-datashare-server/src/main/resources/profile/pro/application.yml

@@ -17,7 +17,7 @@ spring:
     username: ghjg_basics
     password: GHJG@123
     hikari:
-      maximum-pool-size: 15
+      maximum-pool-size: 30
       connection-timeout: 30000
       idle-timeout: 600000
       max-lifetime: 1800000