代码修改

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

@@ -52,7 +52,7 @@ public class DeviceManageService extends BaseJpaService<DeviceDetail,DeviceDetai
        String imsi = deviceDetail.getImsi();
        DeviceDetail tmps1 =  deviceDetailDao.findBySn(deviceSn);
        if (tmps1 != null) {
            if (tmps1.getId()!=deviceDetail.getId()) {
            if (tmps1.getId().longValue()!=deviceDetail.getId().longValue()) {
                result.put(ResponseContant.resultFlag, ResponseContant.fail);
                result.put(ResponseContant.resultMsg, "设备SN码重复");
                return result;
@@ -61,7 +61,7 @@ public class DeviceManageService extends BaseJpaService<DeviceDetail,DeviceDetai
        if (StringUtils.isNotBlank(sim)){
            List<DeviceDetail> tmps = deviceDetailDao.findBySim(sim);
            if (tmps.size()>0){
                if (tmps.get(0).getId()!=deviceDetail.getId()) {
                if (tmps.get(0).getId().longValue()!=deviceDetail.getId().longValue()) {
                    result.put(ResponseContant.resultFlag,ResponseContant.fail);
                    result.put(ResponseContant.resultMsg,"sim卡号重复");
                    return result;
@@ -71,7 +71,7 @@ public class DeviceManageService extends BaseJpaService<DeviceDetail,DeviceDetai
        if (StringUtils.isNotBlank(iccid)){
            List<DeviceDetail> tmps =  deviceDetailDao.findByIccid(iccid);
            if (tmps.size()>0){
                if (tmps.get(0).getId()!=deviceDetail.getId()) {
                if (tmps.get(0).getId().longValue()!=deviceDetail.getId().longValue()) {
                    result.put(ResponseContant.resultFlag,ResponseContant.fail);
                    result.put(ResponseContant.resultMsg,"iccid重复");
                    return result;
@@ -81,7 +81,7 @@ public class DeviceManageService extends BaseJpaService<DeviceDetail,DeviceDetai
        if (StringUtils.isNotBlank(imsi)){
            List<DeviceDetail> tmps =  deviceDetailDao.findByImsi(imsi);
            if (tmps.size()>0){
                if (tmps.get(0).getId()!=deviceDetail.getId()) {
                if (tmps.get(0).getId().longValue()!=deviceDetail.getId().longValue()) {
                    result.put(ResponseContant.resultFlag,ResponseContant.fail);
                    result.put(ResponseContant.resultMsg,"imsi重复");
                    return result;

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

@@ -52,7 +52,7 @@ public class DmDeviceService extends BaseJpaService<Device, DeviceDao> {
                result.put(ResponseContant.resultFlag,ResponseContant.fail);
                result.put(ResponseContant.resultMsg,"设备型号已存在");
                return result;
            }else if (deviceTmp.getId()!=device.getId()){//
            }else if (deviceTmp.getId().longValue()!=device.getId().longValue()){//
                result.put(ResponseContant.resultFlag,ResponseContant.fail);
                result.put(ResponseContant.resultMsg,"设备型号已存在");
                return result;