From f5e54ba1aa87acb485904b152f193c8c8bbad39b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Fri, 26 Jul 2024 17:56:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20voip=E3=80=81=E4=BA=91=E7=9B=92?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E3=80=81=E5=B7=A5=E5=8D=95=E6=89=A7=E8=A1=8C?= =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...troller.java => CraftOrderController.java} | 16 +++++----- .../com/bellmann/model/bo/DeviceDetailBO.java | 2 ++ ...andService.java => CraftOrderService.java} | 4 +-- ...ceImpl.java => CraftOrderServiceImpl.java} | 12 ++++---- .../service/impl/OrderInfoServiceImpl.java | 29 ++++++++++++------- .../resources/mapper/DeviceStaticMapper.xml | 6 ++-- src/main/resources/mapper/OrderInfoMapper.xml | 6 ++-- 7 files changed, 42 insertions(+), 33 deletions(-) rename src/main/java/com/bellmann/controller/{BroadbandController.java => CraftOrderController.java} (82%) rename src/main/java/com/bellmann/service/{BroadbandService.java => CraftOrderService.java} (72%) rename src/main/java/com/bellmann/service/impl/{BroadbandServiceImpl.java => CraftOrderServiceImpl.java} (97%) diff --git a/src/main/java/com/bellmann/controller/BroadbandController.java b/src/main/java/com/bellmann/controller/CraftOrderController.java similarity index 82% rename from src/main/java/com/bellmann/controller/BroadbandController.java rename to src/main/java/com/bellmann/controller/CraftOrderController.java index 30d5050..eb545cd 100644 --- a/src/main/java/com/bellmann/controller/BroadbandController.java +++ b/src/main/java/com/bellmann/controller/CraftOrderController.java @@ -5,7 +5,7 @@ import com.bellmann.common.result.Result; import com.bellmann.model.form.AddBroadbandForm; import com.bellmann.plugin.dupsubmit.annotation.PreventDuplicateSubmit; import com.bellmann.security.util.SecurityUtils; -import com.bellmann.service.BroadbandService; +import com.bellmann.service.CraftOrderService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -17,10 +17,10 @@ import java.util.Map; @Tag(name = "30.宽带上网业务") @RestController @RequiredArgsConstructor -@RequestMapping("/api/broadband/v1") -public class BroadbandController { +@RequestMapping("/api/craft-order/v1") +public class CraftOrderController { - private final BroadbandService broadbandService; + private final CraftOrderService broadbandService; @GetMapping("/basic-info") @Operation(summary = "开通宽带业务-基本数据") public Result> basicInfo(){ @@ -34,11 +34,11 @@ public class BroadbandController { .build(); return Result.success(map); } - @PostMapping("/add-broadband") - @Operation(summary = "开通宽带业务") + @PostMapping("/add") + @Operation(summary = "新增手工工单") @PreventDuplicateSubmit - public Result addBroadband(@RequestBody AddBroadbandForm form){ - return broadbandService.addBroadband(form); + public Result addCraftOrder(@RequestBody AddBroadbandForm form){ + return broadbandService.addCraftOrder(form); } @PostMapping("/update-broadband-mode") @Operation(summary = "修改上网模式") diff --git a/src/main/java/com/bellmann/model/bo/DeviceDetailBO.java b/src/main/java/com/bellmann/model/bo/DeviceDetailBO.java index 818b416..48b1706 100644 --- a/src/main/java/com/bellmann/model/bo/DeviceDetailBO.java +++ b/src/main/java/com/bellmann/model/bo/DeviceDetailBO.java @@ -1,11 +1,13 @@ package com.bellmann.model.bo; import lombok.Data; +import lombok.ToString; import java.time.LocalDateTime; import java.util.Date; @Data +@ToString public class DeviceDetailBO { //dynamic diff --git a/src/main/java/com/bellmann/service/BroadbandService.java b/src/main/java/com/bellmann/service/CraftOrderService.java similarity index 72% rename from src/main/java/com/bellmann/service/BroadbandService.java rename to src/main/java/com/bellmann/service/CraftOrderService.java index 4ece06b..0dfda46 100644 --- a/src/main/java/com/bellmann/service/BroadbandService.java +++ b/src/main/java/com/bellmann/service/CraftOrderService.java @@ -3,8 +3,8 @@ package com.bellmann.service; import com.bellmann.common.result.Result; import com.bellmann.model.form.AddBroadbandForm; -public interface BroadbandService { - Result addBroadband(AddBroadbandForm form); +public interface CraftOrderService { + Result addCraftOrder(AddBroadbandForm form); Result updateBroadbandMode(AddBroadbandForm form); diff --git a/src/main/java/com/bellmann/service/impl/BroadbandServiceImpl.java b/src/main/java/com/bellmann/service/impl/CraftOrderServiceImpl.java similarity index 97% rename from src/main/java/com/bellmann/service/impl/BroadbandServiceImpl.java rename to src/main/java/com/bellmann/service/impl/CraftOrderServiceImpl.java index b7a9c5b..c25b4c2 100644 --- a/src/main/java/com/bellmann/service/impl/BroadbandServiceImpl.java +++ b/src/main/java/com/bellmann/service/impl/CraftOrderServiceImpl.java @@ -22,7 +22,7 @@ import com.bellmann.model.entity.OrderMerger; import com.bellmann.model.entity.OrderMergerService; import com.bellmann.model.form.AddBroadbandForm; import com.bellmann.runner.UIService; -import com.bellmann.service.BroadbandService; +import com.bellmann.service.CraftOrderService; import com.zznode.itms.api.Utils; import com.zznode.itms.idl.order.*; import lombok.RequiredArgsConstructor; @@ -33,7 +33,7 @@ import java.util.*; @Service @RequiredArgsConstructor -public class BroadbandServiceImpl implements BroadbandService { +public class CraftOrderServiceImpl implements CraftOrderService { private final OrderInfoMapper orderInfoMapper; private final DomainMapper domainMapper; @@ -43,7 +43,7 @@ public class BroadbandServiceImpl implements BroadbandService { private final OrderMergerMapper orderMergerMapper; @Override - public Result addBroadband(AddBroadbandForm form) { + public Result addCraftOrder(AddBroadbandForm form) { OrderInfoStruct orderInfoStruct = new OrderInfoStruct(); orderInfoStruct.orderId = System.currentTimeMillis(); orderInfoStruct.receiveOrderId = form.getReceiveOrderId(); //v @@ -93,7 +93,7 @@ public class BroadbandServiceImpl implements BroadbandService { orderInfoStruct.pppoeAcount = Utils.convertStringNull(form.getPppoeAccount()); orderInfoStruct.userSnKey = ""; orderInfoStruct.lifeTime = -999; - orderInfoStruct.operRemark = form.getOperateRemark(); + orderInfoStruct.operRemark = form.getServiceName(); orderInfoStruct.remark1 = ""; orderInfoStruct.remark2 = ""; @@ -184,7 +184,7 @@ public class BroadbandServiceImpl implements BroadbandService { .contactPersonNew(form.getContactPersonNew()) .domainDesc(domain.getDescription()) .customerNameNew(form.getCustomerNameNew()) - .operateRemark(form.getOperateRemark()) + .operateRemark(form.getServiceName()) .orderServiceType(form.getOrderServiceType()) .receiveOrderId(form.getReceiveOrderId()) .remark3(form.getRemark3()) @@ -242,7 +242,7 @@ public class BroadbandServiceImpl implements BroadbandService { .contactPersonNew(form.getContactPersonNew()) .domainDesc(domain.getDescription()) .customerNameNew(form.getCustomerNameNew()) - .operateRemark(form.getOperateRemark()) + .operateRemark(form.getServiceName())//TODO .orderServiceType(form.getOrderServiceType()) .receiveOrderId(form.getReceiveOrderId()) .remark3(form.getRemark3()) diff --git a/src/main/java/com/bellmann/service/impl/OrderInfoServiceImpl.java b/src/main/java/com/bellmann/service/impl/OrderInfoServiceImpl.java index 4c7c799..1f96598 100644 --- a/src/main/java/com/bellmann/service/impl/OrderInfoServiceImpl.java +++ b/src/main/java/com/bellmann/service/impl/OrderInfoServiceImpl.java @@ -34,6 +34,7 @@ import com.zznode.itms.api.NBIManager; import com.zznode.itms.api.Utils; import com.zznode.itms.idl.resourcedefinition.*; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -51,6 +52,7 @@ import java.util.Map; */ @Service @RequiredArgsConstructor +@Slf4j public class OrderInfoServiceImpl implements OrderInfoService { private final OrderInfoMapper orderInfoMapper; @@ -227,18 +229,20 @@ public class OrderInfoServiceImpl implements OrderInfoService { !ouiFlag && !OrderServiceTypeEnum.EQUIPMENT_REPLACEMENT.getValue().equals(orderInfo.getOrderServiceType()) ) { - bo = deviceStaticMapper.orderByDevSnoOui(null, null, uniqueUserId); - if (bo != null) { + DeviceDetailBO deviceDetailBO = deviceStaticMapper.orderByDevSnoOui(null, null, uniqueUserId); + if (deviceDetailBO != null) { + bo = deviceDetailBO; uniqueUserIdFlag = true; } } String pppoeAccount = obj.getPppoeAccount(); if (pppoeAccount != null && !pppoeAccount.isEmpty() && !ouiFlag && uniqueUserIdFlag) { - bo = deviceStaticMapper.orderByPppoeAccount(DevStatusEnum.NORMAL.getValue(), pppoeAccount); - if (bo == null) { - throw new BusinessException(ResultCode.NOT_GET_DEVICE); + DeviceDetailBO deviceDetailBO = deviceStaticMapper.orderByPppoeAccount(DevStatusEnum.NORMAL.getValue(), pppoeAccount); + if (deviceDetailBO != null) { + bo = deviceDetailBO; + pppoeFlag = true; } - pppoeFlag = true; + } if (!pppoeFlag && !ouiFlag && !uniqueUserIdFlag) { throw new BusinessException(ResultCode.NOT_GET_DEVICE); @@ -253,15 +257,14 @@ public class OrderInfoServiceImpl implements OrderInfoService { private RDeviceDetailStruct conversionStruct(DeviceDetailBO bo) { RDeviceDetailStruct struct = new RDeviceDetailStruct(); - RDeviceDynamicStruct devDynamic = struct.devDynamic; - RDeviceStaticStruct devStatic = struct.devStatic; - RDeviceStaticDetailStruct devStaticDetail = struct.devStaticDetail; - + RDeviceDynamicStruct devDynamic = new RDeviceDynamicStruct(); + RDeviceStaticStruct devStatic = new RDeviceStaticStruct(); + RDeviceStaticDetailStruct devStaticDetail = new RDeviceStaticDetailStruct(); devStatic.devId = bo.getDevId(); devStatic.typeAndVerId = bo.getTypeAndVerId(); devStatic.custId = bo.getCustId(); devStatic.regionAreaId = bo.getRegionAreaId(); - devStatic.corpAreaId = bo.getCorpAreaId(); + devStatic.corpAreaId = bo.getCorpAreaId()==null?0L:bo.getCorpAreaId(); devStatic.devSNo = bo.getDevSno(); devStatic.devMac = bo.getDevMac(); devStatic.devPPPoE = bo.getDevPppoe(); @@ -301,6 +304,10 @@ public class OrderInfoServiceImpl implements OrderInfoService { devStaticDetail.userSnNo = bo.getUserSnNo(); devStaticDetail.iptvAccess = bo.getIptvAccess(); devStaticDetail.bandAccess = bo.getBandAccess(); + + struct.devDynamic = devDynamic; + struct.devStatic = devStatic; + struct.devStaticDetail = devStaticDetail; return struct; } diff --git a/src/main/resources/mapper/DeviceStaticMapper.xml b/src/main/resources/mapper/DeviceStaticMapper.xml index 7bf388a..a92614f 100644 --- a/src/main/resources/mapper/DeviceStaticMapper.xml +++ b/src/main/resources/mapper/DeviceStaticMapper.xml @@ -138,10 +138,10 @@ AND ITMS_DEVICE_STATIC.DEV_REMARK3 = #{oui} - AND ITMS_DEVICE_STATIC.DEV_SNO = = #{sno} + AND ITMS_DEVICE_STATIC.DEV_SNO = #{sno} - AND ITMS_DEVICE_STATIC.DEV_REMARK4 = = #{devRemark4} + AND ITMS_DEVICE_STATIC.DEV_REMARK4 = #{devRemark4} limit 1 @@ -190,7 +190,7 @@ AND ITMS_DEVICE_STATIC.DEV_STATUS = #{status} - AND ITMS_DEVICE_STATIC.DEV_PPPOE = = #{pppoeAccount} + AND ITMS_DEVICE_STATIC.DEV_PPPOE = #{pppoeAccount} limit 1 diff --git a/src/main/resources/mapper/OrderInfoMapper.xml b/src/main/resources/mapper/OrderInfoMapper.xml index 1dfd4b8..5c5ca1d 100644 --- a/src/main/resources/mapper/OrderInfoMapper.xml +++ b/src/main/resources/mapper/OrderInfoMapper.xml @@ -115,14 +115,14 @@