asdsa

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.model.TmstruckWeightResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
@@ -39,12 +40,13 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
     //通过物资ID查询应该在哪个汽车衡计量
     List<Integer> getCalculateIdByMaterial(BigDecimal material);
+
     //通过运输订单id获取路段顺序号、物资类型、计量实绩主键、line_id
-    Map<BigDecimal, String> selectByOrderId(BigDecimal orderId);
+    Map<String, BigDecimal> selectByOrderId(BigDecimal orderId);
     /**
      * 通过物料、性质判断所去的汽车衡
      */
-    BigDecimal getTruckCalculateNumber(BigDecimal materialTypeId, BigDecimal bigDecimal);
+    BigDecimal getTruckCalculateNumber(@Param("materialTypeId") BigDecimal materialTypeId, @Param("bigDecimal") BigDecimal bigDecimal);
 
-    List<BigDecimal> getNextStep(BigDecimal lineId, int orderLineSequence);
+    List<BigDecimal> getNextStep(@Param("lineId") BigDecimal lineId, @Param("orderLineSequence") int orderLineSequence);
 }

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

@@ -315,13 +315,13 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     @Override
     public int isNextNeedJl(BigDecimal orderId) {
         //通过运输订单id获取路段顺序号、物资类型、计量实绩主键、line_id
-        Map<BigDecimal,String> map=tmstruckWeightResultMapper.selectByOrderId(orderId);
+        Map<String,BigDecimal> map = tmstruckWeightResultMapper.selectByOrderId(orderId);
         //通过运输订单id获取物资的类型
-        BigDecimal materialTypeId=new BigDecimal(map.get("materialTypeId").toString());
+        BigDecimal materialTypeId = DataChange.dataToBigDecimal(map.get("materialTypeId"));
         //获取路段顺序号
-        BigDecimal orderLineSequence=new BigDecimal(map.get("orderLineSequence").toString());
+        BigDecimal orderLineSequence = DataChange.dataToBigDecimal(map.get("orderLineSequence"));
         //计量实绩主键
-        BigDecimal weightTaskResultId=new BigDecimal(map.get("weightTaskResultId").toString());
+        BigDecimal weightTaskResultId = DataChange.dataToBigDecimal(map.get("weightTaskResultId"));
         //line_id
         BigDecimal lineId=new BigDecimal(map.get("lineId").toString());
         //通过运输线路判断下一步是否为计量，当前是啥，下下一步是啥

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
-    password: st#0901
-    username: DIL0901
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-tms-truck-dev

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
-    password: st#0901
-    username: DIL0901
+      url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+      password: Dil123789
+      username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-tms-truck-dev

src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -979,7 +979,7 @@
     </select>
 
 <!--  * 通过物料、性质判断所去的汽车衡-->
-  <select id="getTruckCalculateNumber" parameterType="java.util.Map" resultType="java.math.BigDecimal">
+  <select id="getTruckCalculateNumber" resultType="java.math.BigDecimal">
     select rtc.truck_calculate_id from rms_truck_calculate_material rtcm
                                          left join rms_truck_calculate rtc on rtcm.truck_calculate_id=rtc.truck_calculate_id
     where rtcm.material_type_id=#{materialTypeId} and rtc.nature=#{nature} and rownum=1 order by rtc.truck_calculate_priority
@@ -987,7 +987,7 @@
 
   <!--    //返回下一步路段顺序号对应的终点type
     BigDecimal getNextStep(BigDecimal lineId, int i);-->
-  <select id="getNextStep" parameterType="java.util.Map" resultType="java.math.BigDecimal">
+  <select id="getNextStep"  resultType="java.math.BigDecimal">
     select rls.segment_end_node_type
     from rms_line_segemnt rls
     where rls.line_id = #{lineId}