Merge branch 'dev' of humingfen/wlyy2.0 into dev

svr/svr-iot/src/main/java/com/yihu/iot/dao/device/IotPatientDeviceDao.java

@@ -51,4 +51,7 @@ public interface IotPatientDeviceDao extends PagingAndSortingRepository<IotPatie
    @Modifying
    @Query("update IotPatientDeviceDO t set t.del = ?2 where t.id = ?1")
    void updateDelById(String id, int del);
    @Query("from IotPatientDeviceDO a where a.deviceSn = ?1 ")
    List<IotPatientDeviceDO> findAllByDeviceSn(String deviceSn);
}

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotPatientDeviceService.java

@@ -412,7 +412,7 @@ public class IotPatientDeviceService extends BaseJpaService<IotPatientDeviceDO,
    }
    public void deleteRepairDevice(String deviceSn) {
        List<IotPatientDeviceDO> patientDeviceDOList = iotPatientDeviceDao.findByDeviceSn(deviceSn);
        List<IotPatientDeviceDO> patientDeviceDOList = iotPatientDeviceDao.findAllByDeviceSn(deviceSn);
        for(IotPatientDeviceDO patientDeviceDO : patientDeviceDOList){
            patientDeviceDO.setStatus(0);
            patientDeviceDO.setUpdateTime(new Date());