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

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;
                }
            }
        }
        //名称、设备类型、设备型号判断

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/YsDeviceService.java

@@ -236,26 +236,32 @@ public class YsDeviceService {
                    break;
                case 2:
                    result.put(ResponseContant.resultFlag,ResponseContant.fail);
                    deviceUtil.updateOnLineStatus(deviceSerial,1);
                    result.put(ResponseContant.resultMsg,"设备开启视频加密,请联系管理员先进行解密");
                    break;
                case 3:
                    result.put(ResponseContant.resultFlag,ResponseContant.fail);
                    deviceUtil.updateOnLineStatus(deviceSerial,0);
                    result.put(ResponseContant.resultMsg,"设备删除");
                    break;
                case 4:
                    result.put(ResponseContant.resultFlag,ResponseContant.fail);
                    deviceUtil.updateOnLineStatus(deviceSerial,0);
                    result.put(ResponseContant.resultMsg,"失效");
                    break;
                case 5:
                    result.put(ResponseContant.resultFlag,ResponseContant.fail);
                    deviceUtil.updateOnLineStatus(deviceSerial,0);
                    result.put(ResponseContant.resultMsg,"未绑定");
                    break;
                case 6:
                    result.put(ResponseContant.resultFlag,ResponseContant.fail);
                    deviceUtil.updateOnLineStatus(deviceSerial,0);
                    result.put(ResponseContant.resultMsg,"账户下流量已超出");
                    break;
                case 7:
                    result.put(ResponseContant.resultFlag,ResponseContant.fail);
                    deviceUtil.updateOnLineStatus(deviceSerial,0);
                    result.put(ResponseContant.resultMsg,"设备接入限制");
                    break;
            }

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/service/DeviceService.java

@@ -888,6 +888,7 @@ public class DeviceService {
            DeviceDetail deviceDetail = deviceDetailDao.findBySn(device);
            if(deviceDetail!=null){
                deviceDetail.setContactStatus(Integer.parseInt(onlinestatu));
                deviceDetailDao.save(deviceDetail);
                if ("0".equals(onlinestatu)){
                    List<String> sns = new ArrayList<>();
                    sns.add(device);