修改了“轨道衡一次计量数据”接口

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -373,10 +373,10 @@ throw new MarkerMetException(500, "操作异常！！");
 
     @ApiOperation(value = "火车号汇总统计汇总-网页", notes = "根据传入时间和火车号，查询给定时间段去重车号")
     @GetMapping(value = "/distinctCarNo")
-    public RESTfulResult distinctCarNo(String railwayTypeNo, String startTime, String endTime, String dataSource) {
+    public RESTfulResult distinctCarNo(String railwayTypeNo,String railwayNo, String startTime, String endTime, String dataSource) {
         RESTfulResult rm = failed();
         try {
-            List<String> rows = meterWorkRailwayActFirstService.distinctCarNo(railwayTypeNo, startTime, endTime, dataSource);
+            List<String> rows = meterWorkRailwayActFirstService.distinctCarNo(railwayTypeNo,railwayNo, startTime, endTime, dataSource);
             return success(rows);
         } catch (MarkerMetException e) {
             e.printStackTrace();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -3113,5 +3113,8 @@
     <if test="dataSource != null and dataSource != ''">
       and  data_source = '${dataSource}'
     </if>
+    <if test="railwayNo != null and railwayNo != ''">
+      and  RAILWAY_NO = '${railwayNo}'
+    </if>
   </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/IMeterWorkRailwayActFirstService.java

@@ -48,7 +48,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     @Transactional(rollbackFor = Exception.class)
     PageList<MeterWorkRailwayActFirst> selectTa(Map<String, Object> parmas, Integer pageNum, Integer pageSize);
 
-    List<String> distinctCarNo(String railwayTypeNo, String startTime, String endTime, String dataSource);
+    List<String> distinctCarNo(String railwayTypeNo,String railwayNo, String startTime, String endTime, String dataSource);
 
     List<MeterWorkRailwayActFirst> selectNet(String weightType, String railwayNo, String flag);
 

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -302,9 +302,10 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<String> distinctCarNo(String railwayTypeNo, String startTime, String endTime, String dataSource) {
+    public List<String> distinctCarNo(String railwayTypeNo,String railwayNo, String startTime, String endTime, String dataSource) {
         HashMap<String, Object> obj = new HashMap<>();
         obj.put("railwayTypeNo", railwayTypeNo);
+        obj.put("railwayNo", railwayNo);
         obj.put("startTime", startTime);
         obj.put("endTime", endTime);
         obj.put("dataSource", dataSource);