Merge remote-tracking branch 'origin/test' into test

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

@@ -37,6 +37,7 @@
             <result column="last_renewal_time" property="lastRenewalTime"/>
             <result column="dsim_create_time" property="createTime"/>
             <result column="is_test" property="isTest"/>
+            <result column="wait_handle" property="waitHandle"/>
         </association>
     </resultMap>
 
@@ -44,7 +45,7 @@
         SELECT
         di.*,
         ds.net_state,
-        dsim.id, dsim.type, dsim.activate_time, dsim.timeout, dsim.last_renewal_time, dsim.create_time as dsim_create_time, dsim.is_test,
+        dsim.id, dsim.type, dsim.activate_time, dsim.timeout, dsim.last_renewal_time, dsim.create_time as dsim_create_time, dsim.is_test, dsim.wait_handle,
         dsys.sim_iccid
         FROM
         device_sim dsim

device-api-service/src/main/java/com/xy/service/DeviceSimServiceImpl.java

@@ -14,6 +14,7 @@ import com.xy.collections.list.JList;
 import com.xy.collections.map.JMap;
 import com.xy.config.DeviceThreadPoolConfig;
 import com.xy.config.FileConfig;
+import com.xy.device.EnumDeviceChargingHistoryStatus;
 import com.xy.device.EnumSimConfig;
 import com.xy.dto.DeviceSimDto;
 import com.xy.entity.DeviceSim;
@@ -122,7 +123,12 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                     .setLastRenewalTime(now)
                     .setUpdateTime(now);
         });
+        //修改设备流量卡信息
         updateBatchById(deviceSims);
+        //修改设备流量卡充值
+        Integer status = SysDictUtils.getValue(EnumDeviceChargingHistoryStatus.Code.CODE.getCode(), EnumDeviceChargingHistoryStatus.N_2.getCode(), Integer.class);
+        deviceSimCharges.forEach(deviceSimCharge -> deviceSimCharge.setStatus(status).setUpdateTime(now));
+        deviceSimChargeService.updateBatchById(deviceSimCharges);
         return R.ok();
     }