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

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -830,9 +830,13 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
 
     @ApiOperation(value = "车号汇总统计汇总-网页", notes = "根据传入时间和车号，查询给定时间段去重车号")
     @GetMapping(value = "/distinctCarNo")
-    public RESTfulResult distinctCarNo(@RequestParam String carNo, String startTime, String endTime, String dataSource) {
+    public RESTfulResult distinctCarNo(@RequestParam HashMap param) {
         RESTfulResult rm = failed();
         try {
+            String carNo = param.get("carNo") == null ? "":param.get("carNo").toString();
+            String startTime = param.get("startTime") == null ? "":param.get("startTime").toString();
+            String endTime = param.get("endTime") == null ? "":param.get("endTime").toString();
+            String dataSource = param.get("dataSource") == null ? "":param.get("dataSource").toString();
             List<String> rows = meterWorkCarActualFirstService.distinctCarNo(carNo, startTime, endTime, dataSource);
             return success(rows);
         } catch (MarkerMetException e) {

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2774,13 +2774,16 @@
 
     <!-- 查询：根据传入时间和车号，查询给定时间段去重车号 -->
     <select id="distinctCarNo" parameterType="java.lang.String" resultMap="BaseResultMap">
-        SELECT distinct car_No
-        from METER_WORK_CAR_ACTUAL_FIRST
-        where VALUE_FLAG != '0' and CAR_NO like '%${carNo}%'
-        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-            and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-        </if>
-      <if test="dataSource != null and dataSource != null">
+      SELECT distinct car_No
+      from METER_WORK_CAR_ACTUAL_FIRST
+      where VALUE_FLAG != '0'
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO like '%${carNo}%'
+      </if>
+      <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+          and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="dataSource != null and dataSource != ''">
         and  data_source = '${dataSource}'
       </if>
     </select>

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

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