代码修改

svr/svr-base/src/main/java/com/yihu/jw/base/service/device/DeviceManageService.java

@@ -63,33 +63,35 @@ public class DeviceManageService extends BaseJpaService<DeviceDetail,DeviceDetai
        String iccid = deviceDetail.getIccid();
        String imsi = deviceDetail.getImsi();
        DeviceDetail tmps1 =  deviceDetailDao.findBySn(deviceSn);
        if (tmps1!=null){
            result.put(ResponseContant.resultFlag,ResponseContant.fail);
            result.put(ResponseContant.resultMsg,"设备SN码重复");
            return result;
        }
        if (StringUtils.isNotBlank(sim)){
            List<DeviceDetail> tmps = deviceDetailDao.findBySim(sim);
            if (tmps.size()>0){
        if (tmps1.getId()!=deviceDetail.getId()){
            if (tmps1!=null){
                result.put(ResponseContant.resultFlag,ResponseContant.fail);
                result.put(ResponseContant.resultMsg,"sim卡号重复");
                result.put(ResponseContant.resultMsg,"设备SN码重复");
                return result;
            }
        }
        if (StringUtils.isNotBlank(iccid)){
            List<DeviceDetail> tmps =  deviceDetailDao.findByIccid(iccid);
            if (tmps.size()>0){
                result.put(ResponseContant.resultFlag,ResponseContant.fail);
                result.put(ResponseContant.resultMsg,"iccid重复");
                return result;
            if (StringUtils.isNotBlank(sim)){
                List<DeviceDetail> tmps = deviceDetailDao.findBySim(sim);
                if (tmps.size()>0){
                    result.put(ResponseContant.resultFlag,ResponseContant.fail);
                    result.put(ResponseContant.resultMsg,"sim卡号重复");
                    return result;
                }
            }
        }
        if (StringUtils.isNotBlank(imsi)){
            List<DeviceDetail> tmps =  deviceDetailDao.findByImsi(imsi);
            if (tmps.size()>0){
                result.put(ResponseContant.resultFlag,ResponseContant.fail);
                result.put(ResponseContant.resultMsg,"imsi重复");
                return result;
            if (StringUtils.isNotBlank(iccid)){
                List<DeviceDetail> tmps =  deviceDetailDao.findByIccid(iccid);
                if (tmps.size()>0){
                    result.put(ResponseContant.resultFlag,ResponseContant.fail);
                    result.put(ResponseContant.resultMsg,"iccid重复");
                    return result;
                }
            }
            if (StringUtils.isNotBlank(imsi)){
                List<DeviceDetail> tmps =  deviceDetailDao.findByImsi(imsi);
                if (tmps.size()>0){
                    result.put(ResponseContant.resultFlag,ResponseContant.fail);
                    result.put(ResponseContant.resultMsg,"imsi重复");
                    return result;
                }
            }
        }
        //名称、设备类型、设备型号判断