Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/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/IotDeviceInventoryService.java

@@ -118,6 +118,7 @@ public class IotDeviceInventoryService extends BaseJpaService<IotDeviceInventory
                    deviceDO.setCategoryName(jsonObject.getString("categoryName"));
                    deviceDO.setManufacturerId(jsonObject.getString("manufacturerId"));
                    deviceDO.setManufacturerName(jsonObject.getString("manufacturerName"));
                    deviceDO.setIsGrant(0);//入库代表未发放
                } else {//设备出库，更换相关信息
                    deviceDO = iotDeviceDao.findByDeviceSn(deviceSn);
                    if (type == 3) {

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());