|
|
@ -10,11 +10,9 @@ import com.bellmann.common.enums.*; |
|
|
|
import com.bellmann.common.exception.BusinessException; |
|
|
|
import com.bellmann.common.exception.BusinessException; |
|
|
|
import com.bellmann.common.result.Result; |
|
|
|
import com.bellmann.common.result.Result; |
|
|
|
import com.bellmann.common.result.ResultCode; |
|
|
|
import com.bellmann.common.result.ResultCode; |
|
|
|
|
|
|
|
import com.bellmann.common.util.CommonUtils; |
|
|
|
import com.bellmann.converter.OrderInfoConverter; |
|
|
|
import com.bellmann.converter.OrderInfoConverter; |
|
|
|
import com.bellmann.mapper.DeviceStaticMapper; |
|
|
|
import com.bellmann.mapper.*; |
|
|
|
import com.bellmann.mapper.DeviceTypeVerDetailMapper; |
|
|
|
|
|
|
|
import com.bellmann.mapper.OrderInfoMapper; |
|
|
|
|
|
|
|
import com.bellmann.mapper.OrderServiceMapper; |
|
|
|
|
|
|
|
import com.bellmann.model.bo.DeviceDetailBO; |
|
|
|
import com.bellmann.model.bo.DeviceDetailBO; |
|
|
|
import com.bellmann.model.entity.DeviceStatic; |
|
|
|
import com.bellmann.model.entity.DeviceStatic; |
|
|
|
import com.bellmann.model.entity.OrderInfo; |
|
|
|
import com.bellmann.model.entity.OrderInfo; |
|
|
@ -25,12 +23,15 @@ import com.bellmann.model.vo.OrderInfoTableVO; |
|
|
|
import com.bellmann.model.vo.OrderInfoVO; |
|
|
|
import com.bellmann.model.vo.OrderInfoVO; |
|
|
|
import com.bellmann.security.util.SecurityUtils; |
|
|
|
import com.bellmann.security.util.SecurityUtils; |
|
|
|
import com.bellmann.service.OrderInfoService; |
|
|
|
import com.bellmann.service.OrderInfoService; |
|
|
|
|
|
|
|
import com.zznode.itms.api.InventoryManager; |
|
|
|
import com.zznode.itms.api.NBIManager; |
|
|
|
import com.zznode.itms.api.NBIManager; |
|
|
|
|
|
|
|
import com.zznode.itms.api.Utils; |
|
|
|
import com.zznode.itms.idl.resourcedefinition.*; |
|
|
|
import com.zznode.itms.idl.resourcedefinition.*; |
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
import org.springframework.data.redis.core.RedisTemplate; |
|
|
|
import org.springframework.data.redis.core.RedisTemplate; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
@ -56,6 +57,8 @@ public class OrderInfoServiceImpl implements OrderInfoService { |
|
|
|
private final DeviceStaticMapper deviceStaticMapper; |
|
|
|
private final DeviceStaticMapper deviceStaticMapper; |
|
|
|
|
|
|
|
|
|
|
|
private final OrderInfoConverter orderInfoConverter; |
|
|
|
private final OrderInfoConverter orderInfoConverter; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private final DeviceTypeVerMapper deviceTypeVerMapper; |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public Page<OrderInfoTableVO> tablePage(SelectQuery query) { |
|
|
|
public Page<OrderInfoTableVO> tablePage(SelectQuery query) { |
|
|
|
int pageNum = query.getPageNum(); |
|
|
|
int pageNum = query.getPageNum(); |
|
|
@ -320,6 +323,46 @@ public class OrderInfoServiceImpl implements OrderInfoService { |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public Result<String> bindingOuiSno(String devOuiSno, Long orderId) { |
|
|
|
public Result<String> bindingOuiSno(String devOuiSno, Long orderId) { |
|
|
|
|
|
|
|
checkDevice(devOuiSno,orderId); |
|
|
|
|
|
|
|
OrderInfo orderInfo = orderInfoMapper.selectOne(new QueryWrapper<OrderInfo>() |
|
|
|
|
|
|
|
.eq("order_id", orderId) |
|
|
|
|
|
|
|
.select("order_id","order_status","unique_user_id","pppoe_account","ad_no") |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
if (OrderStatusEnum.PROCESSING.getValue().equals(orderInfo.getOrderStatus())){ |
|
|
|
|
|
|
|
devOuiSno = CommonUtils.getRandomString(14); |
|
|
|
|
|
|
|
createDevice(devOuiSno,orderInfo); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
int result = NBIManager.bindDevice(orderId, devOuiSno); |
|
|
|
|
|
|
|
if (result!=0){ |
|
|
|
|
|
|
|
throw new BusinessException(ResultCode.DEVICE_BINDING_FAILED); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return Result.success(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void createDevice(String ouiSno,OrderInfo order){ |
|
|
|
|
|
|
|
RDeviceStaticStruct deviceStaticStruct=new RDeviceStaticStruct(); |
|
|
|
|
|
|
|
deviceStaticStruct.typeAndVerId = deviceTypeVerMapper.getTypeAndVerId(); |
|
|
|
|
|
|
|
deviceStaticStruct.custId= Utils.LONG_NULL; |
|
|
|
|
|
|
|
deviceStaticStruct.regionAreaId=order.getSystemDomain(); |
|
|
|
|
|
|
|
deviceStaticStruct.corpAreaId = Utils.LONG_NULL; |
|
|
|
|
|
|
|
deviceStaticStruct.devSNo=ouiSno; |
|
|
|
|
|
|
|
deviceStaticStruct.devMac=""; |
|
|
|
|
|
|
|
deviceStaticStruct.devPPPoE=order.getPppoeAccount(); |
|
|
|
|
|
|
|
deviceStaticStruct.devADNo=order.getAdNo(); |
|
|
|
|
|
|
|
deviceStaticStruct.devCreateTime=new Date().getTime(); |
|
|
|
|
|
|
|
deviceStaticStruct.devModifyTime=Utils.LONG_NULL; |
|
|
|
|
|
|
|
deviceStaticStruct.devSoapFlag=true; |
|
|
|
|
|
|
|
deviceStaticStruct.devInformFlag=true; |
|
|
|
|
|
|
|
deviceStaticStruct.devStatus = RDevStatus.DEV_NORMAL; |
|
|
|
|
|
|
|
deviceStaticStruct.devRemark1=""; |
|
|
|
|
|
|
|
deviceStaticStruct.devRemark2=""; |
|
|
|
|
|
|
|
deviceStaticStruct.devRemark3=""; |
|
|
|
|
|
|
|
deviceStaticStruct.devRemark4=""; |
|
|
|
|
|
|
|
deviceStaticStruct.devRemark5="1"; |
|
|
|
|
|
|
|
RDeviceStaticStructHolder holder=new RDeviceStaticStructHolder(deviceStaticStruct); |
|
|
|
|
|
|
|
int result= InventoryManager.addDevice(holder); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
private void checkDevice(String devOuiSno,Long orderId){ |
|
|
|
String[] split = devOuiSno.split("-"); |
|
|
|
String[] split = devOuiSno.split("-"); |
|
|
|
if (split.length!=2){ |
|
|
|
if (split.length!=2){ |
|
|
|
throw new BusinessException(ResultCode.DEV_OUI_SNO_FORMAT_ERROR); |
|
|
|
throw new BusinessException(ResultCode.DEV_OUI_SNO_FORMAT_ERROR); |
|
|
@ -350,10 +393,5 @@ public class OrderInfoServiceImpl implements OrderInfoService { |
|
|
|
if (!"0".equals(devSnoOui)){ |
|
|
|
if (!"0".equals(devSnoOui)){ |
|
|
|
throw new BusinessException(ResultCode.LOGICID_ALREADY_DEVICE); |
|
|
|
throw new BusinessException(ResultCode.LOGICID_ALREADY_DEVICE); |
|
|
|
} |
|
|
|
} |
|
|
|
orderInfoMapper.update(null,new LambdaUpdateWrapper<OrderInfo>() |
|
|
|
|
|
|
|
.eq(OrderInfo::getOrderId,orderId) |
|
|
|
|
|
|
|
.set(OrderInfo::getDevSnoOui,devOuiSno) |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
return Result.success(); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|