:sparkles: 船舶报港信息逻辑调整

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

@@ -68,7 +68,8 @@ public class BoatController extends CommonController {
   }
 
   @PostMapping("/getReportInfoList")
-  public ReturnMsg getReportInfoList(@RequestBody @Validated ObjectBodyVo vo) {
+  public ReturnMsg getReportInfoList(@RequestBody @Validated ObjectBodyVo vo)
+      throws ParseException {
     if (!checkDbKey(vo.getKey())) {
       return ReturnMsg.error(HttpStatus.BAD_REQUEST, "key值有误,请确认您输入的key值正确!");
     }

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

@@ -29,5 +29,9 @@ public interface CommonMapper {
 
   List<ShipDataVo> selectBoatInfoList(ShipDataRequest param);
 
-  List<BoatReportInfoVo> selectBoatReportInfoList(ReportInfoRequest param);
+  List<BoatReportInfoVo> selectBoatReportInfoList(@Param("reportId") String reportId,
+      @Param("region") String area, @Param("district") String district,
+      @Param("shipId") String shipId, @Param("startTime") String startTime,
+      @Param("endTime") String endTime, @Param("partition") String partition,
+      @Param("reportNo") String reportNo);
 }

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

@@ -12,6 +12,7 @@ import com.shanghaichengdi.ghjgitem.vo.request.ReportInfoRequest;
 import com.shanghaichengdi.ghjgitem.vo.request.ReportSubInfoReq;
 import com.shanghaichengdi.ghjgitem.vo.request.ShipDataRequest;
 import com.shanghaichengdi.ghjgitem.vo.request.SupervisionOrDocNumberReq;
+import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -31,5 +32,5 @@ public interface CommonService {
 
   List<ShipDataVo> selectBoatInfoList(ShipDataRequest param);
 
-  List<BoatReportInfoVo> selectBoatReportInfoList(ReportInfoRequest param);
+  List<BoatReportInfoVo> selectBoatReportInfoList(ReportInfoRequest param) throws ParseException;
 }

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

@@ -16,6 +16,8 @@ import com.shanghaichengdi.ghjgitem.vo.request.ReportInfoRequest;
 import com.shanghaichengdi.ghjgitem.vo.request.ReportSubInfoReq;
 import com.shanghaichengdi.ghjgitem.vo.request.ShipDataRequest;
 import com.shanghaichengdi.ghjgitem.vo.request.SupervisionOrDocNumberReq;
+import com.shanghaigeography.Util.DateUtils;
+import java.text.ParseException;
 import java.time.LocalDate;
 import java.util.Collections;
 import java.util.List;
@@ -97,8 +99,15 @@ public class CommonServiceImpl implements CommonService {
   }
 
   @Override
-  public List<BoatReportInfoVo> selectBoatReportInfoList(ReportInfoRequest param) {
+  public List<BoatReportInfoVo> selectBoatReportInfoList(ReportInfoRequest param)
+      throws ParseException {
+    String startTime = param.getQueryDate() + " 00:00:00";
+    String endTime = param.getQueryDate() + " 23:59:59";
+    String partition = "SHIP_REPORT_" + DateUtils.dateToString(
+        DateUtils.stringToDate(param.getQueryDate(), DateUtils.DATE_FORMAT_10),
+        DateUtils.DATE_FORMAT_11);
     PageHelper.startPage(param.getPageIndex(), param.getPageSize());
-    return mapper.selectBoatReportInfoList(param);
+    return mapper.selectBoatReportInfoList(param.getReportId(), "",
+        "", param.getShipId(), startTime, endTime, partition, param.getReportNo());
   }
 }