流量卡计费

device-api-service/src/main/java/com/xy/mapper/mapper/DeviceSimMapper.xml

@@ -53,6 +53,9 @@
         <if test="queryPage.deviceId != null">
             and di.device_id = #{queryPage.deviceId}
         </if>
+        <if test="queryPage.simId != null and queryPage.simId != ''">
+            and dsim.id = #{queryPage.simId}
+        </if>
         <if test="queryPage.chargingStatus != null and queryPage.chargingStatus != ''">
             <!-- 即将过期 -->
             <if test="queryPage.chargingStatus == 1">

device-api/src/main/java/com/xy/dto/DeviceSimDto.java

@@ -79,6 +79,9 @@ public class DeviceSimDto {
         @ApiModelProperty("流量卡id")
         private String simId;
 
+        @ApiModelProperty("设备id")
+        private Long deviceId;
+
         @ApiModelProperty("商户id")
         private Long mercId;