pc管理端设备管理导入功能修改提交

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/device/repository/DeviceManufacturerDao.java

@@ -7,6 +7,8 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
 * Created by humingfen on 2018/6/6.
 */
@@ -21,4 +23,7 @@ public interface DeviceManufacturerDao extends PagingAndSortingRepository<Device
    @Query("select dm.manufacturerCode from DeviceManufacturer dm where dm.code = ?1")
    String getManufacturerCodeByCode(String code);
    @Query("select dm from DeviceManufacturer dm where dm.del = 0")
    List<DeviceManufacturer> getAll();
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/device/repository/WlyyDeviceDao.java

@@ -2,6 +2,7 @@ package com.yihu.wlyy.device.repository;
import com.yihu.wlyy.device.entity.WlyyDevice;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
@@ -10,4 +11,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
public interface WlyyDeviceDao extends PagingAndSortingRepository<WlyyDevice, Long>, JpaSpecificationExecutor<WlyyDevice> {
    WlyyDevice findByDeviceCode(String deviceCode);
    @Query("select count(d.id) from WlyyDevice d where d.deviceCode = ?1")
    Integer existDeviceCode(String deviceCode);
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/device/DeviceManufacturerService.java

@@ -75,7 +75,7 @@ public class DeviceManufacturerService  {
    }
    public List<DeviceManufacturer> findAll() {
        List<DeviceManufacturer> deviceManufacturer = (List<DeviceManufacturer>) deviceManufacturerDao.findAll();
        List<DeviceManufacturer> deviceManufacturer = (List<DeviceManufacturer>) deviceManufacturerDao.getAll();
        return deviceManufacturer;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/device/WlyyDeviceService.java

@@ -183,7 +183,11 @@ public class WlyyDeviceService {
            }
            device.setIsGrant(0);
            device.setIsBinding(0);
            deviceList.add(device);
            //判断设备是否导入
            Integer count = deviceDao.existDeviceCode(device.getDeviceCode());
            if(count == 0) {
                deviceList.add(device);
            }
        }
        deviceDao.save(deviceList);
        return true;
@@ -245,6 +249,14 @@ public class WlyyDeviceService {
            @Override
            public void transform(String data) {
                device.setDeviceModel(data);
                DmDevice dmDevice = dmDeviceDao.findByModel(device.getDeviceModel());
                if(dmDevice != null) {
                    if(dmDevice.getIsMultiUser().equals("1")) {
                        device.setBindingCount("{\"1\":\"0\", \"2\":\"0\"}");
                    }else if(dmDevice.getIsMultiUser().equals("0")) {
                        device.setBindingCount("{\"1\":\"0\"}");
                    }
                }
            }
        });
        //设备唯一标识
@@ -342,23 +354,11 @@ public class WlyyDeviceService {
        dataMap.put(21, new ExcelData() {
            @Override
            public void transform(String data) {
                if(data.contains("血压")) {
                    device.setBindingCount("{\"1\":\"0\", \"2\":\"0\"}");
                } else if(data.contains("血糖")){
                    device.setBindingCount("{\"1\":\"0\"}");
                }
            }
        });
        //发放时间
        dataMap.put(22, new ExcelData() {
            @Override
            public void transform(String data) {
                if(StringUtils.isNotBlank(data)) {
                    try {
                        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        device.setGrantTime(simpleDateFormat.parse(data));
                    } catch (ParseException e) {
                        e.printStackTrace();
                if(device.getBindingCount() == null) {
                    if (data.contains("血压")) {
                        device.setBindingCount("{\"1\":\"0\", \"2\":\"0\"}");
                    } else if (data.contains("血糖")) {
                        device.setBindingCount("{\"1\":\"0\"}");
                    }
                }
            }