修改序列号新增

src/main/java/com/steerinfo/dil/feign/ColumnDataFeign.java

@@ -12,7 +12,7 @@ import java.util.Map;
  * @Date 2021/6/23 9:58
  * @Version 1.0
  */
-@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "${openfeign.ColumnDataFeign.url}:8083")
+@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "${openfeign.ColumnDataFeign.url}")
 public interface ColumnDataFeign {
     @RequestMapping("getColumnData")
     List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);

src/main/java/com/steerinfo/dil/feign/WmshboundFeign.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * @Date 2021/6/23 9:58
  * @Version 1.0
  */
-@FeignClient(value = "dil-wsmh-api",url = "${openfeign.WmshboundFeign.url}:8070")
+@FeignClient(value = "dil-wsmh-api",url = "${openfeign.WmshboundFeign.url}")
 public interface WmshboundFeign {
 
     @PostMapping("api/v1/wmsh/wmshinboundresults/addWarehousingResult")

src/main/java/com/steerinfo/dil/mapper/AmsshipCargoTransferResultMapper.java

@@ -9,6 +9,7 @@ import java.util.Map;
 
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface AmsshipCargoTransferResultMapper extends IBaseMapper<AmsshipCargoTransferResult, BigDecimal> {
@@ -30,4 +31,7 @@ public interface AmsshipCargoTransferResultMapper extends IBaseMapper<AmsshipCar
     List<Map<String,Object>>  insertBetchId( );
 
     BigDecimal selectPortId(BigDecimal pierId);
+
+    @Select("select seq_AMSSHIP_CARGO.nextval from dual")
+    BigDecimal selectCargoId();
 }

src/main/java/com/steerinfo/dil/mapper/AmsshipDeliveryAttorneyMapper.java

@@ -5,6 +5,7 @@ import com.steerinfo.dil.model.AmsshipDeliveryNotice;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -49,4 +50,7 @@ public interface AmsshipDeliveryAttorneyMapper extends IBaseMapper<AmsshipDelive
      * @return
      */
     List<Map<String, Object>> getRmRawId();
+
+    @Select("select seq_AMSSHIP_ATTORNEY.nextval from dual")
+    BigDecimal selectAttorneyId();
 }

src/main/java/com/steerinfo/dil/mapper/AmsshipDeliveryNoticeMapper.java

@@ -9,6 +9,7 @@ import java.util.Map;
 
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface AmsshipDeliveryNoticeMapper extends IBaseMapper<AmsshipDeliveryNotice, BigDecimal> {
@@ -28,4 +29,7 @@ public interface AmsshipDeliveryNoticeMapper extends IBaseMapper<AmsshipDelivery
     List<Map<String,Object>> selectByNoticeId(Integer noticeId);
     @MapKey("getShipper")
     List<Map<String,Object>>  getShipper();
+
+    @Select("select seq_AMSSHIP_NOTICE.nextval from dual")
+    BigDecimal selectNoticeId();
 }

src/main/java/com/steerinfo/dil/mapper/OmsshipInstructionsCapacityMapper.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface OmsshipInstructionsCapacityMapper extends IBaseMapper<OmsshipInstructionsCapacity, BigDecimal> {
@@ -53,4 +54,7 @@ public interface OmsshipInstructionsCapacityMapper extends IBaseMapper<OmsshipIn
      * @return
      */
     List<Map<String,Object>> selectInstructionsCapacity(BigDecimal instructionsCapacityId);
+
+    @Select("select seq_OMSSHIP_CAPACITY.nextval from dual")
+    BigDecimal selectInstructionCapacityId();
 }

src/main/java/com/steerinfo/dil/mapper/OmsshipShipmentInstructionsMapper.java

@@ -8,6 +8,7 @@ import java.util.Map;
 
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface OmsshipShipmentInstructionsMapper extends IBaseMapper<OmsshipShipmentInstructions, BigDecimal> {
@@ -19,4 +20,7 @@ public interface OmsshipShipmentInstructionsMapper extends IBaseMapper<OmsshipSh
     BigDecimal selectMaxId();
     List<Map<String,Object>> selectShipmentInstructions(BigDecimal shipmentInstructionsId);
     List<Map<String,Object>> getBatchId();
+
+    @Select("select seq_OMSSHIP_SHIPMENT.nextval from dual")
+    BigDecimal selectInstructionId();
 }

src/main/java/com/steerinfo/dil/mapper/TmsshipBargeOperationMapper.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface TmsshipBargeOperationMapper extends IBaseMapper<TmsshipBargeOperation, BigDecimal> {
@@ -34,4 +35,7 @@ public interface TmsshipBargeOperationMapper extends IBaseMapper<TmsshipBargeOpe
      * @return
      */
     List<Map<String,Object>> selectBargeOperation(BigDecimal bargeOperationId);
+
+    @Select("select seq_TMSSHIP_BARGE.nextval from dual")
+    BigDecimal selectBargeId();
 }

src/main/java/com/steerinfo/dil/mapper/TmsshipEntryWharyResultMapper.java

@@ -4,10 +4,14 @@ import com.steerinfo.dil.model.TmsshipEntryWharyResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface TmsshipEntryWharyResultMapper extends IBaseMapper<TmsshipEntryWharyResult, BigDecimal> {
 
     // 得到最大id
     BigDecimal selectMaxId();
+
+    @Select("select seq_TMSSHIP_ENTRY.nextval from dual")
+    BigDecimal selectEntryId();
 }

src/main/java/com/steerinfo/dil/mapper/TmsshipLoadShipResultMapper.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface TmsshipLoadShipResultMapper extends IBaseMapper<TmsshipLoadShipResult, BigDecimal> {
@@ -49,4 +50,7 @@ public interface TmsshipLoadShipResultMapper extends IBaseMapper<TmsshipLoadShip
 
     @Override
     List<TmsshipLoadShipResult> selectByParameters(Map<String, Object> totalId);
+
+    @Select("select seq_TMSSHIP_LOAD.nextval from dual")
+    BigDecimal selectLoadId();
 }

src/main/java/com/steerinfo/dil/mapper/TmsshipOutWharyResultMapper.java

@@ -5,6 +5,7 @@ import com.steerinfo.dil.model.TmsshipTotalResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface TmsshipOutWharyResultMapper extends IBaseMapper<TmsshipOutWharyResult, BigDecimal> {
@@ -14,4 +15,7 @@ public interface TmsshipOutWharyResultMapper extends IBaseMapper<TmsshipOutWhary
 
     // 插入驶离实绩
     int insert(TmsshipTotalResult tmsshipTotalResult);
+
+    @Select("select seq_TMSSHIP_OUT.nextval from dual")
+    BigDecimal selectOutId();
 }

src/main/java/com/steerinfo/dil/mapper/TmsshipShipLocationMapper.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface TmsshipShipLocationMapper extends IBaseMapper<TmsshipShipLocation, BigDecimal> {
@@ -41,4 +42,7 @@ public interface TmsshipShipLocationMapper extends IBaseMapper<TmsshipShipLocati
      * @return
      */
     List<Map<String,Object>> selectShipLocation(BigDecimal locationId);
+
+    @Select("select seq_TMSSHIP_LOCATION.nextval from dual")
+    BigDecimal selectLocationId();
 }

src/main/java/com/steerinfo/dil/mapper/TmsshipTotalResultMapper.java

@@ -8,6 +8,7 @@ import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface TmsshipTotalResultMapper extends IBaseMapper<TmsshipTotalResult, BigDecimal> {
@@ -25,4 +26,7 @@ public interface TmsshipTotalResultMapper extends IBaseMapper<TmsshipTotalResult
 
     // 得到船信息
     List<Map<String, Object>> getCapacity(Map<String, Object> mapVal);
+
+    @Select("select seq_TMSSHIP_TOTAL.nextval from dual")
+    BigDecimal selectTotalId();
 }

src/main/java/com/steerinfo/dil/mapper/TmsshipUnloadShipResultMapper.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface TmsshipUnloadShipResultMapper extends IBaseMapper<TmsshipUnloadShipResult, BigDecimal> {
@@ -40,4 +41,7 @@ public interface TmsshipUnloadShipResultMapper extends IBaseMapper<TmsshipUnload
      * @return
      */
     List<Map<String,Object>> selectUnloadShip(BigDecimal resultId);
+
+    @Select("select seq_TMSSHIP_UNLOAD.nextval from dual")
+    BigDecimal selectUnloadId();
 }

src/main/java/com/steerinfo/dil/mapper/TmsshipWaterQualityResultMapper.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface TmsshipWaterQualityResultMapper extends IBaseMapper<TmsshipWaterQualityResult, BigDecimal> {
@@ -53,4 +54,7 @@ public interface TmsshipWaterQualityResultMapper extends IBaseMapper<TmsshipWate
      * @param orderId
      */
     BigDecimal selectInstructionsId(BigDecimal orderId);
+
+    @Select("select seq_TMSSHIP_QUALITY.nextval from dual")
+    BigDecimal selectQualityId();
 }

src/main/java/com/steerinfo/dil/service/IAmsshipCargoTransferResultService.java

@@ -36,5 +36,6 @@ public interface IAmsshipCargoTransferResultService{
     List<Map<String,Object>> getCargoId();
     int updateByPrimaryKeySelective(AmsshipCargoTransferResult amsshipCargoTransferResult);
     List<Map<String,Object>> selectByOrder(Integer cargoTransferResultId);
-    List<Map<String,Object>>  insertBetchId( );
+    List<Map<String,Object>>  insertBetchId();
+
 }

src/main/java/com/steerinfo/dil/service/impl/AmsshipCargoTransferResultServiceImpl.java

@@ -45,7 +45,7 @@ public class AmsshipCargoTransferResultServiceImpl implements IAmsshipCargoTrans
     @Transactional
     public int insertSelective(AmsshipCargoTransferResult amsshipCargoTransferResult) {
         //货权转移编号
-        BigDecimal cargoTransferResultId = amsshipCargoTransferResultMapper.selectMaxId();
+        BigDecimal cargoTransferResultId = amsshipCargoTransferResultMapper.selectCargoId();
         amsshipCargoTransferResult.setCargoTransferResultId(cargoTransferResultId);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         String  date=sdf.format(new Date());
@@ -119,4 +119,5 @@ public class AmsshipCargoTransferResultServiceImpl implements IAmsshipCargoTrans
     }
 
 
+
 }

src/main/java/com/steerinfo/dil/service/impl/AmsshipDeliveryAttorneyServiceImpl.java

@@ -42,7 +42,7 @@ public class AmsshipDeliveryAttorneyServiceImpl implements IAmsshipDeliveryAttor
 
     @Override
     public int insert(AmsshipDeliveryAttorney amsshipDeliveryAttorney) {
-        BigDecimal attorneyId = amsshipDeliveryAttorneyMapper.selectMaxId();
+        BigDecimal attorneyId = amsshipDeliveryAttorneyMapper.selectAttorneyId();
         amsshipDeliveryAttorney.setAttorneyId(attorneyId);
 
         //  设置常规字段

src/main/java/com/steerinfo/dil/service/impl/AmsshipDeliveryNoticeServiceImpl.java

@@ -44,7 +44,7 @@ public class AmsshipDeliveryNoticeServiceImpl implements IAmsshipDeliveryNoticeS
     @Override
     public int insert(AmsshipDeliveryNotice amsshipDeliveryNotice) {
 
-        BigDecimal noticeId = amsshipDeliveryNoticeMapper.selectMaxId();
+        BigDecimal noticeId = amsshipDeliveryNoticeMapper.selectNoticeId();
         amsshipDeliveryNotice.setNoticeId(noticeId);
         //  设置常规字段
         amsshipDeliveryNotice.setNoticeDistributionStatus("未下发");

src/main/java/com/steerinfo/dil/service/impl/OmsshipInstructionsCapacityServiceImpl.java

@@ -51,7 +51,7 @@ public class OmsshipInstructionsCapacityServiceImpl implements IOmsshipInstructi
      */
     @Override
     public int insert(OmsshipInstructionsCapacity omsshipInstructionsCapacity) {
-        omsshipInstructionsCapacity.setInstructionsCapacityId(selectMaxId());
+        omsshipInstructionsCapacity.setInstructionsCapacityId(omsshipInstructionsCapacityMapper.selectInstructionCapacityId());
         // 设置常规字段
         omsshipInstructionsCapacity.setDeleted(new BigDecimal(0));
         omsshipInstructionsCapacity.setInsertTime(new Date());

src/main/java/com/steerinfo/dil/service/impl/OmsshipShipmentInstructionsServiceImpl.java

@@ -79,7 +79,7 @@ public class OmsshipShipmentInstructionsServiceImpl implements IOmsshipShipmentI
      */
     @Override
     public int insert(OmsshipShipmentInstructions omsshipShipmentInstructions) {
-        BigDecimal shipmentInstructionsId = omsshipShipmentInstructionsMapper.selectMaxId();
+        BigDecimal shipmentInstructionsId = omsshipShipmentInstructionsMapper.selectInstructionId();
         omsshipShipmentInstructions.setShipmentInstructionsId(shipmentInstructionsId);
         //  设置常规字段
         omsshipShipmentInstructions.setInsertTime(new Date());

src/main/java/com/steerinfo/dil/service/impl/TmsshipBargeOperationServiceImpl.java

@@ -45,7 +45,7 @@ public class TmsshipBargeOperationServiceImpl implements ITmsshipBargeOperationS
         Map<String,Object> mapVal = (Map<String, Object>) map.get("mapVal");
         Map<String,Object> bagerShipMap = (Map<String, Object>) map.get("bagerShipMap");
         TmsshipBargeOperation tmsshipBargeOperation = new TmsshipBargeOperation();
-        BigDecimal bargeOperationId = tmsshipBargeOperationMapper.selectMaxId();
+        BigDecimal bargeOperationId = tmsshipBargeOperationMapper.selectBargeId();
         BigDecimal orderId = new BigDecimal((Integer) bagerShipMap.get("orderId"));
         BigDecimal resultTotalId = tmsshipTotalResultService.getResultTotalId(orderId);
         BigDecimal smallCapacityId = new BigDecimal((Integer) mapVal.get("smallCapacityId"));

src/main/java/com/steerinfo/dil/service/impl/TmsshipLoadShipResultServiceImpl.java

@@ -72,7 +72,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         Date resultArrivalTime = new Date((Long)mapVal.get("resultArrivalTime"));
         BigDecimal totalResultId = tmsshipTotalResultService.getResultTotalId(orderId);
         tmsshipEntryWharyResult.setTotalResultId(totalResultId);
-        BigDecimal resultEntryId = tmsshipEntryWharyResultMapper.selectMaxId();
+        BigDecimal resultEntryId = tmsshipEntryWharyResultMapper.selectEntryId();
         tmsshipEntryWharyResult.setResultId(resultEntryId);
         String resultEntryNumber = noUtil.setResultNo("DG",resultEntryId);
         tmsshipEntryWharyResult.setResultNumber(resultEntryNumber);
@@ -94,7 +94,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         Date resultOutWharyTime = new Date((Long) mapVal.get("resultOutWharyTime"));
         TmsshipOutWharyResult tmsshipOutWharyResult = new TmsshipOutWharyResult();
         tmsshipOutWharyResult.setTotalResultId(totalResultId);
-        BigDecimal resultOutId = tmsshipOutWharyResultMapper.selectMaxId();
+        BigDecimal resultOutId = tmsshipOutWharyResultMapper.selectOutId();
         tmsshipOutWharyResult.setResultId(resultOutId);
         String resultOutNumber = noUtil.setResultNo("LG",resultOutId);
         tmsshipOutWharyResult.setResultNumber(resultOutNumber);
@@ -111,7 +111,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         tmsshipOutWharyResult.setDeleteName(null);
         tmsshipOutWharyResult.setDeleteTime(null);
         // 装船
-        BigDecimal resultId = tmsshipLoadShipResultMapper.selectMaxId();
+        BigDecimal resultId = tmsshipLoadShipResultMapper.selectLoadId();
         BigDecimal locationStartPortId = new BigDecimal((Integer) mapVal.get("locationStartPortId"));
         BigDecimal arrivalPortId = new BigDecimal((Integer) mapVal.get("arrivalPortId"));
         BigDecimal batchId = getBatchId(rowMap);

src/main/java/com/steerinfo/dil/service/impl/TmsshipShipLocationServiceImpl.java

@@ -40,7 +40,7 @@ public class TmsshipShipLocationServiceImpl implements ITmsshipShipLocationServi
 
     @Override
     public BigDecimal selectMaxId() {
-        return tmsshipShipLocationMapper.selectMaxId();
+        return tmsshipShipLocationMapper.selectLocationId();
     }
 
     /**

src/main/java/com/steerinfo/dil/service/impl/TmsshipTotalResultServiceImpl.java

@@ -52,7 +52,7 @@ public class TmsshipTotalResultServiceImpl implements ITmsshipTotalResultService
         BigDecimal resultTotalId = selectTotalId(orderId);
         if (resultTotalId == null) {
             TmsshipTotalResult tmsshipTotalResult = new TmsshipTotalResult();
-            BigDecimal totalId = tmsshipTotalResultMapper.selectMaxId();
+            BigDecimal totalId = tmsshipTotalResultMapper.selectTotalId();
             tmsshipTotalResult.setResultId(totalId);
             tmsshipTotalResult.setOrderId(orderId);
             tmsshipTotalResult.setResultDuration(null);

src/main/java/com/steerinfo/dil/service/impl/TmsshipUnloadShipResultServiceImpl.java

@@ -49,7 +49,7 @@ public class TmsshipUnloadShipResultServiceImpl implements ITmsshipUnloadShipRes
      */
     @Override
     public BigDecimal selectMaxId() {
-        return tmsshipUnloadShipResultMapper.selectMaxId();
+        return tmsshipUnloadShipResultMapper.selectUnloadId();
     }
 
     /**

src/main/java/com/steerinfo/dil/service/impl/TmsshipWaterQualityResultServiceImpl.java

@@ -39,7 +39,7 @@ public class TmsshipWaterQualityResultServiceImpl implements ITmsshipWaterQualit
      */
     @Override
     public BigDecimal selectMaxId() {
-        return tmsshipWaterQualityResultMapper.selectMaxId();
+        return tmsshipWaterQualityResultMapper.selectQualityId();
     }
 
     /**